shithub: pokecrystal

Download patch

ref: 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3
parent: 17a4d0540acc00e3f5ad260009115eb36e72b7d2
parent: 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2
author: Thomas Winwood <[email protected]>
date: Fri Jul 20 22:06:31 EDT 2018 

Merge branch 'master' into the-diffening


--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: c
+os:
+  - linux
+  - osx
 install:
   - |-
     path="$(pwd)"; cd;
@@ -20,4 +23,3 @@
 script:
   - make -j2 compare
   - check_status
-
--- 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.
 
-## Can't build ROM; "Section is too big" or "Unable to place section in bank"
+### "Segmentation fault" from `rgbgfx`
 
+If you are using 64-bit Windows, download [**64-bit Cygwin**][cygwin] and [**64-bit rgbds**][rgbds].
+
+### "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.
 
+### "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_event_scripts.md](docs/map_event_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, 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 @@
 
 [cygwin]: https://cygwin.com/install.html
 [rgbds]: https://github.com/rednex/rgbds/releases
-[crowdmap]: https://github.com/yenatch/crowdmap/
 [polished-map]: https://github.com/Rangi42/polished-map
+[crowdmap]: https://github.com/yenatch/crowdmap/
+[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials
--- a/audio.asm
+++ b/audio.asm
@@ -11,7 +11,6 @@
 INCLUDE "audio/sfx_pointers.asm"
 
 
-
 SECTION "Songs 1", ROMX
 
 INCLUDE "audio/music/route36.asm"
@@ -130,7 +129,6 @@
 INCLUDE "audio/music/mobilecenter.asm"
 
 
-
 SECTION "Extra Songs 1", ROMX
 
 INCLUDE "audio/music/credits.asm"
@@ -143,7 +141,6 @@
 INCLUDE "audio/music/postcredits.asm"
 
 
-
 SECTION "Sound Effects", ROMX
 
 INCLUDE "audio/sfx.asm"
@@ -152,7 +149,6 @@
 SECTION "Crystal Sound Effects", ROMX
 
 INCLUDE "audio/sfx_crystal.asm"
-
 
 
 SECTION "Cries", ROMX
--- 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,9 +151,8 @@
 	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
@@ -190,17 +159,15 @@
 	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 @@
 	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,9 +188,8 @@
 	sound __, 13, $f8, $0760
 	sound __,  5, $c1, $0750
 	endchannel
-; f2ef2
 
-Cry_Magcargo_Ch8: ; f2ef2
+Cry_Magcargo_Ch8:
 	noise __,  3, $e8, $3b
 .loop
 	noise __,  2, $f1, $4e
@@ -232,9 +197,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +276,8 @@
 	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
@@ -328,9 +284,8 @@
 	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 @@
 	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 @@
 	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,12 +314,11 @@
 	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
@@ -373,19 +325,17 @@
 	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_Ch6:
 	callchannel Cry_Togetic_branch_f3022
 	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
@@ -392,9 +342,8 @@
 	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
@@ -401,17 +350,15 @@
 	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
@@ -421,9 +368,8 @@
 	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
@@ -434,9 +380,8 @@
 	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
@@ -446,9 +391,8 @@
 	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
@@ -459,9 +403,8 @@
 	sound __,  5, $f8, $0678
 	sound __,  5, $f1, $0674
 	endchannel
-; f30f9
 
-Cry_Hoothoot_Ch6: ; f30f9
+Cry_Hoothoot_Ch6:
 	sound_duty 2, 0, 2, 0
 .loop1
 	sound __,  3, $a1, $0600
@@ -472,56 +415,49 @@
 	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
 .loop1
@@ -533,18 +469,16 @@
 	sound __,  2, $51, $0312
 	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
@@ -552,28 +486,24 @@
 	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
@@ -580,9 +510,8 @@
 	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
@@ -589,9 +518,8 @@
 	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
@@ -599,25 +527,22 @@
 	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
@@ -625,9 +550,8 @@
 	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
@@ -635,10 +559,9 @@
 	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
@@ -647,10 +570,9 @@
 	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
@@ -659,9 +581,8 @@
 	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
@@ -668,9 +589,8 @@
 	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
@@ -677,10 +597,9 @@
 	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
 .loop1
 	sound __,  4, $c1, $0791
@@ -701,10 +620,9 @@
 	sound __,  2, $21, $0401
 	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
@@ -714,88 +632,78 @@
 	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
 .loop
 	sound __,  2, $c1, $0520
@@ -806,9 +714,8 @@
 	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
@@ -816,9 +723,8 @@
 	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
@@ -826,9 +732,8 @@
 	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
@@ -836,9 +741,8 @@
 	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
@@ -846,17 +750,15 @@
 	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
@@ -870,9 +772,8 @@
 	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
@@ -879,9 +780,8 @@
 	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
@@ -889,9 +789,8 @@
 	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
@@ -901,9 +800,8 @@
 	sound __,  4, $f8, $0720
 	sound C_,  5, $f2, $070e
 	endchannel
-; f3441
 
-Cry_Aipom_Ch6: ; f3441
+Cry_Aipom_Ch6:
 	sound_duty 3, 1, 2, 0
 .loop1
 	sound __,  2, $f1, $07b4
@@ -916,9 +814,8 @@
 	loopchannel 2, .loop3
 	sound C_,  1, $92, $0795
 	endchannel
-; f3460
 
-Cry_Aipom_Ch8: ; f3460
+Cry_Aipom_Ch8:
 	noise __,  1, $f1, $28
 	loopchannel 4, Cry_Aipom_Ch8
 	noise __,  1, $91, $49
@@ -929,237 +826,198 @@
 	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
@@ -1168,9 +1026,8 @@
 	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
@@ -1179,9 +1036,8 @@
 	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
@@ -1190,9 +1046,8 @@
 	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
@@ -1202,9 +1057,8 @@
 	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
@@ -1215,9 +1069,8 @@
 	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
@@ -1227,9 +1080,8 @@
 	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
@@ -1237,9 +1089,8 @@
 	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
@@ -1246,17 +1097,15 @@
 	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
@@ -1267,9 +1116,8 @@
 	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
@@ -1280,9 +1128,8 @@
 	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
@@ -1289,9 +1136,8 @@
 	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
@@ -1301,9 +1147,8 @@
 	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
@@ -1314,9 +1159,8 @@
 	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
@@ -1325,9 +1169,8 @@
 	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
@@ -1335,9 +1178,8 @@
 	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
@@ -1345,17 +1187,15 @@
 	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
@@ -1365,9 +1205,8 @@
 	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
@@ -1377,17 +1216,15 @@
 	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
@@ -1396,9 +1233,8 @@
 	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
@@ -1407,9 +1243,8 @@
 	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
@@ -1416,9 +1251,8 @@
 	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
@@ -1429,9 +1263,8 @@
 	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
@@ -1442,39 +1275,34 @@
 	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
@@ -1481,9 +1309,8 @@
 	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
@@ -1490,16 +1317,14 @@
 	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
@@ -1507,11 +1332,10 @@
 	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
@@ -1519,32 +1343,28 @@
 	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
@@ -1551,19 +1371,17 @@
 	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
@@ -1576,9 +1394,8 @@
 	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
@@ -1588,9 +1405,8 @@
 	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
@@ -1600,9 +1416,8 @@
 	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
@@ -1614,9 +1429,8 @@
 	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
@@ -1627,28 +1441,25 @@
 	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_Ch5:
 	sound_duty 0, 2, 0, 2
 	sound __,  6, $f2, $0650
 	sound __, 10, $d1, $0660
@@ -1658,9 +1469,8 @@
 	sound __,  7, $d1, $0620
 	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
@@ -1674,9 +1484,8 @@
 	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
@@ -1688,9 +1497,8 @@
 	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
@@ -1697,9 +1505,8 @@
 	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
@@ -1706,17 +1513,15 @@
 	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
@@ -1726,9 +1531,8 @@
 	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
@@ -1739,9 +1543,8 @@
 	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
@@ -1751,9 +1554,8 @@
 	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
@@ -1760,9 +1562,8 @@
 	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
@@ -1769,16 +1570,14 @@
 	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
@@ -1788,9 +1587,8 @@
 	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
@@ -1800,9 +1598,8 @@
 	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
@@ -1810,50 +1607,44 @@
 	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
@@ -1861,9 +1652,8 @@
 	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
@@ -1871,17 +1661,15 @@
 	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
@@ -1888,9 +1676,8 @@
 	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
@@ -1897,17 +1684,15 @@
 	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
@@ -1916,9 +1701,8 @@
 	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
@@ -1927,9 +1711,8 @@
 	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
@@ -1937,32 +1720,28 @@
 	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
@@ -1973,9 +1752,8 @@
 	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
@@ -1987,9 +1765,8 @@
 	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
@@ -2000,9 +1777,8 @@
 	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
@@ -2011,9 +1787,8 @@
 	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
@@ -2022,9 +1797,8 @@
 	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
@@ -2032,9 +1806,8 @@
 	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
@@ -2041,9 +1814,8 @@
 	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
@@ -2050,17 +1822,15 @@
 	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
@@ -2071,9 +1841,8 @@
 	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
@@ -2082,9 +1851,8 @@
 	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
@@ -2091,9 +1859,8 @@
 	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
@@ -2102,9 +1869,8 @@
 	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
@@ -2113,9 +1879,8 @@
 	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
@@ -2123,9 +1888,8 @@
 	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
@@ -2134,9 +1898,8 @@
 	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
@@ -2145,9 +1908,8 @@
 	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
@@ -2154,9 +1916,8 @@
 	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
@@ -2167,9 +1928,8 @@
 	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
@@ -2180,9 +1940,8 @@
 	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
@@ -2190,9 +1949,8 @@
 	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
@@ -2199,9 +1957,8 @@
 	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
@@ -2208,17 +1965,15 @@
 	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
@@ -2225,9 +1980,8 @@
 	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
@@ -2234,17 +1988,15 @@
 	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
@@ -2255,9 +2007,8 @@
 	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
@@ -2267,11 +2018,10 @@
 	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
@@ -2278,9 +2028,8 @@
 	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
@@ -2287,12 +2036,10 @@
 	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
--- 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 @@
 	dba Cry_Aipom
 	dba Cry_Dunsparce
 	dba Cry_Donphan
-; e927c
--- a/audio/drumkits.asm
+++ b/audio/drumkits.asm
@@ -1,4 +1,4 @@
-Drumkits: ; e8e52
+Drumkits:
 	dw Drumkit0
 	dw Drumkit1
 	dw Drumkit2
@@ -5,9 +5,8 @@
 	dw Drumkit3
 	dw Drumkit4
 	dw Drumkit5
-; e8e5e
 
-Drumkit0: ; e8e5e
+Drumkit0:
 	dw Drum00    ; rest
 	dw Snare1    ; c
 	dw Snare2    ; c#
@@ -21,7 +20,7 @@
 	dw Snare6    ; a
 	dw Snare7    ; a#
 	dw HiHat2    ; b
-Drumkit1: ; e8e78
+Drumkit1:
 	dw Drum00
 	dw HiHat1
 	dw Snare5
@@ -35,7 +34,7 @@
 	dw Snare9
 	dw Snare10
 	dw Snare11
-Drumkit2: ; e8e92
+Drumkit2:
 	dw Drum00
 	dw Snare1
 	dw Snare9
@@ -49,7 +48,7 @@
 	dw Snare6
 	dw Snare7
 	dw HiHat2
-Drumkit3: ; e8eac
+Drumkit3:
 	dw Drum21
 	dw Snare12
 	dw Snare13
@@ -63,7 +62,7 @@
 	dw Drum21
 	dw Kick2
 	dw Crash2
-Drumkit4: ; e8ec6
+Drumkit4:
 	dw Drum21
 	dw Drum20
 	dw Snare13
@@ -77,7 +76,7 @@
 	dw Drum36
 	dw Kick2
 	dw Crash1
-Drumkit5: ; e8ee0
+Drumkit5:
 	dw Drum00
 	dw Snare9
 	dw Snare10
@@ -91,35 +90,29 @@
 	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 @@
 	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
--- 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 @@
 	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 @@
 	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]
@@ -216,9 +208,7 @@
 	ld [rNR51], a
 	ret
 
-; e8125
-
-UpdateChannels: ; e8125
+UpdateChannels:
 	ld hl, .ChannelFnPtrs
 	ld a, [wCurChannel]
 	and $7
@@ -510,9 +500,7 @@
 	ld [rNR44], a
 	ret
 
-; e82e7
-
-_CheckSFX: ; e82e7
+_CheckSFX:
 ; return carry if any sfx channels are active
 	ld hl, wChannel5Flags1
 	bit SOUND_CHANNEL_ON, [hl]
@@ -533,9 +521,7 @@
 	scf
 	ret
 
-; e8307
-
-PlayDanger: ; e8307
+PlayDanger:
 	ld a, [wLowHealthAlarm]
 	bit DANGER_ON_F, a
 	ret z
@@ -595,23 +581,19 @@
 	ld [wSoundOutput], a
 	ret
 
-; e8350
-
-DangerSoundHigh: ; e8350
+DangerSoundHigh:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $50 ; frequency: $750
 	db $87 ; restart sound
-; e8354
 
-DangerSoundLow: ; 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
@@ -723,9 +705,7 @@
 	ld [wVolume], a
 	ret
 
-; e83d1
-
-LoadNote: ; e83d1
+LoadNote:
 	; wait for pitch wheel to finish
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
@@ -845,9 +825,7 @@
 	ld [hl], a
 	ret
 
-; e8466
-
-HandleTrackVibrato: ; e8466
+HandleTrackVibrato:
 ; handle duty, cry pitch, and vibrato
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
@@ -964,9 +942,7 @@
 .quit
 	ret
 
-; e84f9
-
-ApplyPitchWheel: ; e84f9
+ApplyPitchWheel:
 	; quit if pitch wheel inactive
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
@@ -1081,9 +1057,7 @@
 	set NOTE_DUTY_OVERRIDE, [hl]
 	ret
 
-; e858c
-
-HandleNoise: ; e858c
+HandleNoise:
 	; is noise sampling on?
 	ld hl, CHANNEL_FLAGS1
 	add hl, bc
@@ -1109,9 +1083,7 @@
 	ld [wNoiseSampleDelay], a
 	ret
 
-; e85af
-
-ReadNoiseSample: ; e85af
+ReadNoiseSample:
 ; sample struct:
 ;	[wx] [yy] [zz]
 ;	w: ? either 2 or 3
@@ -1161,9 +1133,7 @@
 .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?
@@ -1271,9 +1241,7 @@
 	ld [hli], a ; bank
 	ret
 
-; e8679
-
-RestoreVolume: ; e8679
+RestoreVolume:
 	; ch5 only
 	ld a, [wCurChannel]
 	cp CHAN5
@@ -1292,9 +1260,7 @@
 	ld [wSFXPriority], a
 	ret
 
-; e8698
-
-ParseSFXOrRest: ; e8698
+ParseSFXOrRest:
 	; turn noise sampling on
 	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
@@ -1324,9 +1290,7 @@
 	ld [hl], a
 	ret
 
-; e86c5
-
-GetNoiseSample: ; e86c5
+GetNoiseSample:
 ; load ptr to sample header in wNoiseSampleAddress
 	; are we on the last channel?
 	ld a, [wCurChannel]
@@ -1382,9 +1346,7 @@
 	ld [wNoiseSampleDelay], a
 	ret
 
-; e870f
-
-ParseMusicCommand: ; e870f
+ParseMusicCommand:
 	; reload command
 	ld a, [wCurMusicByte]
 	; get command #
@@ -1401,9 +1363,7 @@
 	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
@@ -1453,21 +1413,18 @@
 	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
@@ -1488,9 +1445,7 @@
 	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
@@ -1523,9 +1478,7 @@
 	set SOUND_SUBROUTINE, [hl]
 	ret
 
-; e87bc
-
-Music_JumpChannel: ; e87bc
+Music_JumpChannel:
 ; jump
 ; parameters: ll hh ; pointer
 	; get pointer from next 2 bytes
@@ -1540,9 +1493,7 @@
 	ld [hl], d
 	ret
 
-; e87cc
-
-Music_LoopChannel: ; e87cc
+Music_LoopChannel:
 ; loops xx - 1 times
 ; 	00: infinite
 ; params: 3
@@ -1603,9 +1554,7 @@
 	ld [hl], e
 	ret
 
-; e880e
-
-Music_SetCondition: ; e880e
+Music_SetCondition:
 ; set condition for a jump
 ; used with FB
 ; params: 1
@@ -1618,9 +1567,7 @@
 	ld [hl], a
 	ret
 
-; e8817
-
-Music_JumpIf: ; e8817
+Music_JumpIf:
 ; conditional jump
 ; used with FA
 ; params: 3
@@ -1666,9 +1613,7 @@
 	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
@@ -1720,9 +1665,7 @@
 	ld [hl], d
 	ret
 
-; e886d
-
-MusicF9: ; e886d
+MusicF9:
 ; sets some flag
 ; seems to be unused
 ; params: 0
@@ -1730,9 +1673,7 @@
 	ld [wc2b5], a
 	ret
 
-; e8873
-
-MusicE2: ; e8873
+MusicE2:
 ; seems to have been dummied out
 ; params: 1
 	call GetMusicByte
@@ -1744,9 +1685,7 @@
 	set SOUND_UNKN_0B, [hl]
 	ret
 
-; e8882
-
-Music_Vibrato: ; e8882
+Music_Vibrato:
 ; vibrato
 ; params: 2
 ;	1: [xx]
@@ -1801,9 +1740,7 @@
 	ld [hl], a
 	ret
 
-; e88bd
-
-Music_SlidePitchTo: ; e88bd
+Music_SlidePitchTo:
 ; set the target for pitch wheel
 ; params: 2
 ; note duration
@@ -1834,9 +1771,7 @@
 	set SOUND_PITCH_WHEEL, [hl]
 	ret
 
-; e88e4
-
-Music_Tone: ; e88e4
+Music_Tone:
 ; tone
 ; params: 1 (dw)
 	ld hl, CHANNEL_FLAGS2
@@ -1850,9 +1785,7 @@
 	ld [hl], a
 	ret
 
-; e88f7
-
-MusicE7: ; e88f7
+MusicE7:
 ; unused
 ; params: 1
 	ld hl, CHANNEL_FLAGS2
@@ -1864,9 +1797,7 @@
 	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, CHANNEL_FLAGS2
@@ -1886,9 +1817,7 @@
 	ld [hl], a
 	ret
 
-; e891e
-
-MusicE8: ; e891e
+MusicE8:
 ; unused
 ; params: 1
 	ld hl, CHANNEL_FLAGS2
@@ -1900,9 +1829,7 @@
 	ld [hl], a
 	ret
 
-; e892d
-
-Music_ToggleSFX: ; e892d
+Music_ToggleSFX:
 ; toggle something
 ; params: none
 	ld hl, CHANNEL_FLAGS1
@@ -1916,9 +1843,7 @@
 	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:
@@ -1940,9 +1865,7 @@
 	ld [wMusicNoiseSampleSet], a
 	ret
 
-; e894f
-
-Music_SFXToggleNoise: ; e894f
+Music_SFXToggleNoise:
 ; toggle sfx noise sampling
 ; params:
 ;	on: 1
@@ -1963,9 +1886,7 @@
 	ld [wSFXNoiseSampleSet], a
 	ret
 
-; e8963
-
-Music_NoteType: ; e8963
+Music_NoteType:
 ; note length
 ;	# frames per 16th note
 ; intensity: see Music_Intensity
@@ -1983,9 +1904,7 @@
 	call Music_Intensity
 	ret
 
-; e8977
-
-Music_SoundStatus: ; e8977
+Music_SoundStatus:
 ; update sound status
 ; params: 1
 	call GetMusicByte
@@ -1995,9 +1914,7 @@
 	set NOTE_UNKN_3, [hl]
 	ret
 
-; e8984
-
-Music_DutyCycle: ; e8984
+Music_DutyCycle:
 ; duty cycle
 ; params: 1
 	call GetMusicByte
@@ -2009,9 +1926,7 @@
 	ld [hl], a
 	ret
 
-; e8991
-
-Music_Intensity: ; e8991
+Music_Intensity:
 ; intensity
 ; params: 1
 ;	hi: pressure
@@ -2022,9 +1937,7 @@
 	ld [hl], a
 	ret
 
-; e899a
-
-Music_Tempo: ; e899a
+Music_Tempo:
 ; global tempo
 ; params: 2
 ;	de: tempo
@@ -2035,16 +1948,14 @@
 	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, CHANNEL_OCTAVE
 	add hl, bc
@@ -2053,9 +1964,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
@@ -2065,9 +1974,7 @@
 	ld [hl], a
 	ret
 
-; e89ba
-
-Music_StereoPanning: ; e89ba
+Music_StereoPanning:
 ; stereo panning
 ; params: 1
 	; stereo on?
@@ -2078,9 +1985,7 @@
 	call GetMusicByte
 	ret
 
-; e89c5
-
-Music_Panning: ; e89c5
+Music_Panning:
 ; force panning
 ; params: 1
 	call SetLRTracks
@@ -2091,9 +1996,7 @@
 	ld [hl], a
 	ret
 
-; e89d2
-
-Music_Volume: ; e89d2
+Music_Volume:
 ; set volume
 ; params: 1
 ;	see Volume
@@ -2109,9 +2012,7 @@
 	ld [wVolume], a
 	ret
 
-; e89e1
-
-Music_TempoRelative: ; e89e1
+Music_TempoRelative:
 ; set global tempo to current channel tempo +/- param
 ; params: 1 signed
 	call GetMusicByte
@@ -2137,9 +2038,7 @@
 	call SetGlobalTempo
 	ret
 
-; e89fd
-
-Music_SFXPriorityOn: ; e89fd
+Music_SFXPriorityOn:
 ; turn sfx priority on
 ; params: none
 	ld a, 1
@@ -2146,9 +2045,7 @@
 	ld [wSFXPriority], a
 	ret
 
-; e8a03
-
-Music_SFXPriorityOff: ; e8a03
+Music_SFXPriorityOff:
 ; turn sfx priority off
 ; params: none
 	xor a
@@ -2155,9 +2052,7 @@
 	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
@@ -2191,9 +2086,7 @@
 	pop bc ; restore current channel
 	ret
 
-; e8a30
-
-Music_NewSong: ; e8a30
+Music_NewSong:
 ; new song
 ; params: 2
 ;	de: song id
@@ -2206,9 +2099,7 @@
 	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
@@ -2240,9 +2131,7 @@
 	ld a, [wCurMusicByte]
 	ret
 
-; e8a5d
-
-GetFrequency: ; e8a5d
+GetFrequency:
 ; generate frequency
 ; input:
 ; 	d: octave
@@ -2294,9 +2183,7 @@
 	ld d, a
 	ret
 
-; e8a8d
-
-SetNoteDuration: ; e8a8d
+SetNoteDuration:
 ; input: a = note duration in 16ths
 	; store delay units in de
 	inc a
@@ -2335,9 +2222,7 @@
 	ld [hl], d
 	ret
 
-; e8ab8
-
-.Multiply: ; e8ab8
+.Multiply:
 ; multiplies a and de
 ; adds the result to l
 ; stores the result in hl
@@ -2358,9 +2243,7 @@
 	jr nz, .loop
 	ret
 
-; e8ac7
-
-SetGlobalTempo: ; e8ac7
+SetGlobalTempo:
 	push bc ; save current channel
 	; are we dealing with music or sfx?
 	ld a, [wCurChannel]
@@ -2389,9 +2272,7 @@
 	pop bc ; restore current channel
 	ret
 
-; e8b03
-
-Tempo: ; e8b03
+Tempo:
 ; input:
 ; 	de: note length
 	; update Tempo
@@ -2407,9 +2288,7 @@
 	ld [hl], a
 	ret
 
-; e8b11
-
-StartChannel: ; e8b11
+StartChannel:
 	call SetLRTracks
 	ld hl, CHANNEL_FLAGS1
 	add hl, bc
@@ -2416,9 +2295,7 @@
 	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
@@ -2438,9 +2315,7 @@
 	pop de
 	ret
 
-; e8b30
-
-_PlayMusic:: ; e8b30
+_PlayMusic::
 ; load music
 	call MusicOff
 	ld hl, wMusicID
@@ -2482,9 +2357,7 @@
 	call MusicOn
 	ret
 
-; e8b79
-
-_PlayCry:: ; e8b79
+_PlayCry::
 ; Play cry de using parameters:
 ;	wCryPitch
 ;	wCryLength
@@ -2595,9 +2468,7 @@
 	call MusicOn
 	ret
 
-; e8c04
-
-_PlaySFX:: ; e8c04
+_PlaySFX::
 ; clear channels if they aren't already
 	call MusicOff
 	ld hl, wChannel5Flags1
@@ -2696,9 +2567,7 @@
 	ld [wSFXPriority], a
 	ret
 
-; e8ca6
-
-PlayStereoSFX:: ; e8ca6
+PlayStereoSFX::
 ; play sfx de
 
 	call MusicOff
@@ -2799,9 +2668,7 @@
 	call MusicOn
 	ret
 
-; e8d1b
-
-LoadChannel: ; e8d1b
+LoadChannel:
 ; prep channel for use
 ; input:
 ; 	de:
@@ -2845,9 +2712,7 @@
 	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:
@@ -2877,9 +2742,7 @@
 	pop de
 	ret
 
-; e8d76
-
-LoadMusicByte:: ; e8d76
+LoadMusicByte::
 ; input:
 ;   de = current music address
 ; output:
@@ -2889,9 +2752,6 @@
 	ld a, [wCurMusicByte]
 	ret
 
-; e8d80
-
-
 INCLUDE "audio/notes.asm"
 
 INCLUDE "audio/wave_samples.asm"
@@ -2898,8 +2758,7 @@
 
 INCLUDE "audio/drumkits.asm"
 
-
-GetLRTracks: ; e8fc2
+GetLRTracks:
 ; gets the default sound l/r channels
 ; stores mono/stereo table in hl
 	ld a, [wOptions]
@@ -2913,22 +2772,18 @@
 	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
@@ -2939,9 +2794,8 @@
 	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
@@ -2958,9 +2812,7 @@
 	jr nz, .loop
 	ret
 
-; e8ffe
-
-ClearChannel: ; e8ffe
+ClearChannel:
 ; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40)
 ; output: 00 00 80 00 80
 
@@ -2977,9 +2829,7 @@
 	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
@@ -2998,4 +2848,3 @@
 	ld e, [hl]
 	call PlayMusic
 	ret
-; e9027
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
-; f518a
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -1,11 +1,10 @@
-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
@@ -12,7 +11,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
-; f5b03
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
-; 17961d
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -1,11 +1,10 @@
-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
@@ -12,7 +11,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b81
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note F_, 2
 	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
-; ee35e
--- 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 @@
 	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 @@
 	note __, 1
 	notetype $c, $84
 	endchannel
-; 178222
 
-Music_BuenasPassword_branch_178222: ; 178222
+Music_BuenasPassword_branch_178222:
 	octave 3
 	note D#, 1
 	note __, 1
@@ -180,9 +177,8 @@
 	note D#, 1
 	note __, 2
 	endchannel
-; 178231
 
-Music_BuenasPassword_Ch2: ; 178231
+Music_BuenasPassword_Ch2:
 	vibrato $12, $34
 	dutycycle $2
 	notetype $c, $a5
@@ -189,7 +185,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note D_, 1
 	endchannel
-; 17843b
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note D_, 2
 	endchannel
-; f7ef3
--- 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 @@
 	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 @@
 	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 @@
 	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,9 +97,8 @@
 	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
@@ -107,7 +105,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G#, 2
 	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
-; f6bf2
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A_, 2
 	note B_, 2
 	endchannel
-; f4518
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D#, 2
 	note E_, 2
 	endchannel
-; ead99
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 2
 	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
-; f5c60
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 1
 	note G#, 2
 	endchannel
-; 1fc4b
 
-Music_Clair_Ch4: ; 1fc4b
+Music_Clair_Ch4:
 	togglenoise $3
 	notetype $c
 	stereopanning $f0
@@ -411,7 +403,7 @@
 	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 @@
 	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 @@
 	stereopanning $f0
 	note G_, 1
 	endchannel
-; 1fc87
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 1
 	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
-; efc01
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A#, 1
 	note D_, 1
 	endchannel
-; 1fa8d
--- 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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note __, 15
 	endchannel
-; 178810
 
-Music_CrystalOpening_Ch4: ; 178810
+Music_CrystalOpening_Ch4:
 	stereopanning $f
 	togglenoise $3
 	notetype $c
@@ -361,4 +357,3 @@
 	note __, 16
 	note __, 16
 	endchannel
-; 178889
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -1,12 +1,11 @@
-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
@@ -13,7 +12,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 6
 	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
-; efb3e
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
-; ea50d
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -1,11 +1,10 @@
-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
@@ -12,7 +11,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	stereopanning $f0
 	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
-; eedcb
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note __, 1
 	note B_, 1
 	endchannel
-; ef5b1
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
-; f07fd
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 3
 	note D_, 1
 	endchannel
-; ee06f
 
-Music_GameCorner_Ch4: ; ee06f
+Music_GameCorner_Ch4:
 	togglenoise $3
 	notetype $c
 	notetype $8
@@ -680,9 +668,9 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note F#, 2
 	endchannel
-; ee119
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note __, 2
 	note G#, 1
 	endchannel
-; eb606
 
-Music_GoldenrodCity_Ch4: ; eb606
+Music_GoldenrodCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
@@ -406,7 +396,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 1
 	note G_, 1
 	endchannel
-; eb676
--- 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 @@
 	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 @@
 	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 @@
 	note C_, 1
 	note __, 13
 	endchannel
-; f7308
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
 	note C_, 16
 	endchannel
-; f7411
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,11 +1,10 @@
-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
@@ -12,7 +11,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note F#, 4
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
-; f4b0c
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D#, 2
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
-; f4815
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A#, 1
 	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
-; f0697
--- 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 @@
 	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 @@
 	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 @@
 	note E_, 6
 	note __, 2
 	endchannel
-; f06e1
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
-; ee94b
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -1,10 +1,9 @@
-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
@@ -11,7 +10,7 @@
 	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
@@ -18,7 +17,7 @@
 	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 @@
 	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,14 +285,13 @@
 	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
@@ -300,7 +298,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note F_, 2
 	note D#, 2
 	endchannel
-; ea9c1
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G#, 1
 	note A#, 2
 	endchannel
-; f66c3
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,7 +483,7 @@
 	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
@@ -494,13 +490,13 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -1,10 +1,9 @@
-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
@@ -11,9 +10,8 @@
 	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 @@
 	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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,14 +433,13 @@
 	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
@@ -451,7 +446,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D#, 2
 	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
-; ec9fa
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 5
 	note G_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
-; ed06d
--- 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 @@
 	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 @@
 	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,25 +215,25 @@
 	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
@@ -241,9 +240,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 16
 	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
-; ed5c6
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
-; ee852
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -1,10 +1,9 @@
-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
@@ -11,7 +10,7 @@
 	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,9 +19,8 @@
 	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
@@ -29,11 +27,9 @@
 	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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
-; ef9bc
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -1,11 +1,10 @@
-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
@@ -12,7 +11,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
-; ee6c5
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note G_, 2
 	endchannel
-; eefb2
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 8
 	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
-; f7b13
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
-; ed82d
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +579,8 @@
 	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
@@ -595,9 +587,8 @@
 	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
@@ -604,9 +595,8 @@
 	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 @@
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1786e8
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note E_, 8
 	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
-; ed8dd
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C_, 1
 	note __, 1
 	endchannel
-; ebeab
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
-; f5127
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +203,8 @@
 	note A_, 1
 	note __, 1
 	endchannel
-; f7597
 
-Music_LookRocket_Ch3: ; f7597
+Music_LookRocket_Ch3:
 	pitchoffset 0, D_
 	vibrato $4, $22
 	notetype $c, $14
@@ -222,7 +211,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note F#, 2
 	endchannel
-; f766d
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 1
 	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
-; ee45f
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f67ae
-; f6810
 
 	db $ff
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 2
 	note G_, 2
 	endchannel
-; ef72f
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_MainMenu_branch_f79a5
-; f79b8
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +510,8 @@
 	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
@@ -525,7 +518,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1ff6c
--- 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 @@
 	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 @@
 	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 @@
 	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,9 +81,8 @@
 	note __, 1
 	note C#, 4
 	endchannel
-; 178084
 
-Music_MobileAdapterMenu_Ch2: ; 178084
+Music_MobileAdapterMenu_Ch2:
 	stereopanning $f0
 	notetype $c, $84
 	dutycycle $2
@@ -93,7 +89,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 3
 	note A_, 4
 	endchannel
-; 178153
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_MobileCenter_branch_179813
-; 17982d
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D#, 1
 	note __, 1
 	loopchannel 0, Music_Mom_branch_f6c56
-; f6c72
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	stereopanning $f0
 	note A#, 8
 	loopchannel 0, Music_MtMoon_branch_edbc3
-; edbd8
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f489b
 	loopchannel 0, Music_MtMoonSquare_branch_f4862
-; f48ae
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +476,8 @@
 	note D_, 2
 	note C#, 2
 	endchannel
-; f5723
 
-Music_NationalPark_Ch3: ; f5723
+Music_NationalPark_Ch3:
 	vibrato $16, $24
 	notetype $c, $11
 	octave 4
@@ -491,7 +484,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A#, 1
 	note D#, 1
 	loopchannel 0, Music_NationalPark_branch_f57bd
-; f57e8
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -1,12 +1,11 @@
-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
@@ -13,7 +12,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	note E_, 1
 	loopchannel 0, Music_NewBarkTown_branch_eb408
-; eb453
--- 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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note B_, 8
 	note A_, 8
 	loopchannel 0, Music_PalletTown_branch_f4c2d
-; f4c9f
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note F_, 2
 	note G_, 4
 	endchannel
-; f7c16
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,13 +390,12 @@
 	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
@@ -411,4 +402,3 @@
 	note G_, 2
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed792
-; ed79b
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A#, 4
 	note A#, 4
 	endchannel
-; ee569
--- 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 @@
 	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 @@
 	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 @@
 	note B_, 2
 	note A_, 2
 	loopchannel 0, Music_PokemonLullaby_branch_f6e06
-; f6e23
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note C#, 2
 	endchannel
-; f7055
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -1,11 +1,10 @@
-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#
@@ -12,7 +11,7 @@
 	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 @@
 	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 @@
 	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 @@
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_PostCredits_branch_cfe5a
-; cff04
--- 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 @@
 	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 @@
 	note D#, 1
 	note __, 1
 	loopchannel 0, Music_Printer_branch_f0823
-; f0941
--- 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,7 +21,7 @@
 	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
@@ -29,7 +28,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 2
 	note B_, 2
 	endchannel
-; f4f79
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
-; f4dea
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,7 +629,7 @@
 	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
@@ -640,7 +636,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +819,8 @@
 	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
@@ -832,9 +827,8 @@
 	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,9 +841,8 @@
 	note C#, 2
 	note G#, 2
 	endchannel
-; e9b5c
 
-Music_RivalBattle_branch_e9b5c: ; e9b5c
+Music_RivalBattle_branch_e9b5c:
 	octave 2
 	note B_, 2
 	octave 3
@@ -856,9 +849,8 @@
 	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 @@
 	note D#, 2
 	loopchannel 2, Music_RivalBattle_branch_e9b65
 	endchannel
-; e9b6f
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 2
 	note A#, 2
 	endchannel
-; ea01d
 
-Music_RocketBattle_branch_ea01d: ; ea01d
+Music_RocketBattle_branch_ea01d:
 	octave 2
 	note A#, 2
 	octave 3
@@ -1012,9 +1004,8 @@
 	octave 3
 	note F_, 2
 	endchannel
-; ea02a
 
-Music_RocketBattle_branch_ea02a: ; ea02a
+Music_RocketBattle_branch_ea02a:
 	octave 2
 	note A_, 2
 	octave 3
@@ -1021,9 +1012,8 @@
 	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 @@
 	octave 2
 	note A_, 2
 	endchannel
-; ea040
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	stereopanning $f0
 	note A_, 4
 	endchannel
-; eece8
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	callchannel Music_RocketTheme_branch_f765c
 	callchannel Music_RocketTheme_branch_f765c
 	loopchannel 0, Music_RocketTheme_branch_f78c3
-; f78fd
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A_, 1
 	note __, 3
 	loopchannel 0, Music_Route1_branch_ec20c
-; ec2ca
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 1
 	note C#, 1
 	endchannel
-; ec720
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note D#, 4
 	loopchannel 0, Music_Route2_branch_edaef
-; edb29
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note E_, 2
 	endchannel
-; ef2d0
--- 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 @@
 	stereopanning $f
 	notetype $c, $b2
 	note __, 2
-Music_Route29_branch_f03a5: ; f03a5
+Music_Route29_branch_f03a5:
 	note __, 2
 	octave 4
 	note C_, 2
@@ -168,9 +167,8 @@
 	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
@@ -177,7 +175,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_Route29_branch_f05b0
-; f05bf
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_Route3_branch_ec4f0
-; ec506
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 1
 	notetype $c
 	endchannel
-; efef5
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +496,8 @@
 	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
@@ -510,9 +504,8 @@
 	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 @@
 	note A_, 1
 	notetype $c
 	endchannel
-; e974f
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D#, 1
 	note D#, 1
 	endchannel
-; eeb75
--- 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 @@
 	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 @@
 	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 @@
 	note E_, 2
 	note __, 10
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
-; ebde1
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -1,10 +1,9 @@
-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
@@ -11,7 +10,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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,11 +61,10 @@
 	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
@@ -76,4 +71,3 @@
 	note C_, 1
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
-; eee3e
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note A_, 2
 	note __, 6
 	endchannel
-; edd30
 
-Music_ShowMeAround_Ch4: ; edd30
+Music_ShowMeAround_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
@@ -315,7 +305,7 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note F#, 2
 	endchannel
-; edd6d
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	stereopanning $ff
 	note F#, 4
 	loopchannel 0, Music_SproutTower_branch_f6a7f
-; f6a99
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note C_, 2
 	endchannel
-; eb2d3
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -1,10 +1,9 @@
-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
@@ -11,16 +10,13 @@
 	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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note E_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_179182
-; 17948b
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G#, 1
 	note __, 3
 	endchannel
-; f54e8
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 2
 	note F_, 2
 	loopchannel 0, Music_TinTower_branch_f694c
-; f6974
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note G_, 1
 	note __, 11
 	endchannel
-; ebc5c
 
-Music_TitleScreen_Ch4: ; ebc5c
+Music_TitleScreen_Ch4:
 	togglenoise $5
 	stereopanning $f0
 	notetype $c
@@ -1081,7 +1075,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note C_, 4
 	note C_, 4
 	endchannel
-; ebd9e
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 2
 	note B_, 2
 	endchannel
-; ebfc3
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -1,11 +1,10 @@
-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
@@ -12,12 +11,12 @@
 	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 @@
 	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,9 +63,8 @@
 	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
@@ -73,12 +71,11 @@
 	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 @@
 	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,9 +164,8 @@
 	note C#, 4
 	note C_, 4
 	endchannel
-; f5d52
 
-Music_UnionCave_branch_f5d52: ; f5d52
+Music_UnionCave_branch_f5d52:
 	octave 2
 	note G#, 2
 	octave 3
@@ -177,18 +172,17 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note __, 8
 	loopchannel 0, Music_UnionCave_branch_f5da9
 	loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
-; f5dc5
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	octave 4
 	note C#, 1
 	endchannel
-; eb808
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -1,11 +1,10 @@
-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
@@ -12,10 +11,10 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note D#, 1
 	loopchannel 0, Music_VictoryRoad_branch_f6d63
-; f6d79
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note D#, 2
 	endchannel
-; f0386
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 2
 	note F#, 2
 	endchannel
-; f435b
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note __, 4
 	note C#, 2
 	endchannel
-; f4602
--- 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
--- 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 @@
 	dw $fdac ; A_
 	dw $fdcd ; A#
 	dw $fded ; B_
-; e8db2
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	intensity $b3
 	note G#, 16
 	endchannel
-; f0ba8
 
-Sfx_KeyItem_Ch6: ; f0ba8
+Sfx_KeyItem_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $6, $c1
@@ -590,9 +478,8 @@
 	intensity $c3
 	note B_, 16
 	endchannel
-; f0bb8
 
-Sfx_KeyItem_Ch7: ; f0bb8
+Sfx_KeyItem_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 4
@@ -612,24 +499,21 @@
 	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 @@
 	note A_, 2
 	note __, 6
 	endchannel
-; f0bfe
 
-Sfx_DexFanfare2049_Ch6: ; f0bfe
+Sfx_DexFanfare2049_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $c, $c1
@@ -674,9 +557,8 @@
 	note G_, 4
 	note F_, 8
 	endchannel
-; f0c13
 
-Sfx_DexFanfare2049_Ch7: ; f0c13
+Sfx_DexFanfare2049_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 4
@@ -695,9 +577,8 @@
 	note F_, 2
 	note __, 6
 	endchannel
-; f0c27
 
-Sfx_DexFanfare2049_Ch8: ; f0c27
+Sfx_DexFanfare2049_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -704,16 +585,14 @@
 	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 @@
 	note F_, 12
 	note __, 12
 	endchannel
-; f0c54
 
-Sfx_Item_Ch6: ; f0c54
+Sfx_Item_Ch6:
 	togglesfx
 	vibrato $8, $27
 	dutycycle $2
@@ -749,9 +627,8 @@
 	note A_, 12
 	note __, 12
 	endchannel
-; f0c68
 
-Sfx_Item_Ch7: ; f0c68
+Sfx_Item_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 4
@@ -774,9 +651,8 @@
 	note F_, 4
 	note __, 14
 	endchannel
-; f0c81
 
-Sfx_Item_Ch8: ; f0c81
+Sfx_Item_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -783,16 +659,14 @@
 	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 @@
 	intensity $b3
 	note F_, 12
 	endchannel
-; f0cb5
 
-Sfx_CaughtMon_Ch6: ; f0cb5
+Sfx_CaughtMon_Ch6:
 	togglesfx
 	dutycycle $2
 	vibrato $8, $27
@@ -836,9 +709,8 @@
 	intensity $c3
 	note A_, 12
 	endchannel
-; f0cce
 
-Sfx_CaughtMon_Ch7: ; f0cce
+Sfx_CaughtMon_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -856,9 +728,8 @@
 	note A_, 3
 	note __, 3
 	endchannel
-; f0ce2
 
-Sfx_CaughtMon_Ch8: ; f0ce2
+Sfx_CaughtMon_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -865,16 +736,14 @@
 	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 @@
 	intensity $a5
 	note A#, 16
 	endchannel
-; f0d17
 
-Sfx_DexFanfare80109_Ch6: ; f0d17
+Sfx_DexFanfare80109_Ch6:
 	togglesfx
 	vibrato $8, $27
 	dutycycle $2
@@ -923,9 +791,8 @@
 	octave 5
 	note D#, 16
 	endchannel
-; f0d32
 
-Sfx_DexFanfare80109_Ch7: ; f0d32
+Sfx_DexFanfare80109_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 4
@@ -951,9 +818,8 @@
 	note D#, 3
 	note __, 9
 	endchannel
-; f0d4e
 
-Sfx_DexFanfare80109_Ch8: ; f0d4e
+Sfx_DexFanfare80109_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -960,22 +826,19 @@
 	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 @@
 	intensity $a5
 	note F_, 16
 	endchannel
-; f0d8a
 
-UnusedSfx_Ch6: ; f0d8a
+UnusedSfx_Ch6:
 	togglesfx
 	vibrato $8, $27
 	dutycycle $2
@@ -1023,9 +885,8 @@
 	intensity $b5
 	note A_, 16
 	endchannel
-; f0da6
 
-UnusedSfx_Ch7: ; f0da6
+UnusedSfx_Ch7:
 	togglesfx
 	notetype $c, $25
 	octave 4
@@ -1039,9 +900,8 @@
 	note A_, 3
 	note __, 9
 	endchannel
-; f0db6
 
-UnusedSfx_Ch8: ; f0db6
+UnusedSfx_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -1048,22 +908,19 @@
 	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 @@
 	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 @@
 	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 @@
 	note G#, 2
 	note __, 8
 	endchannel
-; f0e1b
 
 	togglesfx
 
-Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
+Sfx_RegisterPhoneNumber_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -1145,17 +999,15 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	note B_, 16
 	note __, 6
 	endchannel
-; f0f52
 
 	togglesfx
 
-Sfx_MoveDeleted_Ch8: ; f0f53
+Sfx_MoveDeleted_Ch8:
 	togglesfx
 	sfxtogglenoise $3
 	notetype $c
@@ -1431,18 +1271,16 @@
 	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 @@
 	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 @@
 	note D_, 12
 	note __, 6
 	endchannel
-; f0fac
 
 	togglesfx
 
-Sfx_2ndPlace_Ch7: ; f0fad
+Sfx_2ndPlace_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -1537,11 +1373,10 @@
 	note G_, 12
 	note __, 6
 	endchannel
-; f0fd1
 
 	togglesfx
 
-Sfx_2ndPlace_Ch8: ; f0fd2
+Sfx_2ndPlace_Ch8:
 	togglesfx
 	sfxtogglenoise $3
 	notetype $8
@@ -1553,18 +1388,16 @@
 	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 @@
 	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 @@
 	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 @@
 	note D_, 10
 	note __, 6
 	endchannel
-; f1053
 
 	togglesfx
 
-Sfx_1stPlace_Ch8: ; f1054
+Sfx_1stPlace_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -1674,18 +1504,16 @@
 	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 @@
 	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 @@
 	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 @@
 	note A_, 4
 	note __, 12
 	endchannel
-; f10eb
 
 	togglesfx
 
-Sfx_ChooseACard_Ch8: ; f10ec
+Sfx_ChooseACard_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -1824,18 +1649,16 @@
 	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 @@
 	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 @@
 	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 @@
 	note A_, 16
 	note __, 6
 	endchannel
-; f1169
 
 	togglesfx
 
-Sfx_GetTm_Ch8: ; f116a
+Sfx_GetTm_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -1935,18 +1755,16 @@
 	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 @@
 	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 @@
 	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 @@
 	note F_, 16
 	note __, 6
 	endchannel
-; f11f4
 
 	togglesfx
 
-Sfx_GetBadge_Ch7: ; f11f5
+Sfx_GetBadge_Ch7:
 	togglesfx
 	notetype $6, $25
 	octave 2
@@ -2077,11 +1892,10 @@
 	note F_, 16
 	note __, 6
 	endchannel
-; f121a
 
 	togglesfx
 
-Sfx_GetBadge_Ch8: ; f121b
+Sfx_GetBadge_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $6
@@ -2104,18 +1918,16 @@
 	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 @@
 	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 @@
 	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 @@
 	note C#, 14
 	note __, 6
 	endchannel
-; f12a0
 
 	togglesfx
 
-Sfx_QuitSlots_Ch8: ; f12a1
+Sfx_QuitSlots_Ch8:
 	togglesfx
 	sfxtogglenoise $3
 	notetype $8
@@ -2225,16 +2034,14 @@
 	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
@@ -2269,9 +2076,8 @@
 	note C#, 5
 	note E_, 5
 	endchannel
-; f12e5
 
-Sfx_Protect_Ch8: ; f12e5
+Sfx_Protect_Ch8:
 	noise __, 10, $9e, $0
 	noise __, 10, $be, $11
 	loopchannel 6, Sfx_Protect_Ch8
@@ -2278,13 +2084,11 @@
 	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
 .loop
@@ -2295,13 +2099,11 @@
 	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_Ch8:
 	noise __, 12, $7d, $50
 	noise __,  7, $7d, $4f
 	noise __, 12, $7f, $47
@@ -2312,46 +2114,39 @@
 	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_Ch8:
 	noise __,  5, $f8, $5d
 	noise __,  5, $d8, $6f
 	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
@@ -2358,38 +2153,32 @@
 	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_Ch8:
 	noise __,  1, $0, $0
 	noise __,  5, $e1, $12
 	noise __,  1, $0, $0
@@ -2396,13 +2185,11 @@
 	noise __,  3, $b1, $22
 	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
@@ -2420,14 +2207,12 @@
 	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
@@ -2439,19 +2224,16 @@
 	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
@@ -2469,19 +2251,16 @@
 	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
 .loop
@@ -2498,13 +2277,11 @@
 	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
@@ -2512,13 +2289,11 @@
 	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
 .loop
 	sound __,  3, $c1, $07c8
@@ -2526,13 +2301,11 @@
 	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
@@ -2544,31 +2317,26 @@
 	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
@@ -2576,14 +2344,12 @@
 	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
@@ -2592,20 +2358,17 @@
 	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
@@ -2614,13 +2377,11 @@
 	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
@@ -2645,13 +2406,11 @@
 	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
@@ -2658,14 +2417,12 @@
 	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
@@ -2675,9 +2432,8 @@
 	note G#, 9
 	togglesfx
 	endchannel
-; f1561
 
-Sfx_PerishSong_Ch6: ; f1561
+Sfx_PerishSong_Ch6:
 	togglesfx
 	dutycycle $0
 	vibrato $12, $53
@@ -2688,14 +2444,12 @@
 	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
@@ -2709,9 +2463,8 @@
 	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
@@ -2719,13 +2472,11 @@
 	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
@@ -2734,37 +2485,31 @@
 	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_Ch8:
 	noise __,  3, $e1, $49
 	noise __,  1, $0, $0
 	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
@@ -2780,13 +2525,11 @@
 	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
@@ -2793,13 +2536,11 @@
 	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
 .loop
 	soundinput $bf
@@ -2810,13 +2551,11 @@
 	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
@@ -2830,13 +2569,11 @@
 	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
 .loop
 	soundinput $a4
@@ -2848,13 +2585,11 @@
 	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
 .loop
@@ -2864,13 +2599,11 @@
 	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
 .loop
 	sound __,  3, $f1, $07e4
@@ -2882,13 +2615,11 @@
 	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
 .loop
 	sound __,  2, $f8, $07d0
@@ -2898,14 +2629,12 @@
 	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
@@ -2915,19 +2644,16 @@
 	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
@@ -2934,13 +2660,11 @@
 	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
@@ -2949,14 +2673,12 @@
 	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
@@ -2967,18 +2689,15 @@
 	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
@@ -2988,13 +2707,11 @@
 	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
@@ -3013,13 +2730,11 @@
 	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
@@ -3048,13 +2763,11 @@
 	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
@@ -3071,13 +2784,11 @@
 	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
 .loop
@@ -3091,13 +2802,11 @@
 	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
@@ -3106,13 +2815,11 @@
 	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
@@ -3126,13 +2833,11 @@
 	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
@@ -3147,16 +2852,14 @@
 	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
@@ -3174,11 +2877,10 @@
 	note E_, 2
 	note D_, 6
 	endchannel
-; f189a
 
 	togglesfx
 
-Sfx_DexFanfareLessThan20_Ch6: ; f189b
+Sfx_DexFanfareLessThan20_Ch6:
 	togglesfx
 	notetype $8, $c1
 	octave 3
@@ -3194,11 +2896,10 @@
 	note G_, 2
 	note F#, 6
 	endchannel
-; f18ac
 
 	togglesfx
 
-Sfx_DexFanfareLessThan20_Ch7: ; f18ad
+Sfx_DexFanfareLessThan20_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 4
@@ -3223,11 +2924,10 @@
 	note A_, 2
 	note __, 6
 	endchannel
-; f18c7
 
 	togglesfx
 
-Sfx_DexFanfareLessThan20_Ch8: ; f18c8
+Sfx_DexFanfareLessThan20_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -3235,18 +2935,16 @@
 	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
@@ -3272,11 +2970,10 @@
 	note B_, 8
 	note __, 8
 	endchannel
-; f1900
 
 	togglesfx
 
-Sfx_DexFanfare140169_Ch6: ; f1901
+Sfx_DexFanfare140169_Ch6:
 	togglesfx
 	dutycycle $2
 	vibrato $12, $34
@@ -3299,11 +2996,10 @@
 	note G_, 8
 	note __, 8
 	endchannel
-; f191d
 
 	togglesfx
 
-Sfx_DexFanfare140169_Ch7: ; f191e
+Sfx_DexFanfare140169_Ch7:
 	togglesfx
 	notetype $c, $25
 	note __, 4
@@ -3334,11 +3030,10 @@
 	note G_, 4
 	note __, 4
 	endchannel
-; f193e
 
 	togglesfx
 
-Sfx_DexFanfare140169_Ch8: ; f193f
+Sfx_DexFanfare140169_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $c
@@ -3352,18 +3047,16 @@
 	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
@@ -3389,11 +3082,10 @@
 	note A#, 12
 	note __, 4
 	endchannel
-; f1981
 
 	togglesfx
 
-Sfx_DexFanfare170199_Ch6: ; f1982
+Sfx_DexFanfare170199_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -3418,11 +3110,10 @@
 	note D_, 12
 	note __, 4
 	endchannel
-; f19a2
 
 	togglesfx
 
-Sfx_DexFanfare170199_Ch7: ; f19a3
+Sfx_DexFanfare170199_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -3447,11 +3138,10 @@
 	note A#, 12
 	note __, 4
 	endchannel
-; f19bf
 
 	togglesfx
 
-Sfx_DexFanfare170199_Ch8: ; f19c0
+Sfx_DexFanfare170199_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
@@ -3470,18 +3160,16 @@
 	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
@@ -3505,11 +3193,10 @@
 	note F#, 12
 	note __, 4
 	endchannel
-; f1a03
 
 	togglesfx
 
-Sfx_DexFanfare200229_Ch6: ; f1a04
+Sfx_DexFanfare200229_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -3529,11 +3216,10 @@
 	note A_, 12
 	note __, 4
 	endchannel
-; f1a1e
 
 	togglesfx
 
-Sfx_DexFanfare200229_Ch7: ; f1a1f
+Sfx_DexFanfare200229_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -3574,11 +3260,10 @@
 	note D_, 6
 	note __, 6
 	endchannel
-; f1a49
 
 	togglesfx
 
-Sfx_DexFanfare200229_Ch8: ; f1a4a
+Sfx_DexFanfare200229_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
@@ -3604,18 +3289,16 @@
 	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
@@ -3660,11 +3343,10 @@
 	note A_, 14
 	note __, 2
 	endchannel
-; f1ab1
 
 	togglesfx
 
-Sfx_DexFanfare230Plus_Ch6: ; f1ab2
+Sfx_DexFanfare230Plus_Ch6:
 	togglesfx
 	vibrato $12, $34
 	dutycycle $3
@@ -3696,11 +3378,10 @@
 	note F#, 14
 	note __, 2
 	endchannel
-; f1ad9
 
 	togglesfx
 
-Sfx_DexFanfare230Plus_Ch7: ; f1ada
+Sfx_DexFanfare230Plus_Ch7:
 	togglesfx
 	notetype $8, $25
 	octave 3
@@ -3746,11 +3427,10 @@
 	note D_, 14
 	note __, 2
 	endchannel
-; f1b0b
 
 	togglesfx
 
-Sfx_DexFanfare230Plus_Ch8: ; f1b0c
+Sfx_DexFanfare230Plus_Ch8:
 	togglesfx
 	sfxtogglenoise $4
 	notetype $8
@@ -3783,38 +3463,32 @@
 	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
@@ -3821,14 +3495,12 @@
 	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
@@ -3839,9 +3511,8 @@
 	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
@@ -3853,14 +3524,12 @@
 	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
@@ -3868,9 +3537,8 @@
 	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
 .loop
@@ -3883,34 +3551,29 @@
 	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
@@ -3924,13 +3587,11 @@
 	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
@@ -3944,18 +3605,16 @@
 	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
@@ -3965,9 +3624,8 @@
 	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
@@ -3977,13 +3635,11 @@
 	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
 .loop
 	soundinput $79
@@ -3994,19 +3650,16 @@
 	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
@@ -4030,9 +3683,8 @@
 	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
@@ -4039,28 +3691,24 @@
 	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
@@ -4068,9 +3716,8 @@
 	sound __,  9, $e2, $0200
 	soundinput $8
 	endchannel
-; f1d32
 
-Sfx_BallWobble_Ch5: ; f1d32
+Sfx_BallWobble_Ch5:
 	dutycycle $2
 	soundinput $3a
 	sound __,  5, $f2, $0400
@@ -4078,45 +3725,39 @@
 	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
@@ -4123,10 +3764,9 @@
 	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
@@ -4133,9 +3773,8 @@
 	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
@@ -4142,9 +3781,8 @@
 	sound __, 16, $f2, $0650
 	soundinput $8
 	endchannel
-; f1dac
 
-Sfx_Poison_Ch5: ; f1dac
+Sfx_Poison_Ch5:
 	dutycycle $0
 	soundinput $14
 	sound __,  5, $f2, $0600
@@ -4152,9 +3790,8 @@
 	sound __, 16, $f3, $0600
 	soundinput $8
 	endchannel
-; f1dbf
 
-Sfx_FullHeal_Ch5: ; f1dbf
+Sfx_FullHeal_Ch5:
 	dutycycle $2
 	soundinput $14
 	sound __,  5, $f2, $0600
@@ -4163,9 +3800,8 @@
 	sound __, 16, $f2, $0600
 	soundinput $8
 	endchannel
-; f1dd4
 
-Sfx_GotSafariBalls_Ch5: ; f1dd4
+Sfx_GotSafariBalls_Ch5:
 	dutycycle $2
 	soundinput $15
 	sound __, 16, $f0, $04f0
@@ -4172,9 +3808,8 @@
 	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
@@ -4187,9 +3822,8 @@
 	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
@@ -4196,9 +3830,8 @@
 	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
@@ -4205,9 +3838,8 @@
 	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
@@ -4217,9 +3849,8 @@
 	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
@@ -4227,9 +3858,8 @@
 	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
@@ -4238,9 +3868,8 @@
 	soundinput $8
 	sound __,  2, $0, 0
 	endchannel
-; f1e7b
 
-Sfx_WarpTo_Ch5: ; f1e7b
+Sfx_WarpTo_Ch5:
 	dutycycle $1
 	soundinput $17
 	sound __, 16, $d7, $0500
@@ -4250,9 +3879,8 @@
 	sound __, 16, $17, $0700
 	soundinput $8
 	endchannel
-; f1e96
 
-Sfx_WarpFrom_Ch5: ; f1e96
+Sfx_WarpFrom_Ch5:
 	dutycycle $1
 	soundinput $17
 	sound __, 16, $d7, $0700
@@ -4262,33 +3890,29 @@
 	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
@@ -4306,9 +3930,8 @@
 	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
@@ -4317,9 +3940,8 @@
 	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
@@ -4326,17 +3948,15 @@
 	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
@@ -4346,9 +3966,8 @@
 	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
@@ -4358,9 +3977,8 @@
 	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
@@ -4370,9 +3988,8 @@
 	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
@@ -4384,9 +4001,8 @@
 	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
@@ -4395,22 +4011,19 @@
 	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
@@ -4419,35 +4032,30 @@
 	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
@@ -4460,10 +4068,9 @@
 	noise __,  3, $31, $11
 	noise __,  9, $41, $33
 	endchannel
-; f2036
 
-Sfx_SlotMachineStart_Ch5: ; f2036
-	dutycycle $2
+Sfx_SlotMachineStart_Ch5:
+	dutycycle $2
 	soundinput $44
 	sound __, 16, $f0, $04f0
 	soundinput $17
@@ -4470,16 +4077,14 @@
 	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
@@ -4489,107 +4094,92 @@
 	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_Ch8:
 	noise __,  9, $4f, $23
 	noise __,  5, $c4, $22
 	noise __,  7, $f2, $23
 	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
@@ -4599,62 +4189,53 @@
 	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
@@ -4662,31 +4243,27 @@
 	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
@@ -4693,15 +4270,13 @@
 	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
@@ -4708,23 +4283,20 @@
 	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
@@ -4731,9 +4303,8 @@
 	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
@@ -4742,9 +4313,8 @@
 	noise __,  9, $ff, $54
 	noise __, 16, $f2, $54
 	endchannel
-; f21e9
 
-Sfx_Supersonic_Ch5: ; f21e9
+Sfx_Supersonic_Ch5:
 	dutycycle $2
 	sound __, 16, $3f, $07c0
 .loop
@@ -4752,9 +4322,8 @@
 	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
 .loop
@@ -4762,39 +4331,34 @@
 	loopchannel 4, .loop
 	sound __, 16, $c1, $07c8
 	endchannel
-; f220f
 
-Sfx_Supersonic_Ch8: ; f220f
+Sfx_Supersonic_Ch8:
 	noise __,  4, $97, $12
 	noise __,  4, $a1, $11
 	loopchannel 10, Sfx_Supersonic_Ch8
 	endchannel
-; f221a
 
-Sfx_Leer_Ch5: ; f221a
+Sfx_Leer_Ch5:
 	dutycycle $0
 	sound __,  1, $f1, $07c0
 	sound __,  1, $f1, $0700
 	loopchannel 12, Sfx_Leer_Ch5
 	endchannel
-; f2229
 
-Sfx_Leer_Ch6: ; f2229
+Sfx_Leer_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  1, $e1, $07c1
 	sound __,  1, $e1, $0701
 	loopchannel 12, Sfx_Leer_Ch6
 	endchannel
-; f2238
 
-Sfx_Leer_Ch8: ; f2238
+Sfx_Leer_Ch8:
 	noise __,  2, $d1, $49
 	noise __,  2, $d1, $29
 	loopchannel 6, Sfx_Leer_Ch8
 	endchannel
-; f2243
 
-Sfx_Ember_Ch5: ; f2243
+Sfx_Ember_Ch5:
 	sound_duty 1, 2, 0, 3
 	sound __, 12, $f3, $0120
 	sound __, 10, $d3, $0150
@@ -4802,9 +4366,8 @@
 	sound __,  9, $e3, $0130
 	sound __, 16, $c2, $0110
 	endchannel
-; f225a
 
-Sfx_Ember_Ch8: ; f225a
+Sfx_Ember_Ch8:
 	noise __, 11, $f3, $35
 	noise __, 15, $f6, $45
 	loopchannel 4, Sfx_Ember_Ch8
@@ -4812,9 +4375,8 @@
 	noise __, 13, $f5, $9c
 	noise __, 16, $f4, $ac
 	endchannel
-; f226e
 
-Sfx_Bubblebeam_Ch5: ; f226e
+Sfx_Bubblebeam_Ch5:
 	sound_duty 1, 2, 3, 0
 	sound __,  5, $f4, $0600
 	sound __,  4, $c4, $0500
@@ -4823,9 +4385,8 @@
 	loopchannel 3, Sfx_Bubblebeam_Ch5
 	sound __,  9, $d1, $0600
 	endchannel
-; f2289
 
-Sfx_Bubblebeam_Ch6: ; f2289
+Sfx_Bubblebeam_Ch6:
 	sound_duty 1, 3, 0, 2
 	sound __,  6, $e4, $05e0
 	sound __,  5, $b4, $04e0
@@ -4833,9 +4394,8 @@
 	sound __, 15, $d1, $06a0
 	loopchannel 3, Sfx_Bubblebeam_Ch6
 	endchannel
-; f22a0
 
-Sfx_Bubblebeam_Ch8: ; f22a0
+Sfx_Bubblebeam_Ch8:
 	noise __,  6, $c3, $33
 	noise __,  4, $92, $43
 	noise __, 11, $b5, $33
@@ -4842,9 +4402,8 @@
 	noise __, 16, $c3, $32
 	loopchannel 2, Sfx_Bubblebeam_Ch8
 	endchannel
-; f22b1
 
-Sfx_HydroPump_Ch5: ; f22b1
+Sfx_HydroPump_Ch5:
 	sound_duty 2, 0, 1, 3
 	sound __,  4, $81, $0300
 	sound __,  4, $c1, $0400
@@ -4854,9 +4413,8 @@
 	loopchannel 5, Sfx_HydroPump_Ch5
 	sound __,  9, $81, $0400
 	endchannel
-; f22d0
 
-Sfx_HydroPump_Ch8: ; f22d0
+Sfx_HydroPump_Ch8:
 	noise __,  4, $62, $22
 	noise __,  4, $a2, $32
 	noise __,  4, $d2, $33
@@ -4865,9 +4423,8 @@
 	loopchannel 5, Sfx_HydroPump_Ch8
 	noise __,  9, $81, $12
 	endchannel
-; f22e7
 
-Sfx_Surf_Ch5: ; f22e7
+Sfx_Surf_Ch5:
 	sound_duty 1, 2, 3, 0
 	sound __, 16, $f4, $0500
 	sound __, 16, $c4, $0400
@@ -4874,9 +4431,8 @@
 	sound __, 16, $e2, $05c0
 	loopchannel 3, Sfx_Surf_Ch5
 	endchannel
-; f22fa
 
-Sfx_Surf_Ch6: ; f22fa
+Sfx_Surf_Ch6:
 	sound_duty 1, 3, 0, 2
 	sound __,  8, $e4, $0430
 	sound __, 16, $b4, $0330
@@ -4883,9 +4439,8 @@
 	sound __, 16, $a2, $0438
 	loopchannel 4, Sfx_Surf_Ch6
 	endchannel
-; f230d
 
-Sfx_Surf_Ch8: ; f230d
+Sfx_Surf_Ch8:
 	noise __, 10, $f4, $44
 	noise __, 10, $f2, $43
 	noise __, 16, $f4, $42
@@ -4892,9 +4447,8 @@
 	noise __, 16, $f4, $41
 	loopchannel 3, Sfx_Surf_Ch8
 	endchannel
-; f231e
 
-Sfx_Psybeam_Ch5: ; f231e
+Sfx_Psybeam_Ch5:
 	sound_duty 1, 0, 2, 2
 	sound __, 11, $f1, $0640
 	sound __, 11, $f3, $0680
@@ -4902,9 +4456,8 @@
 	loopchannel 4, Sfx_Psybeam_Ch5
 	sound __, 11, $f1, $0640
 	endchannel
-; f2335
 
-Sfx_Psybeam_Ch6: ; f2335
+Sfx_Psybeam_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __, 11, $f3, $0571
 	sound __,  8, $e3, $0531
@@ -4912,16 +4465,14 @@
 	loopchannel 4, Sfx_Psybeam_Ch6
 	sound __, 11, $f1, $0571
 	endchannel
-; f234c
 
-Sfx_Psybeam_Ch8: ; f234c
+Sfx_Psybeam_Ch8:
 	noise __,  3, $d1, $4a
 	noise __,  3, $d2, $2a
 	loopchannel 21, Sfx_Psybeam_Ch8
 	endchannel
-; f2357
 
-Sfx_Charge_Ch5: ; f2357
+Sfx_Charge_Ch5:
 	dutycycle $0
 	sound __,  3, $f1, $0200
 	sound __,  4, $f1, $0700
@@ -4929,9 +4480,8 @@
 	sound __,  6, $f1, $07f0
 	loopchannel 8, Sfx_Charge_Ch5
 	endchannel
-; f236e
 
-Sfx_Charge_Ch6: ; f236e
+Sfx_Charge_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  3, $e1, $0302
 	sound __,  4, $e1, $07f2
@@ -4939,9 +4489,8 @@
 	sound __,  6, $e1, $0702
 	loopchannel 8, Sfx_Charge_Ch6
 	endchannel
-; f2385
 
-Sfx_Charge_Ch8: ; f2385
+Sfx_Charge_Ch8:
 	noise __,  3, $d3, $10
 	noise __,  4, $d3, $11
 	noise __,  3, $d2, $10
@@ -4948,32 +4497,28 @@
 	noise __,  6, $d2, $12
 	loopchannel 9, Sfx_Charge_Ch8
 	endchannel
-; f2396
 
-Sfx_Thundershock_Ch5: ; f2396
+Sfx_Thundershock_Ch5:
 	sound_duty 3, 2, 2, 0
 	sound __,  4, $f1, $07f0
 	sound __,  5, $f2, $0200
 	loopchannel 8, Sfx_Thundershock_Ch5
 	endchannel
-; f23a5
 
-Sfx_Thundershock_Ch6: ; f23a5
+Sfx_Thundershock_Ch6:
 	sound_duty 3, 0, 3, 2
 	sound __,  5, $e2, $0202
 	sound __,  5, $e1, $07e2
 	loopchannel 9, Sfx_Thundershock_Ch6
 	endchannel
-; f23b4
 
-Sfx_Thundershock_Ch8: ; f23b4
+Sfx_Thundershock_Ch8:
 	noise __,  5, $ff, $43
 	noise __,  5, $f2, $44
 	loopchannel 9, Sfx_Thundershock_Ch8
 	endchannel
-; f23bf
 
-Sfx_Psychic_Ch5: ; f23bf
+Sfx_Psychic_Ch5:
 	dutycycle $2
 	soundinput $f7
 	sound __,  9, $c4, $07bd
@@ -4984,9 +4529,8 @@
 	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
@@ -4995,9 +4539,8 @@
 	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
@@ -5005,9 +4548,8 @@
 	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
@@ -5015,9 +4557,8 @@
 	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
@@ -5025,23 +4566,20 @@
 	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
@@ -5049,9 +4587,8 @@
 	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
@@ -5059,33 +4596,29 @@
 	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
@@ -5098,9 +4631,8 @@
 	octave 5
 	note G_, 8
 	endchannel
-; f24b6
 
-Sfx_Sing_Ch6: ; f24b6
+Sfx_Sing_Ch6:
 	togglesfx
 	vibrato $a, $23
 	dutycycle $2
@@ -5114,9 +4646,8 @@
 	octave 5
 	note G_, 8
 	endchannel
-; f24ca
 
-Sfx_HyperBeam_Ch5: ; f24ca
+Sfx_HyperBeam_Ch5:
 	dutycycle $0
 	sound __,  3, $f1, $0780
 	sound __,  3, $f1, $0700
@@ -5135,9 +4666,8 @@
 	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
@@ -5156,16 +4686,14 @@
 	loopchannel 12, .loop
 	sound __, 16, $f1, $0701
 	endchannel
-; f2548
 
-Sfx_HyperBeam_Ch8: ; f2548
+Sfx_HyperBeam_Ch8:
 	noise __,  2, $d1, $49
 	noise __,  2, $d1, $29
 	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
@@ -5175,9 +4703,8 @@
 	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
@@ -5188,32 +4715,27 @@
 	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
@@ -5221,40 +4743,35 @@
 	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
@@ -5268,24 +4785,21 @@
 	sound __, 16, $12, $07e0
 	soundinput $8
 	endchannel
-; f2617
 
-Sfx_Unknown5F_Ch5: ; f2617
+Sfx_Unknown5F_Ch5:
 	sound __,  3, $f7, $0601
 	sound __,  3, $f7, $0701
 	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_Ch5
 	endchannel
-; f2635
 
-Sfx_Fanfare2_Ch5: ; f2635
+Sfx_Fanfare2_Ch5:
 	togglesfx
 	sfxpriorityon
 	tempo 256
@@ -5309,9 +4823,8 @@
 	note C#, 12
 	sfxpriorityoff
 	endchannel
-; f2658
 
-Sfx_Fanfare2_Ch6: ; f2658
+Sfx_Fanfare2_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $6, $c5
@@ -5330,9 +4843,8 @@
 	notetype $4, $c6
 	note F_, 12
 	endchannel
-; f2673
 
-Sfx_Fanfare2_Ch8: ; f2673
+Sfx_Fanfare2_Ch8:
 	togglesfx
 	notetype $6
 	note C_, 1
@@ -5351,9 +4863,8 @@
 	note F_, 2
 	note G#, 6
 	endchannel
-; f2687
 
-Sfx_Fanfare_Ch5: ; f2687
+Sfx_Fanfare_Ch5:
 	togglesfx
 	sfxpriorityon
 	tempo 256
@@ -5382,9 +4893,8 @@
 	note C#, 12
 	sfxpriorityoff
 	endchannel
-; f26af
 
-Sfx_Fanfare_Ch6: ; f26af
+Sfx_Fanfare_Ch6:
 	togglesfx
 	dutycycle $2
 	notetype $6, $c4
@@ -5419,9 +4929,8 @@
 	notetype $4, $c6
 	note F#, 12
 	endchannel
-; f26d8
 
-Sfx_Fanfare_Ch8: ; f26d8
+Sfx_Fanfare_Ch8:
 	togglesfx
 	notetype $6
 	note C_, 1
@@ -5445,23 +4954,21 @@
 	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_NoSignal_Ch5: ; f26ff
+Sfx_NoSignal_Ch5:
 	dutycycle $2
 	sound C_,  5, $e8, $070b
 	sound C_, 13, $0, 0
 	loopchannel 3, Sfx_NoSignal_Ch5
 	endchannel
-; f270e
 
-Sfx_Sandstorm_Ch8: ; f270e
-Sfx_Unknown5F_Ch8: ; f270e
+Sfx_Sandstorm_Ch8:
+Sfx_Unknown5F_Ch8:
 	noise __,  2, $f8, $41
 	noise __,  3, $9c, $24
 	noise __,  1, $0, $0
@@ -5469,9 +4976,8 @@
 	noise __,  3, $0, $0
 	loopchannel 3, Sfx_Sandstorm_Ch8
 	endchannel
-; f2722
 
-Sfx_Elevator_Ch5: ; f2722
+Sfx_Elevator_Ch5:
 	dutycycle $2
 	soundinput $5a
 .loop
@@ -5486,55 +4992,45 @@
 	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
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,13 +97,11 @@
 	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
@@ -125,13 +108,11 @@
 	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 @@
 	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 @@
 	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,13 +162,11 @@
 	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_
@@ -209,13 +184,11 @@
 	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
@@ -222,15 +195,13 @@
 	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 @@
 	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 @@
 	octave 5
 	note G_, 6
 	endchannel
-; 1799ef
--- 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 @@
 	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 @@
 	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
--- a/audio/wave_samples.asm
+++ b/audio/wave_samples.asm
@@ -1,4 +1,4 @@
-WaveSamples: ; e8db2
+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
@@ -11,4 +11,3 @@
 	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
--- 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
--- a/constants.asm
+++ b/constants.asm
@@ -28,6 +28,7 @@
 INCLUDE "constants/map_data_constants.asm"
 INCLUDE "constants/map_object_constants.asm"
 INCLUDE "constants/map_setup_constants.asm"
+INCLUDE "constants/mart_constants.asm"
 INCLUDE "constants/menu_constants.asm"
 INCLUDE "constants/mobile_constants.asm"
 INCLUDE "constants/move_constants.asm"
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -61,6 +61,7 @@
 	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
--- a/constants/collision_constants.asm
+++ b/constants/collision_constants.asm
@@ -113,3 +113,5 @@
 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
--- a/constants/gfx_constants.asm
+++ b/constants/gfx_constants.asm
@@ -8,7 +8,6 @@
 
 PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff
 
-
 SCREEN_WIDTH  EQU 20 ; tiles
 SCREEN_HEIGHT EQU 18 ; tiles
 SCREEN_WIDTH_PX  EQU SCREEN_WIDTH  * TILE_WIDTH ; pixels
@@ -23,7 +22,6 @@
 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
@@ -34,7 +32,6 @@
 HP_YELLOW EQU 1
 HP_RED    EQU 2
 
-
 ; sprite_oam_struct members (see macros/wram.asm)
 	const_def
 	const SPRITEOAMSTRUCT_YCOORD     ; 0
@@ -43,7 +40,6 @@
 	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
--- a/constants/hardware_constants.asm
+++ b/constants/hardware_constants.asm
@@ -58,10 +58,6 @@
 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_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
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -32,7 +32,6 @@
 CANT_SELECT EQU 1 << CANT_SELECT_F
 CANT_TOSS   EQU 1 << CANT_TOSS_F
 
-
 ; pack pockets
 	const_def
 	const ITEM_POCKET     ; 0
@@ -46,7 +45,6 @@
 MAX_KEY_ITEMS EQU 25
 MAX_PC_ITEMS  EQU 50
 
-
 ; mail
 MAIL_LINE_LENGTH   EQU $10
 MAIL_MSG_LENGTH    EQU $20
@@ -53,7 +51,6 @@
 MAILBOX_CAPACITY   EQU 10
 MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 
-
 ; held item effects
 	const_def
 	const HELD_NONE
@@ -129,49 +126,3 @@
 	const HELD_BRIGHTPOWDER
 	const HELD_78
 	const HELD_FOCUS_BAND
-
-
-; 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
--- a/constants/landmark_constants.asm
+++ b/constants/landmark_constants.asm
@@ -105,7 +105,6 @@
 GIFT_LOCATION  EQU $7e
 EVENT_LOCATION EQU $7f
 
-
 ; Regions
 	const_def
 	const JOHTO_REGION ; 0
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -3,7 +3,6 @@
 GROUP_NONE EQU 0
 MAP_NONE   EQU 0
 
-
 ; map struct members (see data/maps/maps.asm)
 	const_def
 	const MAP_MAPATTRIBUTES_BANK ; 0
@@ -51,7 +50,6 @@
 	const FISHGROUP_REMORAID
 	const FISHGROUP_QWILFISH_NO_SWARM
 
-
 ; connection directions (see data/maps/data.asm)
 	const_def
 	const EAST_F
@@ -66,7 +64,6 @@
 	shift_const SOUTH
 	shift_const NORTH
 
-
 ; SpawnPoints indexes (see data/maps/spawn_points.asm)
 const_value = -1
 	const SPAWN_N_A
@@ -101,7 +98,6 @@
 	const SPAWN_MT_SILVER
 	const SPAWN_FAST_SHIP
 NUM_SPAWNS EQU const_value
-
 
 ; outdoor sprite limits (see engine/overworld/overworld.asm)
 MAX_OUTDOOR_SPRITES EQU 23
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -126,7 +126,6 @@
 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
@@ -282,7 +281,6 @@
 	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
--- /dev/null
+++ b/constants/mart_constants.asm
@@ -1,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
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -32,7 +32,6 @@
 	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
@@ -69,7 +68,6 @@
 ; start/select menu return values
 HMENURETURN_SCRIPT EQU %10000000
 HMENURETURN_ASM    EQU %11111111
-
 
 ; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
 	const_def
--- a/constants/npc_trade_constants.asm
+++ b/constants/npc_trade_constants.asm
@@ -19,6 +19,7 @@
 	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
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -62,11 +62,9 @@
 	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 @@
 PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
 REDMON_STRUCT_LENGTH EQU 44
 
-
 ; caught data
 
 CAUGHT_TIME_MASK  EQU %11000000
@@ -116,7 +113,6 @@
 
 CAUGHT_EGG_LEVEL EQU 1
 
-
 ; maximum number of party pokemon
 PARTY_LENGTH EQU 6
 
@@ -129,7 +125,6 @@
 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_def 1
 	const EVOLVE_LEVEL
@@ -150,7 +145,6 @@
 	const ATK_LT_DEF
 	const ATK_EQ_DEF
 
-
 ; wild data
 
 NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
@@ -158,10 +152,10 @@
 
 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
@@ -181,7 +175,6 @@
 	const TREEMON_SCORE_GOOD ; 1
 	const TREEMON_SCORE_RARE ; 2
 
-
 ; ChangeHappiness arguments (see data/happiness_changes.asm)
 const_value = 1
 	const HAPPINESS_GAINLEVEL         ; 01
@@ -210,7 +203,6 @@
 HAPPINESS_TO_EVOLVE   EQU 220
 HAPPINESS_THRESHOLD_1 EQU 100
 HAPPINESS_THRESHOLD_2 EQU 200
-
 
 ; PP
 PP_UP_MASK EQU %11000000
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -2,7 +2,6 @@
 PLAYER      EQU  0
 LAST_TALKED EQU -2
 
-
 ; memory constants
 	const_def
 	const MEM_BUFFER_0 ; use wStringBuffer3
@@ -10,7 +9,6 @@
 	const MEM_BUFFER_2 ; use wStringBuffer5
 NUM_MEM_BUFFERS EQU const_value
 
-
 ; checkmoney/takemoney accounts
 	const_def
 	const YOUR_MONEY ; 0
@@ -36,7 +34,6 @@
 	const PHONE_CONTACTS_FULL   ; 1
 	const PHONE_CONTACT_REFUSED ; 2
 
-
 ; writecode/checkcode arguments
 ; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
 	const_def
@@ -74,7 +71,6 @@
 RETVAR_ADDR_DE EQU (1 << 6)
 RETVAR_EXECUTE EQU (2 << 6)
 
-
 ; PlayerEventScriptPointers indexes (see engine/overworld/events.asm)
 	const_def -1
 	const PLAYEREVENT_MAPSCRIPT
@@ -90,7 +86,6 @@
 	const PLAYEREVENT_JOYCHANGEFACING
 NUM_PLAYER_EVENTS EQU const_value
 
-
 ; bg_event types
 ; TryBGEvent arguments (see engine/overworld/events.asm)
 	const_def
@@ -115,7 +110,6 @@
 	const OBJECTTYPE_5
 	const OBJECTTYPE_6
 
-
 ; command queue members
 CMDQUEUE_TYPE  EQU 0
 CMDQUEUE_ADDR  EQU 1
@@ -125,10 +119,15 @@
 CMDQUEUE_ENTRY_SIZE EQU 6
 CMDQUEUE_CAPACITY EQU 4
 
-; command queue types
-CMDQUEUE_STONETABLE EQU 2
+; 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
@@ -149,7 +148,6 @@
 	const FLOOR_11F
 	const FLOOR_ROOF
 
-
 ; showemote arguments
 ; Emotes indexes (see data/sprites/emotes.asm)
 	const_def
@@ -216,7 +214,6 @@
 	const_def
 	const SWARM_DUNSPARCE ; 0
 	const SWARM_YANMA     ; 1
-
 
 ; ActivateFishingSwarm writebyte arguments
 	const_def
--- 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
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -20,7 +20,8 @@
 GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
 GAMETIMERPAUSE_MOBILE_7_F     EQU 7
 
-; wOptions:: (bits 4-7) ; cfcc
+; wOptions:: ; cfcc
+TEXT_DELAY_MASK EQU %111
 	const_def 4
 	const NO_TEXT_SCROLL ; 4
 	const STEREO         ; 5
@@ -27,10 +28,9 @@
 	const BATTLE_SHIFT   ; 6
 	const BATTLE_SCENE   ; 7
 
-; wOptions:: (bits 0-2) ; cfcc
-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
 	const_def
--- a/data/battle/ai/constant_damage_effects.asm
+++ b/data/battle/ai/constant_damage_effects.asm
@@ -2,10 +2,9 @@
 ; to calculate damage for these instead of
 ; BattleCommand_DamageCalc and BattleCommand_Stab.
 
-ConstantDamageEffects: ; 39413
+ConstantDamageEffects:
 	db EFFECT_SUPER_FANG
 	db EFFECT_STATIC_DAMAGE
 	db EFFECT_LEVEL_DAMAGE
 	db EFFECT_PSYWAVE
 	db -1 ; end
-; 39418
--- a/data/battle/ai/encore_moves.asm
+++ b/data/battle/ai/encore_moves.asm
@@ -1,6 +1,6 @@
 ; AI_SMART encourages these moves with Encore.
 
-EncoreMoves: ; 38c85
+EncoreMoves:
 	db SWORDS_DANCE
 	db WHIRLWIND
 	db LEER
@@ -32,4 +32,3 @@
 	db COTTON_SPORE
 	db POWDER_SNOW
 	db -1 ; end
-; 38ca4
--- a/data/battle/ai/rain_dance_moves.asm
+++ b/data/battle/ai/rain_dance_moves.asm
@@ -1,6 +1,6 @@
 ; AI_SMART prefers these moves during rain.
 
-RainDanceMoves: ; 390e7
+RainDanceMoves:
 	db WATER_GUN
 	db HYDRO_PUMP
 	db SURF
@@ -13,4 +13,3 @@
 	db OCTAZOOKA
 	db WHIRLPOOL
 	db -1 ; end
-; 390f3
--- a/data/battle/ai/reckless_moves.asm
+++ b/data/battle/ai/reckless_moves.asm
@@ -1,10 +1,9 @@
 ; AI_AGGRESSIVE does not discourage these moves
 ; even if a stronger one is available.
 
-RecklessMoves: ; 393e2
+RecklessMoves:
 	db EFFECT_SELFDESTRUCT
 	db EFFECT_RAMPAGE
 	db EFFECT_MULTI_HIT
 	db EFFECT_DOUBLE_HIT
 	db -1 ; end
-; 393e7
--- a/data/battle/ai/residual_moves.asm
+++ b/data/battle/ai/residual_moves.asm
@@ -14,4 +14,3 @@
 	db SUBSTITUTE
 	db SPIKES
 	db -1 ; end
-; 39453
--- a/data/battle/ai/risky_effects.asm
+++ b/data/battle/ai/risky_effects.asm
@@ -1,8 +1,7 @@
 ; AI_RISKY will not use these effects at max HP
 ; even if they would KO the player.
 
-RiskyEffects: ; 394ff
+RiskyEffects:
 	db EFFECT_SELFDESTRUCT
 	db EFFECT_OHKO
 	db -1 ; end
-; 39502
--- a/data/battle/ai/stall_moves.asm
+++ b/data/battle/ai/stall_moves.asm
@@ -1,7 +1,7 @@
 ; AI_OPPORTUNIST discourages these moves
 ; when the player's HP is low.
 
-StallMoves: ; 39348
+StallMoves:
 	db SWORDS_DANCE
 	db TAIL_WHIP
 	db LEER
@@ -35,4 +35,3 @@
 	db SUBSTITUTE
 	db FLAME_WHEEL
 	db -1 ; end
-; 39369
--- a/data/battle/ai/status_only_effects.asm
+++ b/data/battle/ai/status_only_effects.asm
@@ -1,10 +1,9 @@
 ; AI_BASIC discourages these effects if the player
 ; already has a status condition.
 
-StatusOnlyEffects: ; 385db
+StatusOnlyEffects:
 	db EFFECT_SLEEP
 	db EFFECT_TOXIC
 	db EFFECT_POISON
 	db EFFECT_PARALYZE
 	db -1 ; end
-; 385e0
--- a/data/battle/ai/sunny_day_moves.asm
+++ b/data/battle/ai/sunny_day_moves.asm
@@ -1,6 +1,6 @@
 ; AI_SMART prefers these moves during harsh sunlight.
 
-SunnyDayMoves: ; 39134
+SunnyDayMoves:
 	db FIRE_PUNCH
 	db EMBER
 	db FLAMETHROWER
@@ -10,4 +10,3 @@
 	db MORNING_SUN
 	db SYNTHESIS
 	db -1 ; end
-; 3913d
--- a/data/battle/ai/useful_moves.asm
+++ b/data/battle/ai/useful_moves.asm
@@ -1,6 +1,6 @@
 ; AI_SMART knows these moves are usable all-around.
 
-UsefulMoves: ; 39301
+UsefulMoves:
 	db DOUBLE_EDGE
 	db SING
 	db FLAMETHROWER
@@ -21,4 +21,3 @@
 	db SOFTBOILED
 	db SUPER_FANG
 	db -1 ; end
-; 39315
--- /dev/null
+++ b/data/battle/critical_hit_chances.asm
@@ -1,0 +1,8 @@
+CriticalHitChances:
+	db  7 percent     ;  0
+	db 12 percent + 2 ; +1
+	db 25 percent + 1 ; +2
+	db 33 percent + 1 ; +3
+	db 50 percent + 1 ; +4
+	db 50 percent + 1 ; +5
+	db 50 percent + 1 ; +6
--- a/data/battle/critical_hits.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-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
-	db 25 percent + 1 ; +2
-	db 33 percent + 1 ; +3
-	db 50 percent + 1 ; +4
-	db 50 percent + 1 ; +5
-	db 50 percent + 1 ; +6
--- 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_MoveAnimNoSub ; 34f60
-	dw BattleCommand_RaiseSub ; 35004
-	dw BattleCommand_FailureText ; 35023
-	dw BattleCommand_ApplyDamage ; 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 BattleCommand_BideFailText ; 35165
-	dw BattleCommand_RaiseSubNoAnim ; 365af
-	dw BattleCommand_LowerSubNoAnim ; 365c3
-	dw BattleCommand_BeatUpFailText ; 355b5
-	dw BattleCommand_ClearMissDamage ; 355d5 - a9
-	dw BattleCommand_MoveDelay ; 37e80
-	dw BattleCommand_MoveAnim ; 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
--- a/data/battle/held_consumables.asm
+++ b/data/battle/held_consumables.asm
@@ -1,6 +1,6 @@
 ; Held item effects that are consumed on use
 
-ConsumableEffects: ; 271de
+ConsumableEffects:
 	db HELD_BERRY
 	db HELD_2
 	db HELD_5
@@ -23,4 +23,3 @@
 	db HELD_ESCAPE
 	db HELD_CRITICAL_UP
 	db -1
-; 271f4
--- a/data/battle/held_heal_status.asm
+++ b/data/battle/held_heal_status.asm
@@ -1,6 +1,6 @@
 ; See also data/items/heal_status.asm
 
-HeldStatusHealingEffects: ; 3de44
+HeldStatusHealingEffects:
 	db HELD_HEAL_POISON,   1 << PSN
 	db HELD_HEAL_FREEZE,   1 << FRZ
 	db HELD_HEAL_BURN,     1 << BRN
@@ -8,4 +8,3 @@
 	db HELD_HEAL_PARALYZE, 1 << PAR
 	db HELD_HEAL_STATUS,   ALL_STATUS
 	db -1 ; end
-; 3de51
--- a/data/battle/held_stat_up.asm
+++ b/data/battle/held_stat_up.asm
@@ -7,4 +7,3 @@
 	dbw HELD_ACCURACY_UP,   BattleCommand_AccuracyUp
 	dbw HELD_EVASION_UP,    BattleCommand_EvasionUp
 	db -1 ; end
-; 3df12
--- a/data/battle/metronome_exception_moves.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-; Metronome cannot turn into these moves.
-
-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
--- 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 @@
 	db MOON_BALL,   PAL_BATTLE_OB_GRAY
 	db LOVE_BALL,   PAL_BATTLE_OB_RED
 	db -1,          PAL_BATTLE_OB_GRAY
-; cd284
--- 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 @@
 .Frameset_b8:
 	frame BATTLEANIMOAMSET_D7,  8
 	endanim
-
-; ceeae
--- 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 @@
 	dsprite  -2, 0,   6, 4, $00, $0
 	dsprite  -4, 0,   8, 4, $00, $0
 	dsprite  -2, 0,  10, 4, $00, $0
-; cfcf6
--- a/data/battle_anims/object_gfx.asm
+++ b/data/battle_anims/object_gfx.asm
@@ -4,7 +4,7 @@
 	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 @@
 	anim_obj_gfx 24, AnimObjAeroblastGFX
 	anim_obj_gfx  1, NULL
 	anim_obj_gfx  1, NULL
-; cfd9e
--- a/data/battle_anims/objects.asm
+++ b/data/battle_anims/objects.asm
@@ -16,7 +16,7 @@
 	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 @@
 	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
--- 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 @@
 	db "DYKSTRA@@@", SWIMMERF
 	db "EATON@@@@@", BIKER
 	db "WONG@@@@@@", FIREBREATHER
-; 1f8450
--- 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 @@
 	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 @@
 	bigdw 31 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db ESPEON
 	db LEFTOVERS
 	db MUD_SLAP, PSYCHIC_M, PSYCH_UP, TOXIC
@@ -42,7 +40,7 @@
 	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 @@
 	bigdw 31 ; SDef
 	db "E-HUi@@@@@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db SHADOW_BALL, IRON_TAIL, PSYCH_UP, TOXIC
@@ -69,7 +66,7 @@
 	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 @@
 	bigdw 39 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db WOBBUFFET
 	db FOCUS_BAND
 	db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
@@ -96,7 +92,7 @@
 	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 @@
 	bigdw 23 ; SDef
 	db "SO-NANSU@@@"
 
-
 	db KANGASKHAN
 	db MIRACLEBERRY
 	db REVERSAL, HYPER_BEAM, EARTHQUAKE, ATTRACT
@@ -123,7 +118,7 @@
 	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 @@
 	bigdw 28 ; SDef
 	db "GARU-RA@@@@"
 
-
 	db CORSOLA
 	db SCOPE_LENS
 	db SURF, PSYCHIC_M, RECOVER, ANCIENTPOWER
@@ -150,7 +144,7 @@
 	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 @@
 	bigdw 28 ; SDef
 	db "SANI-GO@@@@"
 
-
 	db MILTANK
 	db GOLD_BERRY
 	db BLIZZARD, EARTHQUAKE, HYPER_BEAM, TOXIC
@@ -177,7 +170,7 @@
 	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 @@
 	bigdw 26 ; SDef
 	db "MIRUTANKU@@"
 
-
 	db AERODACTYL
 	db LEFTOVERS
 	db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE
@@ -204,7 +196,7 @@
 	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 @@
 	bigdw 26 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db LAPRAS
 	db MIRACLEBERRY
 	db BLIZZARD, SURF, THUNDERBOLT, PSYCHIC_M
@@ -231,7 +222,7 @@
 	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 @@
 	bigdw 30 ; SDef
 	db "RAPURASU@@@"
 
-
 	db SNEASEL
 	db GOLD_BERRY
 	db SLASH, FAINT_ATTACK, SURF, BLIZZARD
@@ -258,7 +248,7 @@
 	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 @@
 	bigdw 27 ; SDef
 	db "NIyu-RA@@@@"
 
-
 	db PORYGON2
 	db BRIGHTPOWDER
 	db PSYCHIC_M, BLIZZARD, HYPER_BEAM, TRI_ATTACK
@@ -285,7 +274,7 @@
 	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 @@
 	bigdw 31 ; SDef
 	db "PORIGON2@@@"
 
-
 	db MISDREAVUS
 	db FOCUS_BAND
 	db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL
@@ -312,7 +300,7 @@
 	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 @@
 	bigdw 29 ; SDef
 	db "MUUMA@@@@@@"
 
-
 	db HOUNDOUR
 	db GOLD_BERRY
 	db FAINT_ATTACK, SOLARBEAM, ROAR, SUNNY_DAY
@@ -339,7 +326,7 @@
 	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 @@
 	bigdw 22 ; SDef
 	db "DERUBIRU@@@"
 
-
 	db GIRAFARIG
 	db KINGS_ROCK
 	db PSYBEAM, MUD_SLAP, SHADOW_BALL, AGILITY
@@ -366,7 +352,7 @@
 	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 @@
 	bigdw 24 ; SDef
 	db "KIRINRIKI@@"
 
-
 	db BLISSEY
 	db QUICK_CLAW
 	db HEADBUTT, SOLARBEAM, ROLLOUT, STRENGTH
@@ -393,7 +378,7 @@
 	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 @@
 	bigdw 39 ; SDef
 	db "HAPINASU@@@"
 
-
 	db SNORLAX
 	db MIRACLEBERRY
 	db HEADBUTT, PROTECT, SNORE, SURF
@@ -420,7 +404,7 @@
 	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 @@
 	bigdw 32 ; SDef
 	db "KABIGON@@@@"
 
-
 	db EXEGGUTOR
 	db KINGS_ROCK
 	db TOXIC, GIGA_DRAIN, THIEF, CONFUSION
@@ -447,7 +430,7 @@
 	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 @@
 	bigdw 25 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db HERACROSS
 	db GOLD_BERRY
 	db REVERSAL, ENDURE, COUNTER, ROCK_SMASH
@@ -474,7 +456,7 @@
 	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 @@
 	bigdw 29 ; SDef
 	db "HERAKUROSU@"
 
-
 	db UNOWN
 	db BERRY
 	db HIDDEN_POWER, 0, 0, 0
@@ -501,7 +482,7 @@
 	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 @@
 	bigdw 21 ; SDef
 	db "ANNO-N@@@@@"
 
-
 	db TAUROS
 	db KINGS_ROCK
 	db HEADBUTT, SWAGGER, TAIL_WHIP, ICY_WIND
@@ -528,7 +508,7 @@
 	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 @@
 	bigdw 24 ; SDef
 	db "KENTAROSU@@"
 
-
 	db MR__MIME
 	db QUICK_CLAW
 	db TOXIC, PSYCH_UP, FIRE_PUNCH, HEADBUTT
@@ -555,7 +534,7 @@
 	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 @@
 	db "BARIYA-DO@@"
 
 
-
-
 BattleTowerMons2:
 
 	db UMBREON
@@ -586,7 +563,7 @@
 	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 @@
 	bigdw 72 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db STARMIE
 	db GOLD_BERRY
 	db RECOVER, PSYCHIC_M, SURF, PSYCH_UP
@@ -613,7 +589,7 @@
 	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 @@
 	bigdw 54 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db GYARADOS
 	db MIRACLEBERRY
 	db HYPER_BEAM, DRAGON_RAGE, THUNDERBOLT, FIRE_BLAST
@@ -640,7 +615,7 @@
 	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 @@
 	bigdw 61 ; SDef
 	db "GIyaRADOSU@"
 
-
 	db STEELIX
 	db GOLD_BERRY
 	db ROAR, IRON_TAIL, SWAGGER, EARTHQUAKE
@@ -667,7 +641,7 @@
 	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 @@
 	bigdw 48 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db ALAKAZAM
 	db BERRY_JUICE
 	db PSYCHIC_M, PSYCH_UP, TOXIC, THUNDERPUNCH
@@ -694,7 +667,7 @@
 	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 @@
 	bigdw 55 ; SDef
 	db "HU-DEiN@@@@"
 
-
 	db ARCANINE
 	db BRIGHTPOWDER
 	db FLAMETHROWER, ROAR, HYPER_BEAM, IRON_TAIL
@@ -721,7 +693,7 @@
 	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 @@
 	bigdw 52 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db HERACROSS
 	db FOCUS_BAND
 	db ENDURE, REVERSAL, MEGAHORN, EARTHQUAKE
@@ -748,7 +719,7 @@
 	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 @@
 	bigdw 59 ; SDef
 	db "HERAKUROSU@"
 
-
 	db EXEGGUTOR
 	db LEFTOVERS
 	db HYPER_BEAM, PSYCHIC_M, TOXIC, DREAM_EATER
@@ -775,7 +745,7 @@
 	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 @@
 	bigdw 46 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db AERODACTYL
 	db GOLD_BERRY
 	db REST, HYPER_BEAM, EARTHQUAKE, DRAGON_RAGE
@@ -802,7 +771,7 @@
 	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 @@
 	bigdw 50 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db BLISSEY
 	db BRIGHTPOWDER
 	db PSYCHIC_M, SUBMISSION, SOFTBOILED, COUNTER
@@ -829,7 +797,7 @@
 	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 @@
 	bigdw 75 ; SDef
 	db "HAPINASU@@@"
 
-
 	db LAPRAS
 	db GOLD_BERRY
 	db PSYCHIC_M, THUNDERBOLT, BLIZZARD, CONFUSE_RAY
@@ -856,7 +823,7 @@
 	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 @@
 	bigdw 54 ; SDef
 	db "RAPURASU@@@"
 
-
 	db PIKACHU
 	db LIGHT_BALL
 	db THUNDERBOLT, THUNDER_WAVE, STRENGTH, TOXIC
@@ -883,7 +849,7 @@
 	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 @@
 	bigdw 37 ; SDef
 	db "PIKATIyuU@@"
 
-
 	db SCIZOR
 	db FOCUS_BAND
 	db STEEL_WING, SLASH, TOXIC, SANDSTORM
@@ -910,7 +875,7 @@
 	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 @@
 	bigdw 53 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db HITMONCHAN
 	db GOLD_BERRY
 	db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MEGA_PUNCH
@@ -937,7 +901,7 @@
 	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 @@
 	bigdw 62 ; SDef
 	db "EBIWARA-@@@"
 
-
 	db TAUROS
 	db BRIGHTPOWDER
 	db THUNDERBOLT, EARTHQUAKE, HYPER_BEAM, BLIZZARD
@@ -964,7 +927,7 @@
 	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 @@
 	bigdw 47 ; SDef
 	db "KENTAROSU@@"
 
-
 	db AZUMARILL
 	db MYSTIC_WATER
 	db SURF, BLIZZARD, ATTRACT, RAIN_DANCE
@@ -991,7 +953,7 @@
 	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 @@
 	bigdw 49 ; SDef
 	db "MARIRURI@@@"
 
-
 	db MILTANK
 	db KINGS_ROCK
 	db EARTHQUAKE, THUNDER, ATTRACT, SURF
@@ -1018,7 +979,7 @@
 	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 @@
 	bigdw 48 ; SDef
 	db "MIRUTANKU@@"
 
-
 	db WIGGLYTUFF
 	db GOLD_BERRY
 	db HYPER_BEAM, BLIZZARD, FIRE_BLAST, ATTRACT
@@ -1045,7 +1005,7 @@
 	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 @@
 	bigdw 40 ; SDef
 	db "PUKURIN@@@@"
 
-
 	db WIGGLYTUFF
 	db PINK_BOW
 	db PSYCHIC_M, SWAGGER, PSYCH_UP, HEADBUTT
@@ -1072,7 +1031,7 @@
 	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 @@
 	bigdw 36 ; SDef
 	db "PUKURIN@@@@"
 
-
 	db NIDOKING
 	db BERRY
 	db BLIZZARD, EARTHQUAKE, SURF, THUNDERPUNCH
@@ -1099,7 +1057,7 @@
 	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 @@
 	bigdw 46 ; SDef
 	db "NIDOKINGU@@"
 
-
 	db QUAGSIRE
 	db QUICK_CLAW
 	db AMNESIA, EARTHQUAKE, SURF, RAIN_DANCE
@@ -1126,7 +1083,7 @@
 	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 @@
 	db "NUO-@@@@@@@"
 
 
-
-
 BattleTowerMons3:
 
 	db JOLTEON
@@ -1157,7 +1112,7 @@
 	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 @@
 	bigdw 87 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db POLIWRATH
 	db BRIGHTPOWDER
 	db DOUBLE_TEAM, SURF, FISSURE, SUBMISSION
@@ -1184,7 +1138,7 @@
 	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 @@
 	bigdw 82 ; SDef
 	db "NIyoROBON@@"
 
-
 	db STARMIE
 	db LEFTOVERS
 	db THUNDER_WAVE, PSYCHIC_M, RECOVER, SURF
@@ -1211,7 +1164,7 @@
 	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 @@
 	bigdw 81 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db JYNX
 	db GOLD_BERRY
 	db BLIZZARD, LOVELY_KISS, DREAM_EATER, ATTRACT
@@ -1238,7 +1190,7 @@
 	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 @@
 	bigdw 86 ; SDef
 	db "RU-ZIyuRA@@"
 
-
 	db DUGTRIO
 	db KINGS_ROCK
 	db EARTHQUAKE, SLUDGE_BOMB, SLASH, MUD_SLAP
@@ -1265,7 +1216,7 @@
 	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 @@
 	bigdw 72 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db BELLOSSOM
 	db BRIGHTPOWDER
 	db GIGA_DRAIN, SUNNY_DAY, SOLARBEAM, DOUBLE_TEAM
@@ -1292,7 +1242,7 @@
 	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 @@
 	bigdw 88 ; SDef
 	db "KIREIHANA@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db TOXIC, REFLECT, SOFTBOILED, PROTECT
@@ -1319,7 +1268,7 @@
 	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 @@
 	bigdw 109 ; SDef
 	db "HAPINASU@@@"
 
-
 	db HOUNDOOM
 	db CHARCOAL
 	db FLAMETHROWER, CRUNCH, SHADOW_BALL, DREAM_EATER
@@ -1346,7 +1294,7 @@
 	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 @@
 	bigdw 76 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db MACHAMP
 	db MIRACLEBERRY
 	db CROSS_CHOP, ICE_PUNCH, EARTHQUAKE, FIRE_BLAST
@@ -1373,7 +1320,7 @@
 	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 @@
 	bigdw 80 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db CROBAT
 	db GOLD_BERRY
 	db ATTRACT, CONFUSE_RAY, TOXIC, WING_ATTACK
@@ -1400,7 +1346,7 @@
 	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 @@
 	bigdw 76 ; SDef
 	db "KUROBAtuTO@"
 
-
 	db PORYGON2
 	db BRIGHTPOWDER
 	db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK
@@ -1427,7 +1372,7 @@
 	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 @@
 	bigdw 81 ; SDef
 	db "PORIGON2@@@"
 
-
 	db MAROWAK
 	db THICK_CLUB
 	db EARTHQUAKE, RETURN, HYPER_BEAM, BONEMERANG
@@ -1454,7 +1398,7 @@
 	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 @@
 	bigdw 72 ; SDef
 	db "GARAGARA@@@"
 
-
 	db ELECTRODE
 	db BRIGHTPOWDER
 	db LIGHT_SCREEN, THUNDERBOLT, PROTECT, THUNDER
@@ -1481,7 +1424,7 @@
 	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 @@
 	bigdw 78 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db LAPRAS
 	db LEFTOVERS
 	db RAIN_DANCE, WATER_GUN, ICY_WIND, STRENGTH
@@ -1508,7 +1450,7 @@
 	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 @@
 	bigdw 81 ; SDef
 	db "RAPURASU@@@"
 
-
 	db LANTURN
 	db GOLD_BERRY
 	db RAIN_DANCE, THUNDER, SURF, FLAIL
@@ -1535,7 +1476,7 @@
 	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 @@
 	bigdw 70 ; SDef
 	db "RANTA-N@@@@"
 
-
 	db ESPEON
 	db MIRACLEBERRY
 	db CONFUSION, SWIFT, TOXIC, PSYCH_UP
@@ -1562,7 +1502,7 @@
 	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 @@
 	bigdw 82 ; SDef
 	db "E-HUi@@@@@@"
 
-
 	db TENTACRUEL
 	db KINGS_ROCK
 	db WRAP, TOXIC, SLUDGE_BOMB, BUBBLEBEAM
@@ -1589,7 +1528,7 @@
 	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 @@
 	bigdw 101 ; SDef
 	db "DOKUKURAGE@"
 
-
 	db GENGAR
 	db GOLD_BERRY
 	db THIEF, LICK, NIGHT_SHADE, GIGA_DRAIN
@@ -1616,7 +1554,7 @@
 	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 @@
 	bigdw 70 ; SDef
 	db "GENGA-@@@@@"
 
-
 	db URSARING
 	db GOLD_BERRY
 	db HEADBUTT, PROTECT, ROAR, LEER
@@ -1643,7 +1580,7 @@
 	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 @@
 	bigdw 65 ; SDef
 	db "RINGUMA@@@@"
 
-
 	db FEAROW
 	db BRIGHTPOWDER
 	db MIRROR_MOVE, PURSUIT, PECK, SWIFT
@@ -1670,7 +1606,7 @@
 	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 @@
 	bigdw 58 ; SDef
 	db "ONIDORIRU@@"
 
-
 	db PRIMEAPE
 	db MIRACLEBERRY
 	db LOW_KICK, KARATE_CHOP, REVERSAL, FOCUS_ENERGY
@@ -1697,7 +1632,7 @@
 	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 @@
 	db "OKORIZARU@@"
 
 
-
-
 BattleTowerMons4:
 
 	db TAUROS
@@ -1728,7 +1661,7 @@
 	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 @@
 	bigdw 94 ; SDef
 	db "KENTAROSU@@"
 
-
 	db KINGDRA
 	db LEFTOVERS
 	db SURF, DRAGONBREATH, HYPER_BEAM, BLIZZARD
@@ -1755,7 +1687,7 @@
 	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 @@
 	bigdw 115 ; SDef
 	db "KINGUDORA@@"
 
-
 	db SNORLAX
 	db QUICK_CLAW
 	db ATTRACT, BODY_SLAM, PSYCH_UP, EARTHQUAKE
@@ -1782,7 +1713,7 @@
 	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 @@
 	bigdw 125 ; SDef
 	db "KABIGON@@@@"
 
-
 	db LAPRAS
 	db LEFTOVERS
 	db THUNDERBOLT, ICE_BEAM, CONFUSE_RAY, SURF
@@ -1809,7 +1739,7 @@
 	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 @@
 	bigdw 111 ; SDef
 	db "RAPURASU@@@"
 
-
 	db STEELIX
 	db GOLD_BERRY
 	db SANDSTORM, IRON_TAIL, EARTHQUAKE, TOXIC
@@ -1836,7 +1765,7 @@
 	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 @@
 	bigdw 87 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db ALAKAZAM
 	db KINGS_ROCK
 	db PSYCHIC_M, THUNDERPUNCH, RECOVER, FIRE_PUNCH
@@ -1863,7 +1791,7 @@
 	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 @@
 	bigdw 107 ; SDef
 	db "HU-DEiN@@@@"
 
-
 	db STARMIE
 	db LEFTOVERS
 	db BLIZZARD, THUNDERBOLT, SURF, PSYCHIC_M
@@ -1890,7 +1817,7 @@
 	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 @@
 	bigdw 105 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db WOBBUFFET
 	db GOLD_BERRY
 	db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
@@ -1917,7 +1843,7 @@
 	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 @@
 	bigdw 79 ; SDef
 	db "SO-NANSU@@@"
 
-
 	db GOLEM
 	db FOCUS_BAND
 	db EXPLOSION, EARTHQUAKE, MEGA_PUNCH, ROCK_SLIDE
@@ -1944,7 +1869,7 @@
 	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 @@
 	bigdw 88 ; SDef
 	db "GORO-NIya@@"
 
-
 	db SCIZOR
 	db SCOPE_LENS
 	db SLASH, STEEL_WING, PURSUIT, HYPER_BEAM
@@ -1971,7 +1895,7 @@
 	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 @@
 	bigdw 102 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db DUGTRIO
 	db KINGS_ROCK
 	db EARTHQUAKE, HYPER_BEAM, SLUDGE_BOMB, MUD_SLAP
@@ -1998,7 +1921,7 @@
 	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 @@
 	bigdw 91 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db SLOWBRO
 	db MIRACLEBERRY
 	db SURF, PSYCHIC_M, EARTHQUAKE, BLIZZARD
@@ -2025,7 +1947,7 @@
 	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 @@
 	bigdw 103 ; SDef
 	db "YADORAN@@@@"
 
-
 	db PORYGON2
 	db NO_ITEM
 	db CONVERSION2, CONVERSION, PSYBEAM, THIEF
@@ -2052,7 +1973,7 @@
 	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 @@
 	bigdw 115 ; SDef
 	db "PORIGON2@@@"
 
-
 	db ARCANINE
 	db CHARCOAL
 	db FLAME_WHEEL, LEER, BODY_SLAM, ROAR
@@ -2079,7 +1999,7 @@
 	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 @@
 	bigdw 99 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db FORRETRESS
 	db LEFTOVERS
 	db RAPID_SPIN, PROTECT, TOXIC, SANDSTORM
@@ -2106,7 +2025,7 @@
 	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 @@
 	bigdw 87 ; SDef
 	db "HUoRETOSU@@"
 
-
 	db OMASTAR
 	db GOLD_BERRY
 	db CURSE, WATER_GUN, ANCIENTPOWER, ROCK_SMASH
@@ -2133,7 +2051,7 @@
 	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 @@
 	bigdw 88 ; SDef
 	db "OMUSUTA-@@@"
 
-
 	db CHARIZARD
 	db KINGS_ROCK
 	db FIRE_SPIN, DRAGON_RAGE, FLY, SLASH
@@ -2160,7 +2077,7 @@
 	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 @@
 	bigdw 106 ; SDef
 	db "RIZA-DON@@@"
 
-
 	db EXEGGUTOR
 	db BRIGHTPOWDER
 	db EGG_BOMB, STOMP, PSYCH_UP, CONFUSION
@@ -2187,7 +2103,7 @@
 	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 @@
 	bigdw 84 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db HYPNO
 	db BRIGHTPOWDER
 	db CONFUSION, THUNDERPUNCH, HEADBUTT, DISABLE
@@ -2214,7 +2129,7 @@
 	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 @@
 	bigdw 122 ; SDef
 	db "SURI-PA-@@@"
 
-
 	db MUK
 	db QUICK_CLAW
 	db SCREECH, TOXIC, SLUDGE, HARDEN
@@ -2241,7 +2155,7 @@
 	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 @@
 	bigdw 111 ; SDef
 	db "BETOBETON@@"
 
-
 	db ELECTABUZZ
 	db KINGS_ROCK
 	db LIGHT_SCREEN, THUNDERPUNCH, SWIFT, SNORE
@@ -2268,7 +2181,7 @@
 	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 @@
 	db "EREBU-@@@@@"
 
 
-
-
 BattleTowerMons5:
 
 	db KINGDRA
@@ -2299,7 +2210,7 @@
 	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 @@
 	bigdw 144 ; SDef
 	db "KINGUDORA@@"
 
-
 	db HOUNDOOM
 	db MIRACLEBERRY
 	db REST, CRUNCH, DREAM_EATER, FLAMETHROWER
@@ -2326,7 +2236,7 @@
 	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 @@
 	bigdw 127 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db SHUCKLE
 	db LEFTOVERS
 	db SANDSTORM, REST, TOXIC, WRAP
@@ -2353,7 +2262,7 @@
 	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 @@
 	bigdw 279 ; SDef
 	db "TUBOTUBO@@@"
 
-
 	db SNORLAX
 	db LEFTOVERS
 	db HYPER_BEAM, EARTHQUAKE, SURF, PSYCH_UP
@@ -2380,7 +2288,7 @@
 	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 @@
 	bigdw 159 ; SDef
 	db "KABIGON@@@@"
 
-
 	db LAPRAS
 	db GOLD_BERRY
 	db THUNDERBOLT, SURF, CONFUSE_RAY, BLIZZARD
@@ -2407,7 +2314,7 @@
 	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 @@
 	bigdw 143 ; SDef
 	db "RAPURASU@@@"
 
-
 	db JOLTEON
 	db KINGS_ROCK
 	db THUNDERBOLT, THUNDER_WAVE, SHADOW_BALL, HIDDEN_POWER
@@ -2434,7 +2340,7 @@
 	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 @@
 	bigdw 144 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db SCIZOR
 	db LEFTOVERS
 	db HYPER_BEAM, SLASH, AGILITY, METAL_CLAW
@@ -2461,7 +2366,7 @@
 	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 @@
 	bigdw 124 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db SLOWKING
 	db MINT_BERRY
 	db REST, SURF, PSYCHIC_M, AMNESIA
@@ -2488,7 +2392,7 @@
 	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 @@
 	bigdw 156 ; SDef
 	db "YADOKINGU@@"
 
-
 	db MACHAMP
 	db GOLD_BERRY
 	db CROSS_CHOP, EARTHQUAKE, FIRE_BLAST, THUNDERPUNCH
@@ -2515,7 +2418,7 @@
 	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 @@
 	bigdw 128 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db STARMIE
 	db SCOPE_LENS
 	db THUNDER_WAVE, RECOVER, THUNDERBOLT, SURF
@@ -2542,7 +2444,7 @@
 	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 @@
 	bigdw 130 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db DUGTRIO
 	db KINGS_ROCK
 	db EARTHQUAKE, SLASH, HYPER_BEAM, SLUDGE_BOMB
@@ -2569,7 +2470,7 @@
 	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 @@
 	bigdw 116 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db ELECTRODE
 	db MIRACLEBERRY
 	db THUNDERBOLT, EXPLOSION, MIRROR_COAT, REST
@@ -2596,7 +2496,7 @@
 	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 @@
 	bigdw 126 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db AERODACTYL
 	db KINGS_ROCK
 	db HYPER_BEAM, EARTHQUAKE, FIRE_BLAST, IRON_TAIL
@@ -2623,7 +2522,7 @@
 	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 @@
 	bigdw 119 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db CROBAT
 	db LEFTOVERS
 	db CONFUSE_RAY, ATTRACT, HYPER_BEAM, TOXIC
@@ -2650,7 +2548,7 @@
 	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 @@
 	bigdw 127 ; SDef
 	db "KUROBAtuTO@"
 
-
 	db ZAPDOS
 	db MIRACLEBERRY
 	db DRILL_PECK, THUNDERBOLT, THUNDER_WAVE, HYPER_BEAM
@@ -2677,7 +2574,7 @@
 	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 @@
 	bigdw 136 ; SDef
 	db "SANDA-@@@@@"
 
-
 	db SKARMORY
 	db GOLD_BERRY
 	db SANDSTORM, FLY, STEEL_WING, TOXIC
@@ -2704,7 +2600,7 @@
 	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 @@
 	bigdw 113 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db FORRETRESS
 	db LEFTOVERS
 	db SANDSTORM, TOXIC, EXPLOSION, SWAGGER
@@ -2731,7 +2626,7 @@
 	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 @@
 	bigdw 103 ; SDef
 	db "HUoRETOSU@@"
 
-
 	db STEELIX
 	db MIRACLEBERRY
 	db SANDSTORM, IRON_TAIL, REST, EARTHQUAKE
@@ -2758,7 +2652,7 @@
 	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 @@
 	bigdw 109 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db GIRAFARIG
 	db SCOPE_LENS
 	db DREAM_EATER, CRUNCH, PSYCHIC_M, EARTHQUAKE
@@ -2785,7 +2678,7 @@
 	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 @@
 	bigdw 101 ; SDef
 	db "KIRINRIKI@@"
 
-
 	db GYARADOS
 	db MIRACLEBERRY
 	db HYPER_BEAM, SURF, RAIN_DANCE, ZAP_CANNON
@@ -2812,7 +2704,7 @@
 	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 @@
 	bigdw 135 ; SDef
 	db "GIyaRADOSU@"
 
-
 	db ARTICUNO
 	db GOLD_BERRY
 	db BLIZZARD, HYPER_BEAM, ROAR, ICY_WIND
@@ -2839,7 +2730,7 @@
 	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 @@
 	db "HURI-ZA-@@@"
 
 
-
-
 BattleTowerMons6:
 
 	db KINGDRA
@@ -2870,7 +2759,7 @@
 	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 @@
 	bigdw 172 ; SDef
 	db "KINGUDORA@@"
 
-
 	db TYRANITAR
 	db GOLD_BERRY
 	db CRUNCH, EARTHQUAKE, ROCK_SLIDE, HYPER_BEAM
@@ -2897,7 +2785,7 @@
 	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 @@
 	bigdw 175 ; SDef
 	db "BANGIRASU@@"
 
-
 	db HOUNDOOM
 	db MIRACLEBERRY
 	db FLAMETHROWER, CRUNCH, DREAM_EATER, REST
@@ -2924,7 +2811,7 @@
 	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 @@
 	bigdw 153 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db PORYGON2
 	db LEFTOVERS
 	db BLIZZARD, RECOVER, TOXIC, PSYCHIC_M
@@ -2951,7 +2837,7 @@
 	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 @@
 	bigdw 170 ; SDef
 	db "PORIGON2@@@"
 
-
 	db MACHAMP
 	db QUICK_CLAW
 	db FIRE_PUNCH, CROSS_CHOP, THUNDERPUNCH, EARTHQUAKE
@@ -2978,7 +2863,7 @@
 	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 @@
 	bigdw 158 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db ZAPDOS
 	db MINT_BERRY
 	db REST, DRILL_PECK, THUNDERBOLT, THUNDER_WAVE
@@ -3005,7 +2889,7 @@
 	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 @@
 	bigdw 161 ; SDef
 	db "SANDA-@@@@@"
 
-
 	db WOBBUFFET
 	db GOLD_BERRY
 	db COUNTER, MIRROR_COAT, DESTINY_BOND, SAFEGUARD
@@ -3032,7 +2915,7 @@
 	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 @@
 	bigdw 122 ; SDef
 	db "SO-NANSU@@@"
 
-
 	db AERODACTYL
 	db LEFTOVERS
 	db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE
@@ -3059,7 +2941,7 @@
 	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 @@
 	bigdw 142 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db DRAGONITE
 	db MIRACLEBERRY
 	db HYPER_BEAM, ICY_WIND, THUNDERBOLT, SURF
@@ -3086,7 +2967,7 @@
 	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 @@
 	bigdw 172 ; SDef
 	db "KAIRIyu-@@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db MUD_SLAP, MOONLIGHT, PSYCHIC_M, FAINT_ATTACK
@@ -3113,7 +2993,7 @@
 	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 @@
 	bigdw 212 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db ARCANINE
 	db CHARCOAL
 	db FLAMETHROWER, CRUNCH, EXTREMESPEED, IRON_TAIL
@@ -3140,7 +3019,7 @@
 	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 @@
 	bigdw 149 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db SKARMORY
 	db MIRACLEBERRY
 	db STEEL_WING, FLY, TOXIC, PROTECT
@@ -3167,7 +3045,7 @@
 	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 @@
 	bigdw 135 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db SOFTBOILED, TOXIC, PROTECT, PSYCHIC_M
@@ -3194,7 +3071,7 @@
 	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 @@
 	bigdw 215 ; SDef
 	db "HAPINASU@@@"
 
-
 	db SNORLAX
 	db PINK_BOW
 	db ROCK_SLIDE, SURF, BODY_SLAM, EARTHQUAKE
@@ -3221,7 +3097,7 @@
 	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 @@
 	bigdw 184 ; SDef
 	db "KABIGON@@@@"
 
-
 	db HERACROSS
 	db FOCUS_BAND
 	db REVERSAL, MEGAHORN, EARTHQUAKE, COUNTER
@@ -3248,7 +3123,7 @@
 	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 @@
 	bigdw 167 ; SDef
 	db "HERAKUROSU@"
 
-
 	db JYNX
 	db MIRACLEBERRY
 	db BLIZZARD, PSYCHIC_M, SHADOW_BALL, ICY_WIND
@@ -3275,7 +3149,7 @@
 	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 @@
 	bigdw 165 ; SDef
 	db "RU-ZIyuRA@@"
 
-
 	db BLASTOISE
 	db GOLD_BERRY
 	db SURF, EARTHQUAKE, RAPID_SPIN, BLIZZARD
@@ -3302,7 +3175,7 @@
 	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 @@
 	bigdw 180 ; SDef
 	db "KAMEtuKUSU@"
 
-
 	db RHYDON
 	db QUICK_CLAW
 	db EARTHQUAKE, SURF, IRON_TAIL, ROCK_SLIDE
@@ -3329,7 +3201,7 @@
 	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 @@
 	bigdw 104 ; SDef
 	db "SAIDON@@@@@"
 
-
 	db SANDSLASH
 	db SCOPE_LENS
 	db EARTHQUAKE, SLASH, HYPER_BEAM, SNORE
@@ -3356,7 +3227,7 @@
 	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 @@
 	bigdw 105 ; SDef
 	db "SANDOPAN@@@"
 
-
 	db PARASECT
 	db GOLD_BERRY
 	db SPORE, GIGA_DRAIN, HYPER_BEAM, SLUDGE_BOMB
@@ -3383,7 +3253,7 @@
 	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 @@
 	bigdw 144 ; SDef
 	db "PARASEKUTO@"
 
-
 	db GOLEM
 	db BRIGHTPOWDER
 	db EXPLOSION, EARTHQUAKE, FIRE_PUNCH, FRUSTRATION
@@ -3410,7 +3279,7 @@
 	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 @@
 	db "GORO-NIya@@"
 
 
-
-
 BattleTowerMons7:
 
 	db JOLTEON
@@ -3441,7 +3308,7 @@
 	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 @@
 	bigdw 201 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db VAPOREON
 	db LEFTOVERS
 	db BLIZZARD, SHADOW_BALL, SURF, MUD_SLAP
@@ -3468,7 +3334,7 @@
 	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 @@
 	bigdw 197 ; SDef
 	db "SIyaWA-ZU@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db FAINT_ATTACK, MOONLIGHT, PSYCH_UP, TOXIC
@@ -3495,7 +3360,7 @@
 	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 @@
 	bigdw 247 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db BLISSEY
 	db GOLD_BERRY
 	db COUNTER, SOFTBOILED, SHADOW_BALL, THUNDERBOLT
@@ -3522,7 +3386,7 @@
 	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 @@
 	bigdw 250 ; SDef
 	db "HAPINASU@@@"
 
-
 	db SNORLAX
 	db LEFTOVERS
 	db ROCK_SLIDE, EARTHQUAKE, BLIZZARD, SHADOW_BALL
@@ -3549,7 +3412,7 @@
 	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 @@
 	bigdw 215 ; SDef
 	db "KABIGON@@@@"
 
-
 	db HOUNDOOM
 	db KINGS_ROCK
 	db CRUNCH, FLAMETHROWER, FAINT_ATTACK, ROAR
@@ -3576,7 +3438,7 @@
 	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 @@
 	bigdw 175 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db TYRANITAR
 	db LEFTOVERS
 	db EARTHQUAKE, CRUNCH, ROCK_SLIDE, HYPER_BEAM
@@ -3603,7 +3464,7 @@
 	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 @@
 	bigdw 203 ; SDef
 	db "BANGIRASU@@"
 
-
 	db ZAPDOS
 	db GOLD_BERRY
 	db THUNDERBOLT, DRILL_PECK, THUNDER_WAVE, HYPER_BEAM
@@ -3630,7 +3490,7 @@
 	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 @@
 	bigdw 189 ; SDef
 	db "SANDA-@@@@@"
 
-
 	db EXEGGUTOR
 	db MIRACLEBERRY
 	db REST, EXPLOSION, PSYCHIC_M, GIGA_DRAIN
@@ -3657,7 +3516,7 @@
 	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 @@
 	bigdw 151 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db UMBREON
 	db GOLD_BERRY
 	db MOONLIGHT, FAINT_ATTACK, PSYCHIC_M, SHADOW_BALL
@@ -3684,7 +3542,7 @@
 	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 @@
 	bigdw 240 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db GYARADOS
 	db BRIGHTPOWDER
 	db SURF, THUNDERBOLT, HYPER_BEAM, ROAR
@@ -3711,7 +3568,7 @@
 	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 @@
 	bigdw 204 ; SDef
 	db "GIyaRADOSU@"
 
-
 	db QUAGSIRE
 	db MIRACLEBERRY
 	db EARTHQUAKE, SURF, SLUDGE_BOMB, IRON_TAIL
@@ -3738,7 +3594,7 @@
 	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 @@
 	bigdw 152 ; SDef
 	db "NUO-@@@@@@@"
 
-
 	db URSARING
 	db SCOPE_LENS
 	db SLASH, EARTHQUAKE, HYPER_BEAM, THUNDERPUNCH
@@ -3765,7 +3620,7 @@
 	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 @@
 	bigdw 166 ; SDef
 	db "RINGUMA@@@@"
 
-
 	db MR__MIME
 	db KINGS_ROCK
 	db REFLECT, FIRE_PUNCH, PSYCHIC_M, ENCORE
@@ -3792,7 +3646,7 @@
 	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 @@
 	bigdw 226 ; SDef
 	db "BARIYA-DO@@"
 
-
 	db PRIMEAPE
 	db QUICK_CLAW
 	db CROSS_CHOP, ICE_PUNCH, THUNDERPUNCH, ROCK_SLIDE
@@ -3819,7 +3672,7 @@
 	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 @@
 	bigdw 162 ; SDef
 	db "OKORIZARU@@"
 
-
 	db GIRAFARIG
 	db GOLD_BERRY
 	db AGILITY, BATON_PASS, CRUNCH, EARTHQUAKE
@@ -3846,7 +3698,7 @@
 	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 @@
 	bigdw 152 ; SDef
 	db "KIRINRIKI@@"
 
-
 	db HITMONLEE
 	db FOCUS_BAND
 	db REVERSAL, ENDURE, BODY_SLAM, MEGA_KICK
@@ -3873,7 +3724,7 @@
 	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 @@
 	bigdw 217 ; SDef
 	db "SAWAMURA-@@"
 
-
 	db HERACROSS
 	db BRIGHTPOWDER
 	db REVERSAL, ENDURE, MEGAHORN, EARTHQUAKE
@@ -3900,7 +3750,7 @@
 	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 @@
 	bigdw 186 ; SDef
 	db "HERAKUROSU@"
 
-
 	db VENUSAUR
 	db BRIGHTPOWDER
 	db SUNNY_DAY, SOLARBEAM, SYNTHESIS, HYPER_BEAM
@@ -3927,7 +3776,7 @@
 	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 @@
 	bigdw 180 ; SDef
 	db "HUSIGIBANA@"
 
-
 	db CHARIZARD
 	db SCOPE_LENS
 	db SLASH, EARTHQUAKE, HYPER_BEAM, FLAMETHROWER
@@ -3954,7 +3802,7 @@
 	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 @@
 	bigdw 159 ; SDef
 	db "RIZA-DON@@@"
 
-
 	db BLASTOISE
 	db QUICK_CLAW
 	db HYDRO_PUMP, ICE_PUNCH, HYPER_BEAM, IRON_TAIL
@@ -3981,7 +3828,7 @@
 	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 @@
 	db "KAMEtuKUSU@"
 
 
-
-
 BattleTowerMons8:
 
 	db JOLTEON
@@ -4012,7 +3857,7 @@
 	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 @@
 	bigdw 221 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db SNORLAX
 	db LEFTOVERS
 	db REST, BELLY_DRUM, SNORE, EARTHQUAKE
@@ -4039,7 +3883,7 @@
 	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 @@
 	bigdw 250 ; SDef
 	db "KABIGON@@@@"
 
-
 	db HOUNDOOM
 	db MINT_BERRY
 	db REST, CRUNCH, FLAMETHROWER, SUNNY_DAY
@@ -4066,7 +3909,7 @@
 	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 @@
 	bigdw 197 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db TAUROS
 	db GOLD_BERRY
 	db EARTHQUAKE, BODY_SLAM, IRON_TAIL, HYPER_BEAM
@@ -4093,7 +3935,7 @@
 	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 @@
 	bigdw 183 ; SDef
 	db "KENTAROSU@@"
 
-
 	db LAPRAS
 	db MINT_BERRY
 	db REST, SURF, CONFUSE_RAY, PSYCHIC_M
@@ -4120,7 +3961,7 @@
 	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 @@
 	bigdw 218 ; SDef
 	db "RAPURASU@@@"
 
-
 	db TYRANITAR
 	db MIRACLEBERRY
 	db REST, CRUNCH, EARTHQUAKE, ROCK_SLIDE
@@ -4147,7 +3987,7 @@
 	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 @@
 	bigdw 226 ; SDef
 	db "BANGIRASU@@"
 
-
 	db GENGAR
 	db NO_ITEM
 	db THUNDERBOLT, SHADOW_BALL, CONFUSE_RAY, THIEF
@@ -4174,7 +4013,7 @@
 	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 @@
 	bigdw 189 ; SDef
 	db "GENGA-@@@@@"
 
-
 	db FORRETRESS
 	db LEFTOVERS
 	db EXPLOSION, TOXIC, SOLARBEAM, SWAGGER
@@ -4201,7 +4039,7 @@
 	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 @@
 	bigdw 165 ; SDef
 	db "HUoRETOSU@@"
 
-
 	db KINGDRA
 	db MINT_BERRY
 	db REST, SURF, BLIZZARD, DRAGONBREATH
@@ -4228,7 +4065,7 @@
 	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 @@
 	bigdw 221 ; SDef
 	db "KINGUDORA@@"
 
-
 	db DRAGONITE
 	db GOLD_BERRY
 	db THUNDER_WAVE, SURF, THUNDERBOLT, OUTRAGE
@@ -4255,7 +4091,7 @@
 	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 @@
 	bigdw 228 ; SDef
 	db "KAIRIyu-@@@"
 
-
 	db PORYGON2
 	db LEFTOVERS
 	db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK
@@ -4282,7 +4117,7 @@
 	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 @@
 	bigdw 221 ; SDef
 	db "PORIGON2@@@"
 
-
 	db JYNX
 	db QUICK_CLAW
 	db LOVELY_KISS, BLIZZARD, DREAM_EATER, PSYCHIC_M
@@ -4309,7 +4143,7 @@
 	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 @@
 	bigdw 225 ; SDef
 	db "RU-ZIyuRA@@"
 
-
 	db MANTINE
 	db GOLD_BERRY
 	db SURF, CONFUSE_RAY, BLIZZARD, WING_ATTACK
@@ -4336,7 +4169,7 @@
 	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 @@
 	bigdw 292 ; SDef
 	db "MANTAIN@@@@"
 
-
 	db SKARMORY
 	db QUICK_CLAW
 	db STEEL_WING, FLY, MUD_SLAP, TOXIC
@@ -4363,7 +4195,7 @@
 	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 @@
 	bigdw 185 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db MOLTRES
 	db CHARCOAL
 	db FLAMETHROWER, SKY_ATTACK, STEEL_WING, HYPER_BEAM
@@ -4390,7 +4221,7 @@
 	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 @@
 	bigdw 207 ; SDef
 	db "HUaIYA-@@@@"
 
-
 	db AERODACTYL
 	db MIRACLEBERRY
 	db HYPER_BEAM, REST, EARTHQUAKE, ROAR
@@ -4417,7 +4247,7 @@
 	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 @@
 	bigdw 189 ; SDef
 	db "PUTERA@@@@@"
 
-
 	db ELECTRODE
 	db KINGS_ROCK
 	db THUNDERBOLT, EXPLOSION, MIRROR_COAT, TOXIC
@@ -4444,7 +4273,7 @@
 	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 @@
 	bigdw 201 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db DUGTRIO
 	db SCOPE_LENS
 	db SLASH, EARTHQUAKE, THIEF, MUD_SLAP
@@ -4471,7 +4299,7 @@
 	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 @@
 	bigdw 177 ; SDef
 	db "DAGUTORIO@@"
 
-
 	db VICTREEBEL
 	db QUICK_CLAW
 	db GIGA_DRAIN, SLUDGE_BOMB, HYPER_BEAM, TOXIC
@@ -4498,7 +4325,7 @@
 	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 @@
 	bigdw 143 ; SDef
 	db "UTUBOtuTO@@"
 
-
 	db PINSIR
 	db GOLD_BERRY
 	db HYPER_BEAM, SUBMISSION, STRENGTH, TOXIC
@@ -4525,7 +4351,7 @@
 	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 @@
 	bigdw 157 ; SDef
 	db "KAIROSU@@@@"
 
-
 	db GRANBULL
 	db BRIGHTPOWDER
 	db ROAR, SHADOW_BALL, HYPER_BEAM, THUNDERPUNCH
@@ -4552,7 +4377,7 @@
 	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 @@
 	db "GURANBURU@@"
 
 
-
-
 BattleTowerMons9:
 
 	db UMBREON
@@ -4583,7 +4406,7 @@
 	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 @@
 	bigdw 314 ; SDef
 	db "BURAtuKI-@@"
 
-
 	db DRAGONITE
 	db QUICK_CLAW
 	db FIRE_BLAST, HYPER_BEAM, OUTRAGE, BLIZZARD
@@ -4610,7 +4432,7 @@
 	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 @@
 	bigdw 263 ; SDef
 	db "KAIRIyu-@@@"
 
-
 	db STARMIE
 	db LEFTOVERS
 	db RECOVER, THUNDERBOLT, SURF, PSYCHIC_M
@@ -4637,7 +4458,7 @@
 	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 @@
 	bigdw 236 ; SDef
 	db "SUTA-MI-@@@"
 
-
 	db CLOYSTER
 	db LEFTOVERS
 	db EXPLOSION, BLIZZARD, SURF, ICY_WIND
@@ -4664,7 +4484,7 @@
 	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 @@
 	bigdw 162 ; SDef
 	db "PARUSIeN@@@"
 
-
 	db CROBAT
 	db GOLD_BERRY
 	db WING_ATTACK, HAZE, HYPER_BEAM, GIGA_DRAIN
@@ -4691,7 +4510,7 @@
 	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 @@
 	bigdw 225 ; SDef
 	db "KUROBAtuTO@"
 
-
 	db PORYGON2
 	db QUICK_CLAW
 	db TOXIC, PSYCHIC_M, RECOVER, PROTECT
@@ -4718,7 +4536,7 @@
 	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 @@
 	bigdw 248 ; SDef
 	db "PORIGON2@@@"
 
-
 	db KINGDRA
 	db LEFTOVERS
 	db DRAGONBREATH, SURF, HYPER_BEAM, BLIZZARD
@@ -4745,7 +4562,7 @@
 	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 @@
 	bigdw 248 ; SDef
 	db "KINGUDORA@@"
 
-
 	db TYRANITAR
 	db QUICK_CLAW
 	db HYPER_BEAM, CRUNCH, EARTHQUAKE, ROCK_SLIDE
@@ -4772,7 +4588,7 @@
 	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 @@
 	bigdw 259 ; SDef
 	db "BANGIRASU@@"
 
-
 	db LAPRAS
 	db MINT_BERRY
 	db REST, SURF, THUNDERBOLT, PSYCHIC_M
@@ -4799,7 +4614,7 @@
 	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 @@
 	bigdw 255 ; SDef
 	db "RAPURASU@@@"
 
-
 	db ESPEON
 	db GOLD_BERRY
 	db PSYCHIC_M, SHADOW_BALL, SUNNY_DAY, MORNING_SUN
@@ -4826,7 +4640,7 @@
 	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 @@
 	bigdw 250 ; SDef
 	db "E-HUi@@@@@@"
 
-
 	db MACHAMP
 	db QUICK_CLAW
 	db CROSS_CHOP, VITAL_THROW, FIRE_BLAST, EARTHQUAKE
@@ -4853,7 +4666,7 @@
 	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 @@
 	bigdw 230 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db SNORLAX
 	db MIRACLEBERRY
 	db FIRE_BLAST, SURF, EARTHQUAKE, HYPER_BEAM
@@ -4880,7 +4692,7 @@
 	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 @@
 	bigdw 275 ; SDef
 	db "KABIGON@@@@"
 
-
 	db ARCANINE
 	db MINT_BERRY
 	db SUNNY_DAY, FLAMETHROWER, EXTREMESPEED, REST
@@ -4907,7 +4718,7 @@
 	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 @@
 	bigdw 226 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db SOLARBEAM, SUNNY_DAY, SOFTBOILED, FIRE_BLAST
@@ -4934,7 +4744,7 @@
 	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 @@
 	bigdw 322 ; SDef
 	db "HAPINASU@@@"
 
-
 	db HOUNDOOM
 	db BRIGHTPOWDER
 	db FLAMETHROWER, CRUNCH, SUNNY_DAY, SOLARBEAM
@@ -4961,7 +4770,7 @@
 	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 @@
 	bigdw 223 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db SKARMORY
 	db QUICK_CLAW
 	db SANDSTORM, STEEL_WING, TOXIC, RETURN
@@ -4988,7 +4796,7 @@
 	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 @@
 	bigdw 193 ; SDef
 	db "EA-MUDO@@@@"
 
-
 	db SHUCKLE
 	db LEFTOVERS
 	db TOXIC, WRAP, PROTECT, ENCORE
@@ -5015,7 +4822,7 @@
 	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 @@
 	bigdw 493 ; SDef
 	db "TUBOTUBO@@@"
 
-
 	db FLAREON
 	db MINT_BERRY
 	db HYPER_BEAM, FLAMETHROWER, SHADOW_BALL, ROAR
@@ -5042,7 +4848,7 @@
 	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 @@
 	bigdw 265 ; SDef
 	db "BU-SUTA-@@@"
 
-
 	db MILTANK
 	db LEFTOVERS
 	db MILK_DRINK, EARTHQUAKE, ATTRACT, BODY_SLAM
@@ -5069,7 +4874,7 @@
 	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 @@
 	bigdw 182 ; SDef
 	db "MIRUTANKU@@"
 
-
 	db TAUROS
 	db PINK_BOW
 	db THUNDERBOLT, HYPER_BEAM, ATTRACT, EARTHQUAKE
@@ -5096,7 +4900,7 @@
 	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 @@
 	bigdw 180 ; SDef
 	db "KENTAROSU@@"
 
-
 	db MUK
 	db QUICK_CLAW
 	db TOXIC, SLUDGE_BOMB, ATTRACT, GIGA_DRAIN
@@ -5123,7 +4926,7 @@
 	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 @@
 	db "BETOBETON@@"
 
 
-
-
 BattleTowerMons10:
 
 	db HOUNDOOM
@@ -5154,7 +4955,7 @@
 	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 @@
 	bigdw 252 ; SDef
 	db "HERUGA-@@@@"
 
-
 	db MACHAMP
 	db QUICK_CLAW
 	db CROSS_CHOP, EARTHQUAKE, HYPER_BEAM, VITAL_THROW
@@ -5181,7 +4981,7 @@
 	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 @@
 	bigdw 266 ; SDef
 	db "KAIRIKI-@@@"
 
-
 	db KINGDRA
 	db LEFTOVERS
 	db SURF, DRAGONBREATH, REST, TOXIC
@@ -5208,7 +5007,7 @@
 	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 @@
 	bigdw 284 ; SDef
 	db "KINGUDORA@@"
 
-
 	db JOLTEON
 	db BRIGHTPOWDER
 	db THUNDERBOLT, ROAR, THUNDER_WAVE, IRON_TAIL
@@ -5235,7 +5033,7 @@
 	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 @@
 	bigdw 278 ; SDef
 	db "SANDA-SU@@@"
 
-
 	db TAUROS
 	db KINGS_ROCK
 	db HYPER_BEAM, EARTHQUAKE, IRON_TAIL, THUNDERBOLT
@@ -5262,7 +5059,7 @@
 	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 @@
 	bigdw 230 ; SDef
 	db "KENTAROSU@@"
 
-
 	db ARCANINE
 	db LEFTOVERS
 	db FLAMETHROWER, EXTREMESPEED, IRON_TAIL, HYPER_BEAM
@@ -5289,7 +5085,7 @@
 	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 @@
 	bigdw 250 ; SDef
 	db "UINDEi@@@@@"
 
-
 	db CHARIZARD
 	db SCOPE_LENS
 	db FLAMETHROWER, EARTHQUAKE, SLASH, FLY
@@ -5316,7 +5111,7 @@
 	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 @@
 	bigdw 263 ; SDef
 	db "RIZA-DON@@@"
 
-
 	db ELECTRODE
 	db BRIGHTPOWDER
 	db THUNDER_WAVE, THUNDERBOLT, EXPLOSION, MIRROR_COAT
@@ -5343,7 +5137,7 @@
 	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 @@
 	bigdw 248 ; SDef
 	db "MARUMAIN@@@"
 
-
 	db RHYDON
 	db MIRACLEBERRY
 	db SURF, EARTHQUAKE, HYPER_BEAM, ROCK_SLIDE
@@ -5370,7 +5163,7 @@
 	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 @@
 	bigdw 178 ; SDef
 	db "SAIDON@@@@@"
 
-
 	db STEELIX
 	db LEFTOVERS
 	db EARTHQUAKE, HYPER_BEAM, SWAGGER, CRUNCH
@@ -5397,7 +5189,7 @@
 	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 @@
 	bigdw 218 ; SDef
 	db "HAGANE-RU@@"
 
-
 	db FEAROW
 	db KINGS_ROCK
 	db DRILL_PECK, STEEL_WING, HYPER_BEAM, MUD_SLAP
@@ -5424,7 +5215,7 @@
 	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 @@
 	bigdw 212 ; SDef
 	db "ONIDORIRU@@"
 
-
 	db MISDREAVUS
 	db FOCUS_BAND
 	db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL
@@ -5451,7 +5241,7 @@
 	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 @@
 	bigdw 263 ; SDef
 	db "MUUMA@@@@@@"
 
-
 	db SNEASEL
 	db SCOPE_LENS
 	db SLASH, BLIZZARD, DREAM_EATER, FAINT_ATTACK
@@ -5478,7 +5267,7 @@
 	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 @@
 	bigdw 240 ; SDef
 	db "NIyu-RA@@@@"
 
-
 	db SCIZOR
 	db QUICK_CLAW
 	db STEEL_WING, HYPER_BEAM, SLASH, TOXIC
@@ -5505,7 +5293,7 @@
 	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 @@
 	bigdw 246 ; SDef
 	db "HAtuSAMU@@@"
 
-
 	db BLISSEY
 	db LEFTOVERS
 	db THUNDERBOLT, BLIZZARD, FIRE_BLAST, SOFTBOILED
@@ -5532,7 +5319,7 @@
 	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 @@
 	bigdw 346 ; SDef
 	db "HAPINASU@@@"
 
-
 	db PILOSWINE
 	db MINT_BERRY
 	db REST, BLIZZARD, HYPER_BEAM, EARTHQUAKE
@@ -5559,7 +5345,7 @@
 	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 @@
 	bigdw 194 ; SDef
 	db "INOMU-@@@@@"
 
-
 	db EXEGGUTOR
 	db QUICK_CLAW
 	db PSYCHIC_M, TOXIC, EXPLOSION, GIGA_DRAIN
@@ -5586,7 +5371,7 @@
 	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 @@
 	bigdw 218 ; SDef
 	db "NAtuSI-@@@@"
 
-
 	db OMASTAR
 	db LEFTOVERS
 	db SURF, ANCIENTPOWER, BLIZZARD, TOXIC
@@ -5613,7 +5397,7 @@
 	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 @@
 	bigdw 214 ; SDef
 	db "OMUSUTA-@@@"
 
-
 	db GOLEM
 	db BRIGHTPOWDER
 	db EXPLOSION, EARTHQUAKE, ROCK_SLIDE, FIRE_BLAST
@@ -5640,7 +5423,7 @@
 	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 @@
 	bigdw 190 ; SDef
 	db "GORO-NIya@@"
 
-
 	db HITMONCHAN
 	db FOCUS_BAND
 	db COUNTER, FIRE_PUNCH, THUNDERPUNCH, ICE_PUNCH
@@ -5667,7 +5449,7 @@
 	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 @@
 	bigdw 280 ; SDef
 	db "EBIWARA-@@@"
 
-
 	db LANTURN
 	db QUICK_CLAW
 	db SURF, RAIN_DANCE, ZAP_CANNON, CONFUSE_RAY
@@ -5694,7 +5475,7 @@
 	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
--- a/data/battle_tower/trainer_text.asm
+++ b/data/battle_tower/trainer_text.asm
@@ -1,4 +1,4 @@
-BattleTowerText_0x1ec000: ; 0x1ec000
+BattleTowerText_0x1ec000:
 	text "Hello, glad to"
 	line "meet you!"
 
@@ -5,147 +5,123 @@
 	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."
 
@@ -152,57 +128,48 @@
 	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?"
 
@@ -209,9 +176,8 @@
 	para "Let me battle you,"
 	line "then!"
 	done
-; 0x1ec461
 
-UnknownText_0x1ec461: ; 0x1ec461
+UnknownText_0x1ec461:
 	text "You need another"
 	line "ten years of"
 
@@ -218,9 +184,8 @@
 	para "training to get"
 	line "better, I'd say."
 	done
-; 0x1ec4a0
 
-UnknownText_0x1ec4a0: ; 0x1ec4a0
+UnknownText_0x1ec4a0:
 	text "You're incredibly"
 	line "talented."
 
@@ -227,87 +192,73 @@
 	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."
 
@@ -314,21 +265,18 @@
 	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."
 
@@ -335,51 +283,43 @@
 	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."
 
@@ -386,358 +326,298 @@
 	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
--- 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 @@
 	NONTALKABLE  LANDTILE ; fd
 	NONTALKABLE  LANDTILE ; fe
 	NONTALKABLE  WALLTILE ; COLL_FF
-; 4cf1f
--- 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 @@
 	db CREDITS_WAIT, 20
 
 	db CREDITS_END
-; 10ae13
--- a/data/credits_strings.asm
+++ b/data/credits_strings.asm
@@ -188,7 +188,7 @@
 .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 @@
 .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@"          ; "コーディネーター@"
--- a/data/decorations/attributes.asm
+++ b/data/decorations/attributes.asm
@@ -5,7 +5,7 @@
 	db \5
 ENDM
 
-DecorationAttributes: ; 26a4f
+DecorationAttributes:
 ; entries correspond to deco constants
 	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
@@ -60,4 +60,3 @@
 	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
--- 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 @@
 	db DECO_GOLD_TROPHY_DOLL ; 33
 	db DECO_SILVER_TROPHY_DOLL ; 34
 	db -1
-; 26f59
--- 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
@@ -37,4 +37,3 @@
 	db DECOFLAG_GRIMER_DOLL
 	db DECOFLAG_UNOWN_DOLL
 .End
-; 2c76f
--- 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 @@
 	db "BLUE@"
 	db "YELLOW@"
 	db "GREEN@"
-; 26c72
--- 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 @@
 
 	db $00
 	db $00
-; 14f84
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -4,7 +4,7 @@
 	dwb \1 + (\2 / 8), 1 << (\2 % 8)
 ENDM
 
-EngineFlags: ; 80462
+EngineFlags:
 ; entries correspond to ENGINE_* constants
 
 	; pokegear
@@ -197,5 +197,3 @@
 
 	engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0
 	engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F
-
-; 80648
--- a/data/events/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 @@
 	dw EVENT_BUG_CATCHING_CONTESTANT_8A
 	dw EVENT_BUG_CATCHING_CONTESTANT_9A
 	dw EVENT_BUG_CATCHING_CONTESTANT_10A
-; 13a12
--- a/data/events/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 @@
 	dw BugContestant_BugCatcherJosh
 	dw BugContestant_YoungsterSamuel
 	dw BugContestant_SchoolboyKipp
-; 13799
 
 ; contestant format:
 ;   db class, id
@@ -78,4 +77,3 @@
 	dbw VENONAT,    267
 	dbw PARAS,      254
 	dbw KAKUNA,     259
-; 13807
--- a/data/events/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 @@
 	db $0f, $17, 0
 	db -1 ; end
 
-
-WhirlpoolBlockPointers: ; c8a4
+WhirlpoolBlockPointers:
 	dbw TILESET_JOHTO, .johto
 	db -1 ; end
 
--- a/data/events/happiness_probabilities.asm
+++ b/data/events/happiness_probabilities.asm
@@ -1,12 +1,12 @@
-HappinessData_YoungerHaircutBrother: ; 7459
+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: ; 7462
+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: ; 746b
+HappinessData_DaisysGrooming:
 	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
--- a/data/events/magikarp_lengths.asm
+++ b/data/events/magikarp_lengths.asm
@@ -1,4 +1,4 @@
-MagikarpLengths: ; fbca8
+MagikarpLengths:
 ; [wMagikarpLength] = z * 100 + (bc - x) / y
 ; First argument is the bc threshold as well as x.
 ; Second argument is y.
@@ -18,4 +18,3 @@
 	dwb 65210, 5
 	dwb 65410, 2
 	dwb 65510, 1 ; not used
-; fbcd2
--- a/data/events/npc_trades.asm
+++ b/data/events/npc_trades.asm
@@ -6,7 +6,7 @@
 	db \8, \9, 0
 ENDM
 
-NPCTrades: ; fce58
+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
@@ -15,4 +15,3 @@
 	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
-; fcf38
--- a/data/events/odd_eggs.asm
+++ b/data/events/odd_eggs.asm
@@ -26,11 +26,9 @@
 ; Tyrogue
 	prob 10
 	prob 1
-; 1fb56e
 
+OddEggs:
 
-OddEggs: ; 1fb56e
-
 OddEgg1:
 	db PICHU
 	db NO_ITEM
@@ -43,7 +41,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/data/events/pokedex_ratings.asm
+++ b/data/events/pokedex_ratings.asm
@@ -3,7 +3,7 @@
 	dbww \1, \2, \3
 ENDM
 
-OakRatings: ; 0x2667f
+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
@@ -25,5 +25,3 @@
 	rating 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
 	rating 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
 	rating 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
- ; 0x266de
- 
\ No newline at end of file
--- a/data/events/unown_walls.asm
+++ b/data/events/unown_walls.asm
@@ -17,7 +17,7 @@
 	db -1 ; end
 ENDM
 
-UnownWalls: ; 8aebc
+UnownWalls:
 ; UNOWNWORDS_ESCAPE
 	; db      $08, $44, $04, $00, $2e, $08, -1
 	unownwall "E", "S", "C", "A", "P", "E"
@@ -30,9 +30,8 @@
 ; UNOWNWORDS_HO_OH
 	; db      $0e, $2c, $64, $2c, $0e, -1
 	unownwall "H", "O", "-", "O", "H"
-; 8aed5
 
-MenuHeaders_UnownWalls: ; 0x8aed5
+MenuHeaders_UnownWalls:
 ; UNOWNWORDS_ESCAPE
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 3, 4, 16, 9
@@ -45,4 +44,3 @@
 ; UNOWNWORDS_HO_OH
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 4, 4, 15, 9
-; 8aee9
--- a/data/growth_rates.asm
+++ b/data/growth_rates.asm
@@ -9,7 +9,7 @@
 	db \4, \5
 ENDM
 
-GrowthRates: ; 50efa
+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
@@ -17,4 +17,3 @@
 	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
--- 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 @@
 	db BLK_APRICORN, HEAVY_BALL
 	db PNK_APRICORN, LOVE_BALL
 	db -1
-; 24caf
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -5,7 +5,7 @@
 	dn \6, \7
 ENDM
 
-ItemAttributes: ; 67c1
+ItemAttributes:
 ; entries correspond to item ids
 ; MASTER_BALL
 	item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
--- 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 @@
 	dbw STARDUST,    900
 	dbw STAR_PIECE, 4600
 	db -1
-; 15c62
--- 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
@@ -10,4 +10,3 @@
 	db CALCIUM,      5
 	db HP_UP,        5
 .End
-; 8b170
--- 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
@@ -16,4 +16,3 @@
 	db ITEM_FA, BERRY
 	db -1,      BERRY
 	db 0 ; end
-; 2879e
--- 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 @@
 	db ICE_BERRY    ; PEWTER_CITY_1
 	db MINT_BERRY   ; PEWTER_CITY_2
 	db BURNT_BERRY  ; FUCHSIA_CITY
-; 440b5
--- 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 @@
 	dbw RAGECANDYBAR,  20
 	dbw BERRY_JUICE,   20
 	dbw -1, 0 ; end
-; f3df
--- a/data/items/heal_status.asm
+++ b/data/items/heal_status.asm
@@ -1,6 +1,6 @@
 ; See also data/battle/held_heal_status.asm
 
-StatusHealingActions: ; f071
+StatusHealingActions:
 	;  item,         party menu action text, status
 	db ANTIDOTE,     PARTYMENUTEXT_HEAL_PSN, 1 << PSN
 	db BURN_HEAL,    PARTYMENUTEXT_HEAL_BRN, 1 << BRN
@@ -17,4 +17,3 @@
 	db MINT_BERRY,   PARTYMENUTEXT_HEAL_SLP, SLP
 	db MIRACLEBERRY, PARTYMENUTEXT_HEAL_ALL, %11111111
 	db -1, 0, 0 ; end
-; f09e
--- 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 @@
 	db MUSIC_MAIL
 	db MIRAGE_MAIL
 	db -1
-; b9e8b
--- 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
@@ -35,10 +35,8 @@
 	dw MartIndigoPlateau
 	dw MartUnderground
 .End
-; 160ed
 
-
-MartCherrygrove: ; 160ed
+MartCherrygrove:
 	db 4 ; # items
 	db POTION
 	db ANTIDOTE
@@ -45,9 +43,8 @@
 	db PARLYZ_HEAL
 	db AWAKENING
 	db -1 ; end
-; 160f3
 
-MartCherrygroveDex: ; 160f3
+MartCherrygroveDex:
 	db 5 ; # items
 	db POKE_BALL
 	db POTION
@@ -55,9 +52,8 @@
 	db PARLYZ_HEAL
 	db AWAKENING
 	db -1 ; end
-; 160fa
 
-MartViolet: ; 160fa
+MartViolet:
 	db 10 ; # items
 	db POKE_BALL
 	db POTION
@@ -70,9 +66,8 @@
 	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 @@
 	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 @@
 	db FULL_HEAL
 	db REVIVE
 	db -1 ; end
-; 16118
 
-MartGoldenrod2F1: ; 16118
+MartGoldenrod2F1:
 	db 7 ; # items
 	db POTION
 	db SUPER_POTION
@@ -106,9 +99,8 @@
 	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 @@
 	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 @@
 	db GUARD_SPEC
 	db X_ACCURACY
 	db -1 ; end
-; 16134
 
-MartGoldenrod4F: ; 16134
+MartGoldenrod4F:
 	db 5 ; # items
 	db PROTEIN
 	db IRON
@@ -141,17 +131,15 @@
 	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
@@ -158,9 +146,8 @@
 	db TM_ICE_PUNCH
 	db TM_HEADBUTT
 	db -1 ; end
-; 16146
 
-MartGoldenrod5F3: ; 16146
+MartGoldenrod5F3:
 	db 4 ; # items
 	db TM_THUNDERPUNCH
 	db TM_FIRE_PUNCH
@@ -167,9 +154,8 @@
 	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 @@
 	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 @@
 	db SUPER_REPEL
 	db SURF_MAIL
 	db -1 ; end
-; 1615e
 
-MartEcruteak: ; 1615e
+MartEcruteak:
 	db 10 ; # items
 	db POKE_BALL
 	db GREAT_BALL
@@ -206,9 +190,8 @@
 	db ICE_HEAL
 	db REVIVE
 	db -1 ; end
-; 1616a
 
-MartMahogany1: ; 1616a
+MartMahogany1:
 	db 4 ; # items
 	db TINYMUSHROOM
 	db SLOWPOKETAIL
@@ -215,9 +198,8 @@
 	db POKE_BALL
 	db POTION
 	db -1 ; end
-; 16170
 
-MartMahogany2: ; 16170
+MartMahogany2:
 	db 9 ; # items
 	db RAGECANDYBAR
 	db GREAT_BALL
@@ -229,9 +211,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	db BURN_HEAL
 	db LITEBLUEMAIL
 	db -1 ; end
-; 161b9
 
-MartCeladon2F1: ; 161b9
+MartCeladon2F1:
 	db 7 ; # items
 	db POTION
 	db SUPER_POTION
@@ -321,9 +296,8 @@
 	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 @@
 	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 @@
 	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 @@
 	db CARBOS
 	db CALCIUM
 	db -1 ; end
-; 161e1
 
-MartCeladon5F2: ; 161e1
+MartCeladon5F2:
 	db 7 ; # items
 	db X_ACCURACY
 	db GUARD_SPEC
@@ -376,9 +346,8 @@
 	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 @@
 	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 @@
 	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 @@
 	db REPEL
 	db PORTRAITMAIL
 	db -1 ; end
-; 16205
 
-MartIndigoPlateau: ; 16205
+MartIndigoPlateau:
 	db 7 ; # items
 	db ULTRA_BALL
 	db MAX_REPEL
@@ -424,9 +390,8 @@
 	db REVIVE
 	db FULL_HEAL
 	db -1 ; end
-; 1620e
 
-MartUnderground: ; 1620e
+MartUnderground:
 	db 4 ; # items
 	db ENERGYPOWDER
 	db ENERGY_ROOT
@@ -433,11 +398,9 @@
 	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
--- a/data/items/mom_phone.asm
+++ b/data/items/mom_phone.asm
@@ -5,15 +5,15 @@
 	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
-.End ; 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 @@
 	momitem  40000,   900, MOM_ITEM, HYPER_POTION
 	momitem  50000,  8000, MOM_DOLL, DECO_PIKACHU_DOLL
 	momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
-.End ; fd1ae
+.End
--- 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
@@ -37,4 +37,3 @@
 	db BLUESKY_MAIL
 	db MIRAGE_MAIL
 .End
-; 2c74a
--- a/data/items/rooftop_sale.asm
+++ b/data/items/rooftop_sale.asm
@@ -1,4 +1,4 @@
-RooftopSaleMart1: ; 15aee
+RooftopSaleMart1:
 	db 5
 	dbw POKE_BALL,     150
 	dbw GREAT_BALL,    500
@@ -7,7 +7,7 @@
 	dbw REVIVE,       1200
 	db -1
 
-RooftopSaleMart2: ; 15aff
+RooftopSaleMart2:
 	db 5
 	dbw HYPER_POTION, 1000
 	dbw FULL_RESTORE, 2000
@@ -15,4 +15,3 @@
 	dbw ULTRA_BALL,   1000
 	dbw PROTEIN,      7800
 	db -1
-; 15b10
--- 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
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -63,7 +63,6 @@
 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
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@@ -3,7 +3,7 @@
 	db \2, SPAWN_\1
 ENDM
 
-Flypoints: ; 91c5e
+Flypoints:
 ; landmark, spawn point
 	const_def
 ; Johto
@@ -35,4 +35,3 @@
 	flypoint CINNABAR,     CINNABAR_ISLAND
 	flypoint INDIGO,       INDIGO_PLATEAU
 	db -1
-; 91c8f
--- 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@"
--- a/data/maps/map_data.asm
+++ b/data/maps/map_data.asm
@@ -6,7 +6,6 @@
 INCLUDE "data/maps/maps.asm"
 INCLUDE "data/maps/attributes.asm"
 
-
 INCLUDE "data/maps/blocks.asm"
 
 INCLUDE "data/maps/scripts.asm"
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -43,7 +43,6 @@
 	dw MapGroup_Saffron     ; 25
 	dw MapGroup_Cherrygrove ; 26
 
-
 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
--- 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 @@
 	dw NewBarkGroupSprites
 	dw SaffronGroupSprites
 	dw CherrygroveGroupSprites
-; 144ec
 
-
-PalletGroupSprites: ; 144ec
+PalletGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
 	db SPRITE_FAMICOM
@@ -56,9 +54,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	db SPRITE_FISHING_GURU
 	db SPRITE_POKE_BALL
 	db SPRITE_POKEDEX
-; 14736
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@@ -6,7 +6,7 @@
 	const ROOF_OLIVINE   ; 3
 	const ROOF_GOLDENROD ; 4
 
-MapGroupRoofs: ; 1c021i
+MapGroupRoofs:
 ; entries correspond to map groups
 ; values are indexes for Roofs (see below)
 	db -1             ;  0
@@ -36,9 +36,8 @@
 	db ROOF_NEW_BARK  ; 24 (New Bark)
 	db -1             ; 25
 	db ROOF_NEW_BARK  ; 26 (Cherrygrove)
-; 1c03c
 
-Roofs: ; 1c03c
+Roofs:
 ; entries correspond to ROOF_* constants
 INCBIN "gfx/tilesets/roofs/0.2bpp"
 INCBIN "gfx/tilesets/roofs/1.2bpp"
@@ -45,4 +44,3 @@
 INCBIN "gfx/tilesets/roofs/2.2bpp"
 INCBIN "gfx/tilesets/roofs/3.2bpp"
 INCBIN "gfx/tilesets/roofs/4.2bpp"
-; 1c30c
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -4,7 +4,7 @@
 	dw \2
 ENDM
 
-MapScenes:: ; 4d01e
+MapScenes::
 	scene_var POKECENTER_2F,                               wPokecenter2FSceneID
 	scene_var TRADE_CENTER,                                wTradeCenterSceneID
 	scene_var COLOSSEUM,                                   wColosseumSceneID
@@ -85,4 +85,3 @@
 	scene_var MOBILE_TRADE_ROOM,                           wMobileTradeRoomSceneID
 	scene_var MOBILE_BATTLE_ROOM,                          wMobileBattleRoomSceneID
 	db -1
-; 4d15b
--- 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,14 +12,13 @@
 	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
@@ -44,7 +43,7 @@
 	db map_wildmons
 	db map_end
 
-MapSetupScript_BadWarp: ; 153a9
+MapSetupScript_BadWarp:
 	db map_load_spawn
 	db map_load_attributes
 	db map_change_callback
@@ -68,7 +67,7 @@
 	db map_wildmons
 	db map_end
 
-MapSetupScript_Connection: ; 153bf
+MapSetupScript_Connection:
 	db map_animations_off
 	db map_load_connection
 	db map_load_attributes
@@ -87,11 +86,11 @@
 	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_load_attributes
 	db map_warp_face
@@ -114,7 +113,7 @@
 	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 @@
 	db map_wildmons
 	db map_end
 
-MapSetupScript_LinkReturn: ; 153f7
+MapSetupScript_LinkReturn:
 	db map_fade
 	db map_lcd_off
 	db map_sound_off
@@ -151,7 +150,7 @@
 	db map_text_scroll_off
 	db map_end
 
-MapSetupScript_Continue: ; 15408
+MapSetupScript_Continue:
 	db map_lcd_off
 	db map_sound_off
 	db map_load_attributes_2
@@ -171,7 +170,7 @@
 	db map_wildmons
 	db map_end
 
-MapSetupScript_Submenu: ; 1541a
+MapSetupScript_Submenu:
 	db map_load_blocks
 	db map_connection_blocks
 	db map_end
--- 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 @@
 	db PREDEFPAL_NEW_BARK
 	db PREDEFPAL_SAFFRON
 	db PREDEFPAL_CHERRYGROVE
-; 8a60
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@@ -4,7 +4,7 @@
 	db \2, \3
 ENDM
 
-SpawnPoints: ; 0x152ab
+SpawnPoints:
 ; entries correspond to SPAWN_* constants
 
 	spawn PLAYERS_HOUSE_2F,            3,  3
@@ -38,4 +38,3 @@
 	spawn SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
 	spawn N_A,                        -1, -1
-; 1531f
--- a/data/mon_menu.asm
+++ b/data/mon_menu.asm
@@ -8,7 +8,7 @@
 	const MONMENUVALUE_MAIL   ; 6
 	const MONMENUVALUE_ERROR  ; 7
 
-MonMenuOptionStrings: ; 24caf
+MonMenuOptionStrings:
 ; entries correspond to MONMENUVALUE_* constants
 	db "STATS@"
 	db "SWITCH@"
@@ -17,9 +17,8 @@
 	db "MOVE@"
 	db "MAIL@"
 	db "ERROR!@"
-; 24cd9
 
-MonMenuOptions: ; 24cd9
+MonMenuOptions:
 ; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm)
 ; moves
 	db MONMENU_FIELD_MOVE, MONMENUITEM_CUT,        CUT
@@ -45,4 +44,3 @@
 	db MONMENU_MENUOPTION, MONMENUITEM_MAIL,       MONMENUVALUE_MAIL
 	db MONMENU_MENUOPTION, MONMENUITEM_ERROR,      MONMENUVALUE_ERROR
 	db -1
-; 24d19
--- 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 @@
 	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,7 +299,6 @@
 	anim_bgeffect ANIM_BG_06, $0, $2, $0
 	anim_wait 128
 	anim_ret
-; c92c1
 
 BattleAnim_ThrowPokeBall:
 	anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall
@@ -320,7 +317,6 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +617,8 @@
 	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
@@ -651,9 +625,8 @@
 	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
@@ -660,27 +633,23 @@
 	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 @@
 	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 @@
 	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,9 +686,8 @@
 	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
@@ -728,9 +694,8 @@
 	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,9 +704,8 @@
 	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
@@ -748,10 +712,9 @@
 	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 @@
 	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 @@
 	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,9 +757,8 @@
 	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
@@ -805,9 +765,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +1352,8 @@
 	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
@@ -1436,7 +1360,6 @@
 	anim_call BattleAnim_Selfdestruct_branch_cbb8f
 	anim_wait 16
 	anim_ret
-; c9c63
 
 .loop
 	anim_call BattleAnim_Selfdestruct_branch_cbb62
@@ -1445,9 +1368,8 @@
 	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 @@
 	anim_call BattleAnim_Explosion_branch_cbb8f
 	anim_wait 16
 	anim_ret
-; c9c87
 
 .loop
 	anim_call BattleAnim_Explosion_branch_cbb62
@@ -1464,16 +1385,14 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +1497,8 @@
 	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
@@ -1592,9 +1505,8 @@
 	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 @@
 	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 @@
 	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,17 +1534,15 @@
 	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
@@ -1641,9 +1549,8 @@
 	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 @@
 	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 @@
 	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,9 +1589,8 @@
 	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
@@ -1693,13 +1597,12 @@
 	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
@@ -1706,9 +1609,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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,12 +1675,10 @@
 	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
@@ -1788,9 +1685,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +1820,8 @@
 	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
@@ -1940,9 +1828,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +2563,8 @@
 	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
@@ -2736,9 +2571,8 @@
 	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
@@ -2745,9 +2579,8 @@
 	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
@@ -2754,9 +2587,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +2687,8 @@
 	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
@@ -2871,9 +2695,8 @@
 	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
@@ -2880,9 +2703,8 @@
 	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,9 +2722,8 @@
 	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
@@ -2909,9 +2730,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +3067,8 @@
 	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
@@ -3278,9 +3075,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +3126,8 @@
 	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
@@ -3343,9 +3134,8 @@
 	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
@@ -3352,9 +3142,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +3417,8 @@
 	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
@@ -3653,9 +3425,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +3629,8 @@
 	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
@@ -3879,9 +3637,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +4105,8 @@
 	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
@@ -4384,9 +4113,8 @@
 	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,9 +4125,8 @@
 	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
@@ -4406,9 +4133,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,27 +4733,25 @@
 	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
@@ -5068,12 +4758,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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,23 +4813,20 @@
 	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
@@ -5150,23 +4833,20 @@
 	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
@@ -5173,4 +4853,3 @@
 	anim_incobj  1
 	anim_wait 1
 	anim_ret
-; cbcdd
--- /dev/null
+++ b/data/moves/critical_hit_moves.asm
@@ -1,0 +1,9 @@
+CriticalHitMoves:
+	db KARATE_CHOP
+	db RAZOR_WIND
+	db RAZOR_LEAF
+	db CRABHAMMER
+	db SLASH
+	db AEROBLAST
+	db CROSS_CHOP
+	db -1
--- 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 @@
 	dw MoveFEDescription
 	dw MoveFFDescription
 	dw Move00Description
-; 2cd52
 
 MoveFCDescription:
 MoveFDDescription:
@@ -836,6 +835,7 @@
 SkyAttackDescription:
 	db   "1st turn: Prepare"
 	next "2nd turn: Attack@"
+
 TransformDescription:
 	db   "The user assumes"
 	next "the foe's guise.@"
@@ -1267,4 +1267,3 @@
 BeatUpDescription:
 	db   "Party #MON join"
 	next "in the attack.@"
-; 2ed44
--- 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
--- 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
--- 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 @@
 	db EFFECT_COUNTER,      0
 	db EFFECT_MIRROR_COAT,  0
 	db -1
-; 3c5ec
--- 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 @@
 ; 4: originally "[mon]の¯[move]!" ("[mon]'s¯[move]!")
 ; Any move not listed above uses this grammar.
 	db -1 ; end
-; 105ed0
--- /dev/null
+++ b/data/moves/metronome_exception_moves.asm
@@ -1,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
--- a/data/moves/moves.asm
+++ b/data/moves/moves.asm
@@ -10,7 +10,7 @@
 	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
--- a/data/moves/tmhm_moves.asm
+++ b/data/moves/tmhm_moves.asm
@@ -1,4 +1,4 @@
-TMHMMoves: ; 1167a
+TMHMMoves:
 ; entries correspond to *_TMNUM enums (see constants/item_constants.asm)
 ; TMs
 	db DYNAMICPUNCH
@@ -64,4 +64,3 @@
 	db THUNDERBOLT
 	db ICE_BEAM
 	db 0 ; end
-; 116b7
--- a/data/party_menu_qualities.asm
+++ b/data/party_menu_qualities.asm
@@ -18,8 +18,7 @@
 	db -1 ; end
 ENDM
 
-
-PartyMenuQualityPointers: ; 503b2
+PartyMenuQualityPointers:
 ; entries correspond to PARTYMENUACTION_* constants
 	dw .Default  ; PARTYMENUACTION_CHOOSE_POKEMON
 	dw .Default  ; PARTYMENUACTION_HEALING_ITEM
@@ -31,7 +30,6 @@
 	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
@@ -38,4 +36,3 @@
 .EvoStone: partymenuqualities NICKNAMES, EVO_STONE_COMPAT,  LEVEL, STATUS
 .Gender:   partymenuqualities NICKNAMES, GENDER,            LEVEL, STATUS
 .Mobile:   partymenuqualities NICKNAMES, MOBILE_SELECTION,  LEVEL, STATUS
-; 503e0
--- a/data/phone/non_trainer_names.asm
+++ b/data/phone/non_trainer_names.asm
@@ -1,4 +1,4 @@
-NonTrainerCallerNames: ; 903d6
+NonTrainerCallerNames:
 ; entries correspond to PHONECONTACT_* constants
 	dw .none
 	dw .mom
@@ -12,5 +12,4 @@
 .bill:     db "BILL:@"
 .elm:      db "PROF.ELM:@"
 .bikeshop: db "BIKE SHOP:@"
-.buena:    db "BUENA:<LNBRK>   DISC JOCKEY@"
-; 90423
+.buena:    db "BUENA:<LF>   DISC JOCKEY@"
--- 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
--- a/data/phone/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
@@ -8,7 +8,7 @@
 	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,   PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript,      0,       UnusedPhoneScript
@@ -48,4 +48,3 @@
 	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
--- a/data/phone/special_calls.asm
+++ b/data/phone/special_calls.asm
@@ -5,7 +5,7 @@
 	dba \3
 ENDM
 
-SpecialPhoneCallList: ; 90627
+SpecialPhoneCallList:
 ; entries correspond to SPECIALCALL_* constants
 	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
 	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
@@ -15,4 +15,3 @@
 	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_BIKESHOP, BikeShopPhoneScript
 	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_MOM,      MomPhoneLectureScript
 	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
-; 90657
--- 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 @@
 	line "SERVICE."
 	done
 
-BillPhoneDayGreetingText: ; 0x1b4470
+BillPhoneDayGreetingText:
 	text "Good day!"
 
 	para "This is the #-"
@@ -18,7 +18,7 @@
 	line "SERVICE."
 	done
 
-BillPhoneNiteGreetingText: ; 0x1b44b5
+BillPhoneNiteGreetingText:
 	text "Good evening!"
 
 	para "This is the #-"
@@ -28,7 +28,7 @@
 	line "SERVICE."
 	done
 
-BillPhoneGenericText: ; 0x1b44fe
+BillPhoneGenericText:
 	text "Who's calling?"
 
 	para "<PLAY_G>, is it?"
@@ -38,7 +38,7 @@
 	line $56
 	done
 
-BillPhoneNotFullText: ; 0x1b452a
+BillPhoneNotFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -52,7 +52,7 @@
 	line "fill it up!"
 	done
 
-BillPhoneNearlyFullText: ; 0x1b4587
+BillPhoneNearlyFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -66,7 +66,7 @@
 	line "switch your BOX."
 	done
 
-BillPhoneFullText: ; 0x1b45ed
+BillPhoneFullText:
 	text "Thanks for"
 	line "waiting!"
 
@@ -80,7 +80,7 @@
 	line "more #MON."
 	done
 
-BillPhoneNewlyFullText: ; 0x1b4652
+BillPhoneNewlyFullText:
 	text "Hi, <PLAY_G>?"
 	line "It's me, BILL!"
 
--- 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,9 +7,8 @@
 	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>!"
 
@@ -16,9 +15,8 @@
 	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 @@
 	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,9 +43,8 @@
 	para "Let me tell you,"
 	line "I'm exhausted!"
 	done
-; 0xa0d96
 
-UnknownText_0xa0d96: ; 0xa0d96
+UnknownText_0xa0d96:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
@@ -55,9 +51,8 @@
 	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!"
 
@@ -64,9 +59,8 @@
 	para "I needed someone"
 	line "to chat with!"
 	done
-; 0xa0e01
 
-UnknownText_0xa0e01: ; 0xa0e01
+UnknownText_0xa0e01:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
@@ -73,9 +67,8 @@
 	para "I'm just on my"
 	line "break."
 	done
-; 0xa0e29
 
-UnknownText_0xa0e29: ; 0xa0e29
+UnknownText_0xa0e29:
 	text "<PLAY_G>!"
 	line "Hi, it's BUENA!"
 
@@ -82,9 +75,8 @@
 	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 @@
 	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 @@
 	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 @@
 
 	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 @@
 
 	para "Let's chat again!"
 	done
-; 0xa1143
 
-UnknownText_0xa1143: ; 0xa1143
+UnknownText_0xa1143:
 	text "You know, last"
 	line "night…"
 
@@ -198,9 +186,8 @@
 	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 @@
 
 	para "Catch you later!"
 	done
-; 0xa1318
 
-UnknownText_0xa1318: ; 0xa1318
+UnknownText_0xa1318:
 	text "…Cough, cough!"
 
 	para "Uhm sorry uh got"
@@ -242,9 +228,8 @@
 	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 @@
 	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 @@
 
 	para "Let's chat again!"
 	done
-; 0xa15de
 
-UnknownText_0xa15de: ; 0xa15de
+UnknownText_0xa15de:
 	text "Guess what?"
 	line "The RADIO TOWER's"
 
@@ -331,9 +314,8 @@
 	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 @@
 	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 @@
 
 	para "Bye-bye!"
 	done
-; 0xa19b1
 
-UnknownText_0xa19b1: ; 0xa19b1
+UnknownText_0xa19b1:
 	text "Guess what? All of"
 	line "us from the RADIO"
 
@@ -434,9 +414,8 @@
 
 	para "Bye-bye!"
 	done
-; 0xa1ac0
 
-UnknownText_0xa1ac0: ; 0xa1ac0
+UnknownText_0xa1ac0:
 	text "Did you know…?"
 
 	para "BEN and FERN talk"
@@ -465,9 +444,8 @@
 
 	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 @@
 
 	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 @@
 
 	para "Catch you later!"
 	done
-; 0xa1d5f
 
-UnknownText_0xa1d5f: ; 0xa1d5f
+UnknownText_0xa1d5f:
 	text "Hey, <PLAY_G>. You"
 	line "use your #GEAR"
 
@@ -530,9 +506,8 @@
 	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 @@
 
 	para "Please call again!"
 	done
-; 0xa1eca
--- 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 @@
 	cont "they are hurt."
 	done
 
-ElmPhoneSawMrPokemonText: ; 0x1b4749
+ElmPhoneSawMrPokemonText:
 	text "Hello, <PLAY_G>?"
 
 	para "Did you meet MR."
@@ -17,7 +17,7 @@
 	cont "Come back safely!"
 	done
 
-ElmPhonePokemonStolenText: ; 0x1b4784
+ElmPhonePokemonStolenText:
 	text "<PLAY_G>? I'm very"
 	line "upset now."
 
@@ -28,7 +28,7 @@
 	line "do that?"
 	done
 
-ElmPhoneCheckingEggText: ; 0x1b47d5
+ElmPhoneCheckingEggText:
 	text "Hello, <PLAY_G>?"
 
 	para "We're checking the"
@@ -38,7 +38,7 @@
 	line "#MON EGG."
 	done
 
-ElmPhoneAssistantText: ; 0x1b481c
+ElmPhoneAssistantText:
 	text "Hello, <PLAY_G>?"
 
 	para "Did you see my"
@@ -48,7 +48,7 @@
 	line "in VIOLET CITY."
 	done
 
-ElmPhoneEggUnhatchedText: ; 0x1b4868
+ElmPhoneEggUnhatchedText:
 	text "Hello, <PLAY_G>?"
 
 	para "How's the EGG? Has"
@@ -58,7 +58,7 @@
 	line "pens, please call."
 	done
 
-ElmPhoneEggHatchedText: ; 0x1b48bb
+ElmPhoneEggHatchedText:
 	text "Hello, <PLAY_G>?"
 	line "How is the EGG?"
 
@@ -70,7 +70,7 @@
 	line "me now!"
 	done
 
-ElmPhoneDiscovery1Text: ; 0x1b491f
+ElmPhoneDiscovery1Text:
 	text "Hello, <PLAY_G>?"
 
 	para "I just made a new"
@@ -83,7 +83,7 @@
 	line "the #MON."
 	done
 
-ElmPhoneDiscovery2Text: ; 0x1b4982
+ElmPhoneDiscovery2Text:
 	text "Hello, <PLAY_G>?"
 
 	para "It's still a"
@@ -96,7 +96,7 @@
 	line "ing that now."
 	done
 
-ElmPhonePokerusText: ; 0x1b49e7
+ElmPhonePokerusText:
 	text "Hello, <PLAY_G>?"
 
 	para "I discovered an"
@@ -129,7 +129,7 @@
 	cont "about. Bye!"
 	done
 
-ElmPhoneDisasterText: ; 0x1b4b17
+ElmPhoneDisasterText:
 	text "H-hello? <PLAY_G>?"
 	line "It's a disaster!"
 
@@ -143,7 +143,7 @@
 	line "here now!"
 	done
 
-ElmPhoneEggAssistantText: ; 0x1b4b87
+ElmPhoneEggAssistantText:
 	text "Hello, <PLAY_G>? We"
 	line "discovered some-"
 
@@ -158,7 +158,7 @@
 	cont "him?"
 	done
 
-ElmPhoneRocketText: ; 0x1b4c06
+ElmPhoneRocketText:
 	text "<PLAY_G>, how are"
 	line "things going?"
 
@@ -185,7 +185,7 @@
 	line "Take care!"
 	done
 
-ElmPhoneGiftText: ; 0x1b4d09
+ElmPhoneGiftText:
 	text "Hello, <PLAY_G>?"
 
 	para "I have something"
@@ -197,7 +197,7 @@
 	para "See you later!"
 	done
 
-ElmPhoneUnusedText: ; 0x1b4d5d
+ElmPhoneUnusedText:
 	text "Hello, <PLAY_G>?"
 	line "How's it going?"
 
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +192,8 @@
 	para "I'll always be"
 	line "cheering you on!"
 	done
-; 0x646a3
 
-IrwinCalledRightAwayText: ; 0x646a3
+IrwinCalledRightAwayText:
 	text "Hehe, I called"
 	line "right away!"
 
@@ -212,9 +200,8 @@
 	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 @@
 	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,9 +240,8 @@
 
 	para "You so rock!"
 	done
-; 0x64846
 
-UnknownText_0x64846: ; 0x64846
+UnknownText_0x64846:
 	text "Hearing about your"
 	line "escapades rocks my"
 
@@ -263,9 +248,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x64c5a
 
-UnknownText_0x64c5a: ; 0x64c5a
+UnknownText_0x64c5a:
 	text "Hello? Are you"
 	line "coming or what?"
 
@@ -421,9 +395,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +462,8 @@
 	text_start
 	line "and pick it up?"
 	done
-; 0x64e90
 
-UnknownText_0x64e90: ; 0x64e90
+UnknownText_0x64e90:
 	text "I haven't picked"
 	line "up anything yet."
 
@@ -503,9 +470,8 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x64f74
 
-UnknownText_0x64f74: ; 0x64f74
+UnknownText_0x64f74:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " is"
@@ -540,9 +504,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x65161
 
-UnknownText_0x65161: ; 0x65161
+UnknownText_0x65161:
 	text "Oh! You wanted a"
 	line "gift, right?"
 
@@ -619,9 +577,8 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x6520f
 
-UnknownText_0x6520f: ; 0x6520f
+UnknownText_0x6520f:
 	text "Hello?"
 
 	para "If you don't come"
@@ -649,9 +605,8 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x65271
 
-ChadObservingWildText: ; 0x65271
+ChadObservingWildText:
 	text "I recently began"
 	line "observing wild"
 	cont "@"
@@ -670,9 +625,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	para "ferocious #MON"
 	line "calm right down."
 	done
-; 0x65555
 
-ChadProfElmGossipText: ; 0x65555
+ChadProfElmGossipText:
 	text "Everyone's talking"
 	line "about PROF.ELM."
 
@@ -765,9 +713,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	para "and chat about"
 	line "PROF.OAK."
 	done
-; 0x65969
 
-ChadTravelGossipText: ; 0x65969
+ChadTravelGossipText:
 	text "Did you know?"
 	line "PROF.OAK traveled"
 
@@ -889,9 +830,8 @@
 	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"
 
@@ -898,9 +838,8 @@
 	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 @@
 	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 @@
 
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	para "Come pick this up"
 	line "anytime."
 	done
-; 0x65de4
 
-TullyGrownText: ; 0x65de4
+TullyGrownText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " has"
@@ -1040,9 +970,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x65ff2
 
-UnknownText_0x65ff2: ; 0x65ff2
+UnknownText_0x65ff2:
 	text "Have I found"
 	line "anything good?"
 
@@ -1116,9 +1040,8 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x660be
 
-BrentRareTradeText: ; 0x660be
+BrentRareTradeText:
 	text "Oh yeah, I got an"
 	line "extremely rare"
 
@@ -1155,9 +1076,8 @@
 	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 @@
 	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 @@
 	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,14 +1123,12 @@
 	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"
 
@@ -1219,9 +1135,8 @@
 	para "supposed to be a"
 	line "great #MANIAC."
 	done
-; 0x662fc
 
-UnknownText_0x662fc: ; 0x662fc
+UnknownText_0x662fc:
 	text "Did you know…?"
 	line "Apparently BILL's"
 
@@ -1228,16 +1143,14 @@
 	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"
 
@@ -1244,9 +1157,8 @@
 	para "lives on ROUTE 25"
 	line "in KANTO."
 	done
-; 0x663a1
 
-UnknownText_0x663a1: ; 0x663a1
+UnknownText_0x663a1:
 	text "Did you know…?"
 	line "ABRA was the first"
 
@@ -1253,9 +1165,8 @@
 	para "#MON that BILL"
 	line "ostensibly caught."
 	done
-; 0x663e6
 
-UnknownText_0x663e6: ; 0x663e6
+UnknownText_0x663e6:
 	text "Did you know…?"
 	line "BILL's younger"
 
@@ -1262,9 +1173,8 @@
 	para "sister apparently"
 	line "can't wink."
 	done
-; 0x66421
 
-UnknownText_0x66421: ; 0x66421
+UnknownText_0x66421:
 	text "Did you know…?"
 	line "BILL supposedly"
 
@@ -1271,9 +1181,8 @@
 	para "hates milk and"
 	line "can't drink it."
 	done
-; 0x6645f
 
-UnknownText_0x6645f: ; 0x6645f
+UnknownText_0x6645f:
 	text "Did you know…?"
 	line "Evidently, BILL"
 
@@ -1280,9 +1189,8 @@
 	para "isn't very good at"
 	line "battling."
 	done
-; 0x6649b
 
-UnknownText_0x6649b: ; 0x6649b
+UnknownText_0x6649b:
 	text "Did you know…?"
 	line "BILL appears to"
 
@@ -1289,9 +1197,8 @@
 	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"
 
@@ -1298,9 +1205,8 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x665ad
 
-UnknownText_0x665ad: ; 0x665ad
+UnknownText_0x665ad:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -1335,9 +1239,8 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x66796
 
-TiffanyItsAwfulText: ; 0x66796
+TiffanyItsAwfulText:
 	text_from_ram wStringBuffer4
 	text "!"
 
@@ -1409,14 +1309,12 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x66980
 
-VanceLiftoffText: ; 0x66980
+VanceLiftoffText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -1480,9 +1374,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text "!"
 	line "FLY over now!"
 	done
-; 0x66afc
 
-WiltonGrownText: ; 0x66afc
+WiltonGrownText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -1552,9 +1439,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x66ca7
 
-WiltonHaventFoundAnythingText: ; 0x66ca7
+WiltonHaventFoundAnythingText:
 	text "Nah, I haven't"
 	line "found anything"
 
@@ -1623,9 +1504,8 @@
 	para "You have to have"
 	line "patience."
 	done
-; 0x66cf7
 
-WiltonNotBitingText: ; 0x66cf7
+WiltonNotBitingText:
 	text "Sigh…"
 	line "They're not biting"
 
@@ -1637,9 +1517,8 @@
 	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 @@
 	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 @@
 
 	para "Oooooaaarrrgh!"
 	done
-; 0x66e17
 
-UnknownText_0x66e17: ; 0x66e17
+UnknownText_0x66e17:
 	text "I'm in training"
 	line "now. I apologize,"
 
@@ -1682,9 +1558,8 @@
 
 	para "Oooooaaarrrgh!"
 	done
-; 0x66e67
 
-UnknownText_0x66e67: ; 0x66e67
+UnknownText_0x66e67:
 	text "I apologize, but I"
 	line "don't have time to"
 
@@ -1696,9 +1571,8 @@
 
 	para "Yiiihah!"
 	done
-; 0x66ed3
 
-UnknownText_0x66ed3: ; 0x66ed3
+UnknownText_0x66ed3:
 	text "I plan to take a"
 	line "lunch break, so"
 
@@ -1705,9 +1579,8 @@
 	para "come see me then!"
 	line "Ayiiiyah!"
 	done
-; 0x66f11
 
-KenjiBreakText: ; 0x66f11
+KenjiBreakText:
 	text "I'm taking a break"
 	line "on ROUTE 45!"
 
@@ -1714,9 +1587,8 @@
 	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 @@
 
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	para "Come back for"
 	line "another battle!"
 	done
-; 0x672d5
 
-ErinComeBattleText: ; 0x672d5
+ErinComeBattleText:
 	text "Oh, <PLAY_G>!"
 	line "Come battle ERIN!"
 
@@ -1877,4 +1735,3 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x67308
--- 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 @@
 	para "keep that BICYCLE."
 	line "Thanks again!"
 	done
-; 0x1740c0
 
-JackIntelligenceText: ; 0x1740c0
+JackIntelligenceText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -29,9 +28,8 @@
 	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 @@
 	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 @@
 	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,14 +72,12 @@
 	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,"
@@ -90,9 +84,8 @@
 	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 @@
 	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 @@
 	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 @@
 	para "your STOMP becomes"
 	line "more powerful."
 	done
-; 0x174391
 
-JackGustTriviaText: ; 0x174391
+JackGustTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -134,9 +124,8 @@
 	para "GUST becomes much"
 	line "more powerful."
 	done
-; 0x1743e3
 
-JackTwisterTriviaText: ; 0x1743e3
+JackTwisterTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -145,9 +134,8 @@
 	para "TWISTER becomes"
 	line "more powerful."
 	done
-; 0x174433
 
-JackEarthquakeTriviaText: ; 0x174433
+JackEarthquakeTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -156,9 +144,8 @@
 	para "EARTHQUAKE becomes"
 	line "more powerful."
 	done
-; 0x174485
 
-JackMagnitudeTriviaText: ; 0x174485
+JackMagnitudeTriviaText:
 	text "Did you know…?"
 
 	para "If your opponent"
@@ -167,9 +154,8 @@
 	para "MAGNITUDE becomes"
 	line "more powerful."
 	done
-; 0x1744d6
 
-JackSandstormTriviaText: ; 0x1744d6
+JackSandstormTriviaText:
 	text "Did you know…?"
 
 	para "The rock, ground"
@@ -178,9 +164,8 @@
 	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 @@
 	para "moves become much"
 	line "weaker."
 	done
-; 0x174571
 
-JackRainDanceTriviaText: ; 0x174571
+JackRainDanceTriviaText:
 	text "Did you know…?"
 
 	para "When it's raining,"
@@ -200,9 +184,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +273,8 @@
 	para "Please come see me"
 	line "when you can."
 	done
-; 0x17485b
 
-UnknownText_0x17485b: ; 0x17485b
+UnknownText_0x17485b:
 	text "Are your #MON"
 	line "in prime form?"
 
@@ -305,9 +281,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text "…"
 	line "Oh! Never mind!"
 	done
-; 0x17543a
 
-UnknownText_0x17543a: ; 0x17543a
+UnknownText_0x17543a:
 	text "We are going to"
 	line "battle!"
 
@@ -772,14 +716,12 @@
 	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 @@
 
 	para "It was a fluke!"
 	done
-; 0x1754e5
 
-UnknownText_0x1754e5: ; 0x1754e5
+UnknownText_0x1754e5:
 	text "What are you"
 	line "doing?"
 
@@ -802,9 +743,8 @@
 	text "!"
 	line "Don't try to run!"
 	done
-; 0x175530
 
-JoeySharperText: ; 0x175530
+JoeySharperText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -817,9 +757,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x1757d4
 
-WadeAreYouGrowingText: ; 0x1757d4
+WadeAreYouGrowingText:
 	text "Are your #MON"
 	line "growing?"
 
@@ -921,9 +854,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "."
 	done
-; 0x175abe
 
-UnknownText_0x175abe: ; 0x175abe
+UnknownText_0x175abe:
 	text "Huh? BERRIES?"
 
 	para "Sorry, I haven't"
@@ -1020,9 +946,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer4
 	text " too."
 	done
-; 0x17686d
 
-UnknownText_0x17686d: ; 0x17686d
+UnknownText_0x17686d:
 	text "Listen, listen!"
 
 	para "Uh… Um… Whoops!"
@@ -1469,9 +1368,8 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x176a2f
 
-AnthonyAteBerriesText: ; 0x176a2f
+AnthonyAteBerriesText:
 	text "The other day, I"
 	line "was watching my"
 
@@ -1541,9 +1437,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text "!"
 	line "I'm waiting!"
 	done
-; 0x176dd1
 
-UnknownText_0x176dd1: ; 0x176dd1
+UnknownText_0x176dd1:
 	text "Hello? What? Where"
 	line "is DUNSPARCE?"
 
@@ -1667,9 +1555,8 @@
 	para "are strong #MON"
 	line "around."
 	done
-; 0x176e5d
 
-ToddLooksCuteLikeMeText: ; 0x176e5d
+ToddLooksCuteLikeMeText:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " is"
@@ -1678,9 +1565,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +1639,8 @@
 	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"
 
@@ -1766,9 +1647,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x17750e
 
-UnknownText_0x17750e: ; 0x17750e
+UnknownText_0x17750e:
 	text "I'm getting really"
 	line "impatient, waiting"
 
@@ -1924,4 +1793,3 @@
 	text_from_ram wStringBuffer5
 	text "!"
 	done
-; 0x177561
--- a/data/phone/text/mom.asm
+++ b/data/phone/text/mom.asm
@@ -1,4 +1,4 @@
-MomPhoneGreetingText: ; 0x1b4000
+MomPhoneGreetingText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
@@ -5,7 +5,7 @@
 	line "Working hard?"
 	done
 
-MomPhoneLandmarkText: ; 0x1b4021
+MomPhoneLandmarkText:
 	text "Oh, so you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -19,7 +19,7 @@
 	line "take a look?"
 	done
 
-MomPhoneGenericAreaText: ; 0x1b406b
+MomPhoneGenericAreaText:
 	text "Really, you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -30,7 +30,7 @@
 	cont "of neat, <PLAYER>."
 	done
 
-MomPhoneNewBarkText: ; 0x1b40b1
+MomPhoneNewBarkText:
 	text "What? You're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -40,7 +40,7 @@
 	line "sometime!"
 	done
 
-MomPhoneCherrygroveText: ; 0x1b40e4
+MomPhoneCherrygroveText:
 	text "You're visiting"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -50,7 +50,7 @@
 	line "home for a bit?"
 	done
 
-MomOtherAreaText: ; 0x1b411c
+MomOtherAreaText:
 	text "Wow, you're in"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -60,7 +60,7 @@
 	line "#MON quest!"
 	done
 
-MomDeterminedText: ; 0x1b4150
+MomDeterminedText:
 	text "That sounds really"
 	line "tough."
 
@@ -71,7 +71,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	cont "waiting for you?"
 	done
 
-MomPhoneNoPokedexText: ; 0x1b431d
+MomPhoneNoPokedexText:
 	text "Hello?"
 
 	para "Oh, hi, <PLAYER>!"
@@ -138,7 +138,7 @@
 	line "ELM? Be good!"
 	done
 
-MomPhoneNoGymQuestText: ; 0x1b435f
+MomPhoneNoGymQuestText:
 	text "Hello?"
 
 	para "Hi, <PLAYER>! If"
@@ -148,7 +148,7 @@
 	line "on home, dear."
 	done
 
-MomPhoneLectureText: ; 0x1b43a1
+MomPhoneLectureText:
 	text "Hello?"
 
 	para "…… <PLAYER>?"
--- a/data/phone/text/trainers.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 @@
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b4ded: ; 0x1b4ded
+UnknownText_0x1b4ded:
 	text "Hello. This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -18,7 +18,7 @@
 	line "<PLAY_G>?"
 	done
 
-UnknownText_0x1b4e16: ; 0x1b4e16
+UnknownText_0x1b4e16:
 	text "Hello. This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -28,7 +28,7 @@
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b4e3e: ; 0x1b4e3e
+UnknownText_0x1b4e3e:
 	text "<PLAY_G>, good"
 	line "morning!"
 
@@ -38,7 +38,7 @@
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b4e72: ; 0x1b4e72
+UnknownText_0x1b4e72:
 	text "<PLAY_G>, howdy!"
 
 	para "It's me, @"
@@ -47,7 +47,7 @@
 	line "Isn't it nice out?"
 	done
 
-UnknownText_0x1b4e9e: ; 0x1b4e9e
+UnknownText_0x1b4e9e:
 	text "<PLAY_G>, good"
 	line "evening!"
 
@@ -57,7 +57,7 @@
 	line "Got a minute?"
 	done
 
-UnknownText_0x1b4ecd: ; 0x1b4ecd
+UnknownText_0x1b4ecd:
 	text "How are your"
 	line "#MON doing?"
 
@@ -70,7 +70,7 @@
 	line "it's like me…"
 	done
 
-UnknownText_0x1b4f21: ; 0x1b4f21
+UnknownText_0x1b4f21:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -80,7 +80,7 @@
 	line "<PLAYER>."
 	done
 
-UnknownText_0x1b4f4d: ; 0x1b4f4d
+UnknownText_0x1b4f4d:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -90,7 +90,7 @@
 	line "<PLAYER>."
 	done
 
-UnknownText_0x1b4f75: ; 0x1b4f75
+UnknownText_0x1b4f75:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -100,7 +100,7 @@
 	line "<PLAYER>."
 	done
 
-UnknownText_0x1b4fa1: ; 0x1b4fa1
+UnknownText_0x1b4fa1:
 	text "Hello, <PLAYER>."
 	line "Good morning."
 
@@ -110,7 +110,7 @@
 	line "Were you asleep?"
 	done
 
-UnknownText_0x1b4fda: ; 0x1b4fda
+UnknownText_0x1b4fda:
 	text "Hi, <PLAYER>."
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -119,7 +119,7 @@
 	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 @@
 	para "Were you awake?"
 	done
 
-UnknownText_0x1b502b: ; 0x1b502b
+UnknownText_0x1b502b:
 	text "Keeping your"
 	line "#MON happy?"
 
@@ -139,7 +139,7 @@
 	cont "lot every day."
 	done
 
-UnknownText_0x1b5073: ; 0x1b5073
+UnknownText_0x1b5073:
 	text "Yeah, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -149,7 +149,7 @@
 	line "<PLAYER>?"
 	done
 
-UnknownText_0x1b509b: ; 0x1b509b
+UnknownText_0x1b509b:
 	text "Yeah, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -159,7 +159,7 @@
 	line "<PLAYER>?"
 	done
 
-UnknownText_0x1b50c2: ; 0x1b50c2
+UnknownText_0x1b50c2:
 	text "Yeah, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -169,7 +169,7 @@
 	line "<PLAYER>?"
 	done
 
-UnknownText_0x1b50e9: ; 0x1b50e9
+UnknownText_0x1b50e9:
 	text "Yo, <PLAYER>!"
 	line "You awake?"
 
@@ -179,7 +179,7 @@
 	line "How's it going?"
 	done
 
-UnknownText_0x1b511a: ; 0x1b511a
+UnknownText_0x1b511a:
 	text "Yo, <PLAYER>! You"
 	line "free right now?"
 
@@ -189,7 +189,7 @@
 	line "How's it going?"
 	done
 
-UnknownText_0x1b5154: ; 0x1b5154
+UnknownText_0x1b5154:
 	text "Yo, <PLAYER>!"
 	line "Were you asleep?"
 
@@ -199,7 +199,7 @@
 	line "How's it going?"
 	done
 
-UnknownText_0x1b518b: ; 0x1b518b
+UnknownText_0x1b518b:
 	text "How are your"
 	line "#MON doing?"
 
@@ -219,7 +219,7 @@
 	line "bit much for me!"
 	done
 
-UnknownText_0x1b522b: ; 0x1b522b
+UnknownText_0x1b522b:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text "'s"
@@ -230,7 +230,7 @@
 	line "tougher than me!"
 	done
 
-UnknownText_0x1b5270: ; 0x1b5270
+UnknownText_0x1b5270:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -240,7 +240,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b52a5: ; 0x1b52a5
+UnknownText_0x1b52a5:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -249,7 +249,7 @@
 	para "Hi, <PLAY_G>!"
 	done
 
-UnknownText_0x1b52cc: ; 0x1b52cc
+UnknownText_0x1b52cc:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -259,7 +259,7 @@
 	line "Good evening!"
 	done
 
-UnknownText_0x1b5301: ; 0x1b5301
+UnknownText_0x1b5301:
 	text "<PLAY_G>, good"
 	line "morning!"
 
@@ -269,7 +269,7 @@
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b5335: ; 0x1b5335
+UnknownText_0x1b5335:
 	text "Hi, <PLAY_G>!"
 
 	para "It's me, @"
@@ -278,7 +278,7 @@
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b535f: ; 0x1b535f
+UnknownText_0x1b535f:
 	text "<PLAY_G>, good"
 	line "evening!"
 
@@ -288,7 +288,7 @@
 	line "How are you doing?"
 	done
 
-UnknownText_0x1b5393: ; 0x1b5393
+UnknownText_0x1b5393:
 	text "How are your"
 	line "#MON doing?"
 
@@ -303,7 +303,7 @@
 	cont "CHAMPS!"
 	done
 
-UnknownText_0x1b53f7: ; 0x1b53f7
+UnknownText_0x1b53f7:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -315,7 +315,7 @@
 	para ""
 	done
 
-UnknownText_0x1b5424: ; 0x1b5424
+UnknownText_0x1b5424:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -324,7 +324,7 @@
 	para "Oh. Hi, <PLAY_G>."
 	done
 
-UnknownText_0x1b5446: ; 0x1b5446
+UnknownText_0x1b5446:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -334,7 +334,7 @@
 	line "Good evening."
 	done
 
-UnknownText_0x1b5472: ; 0x1b5472
+UnknownText_0x1b5472:
 	text "Good morning,"
 	line "<PLAY_G>!"
 
@@ -344,7 +344,7 @@
 	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 @@
 	line "time?"
 	done
 
-UnknownText_0x1b54d4: ; 0x1b54d4
+UnknownText_0x1b54d4:
 	text "Hi, <PLAY_G>."
 	line "Good evening."
 
@@ -366,7 +366,7 @@
 	line "awake."
 	done
 
-UnknownText_0x1b5510: ; 0x1b5510
+UnknownText_0x1b5510:
 	text "Are you the kind"
 	line "of person who goes"
 
@@ -383,7 +383,7 @@
 	line "#MON trainer."
 	done
 
-UnknownText_0x1b55ae: ; 0x1b55ae
+UnknownText_0x1b55ae:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -393,7 +393,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b55da: ; 0x1b55da
+UnknownText_0x1b55da:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -402,7 +402,7 @@
 	para "Oh, <PLAY_G>? Hi!"
 	done
 
-UnknownText_0x1b55fc: ; 0x1b55fc
+UnknownText_0x1b55fc:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -412,7 +412,7 @@
 	line "Good evening!"
 	done
 
-UnknownText_0x1b5628: ; 0x1b5628
+UnknownText_0x1b5628:
 	text "Oh, <PLAY_G>?"
 
 	para "Tweet! Yeah, it's"
@@ -421,7 +421,7 @@
 	text "."
 	done
 
-UnknownText_0x1b564c: ; 0x1b564c
+UnknownText_0x1b564c:
 	text "Oh, <PLAY_G>?"
 
 	para "Tweet! Yeah, it's"
@@ -430,7 +430,7 @@
 	text "."
 	done
 
-UnknownText_0x1b5670: ; 0x1b5670
+UnknownText_0x1b5670:
 	text "Oh, <PLAY_G>?"
 
 	para "Tweet! Yeah, it's"
@@ -439,7 +439,7 @@
 	text "."
 	done
 
-UnknownText_0x1b5694: ; 0x1b5694
+UnknownText_0x1b5694:
 	text "Are your #MON"
 	line "still cooking?"
 
@@ -453,7 +453,7 @@
 	cont "for a while."
 	done
 
-UnknownText_0x1b5702: ; 0x1b5702
+UnknownText_0x1b5702:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -463,7 +463,7 @@
 	line "What's up?"
 	done
 
-UnknownText_0x1b572e: ; 0x1b572e
+UnknownText_0x1b572e:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -473,7 +473,7 @@
 	line "what's up?"
 	done
 
-UnknownText_0x1b575a: ; 0x1b575a
+UnknownText_0x1b575a:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -483,7 +483,7 @@
 	line "what's up?"
 	done
 
-UnknownText_0x1b5786: ; 0x1b5786
+UnknownText_0x1b5786:
 	text "You're slow! Hurry"
 	line "up and answer!"
 
@@ -492,7 +492,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b57b7: ; 0x1b57b7
+UnknownText_0x1b57b7:
 	text "You're slow! Hurry"
 	line "up and answer!"
 
@@ -501,7 +501,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b57e8: ; 0x1b57e8
+UnknownText_0x1b57e8:
 	text "You're slow! Hurry"
 	line "up and answer!"
 
@@ -510,7 +510,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b5819: ; 0x1b5819
+UnknownText_0x1b5819:
 	text "Hey, how are your"
 	line "#MON doing?"
 
@@ -526,7 +526,7 @@
 	line "is that?"
 	done
 
-UnknownText_0x1b589a: ; 0x1b589a
+UnknownText_0x1b589a:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " here!"
@@ -535,7 +535,7 @@
 	line "doing well?"
 	done
 
-UnknownText_0x1b58c2: ; 0x1b58c2
+UnknownText_0x1b58c2:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " here!"
@@ -544,7 +544,7 @@
 	line "doing well?"
 	done
 
-UnknownText_0x1b58ea: ; 0x1b58ea
+UnknownText_0x1b58ea:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " here!"
@@ -553,7 +553,7 @@
 	line "doing well?"
 	done
 
-UnknownText_0x1b5912: ; 0x1b5912
+UnknownText_0x1b5912:
 	text "Yo, <PLAYER>!"
 	line "How're you doing?"
 
@@ -563,7 +563,7 @@
 	line "got a minute?"
 	done
 
-UnknownText_0x1b5948: ; 0x1b5948
+UnknownText_0x1b5948:
 	text "Yo, <PLAYER>! How's"
 	line "it going?"
 
@@ -573,7 +573,7 @@
 	line "Got a minute?"
 	done
 
-UnknownText_0x1b597c: ; 0x1b597c
+UnknownText_0x1b597c:
 	text "Yo, <PLAYER>!"
 	line "How're you doing?"
 
@@ -583,7 +583,7 @@
 	line "got a minute?"
 	done
 
-UnknownText_0x1b59b2: ; 0x1b59b2
+UnknownText_0x1b59b2:
 	text "How are your"
 	line "#MON doing?"
 
@@ -600,7 +600,7 @@
 	line "trainer with it!"
 	done
 
-UnknownText_0x1b5a3b: ; 0x1b5a3b
+UnknownText_0x1b5a3b:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -610,7 +610,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b5a74: ; 0x1b5a74
+UnknownText_0x1b5a74:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -619,7 +619,7 @@
 	para "Oh, hi, <PLAY_G>!"
 	done
 
-UnknownText_0x1b5a9f: ; 0x1b5a9f
+UnknownText_0x1b5a9f:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -629,7 +629,7 @@
 	line "Good evening!"
 	done
 
-UnknownText_0x1b5ad8: ; 0x1b5ad8
+UnknownText_0x1b5ad8:
 	text "<PLAY_G>, good"
 	line "morning!"
 
@@ -639,7 +639,7 @@
 	line "Isn't it nice out?"
 	done
 
-UnknownText_0x1b5b0b: ; 0x1b5b0b
+UnknownText_0x1b5b0b:
 	text "<PLAY_G>, howdy!"
 
 	para "It's me, @"
@@ -648,7 +648,7 @@
 	line "Isn't it nice out?"
 	done
 
-UnknownText_0x1b5b37: ; 0x1b5b37
+UnknownText_0x1b5b37:
 	text "Good evening,"
 	line "<PLAY_G>!"
 
@@ -658,7 +658,7 @@
 	line "Were you awake?"
 	done
 
-UnknownText_0x1b5b68: ; 0x1b5b68
+UnknownText_0x1b5b68:
 	text "How are your"
 	line "#MON doing?"
 
@@ -678,7 +678,7 @@
 	line "exhausting."
 	done
 
-UnknownText_0x1b5c10: ; 0x1b5c10
+UnknownText_0x1b5c10:
 	text "Yes? Ah, <PLAY_G>."
 
 	para "You're courteous"
@@ -688,7 +688,7 @@
 	line "call on the phone."
 	done
 
-UnknownText_0x1b5c63: ; 0x1b5c63
+UnknownText_0x1b5c63:
 	text "Yes? Ah, <PLAY_G>."
 
 	para "You're courteous"
@@ -698,7 +698,7 @@
 	line "call on the phone."
 	done
 
-UnknownText_0x1b5cb6: ; 0x1b5cb6
+UnknownText_0x1b5cb6:
 	text "Yes? Ah, <PLAY_G>."
 
 	para "You're courteous"
@@ -708,7 +708,7 @@
 	line "call on the phone."
 	done
 
-UnknownText_0x1b5d09: ; 0x1b5d09
+UnknownText_0x1b5d09:
 	text "Hiya, it's Uncle"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -715,7 +715,7 @@
 	text "."
 	done
 
-UnknownText_0x1b5d21: ; 0x1b5d21
+UnknownText_0x1b5d21:
 	text "Hiya, it's Uncle"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -722,7 +722,7 @@
 	text "."
 	done
 
-UnknownText_0x1b5d39: ; 0x1b5d39
+UnknownText_0x1b5d39:
 	text "Hiya, it's Uncle"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -729,7 +729,7 @@
 	text "."
 	done
 
-UnknownText_0x1b5d51: ; 0x1b5d51
+UnknownText_0x1b5d51:
 	text "Are you taking"
 	line "good care of your"
 
@@ -738,7 +738,7 @@
 	cont "partners!"
 	done
 
-UnknownText_0x1b5d9f: ; 0x1b5d9f
+UnknownText_0x1b5d9f:
 	text "Hello, @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -748,7 +748,7 @@
 	line "Good morning."
 	done
 
-UnknownText_0x1b5dcc: ; 0x1b5dcc
+UnknownText_0x1b5dcc:
 	text "Hello, @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -758,7 +758,7 @@
 	line "How are you?"
 	done
 
-UnknownText_0x1b5df8: ; 0x1b5df8
+UnknownText_0x1b5df8:
 	text "Hello, @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -768,7 +768,7 @@
 	line "Good evening."
 	done
 
-UnknownText_0x1b5e25: ; 0x1b5e25
+UnknownText_0x1b5e25:
 	text "Good morning,"
 	line "<PLAY_G>."
 
@@ -778,7 +778,7 @@
 	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 @@
 	line "going for you?"
 	done
 
-UnknownText_0x1b5e8e: ; 0x1b5e8e
+UnknownText_0x1b5e8e:
 	text "Good evening,"
 	line "<PLAY_G>."
 
@@ -798,7 +798,7 @@
 	line "Are you awake?"
 	done
 
-UnknownText_0x1b5ebe: ; 0x1b5ebe
+UnknownText_0x1b5ebe:
 	text "I had some time,"
 	line "so I called you."
 
@@ -820,7 +820,7 @@
 	line "the receptionist!"
 	done
 
-UnknownText_0x1b5f7a: ; 0x1b5f7a
+UnknownText_0x1b5f7a:
 	text "Yeah, @"
 	text_from_ram wStringBuffer3
 	text " the"
@@ -829,7 +829,7 @@
 	para "Ah, <PLAYER>!"
 	done
 
-UnknownText_0x1b5f9e: ; 0x1b5f9e
+UnknownText_0x1b5f9e:
 	text "Yeah, @"
 	text_from_ram wStringBuffer3
 	text " the"
@@ -839,7 +839,7 @@
 	line "right?"
 	done
 
-UnknownText_0x1b5fc9: ; 0x1b5fc9
+UnknownText_0x1b5fc9:
 	text "Yeah, @"
 	text_from_ram wStringBuffer3
 	text " the"
@@ -849,7 +849,7 @@
 	line "it?"
 	done
 
-UnknownText_0x1b5ff6: ; 0x1b5ff6
+UnknownText_0x1b5ff6:
 	text "Yo, <PLAYER>?"
 
 	para "This is @"
@@ -858,7 +858,7 @@
 	line "the HIKER!"
 	done
 
-UnknownText_0x1b6017: ; 0x1b6017
+UnknownText_0x1b6017:
 	text "Hey, is this"
 	line "<PLAYER>?"
 
@@ -868,7 +868,7 @@
 	line "the HIKER!"
 	done
 
-UnknownText_0x1b6041: ; 0x1b6041
+UnknownText_0x1b6041:
 	text "<PLAYER>, you still"
 	line "awake?"
 
@@ -878,7 +878,7 @@
 	line "the HIKER!"
 	done
 
-UnknownText_0x1b606f: ; 0x1b606f
+UnknownText_0x1b606f:
 	text "Are your #MON"
 	line "as feisty as ever?"
 
@@ -894,7 +894,7 @@
 	line "all our energy."
 	done
 
-UnknownText_0x1b60f5: ; 0x1b60f5
+UnknownText_0x1b60f5:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -903,7 +903,7 @@
 	para "Hey, <PLAY_G>!"
 	done
 
-UnknownText_0x1b611b: ; 0x1b611b
+UnknownText_0x1b611b:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -913,7 +913,7 @@
 	line "<PLAY_G>."
 	done
 
-UnknownText_0x1b6149: ; 0x1b6149
+UnknownText_0x1b6149:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -922,7 +922,7 @@
 	para "Ah, <PLAY_G>!"
 	done
 
-UnknownText_0x1b616e: ; 0x1b616e
+UnknownText_0x1b616e:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -931,7 +931,7 @@
 	para "<PLAY_G>, right?"
 	done
 
-UnknownText_0x1b618f: ; 0x1b618f
+UnknownText_0x1b618f:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -941,7 +941,7 @@
 	line "you doing?"
 	done
 
-UnknownText_0x1b61bd: ; 0x1b61bd
+UnknownText_0x1b61bd:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -951,7 +951,7 @@
 	line "call you so late."
 	done
 
-UnknownText_0x1b61f2: ; 0x1b61f2
+UnknownText_0x1b61f2:
 	text "How do you raise"
 	line "your #MON?"
 
@@ -965,7 +965,7 @@
 	line "with items."
 	done
 
-UnknownText_0x1b626a: ; 0x1b626a
+UnknownText_0x1b626a:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -975,7 +975,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b6296: ; 0x1b6296
+UnknownText_0x1b6296:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -985,7 +985,7 @@
 	line "Hi, how are you?"
 	done
 
-UnknownText_0x1b62c5: ; 0x1b62c5
+UnknownText_0x1b62c5:
 	text "Hello? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -995,7 +995,7 @@
 	line "Good evening!"
 	done
 
-UnknownText_0x1b62f1: ; 0x1b62f1
+UnknownText_0x1b62f1:
 	text "<PLAY_G>?"
 
 	para "It's @"
@@ -1004,7 +1004,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b630e: ; 0x1b630e
+UnknownText_0x1b630e:
 	text "<PLAY_G>?"
 
 	para "It's @"
@@ -1013,7 +1013,7 @@
 	line "this a bad time?"
 	done
 
-UnknownText_0x1b6331: ; 0x1b6331
+UnknownText_0x1b6331:
 	text "<PLAY_G>?"
 
 	para "It's @"
@@ -1022,7 +1022,7 @@
 	line "Got time to chat?"
 	done
 
-UnknownText_0x1b6352: ; 0x1b6352
+UnknownText_0x1b6352:
 	text "Are your #MON"
 	line "still tough?"
 
@@ -1032,7 +1032,7 @@
 	text "."
 	done
 
-UnknownText_0x1b638c: ; 0x1b638c
+UnknownText_0x1b638c:
 	text "Hello? @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -1041,7 +1041,7 @@
 	para "Hey, <PLAY_G>!"
 	done
 
-UnknownText_0x1b63a8: ; 0x1b63a8
+UnknownText_0x1b63a8:
 	text "Hello? @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -1050,7 +1050,7 @@
 	para "Wow, <PLAY_G>!"
 	done
 
-UnknownText_0x1b63c4: ; 0x1b63c4
+UnknownText_0x1b63c4:
 	text "Hello? @"
 	text_from_ram wStringBuffer3
 	text_start
@@ -1059,7 +1059,7 @@
 	para "Yippee, <PLAY_G>!"
 	done
 
-UnknownText_0x1b63e3: ; 0x1b63e3
+UnknownText_0x1b63e3:
 	text "Uh, hello."
 	line "<PLAY_G>?"
 
@@ -1069,7 +1069,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6407: ; 0x1b6407
+UnknownText_0x1b6407:
 	text "Uh, hello,"
 	line "<PLAY_G>?"
 
@@ -1079,7 +1079,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b642c: ; 0x1b642c
+UnknownText_0x1b642c:
 	text "Uh, hello,"
 	line "<PLAY_G>?"
 
@@ -1089,7 +1089,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6454: ; 0x1b6454
+UnknownText_0x1b6454:
 	text "Yeah, hello."
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -1098,7 +1098,7 @@
 	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 @@
 	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 @@
 	para "…Huh, <PLAY_G>? Yo!"
 	done
 
-UnknownText_0x1b64d2: ; 0x1b64d2
+UnknownText_0x1b64d2:
 	text "Yeah, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1126,7 +1126,7 @@
 	line "to, <PLAY_G>?"
 	done
 
-UnknownText_0x1b6506: ; 0x1b6506
+UnknownText_0x1b6506:
 	text "Yeah, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1136,7 +1136,7 @@
 	line "<PLAY_G>?"
 	done
 
-UnknownText_0x1b6539: ; 0x1b6539
+UnknownText_0x1b6539:
 	text "Yeah, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1146,13 +1146,13 @@
 	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 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b65c7: ; 0x1b65c7
+UnknownText_0x1b65c7:
 	text "Yup, it's @"
 	text_from_ram wStringBuffer3
 	text "!"
@@ -1169,7 +1169,7 @@
 	para "Is that <PLAY_G>?"
 	done
 
-UnknownText_0x1b65e3: ; 0x1b65e3
+UnknownText_0x1b65e3:
 	text "Yup, it's @"
 	text_from_ram wStringBuffer3
 	text "!"
@@ -1178,7 +1178,7 @@
 	line "Good evening!"
 	done
 
-UnknownText_0x1b660d: ; 0x1b660d
+UnknownText_0x1b660d:
 	text "Hello! It's me,"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1185,7 +1185,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6624: ; 0x1b6624
+UnknownText_0x1b6624:
 	text "Hello! It's me,"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1192,7 +1192,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b663b: ; 0x1b663b
+UnknownText_0x1b663b:
 	text "Hello! It's me,"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1199,7 +1199,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6652: ; 0x1b6652
+UnknownText_0x1b6652:
 	text "<PLAY_G>, are you"
 	line "raising your"
 	cont "#MON properly?"
@@ -1212,7 +1212,7 @@
 	cont "love and care."
 	done
 
-UnknownText_0x1b66c8: ; 0x1b66c8
+UnknownText_0x1b66c8:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " on the"
@@ -1221,7 +1221,7 @@
 	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 @@
 	line "It's <PLAY_G>!"
 	done
 
-UnknownText_0x1b6713: ; 0x1b6713
+UnknownText_0x1b6713:
 	text "Hi, @"
 	text_from_ram wStringBuffer3
 	text " on the"
@@ -1241,7 +1241,7 @@
 	line "What's up?"
 	done
 
-UnknownText_0x1b6738: ; 0x1b6738
+UnknownText_0x1b6738:
 	text "Uh, <PLAY_G>?"
 
 	para "It's me!"
@@ -1250,7 +1250,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6757: ; 0x1b6757
+UnknownText_0x1b6757:
 	text "Uh, <PLAY_G>?"
 
 	para "It's me!"
@@ -1259,7 +1259,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6776: ; 0x1b6776
+UnknownText_0x1b6776:
 	text "Uh, <PLAY_G>?"
 
 	para "It's me!"
@@ -1268,7 +1268,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b6795: ; 0x1b6795
+UnknownText_0x1b6795:
 	text "My @"
 	text_from_ram wStringBuffer4
 	text " is"
@@ -1281,7 +1281,7 @@
 	line "#MON doing?"
 	done
 
-UnknownText_0x1b67e2: ; 0x1b67e2
+UnknownText_0x1b67e2:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1291,7 +1291,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b680e: ; 0x1b680e
+UnknownText_0x1b680e:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1301,7 +1301,7 @@
 	line "day!"
 	done
 
-UnknownText_0x1b6836: ; 0x1b6836
+UnknownText_0x1b6836:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1311,7 +1311,7 @@
 	line "evening!"
 	done
 
-UnknownText_0x1b6862: ; 0x1b6862
+UnknownText_0x1b6862:
 	text "Hi, <PLAY_G>, good"
 	line "morning!"
 
@@ -1321,7 +1321,7 @@
 	line "How are you?"
 	done
 
-UnknownText_0x1b6890: ; 0x1b6890
+UnknownText_0x1b6890:
 	text "Hi, <PLAY_G>, good"
 	line "day!"
 
@@ -1331,7 +1331,7 @@
 	line "How are you?"
 	done
 
-UnknownText_0x1b68ba: ; 0x1b68ba
+UnknownText_0x1b68ba:
 	text "Hi, <PLAY_G>, good"
 	line "evening!"
 
@@ -1341,7 +1341,7 @@
 	line "How are you?"
 	done
 
-UnknownText_0x1b68e8: ; 0x1b68e8
+UnknownText_0x1b68e8:
 	text "How are your"
 	line "#MON doing?"
 
@@ -1360,7 +1360,7 @@
 	cont "be a big surprise."
 	done
 
-UnknownText_0x1b69a8: ; 0x1b69a8
+UnknownText_0x1b69a8:
 	text "Hi, <PLAY_G>?"
 
 	para "Good morning pika."
@@ -1367,7 +1367,7 @@
 	line "What's up pika?"
 	done
 
-UnknownText_0x1b69d2: ; 0x1b69d2
+UnknownText_0x1b69d2:
 	text "Hi, <PLAY_G>?"
 
 	para "Good day pika,"
@@ -1374,7 +1374,7 @@
 	line "what's up pika?"
 	done
 
-UnknownText_0x1b69f8: ; 0x1b69f8
+UnknownText_0x1b69f8:
 	text "Hi, <PLAY_G>?"
 
 	para "Good evening pika,"
@@ -1381,7 +1381,7 @@
 	line "what's up pika?"
 	done
 
-UnknownText_0x1b6a22: ; 0x1b6a22
+UnknownText_0x1b6a22:
 	text "<PLAY_G> pika, good"
 	line "morning!"
 
@@ -1391,7 +1391,7 @@
 	line "pika are you?"
 	done
 
-UnknownText_0x1b6a56: ; 0x1b6a56
+UnknownText_0x1b6a56:
 	text "<PLAY_G> pika, good"
 	line "pika day!"
 
@@ -1401,7 +1401,7 @@
 	line "pika are you?"
 	done
 
-UnknownText_0x1b6a8b: ; 0x1b6a8b
+UnknownText_0x1b6a8b:
 	text "<PLAY_G> pika, good"
 	line "evening!"
 
@@ -1411,7 +1411,7 @@
 	line "you pika awake?"
 	done
 
-UnknownText_0x1b6ac2: ; 0x1b6ac2
+UnknownText_0x1b6ac2:
 	text "You have to hear"
 	line "this! My lovable"
 
@@ -1425,7 +1425,7 @@
 	cont "together as one!"
 	done
 
-UnknownText_0x1b6b39: ; 0x1b6b39
+UnknownText_0x1b6b39:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1435,7 +1435,7 @@
 	line "<PLAY_G>."
 	done
 
-UnknownText_0x1b6b65: ; 0x1b6b65
+UnknownText_0x1b6b65:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1445,7 +1445,7 @@
 	line "<PLAY_G>, right?"
 	done
 
-UnknownText_0x1b6b92: ; 0x1b6b92
+UnknownText_0x1b6b92:
 	text "Hello, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1455,7 +1455,7 @@
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b6bb9: ; 0x1b6bb9
+UnknownText_0x1b6bb9:
 	text "Hello!"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1465,7 +1465,7 @@
 	line "weather's great!"
 	done
 
-UnknownText_0x1b6bef: ; 0x1b6bef
+UnknownText_0x1b6bef:
 	text "Hello!"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1475,7 +1475,7 @@
 	line "for fishing!"
 	done
 
-UnknownText_0x1b6c23: ; 0x1b6c23
+UnknownText_0x1b6c23:
 	text "Hello!"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1485,7 +1485,7 @@
 	line "for fishing!"
 	done
 
-UnknownText_0x1b6c56: ; 0x1b6c56
+UnknownText_0x1b6c56:
 	text "How's your trip"
 	line "coming along?"
 
@@ -1493,7 +1493,7 @@
 	line "about my fishing!"
 	done
 
-UnknownText_0x1b6c96: ; 0x1b6c96
+UnknownText_0x1b6c96:
 	text "Yes? @"
 	text_from_ram wStringBuffer3
 	text " here…"
@@ -1502,7 +1502,7 @@
 	line "can I do for you?"
 	done
 
-UnknownText_0x1b6cc6: ; 0x1b6cc6
+UnknownText_0x1b6cc6:
 	text "Yes? @"
 	text_from_ram wStringBuffer3
 	text " here…"
@@ -1511,7 +1511,7 @@
 	line "can I do for you?"
 	done
 
-UnknownText_0x1b6cf6: ; 0x1b6cf6
+UnknownText_0x1b6cf6:
 	text "Yes? @"
 	text_from_ram wStringBuffer3
 	text " here…"
@@ -1520,7 +1520,7 @@
 	line "can I do for you?"
 	done
 
-UnknownText_0x1b6d26: ; 0x1b6d26
+UnknownText_0x1b6d26:
 	text "Hiya, <PLAYER>. How"
 	line "are you doing?"
 
@@ -1530,7 +1530,7 @@
 	text "."
 	done
 
-UnknownText_0x1b6d57: ; 0x1b6d57
+UnknownText_0x1b6d57:
 	text "Hiya, <PLAYER>, how"
 	line "are you doing?"
 
@@ -1540,7 +1540,7 @@
 	text "."
 	done
 
-UnknownText_0x1b6d88: ; 0x1b6d88
+UnknownText_0x1b6d88:
 	text "Hiya, <PLAYER>, how"
 	line "are you doing?"
 
@@ -1550,7 +1550,7 @@
 	text "."
 	done
 
-UnknownText_0x1b6db9: ; 0x1b6db9
+UnknownText_0x1b6db9:
 	text "Oh yeah, I saw you"
 	line "coming out of a"
 
@@ -1573,7 +1573,7 @@
 	cont "often. Heheh!"
 	done
 
-UnknownText_0x1b6e7c: ; 0x1b6e7c
+UnknownText_0x1b6e7c:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1583,7 +1583,7 @@
 	line "Good morning."
 	done
 
-UnknownText_0x1b6ea6: ; 0x1b6ea6
+UnknownText_0x1b6ea6:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1593,7 +1593,7 @@
 	line "Hello."
 	done
 
-UnknownText_0x1b6ec9: ; 0x1b6ec9
+UnknownText_0x1b6ec9:
 	text "Yes? This is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1603,7 +1603,7 @@
 	line "evening."
 	done
 
-UnknownText_0x1b6ef3: ; 0x1b6ef3
+UnknownText_0x1b6ef3:
 	text "Is this <PLAY_G>?"
 
 	para "Good morning. This"
@@ -1612,7 +1612,7 @@
 	text "."
 	done
 
-UnknownText_0x1b6f1c: ; 0x1b6f1c
+UnknownText_0x1b6f1c:
 	text "Is this <PLAY_G>?"
 
 	para "Hi, it's @"
@@ -1620,7 +1620,7 @@
 	text "."
 	done
 
-UnknownText_0x1b6f37: ; 0x1b6f37
+UnknownText_0x1b6f37:
 	text "Is this <PLAY_G>?"
 
 	para "Good evening. This"
@@ -1629,7 +1629,7 @@
 	text "."
 	done
 
-UnknownText_0x1b6f60: ; 0x1b6f60
+UnknownText_0x1b6f60:
 	text "Are your #MON"
 	line "doing well?"
 
@@ -1652,7 +1652,7 @@
 	line "every day."
 	done
 
-UnknownText_0x1b7019: ; 0x1b7019
+UnknownText_0x1b7019:
 	text "Yes, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1664,7 +1664,7 @@
 	line "#MON?"
 	done
 
-UnknownText_0x1b7057: ; 0x1b7057
+UnknownText_0x1b7057:
 	text "Yes, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1676,7 +1676,7 @@
 	line "#MON flying?"
 	done
 
-UnknownText_0x1b7092: ; 0x1b7092
+UnknownText_0x1b7092:
 	text "Yes, hello?"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1689,7 +1689,7 @@
 	line "see some action?"
 	done
 
-UnknownText_0x1b70e7: ; 0x1b70e7
+UnknownText_0x1b70e7:
 	text "Good morning,"
 	line "<PLAY_G>!"
 
@@ -1699,7 +1699,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b7112: ; 0x1b7112
+UnknownText_0x1b7112:
 	text "Hi, <PLAY_G>!"
 
 	para "It's @"
@@ -1708,7 +1708,7 @@
 	line "Remember me?"
 	done
 
-UnknownText_0x1b7132: ; 0x1b7132
+UnknownText_0x1b7132:
 	text "Good evening,"
 	line "<PLAY_G>!"
 
@@ -1718,7 +1718,7 @@
 	line "Are you free now?"
 	done
 
-UnknownText_0x1b7161: ; 0x1b7161
+UnknownText_0x1b7161:
 	text "Are you and your"
 	line "#MON fine?"
 
@@ -1734,7 +1734,7 @@
 	line "#MON!"
 	done
 
-UnknownText_0x1b71d5: ; 0x1b71d5
+UnknownText_0x1b71d5:
 	text "Hello, you have"
 	line "reached @"
 	text_from_ram wStringBuffer3
@@ -1743,7 +1743,7 @@
 	para "Ah, <PLAY_G>."
 	done
 
-UnknownText_0x1b71fc: ; 0x1b71fc
+UnknownText_0x1b71fc:
 	text "Hello, you have"
 	line "reached @"
 	text_from_ram wStringBuffer3
@@ -1753,7 +1753,7 @@
 	line "it?"
 	done
 
-UnknownText_0x1b722a: ; 0x1b722a
+UnknownText_0x1b722a:
 	text "Hello, you have"
 	line "reached @"
 	text_from_ram wStringBuffer3
@@ -1763,7 +1763,7 @@
 	line "<PLAY_G>."
 	done
 
-UnknownText_0x1b725c: ; 0x1b725c
+UnknownText_0x1b725c:
 	text "Ah, it's @"
 	text_from_ram wStringBuffer3
 	text "…"
@@ -1772,7 +1772,7 @@
 	line "moment?"
 	done
 
-UnknownText_0x1b7283: ; 0x1b7283
+UnknownText_0x1b7283:
 	text "Ah, it's @"
 	text_from_ram wStringBuffer3
 	text "…"
@@ -1780,7 +1780,7 @@
 	para "Can you talk now?"
 	done
 
-UnknownText_0x1b72a5: ; 0x1b72a5
+UnknownText_0x1b72a5:
 	text "Ah, it's @"
 	text_from_ram wStringBuffer3
 	text "…"
@@ -1789,7 +1789,7 @@
 	line "so late."
 	done
 
-UnknownText_0x1b72d0: ; 0x1b72d0
+UnknownText_0x1b72d0:
 	text "Have your #MON"
 	line "grown any?"
 
@@ -1799,7 +1799,7 @@
 	line "grown quite a bit."
 	done
 
-UnknownText_0x1b730b: ; 0x1b730b
+UnknownText_0x1b730b:
 	text_from_ram wStringBuffer3
 	text " here…"
 
@@ -1807,7 +1807,7 @@
 	line "morning, hey?"
 	done
 
-UnknownText_0x1b7331: ; 0x1b7331
+UnknownText_0x1b7331:
 	text_from_ram wStringBuffer3
 	text " here…"
 
@@ -1815,7 +1815,7 @@
 	line "weather, hey?"
 	done
 
-UnknownText_0x1b7357: ; 0x1b7357
+UnknownText_0x1b7357:
 	text_from_ram wStringBuffer3
 	text " here…"
 
@@ -1823,7 +1823,7 @@
 	line "moonlight, hey?"
 	done
 
-UnknownText_0x1b737f: ; 0x1b737f
+UnknownText_0x1b737f:
 	text "Hey, <PLAYER>!"
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -1830,7 +1830,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b7397: ; 0x1b7397
+UnknownText_0x1b7397:
 	text "Hey, <PLAYER>!"
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -1837,7 +1837,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b73af: ; 0x1b73af
+UnknownText_0x1b73af:
 	text "Hey, <PLAYER>!"
 	line "This is @"
 	text_from_ram wStringBuffer3
@@ -1844,7 +1844,7 @@
 	text "!"
 	done
 
-UnknownText_0x1b73c7: ; 0x1b73c7
+UnknownText_0x1b73c7:
 	text "Yup, yup!"
 	line "It's @"
 	text_from_ram wStringBuffer3
@@ -1854,7 +1854,7 @@
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b73ef: ; 0x1b73ef
+UnknownText_0x1b73ef:
 	text "Yup, yup!"
 	line "It's @"
 	text_from_ram wStringBuffer3
@@ -1864,7 +1864,7 @@
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b7417: ; 0x1b7417
+UnknownText_0x1b7417:
 	text "Yup, yup!"
 	line "It's @"
 	text_from_ram wStringBuffer3
@@ -1874,7 +1874,7 @@
 	line "<PLAY_G>!"
 	done
 
-UnknownText_0x1b743f: ; 0x1b743f
+UnknownText_0x1b743f:
 	text "<PLAY_G>, it's"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1884,7 +1884,7 @@
 	line "proper breakfast?"
 	done
 
-UnknownText_0x1b746f: ; 0x1b746f
+UnknownText_0x1b746f:
 	text "<PLAY_G>, it's"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1894,7 +1894,7 @@
 	line "proper lunch?"
 	done
 
-UnknownText_0x1b749b: ; 0x1b749b
+UnknownText_0x1b749b:
 	text "<PLAY_G>, it's"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1904,7 +1904,7 @@
 	line "proper dinner?"
 	done
 
-UnknownText_0x1b74c8: ; 0x1b74c8
+UnknownText_0x1b74c8:
 	text "Are your #MON"
 	line "looking good?"
 
@@ -1917,7 +1917,7 @@
 	line "Hahahah!"
 	done
 
-UnknownText_0x1b751a: ; 0x1b751a
+UnknownText_0x1b751a:
 	text "Yes, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1927,7 +1927,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b7548: ; 0x1b7548
+UnknownText_0x1b7548:
 	text "Yes, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1937,7 +1937,7 @@
 	line "Yahoo!"
 	done
 
-UnknownText_0x1b756f: ; 0x1b756f
+UnknownText_0x1b756f:
 	text "Yes, this is"
 	line "@"
 	text_from_ram wStringBuffer3
@@ -1946,7 +1946,7 @@
 	para "Oh, hi, <PLAY_G>!"
 	done
 
-UnknownText_0x1b758f: ; 0x1b758f
+UnknownText_0x1b758f:
 	text "<PLAY_G>!"
 
 	para "It's @"
@@ -1955,7 +1955,7 @@
 	line "Good morning!"
 	done
 
-UnknownText_0x1b75ac: ; 0x1b75ac
+UnknownText_0x1b75ac:
 	text "<PLAY_G>!"
 
 	para "It's @"
@@ -1964,7 +1964,7 @@
 	line "Working hard?"
 	done
 
-UnknownText_0x1b75c9: ; 0x1b75c9
+UnknownText_0x1b75c9:
 	text "<PLAY_G>!"
 
 	para "It's @"
@@ -1973,7 +1973,7 @@
 	line "Were you up?"
 	done
 
-UnknownText_0x1b75e5: ; 0x1b75e5
+UnknownText_0x1b75e5:
 	text "Are you raising"
 	line "your #MON?"
 
@@ -1986,6 +1986,6 @@
 	cont "looking good!"
 	done
 
-UnusedPhoneText: ; 0x1b7624
+UnusedPhoneText:
 	text "Good morning."
 	done
--- a/data/player_names.asm
+++ b/data/player_names.asm
@@ -1,4 +1,4 @@
-ChrisNameMenuHeader: ; 882b5
+ChrisNameMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .MaleNames
@@ -5,11 +5,11 @@
 	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,7 +17,7 @@
 	db 2 ; displacement
 	db " NAME @" ; title
 
-KrisNameMenuHeader: ; 882e5
+KrisNameMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, TEXTBOX_Y - 1
 	dw .FemaleNames
@@ -24,11 +24,11 @@
 	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@"
--- a/data/pokemon/cries.asm
+++ b/data/pokemon/cries.asm
@@ -3,7 +3,7 @@
 	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 @@
 	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
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -3,7 +3,6 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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"
--- 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 @@
 	dw LugiaPokedexEntry
 	dw HoOhPokedexEntry
 	dw CelebiPokedexEntry
-; 0x4456e
--- 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 @@
 	db YANMA
 	db ZAPDOS
 	db ZUBAT
-; 0x40d60
--- 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 @@
 	db MEWTWO
 	db MEW
 	db CELEBI
-; 0x40e5b
--- 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 @@
 	dw NoEggMoves
 	dw NoEggMoves
 	dw NoEggMoves
-; 0x23d07
--- a/data/pokemon/egg_moves.asm
+++ b/data/pokemon/egg_moves.asm
@@ -11,11 +11,7 @@
 ; 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
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -3,11 +3,6 @@
 
 SECTION "Evolutions and Attacks", ROMX
 
-
-INCLUDE "data/pokemon/evos_attacks_pointers.asm"
-
-
-EvosAttacks::
 ; Evos+attacks data structure:
 ; - Evolution methods:
 ;    * db EVOLVE_LEVEL, level, species
@@ -20,6 +15,7 @@
 ;    * db level, move
 ; - db 0 ; no more level-up moves
 
+INCLUDE "data/pokemon/evos_attacks_pointers.asm"
 
 BulbasaurEvosAttacks:
 	db EVOLVE_LEVEL, 16, IVYSAUR
--- 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 @@
 	dw LugiaEvosAttacks
 	dw HoOhEvosAttacks
 	dw CelebiEvosAttacks
-; 0x427a7
--- a/data/pokemon/ezchat_order.asm
+++ b/data/pokemon/ezchat_order.asm
@@ -93,4 +93,3 @@
 .ro:       db VULPIX, -1
 .wa:       db JUMPLUFF, TOTODILE, MACHOP ;, -1
 .end:      db -1
-; 11d67e
--- a/data/pokemon/gen1_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 @@
 	db 100 ; DRAGONITE
 	db 154 ; MEWTWO
 	db 100 ; MEW
-; fb6ed
--- a/data/pokemon/gen1_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 @@
 	db QWILFISH
 	db WOBBUFFET
 	db WOBBUFFET
-; fba18
--- 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 @@
 	db ICON_LUGIA       ; LUGIA
 	db ICON_HO_OH       ; HO_OH
 	db ICON_HUMANSHAPE  ; CELEBI
-; 8ebbf
--- 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 @@
 ; 255 shiny
 	RGB 23, 23, 23
 	RGB 17, 17, 17
-
-; b0ce
--- a/data/pokemon/unown_words.asm
+++ b/data/pokemon/unown_words.asm
@@ -7,7 +7,7 @@
 	db -1
 ENDM
 
-UnownWords: ; fba5a
+UnownWords:
 ; entries correspond to UNOWN_* form constants
 	dw UnownWordA
 	dw UnownWordA
@@ -36,7 +36,6 @@
 	dw UnownWordX
 	dw UnownWordY
 	dw UnownWordZ
-; fba90
 
 UnownWordA: unownword "ANGRY"
 UnownWordB: unownword "BEAR"
@@ -64,4 +63,3 @@
 UnownWordX: unownword "XXXXX"
 UnownWordY: unownword "YIELD"
 UnownWordZ: unownword "ZOOM"
-; fbb32
--- /dev/null
+++ b/data/pokemon/unused_pic_banks.asm
@@ -1,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
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -6,7 +6,7 @@
 	dab \1
 ENDM
 
-PredefPointers:: ; 856b
+PredefPointers::
 	add_predef LearnMove ; $0
 	add_predef DummyPredef1
 	add_predef HealParty ; this is both a special and a predef
@@ -82,4 +82,3 @@
 	add_predef Unused_HOF_AnimateAlignedFrontpic ; $48
 	add_predef HOF_AnimateFrontpic
 	dbw -1, InexplicablyEmptyFunction ; ???
-; 864c
--- a/data/sgb_ctrl_packets.asm
+++ b/data/sgb_ctrl_packets.asm
@@ -37,7 +37,6 @@
 	db \3 ; length (1-11)
 ENDM
 
-
 ; Crystal does not support SGB, so this is unused.
 
 PalTrnPacket:  sgb_pal_trn
@@ -48,7 +47,6 @@
 
 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.
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -6,7 +6,7 @@
 	dba \1
 ENDM
 
-SpecialsPointers:: ; c029
+SpecialsPointers::
 	add_special WarpToSpawnPoint ; $0
 
 ; Communications
@@ -182,4 +182,3 @@
 	add_special InitialSetDSTFlag
 	add_special InitialClearDSTFlag
 	add_special DummySpecial_c224 ; $a8
-; c224
--- 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 @@
 	dw .Frameset_IntroUnownF
 	dw .Frameset_CelebiLeft
 	dw .Frameset_CelebiRight
-; 8d76a
 
 .Frameset_00:
 	frame SPRITE_ANIM_OAMSET_RED_WALK_1, 32
@@ -496,4 +495,3 @@
 	frame SPRITE_ANIM_OAMSET_CELEBI_1,  8, OAM_X_FLIP
 	frame SPRITE_ANIM_OAMSET_CELEBI_2,  8, OAM_X_FLIP
 	endanim
-; 8d94d
--- 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 @@
 	dsprite  0,  0, -1,  4, $51, 1
 	dsprite  0,  0,  0,  4, $52, 1
 	dsprite  0,  0,  1,  4, $53, 1
-; 8e706
--- 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 @@
 	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
--- a/data/sprites/emotes.asm
+++ b/data/sprites/emotes.asm
@@ -2,21 +2,20 @@
 ; 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
--- 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
@@ -37,7 +37,6 @@
 
 NUM_FACINGS EQU (Facings.End - Facings) / 2
 
-
 ; Tables used as a reference to transform OAM data.
 
 ; Format:
@@ -52,7 +51,6 @@
 	db  0,  8, 0, $01
 	db  8,  0, RELATIVE_ATTRIBUTES, $02
 	db  8,  8, RELATIVE_ATTRIBUTES, $03
-; 409c
 
 FacingStepDown1: ; walking down 1
 	db 4 ; #
@@ -60,7 +58,6 @@
 	db  0,  8, 0, $81
 	db  8,  0, RELATIVE_ATTRIBUTES, $82
 	db  8,  8, RELATIVE_ATTRIBUTES, $83
-; 40ad
 
 FacingStepDown3: ; walking down 2
 	db 4 ; #
@@ -68,7 +65,6 @@
 	db  0,  0, X_FLIP, $81
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $82
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $83
-; 40be
 
 FacingStepUp0:
 FacingStepUp2: ; standing up
@@ -77,7 +73,6 @@
 	db  0,  8, 0, $05
 	db  8,  0, RELATIVE_ATTRIBUTES, $06
 	db  8,  8, RELATIVE_ATTRIBUTES, $07
-; 40cf
 
 FacingStepUp1: ; walking up 1
 	db 4 ; #
@@ -85,7 +80,6 @@
 	db  0,  8, 0, $85
 	db  8,  0, RELATIVE_ATTRIBUTES, $86
 	db  8,  8, RELATIVE_ATTRIBUTES, $87
-; 40e0
 
 FacingStepUp3: ; walking up 2
 	db 4 ; #
@@ -93,7 +87,6 @@
 	db  0,  0, X_FLIP, $85
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $86
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $87
-; 40f1
 
 FacingStepLeft0:
 FacingStepLeft2: ; standing left
@@ -102,7 +95,6 @@
 	db  0,  8, 0, $09
 	db  8,  0, RELATIVE_ATTRIBUTES, $0a
 	db  8,  8, RELATIVE_ATTRIBUTES, $0b
-; 4102
 
 FacingStepRight0:
 FacingStepRight2: ; standing right
@@ -111,7 +103,6 @@
 	db  0,  0, X_FLIP, $09
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
-; 4113
 
 FacingStepLeft1:
 FacingStepLeft3: ; walking left
@@ -120,7 +111,6 @@
 	db  0,  8, 0, $89
 	db  8,  0, RELATIVE_ATTRIBUTES, $8a
 	db  8,  8, RELATIVE_ATTRIBUTES, $8b
-; 4124
 
 FacingStepRight1:
 FacingStepRight3: ; walking right
@@ -129,7 +119,6 @@
 	db  0,  0, X_FLIP, $89
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $8a
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $8b
-; 4135
 
 FacingFishDown: ; fishing down
 	db 5 ; #
@@ -138,7 +127,6 @@
 	db  8,  0, RELATIVE_ATTRIBUTES, $02
 	db  8,  8, RELATIVE_ATTRIBUTES, $03
 	db 16,  0, ABSOLUTE_TILE_ID, $fc
-; 414a
 
 FacingFishUp: ; fishing up
 	db 5 ; #
@@ -147,7 +135,6 @@
 	db  8,  0, RELATIVE_ATTRIBUTES, $06
 	db  8,  8, RELATIVE_ATTRIBUTES, $07
 	db -8,  0, ABSOLUTE_TILE_ID, $fc
-; 415f
 
 FacingFishLeft: ; fishing left
 	db 5 ; #
@@ -156,7 +143,6 @@
 	db  8,  0, RELATIVE_ATTRIBUTES, $0a
 	db  8,  8, RELATIVE_ATTRIBUTES, $0b
 	db  5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd
-; 4174
 
 FacingFishRight: ; fishing right
 	db 5 ; #
@@ -165,7 +151,6 @@
 	db  8,  8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
 	db  8,  0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
 	db  5, 16, ABSOLUTE_TILE_ID, $fd
-; 4189
 
 FacingEmote: ; emote
 	db 4 ; #
@@ -173,13 +158,11 @@
 	db  0,  8, ABSOLUTE_TILE_ID, $f9
 	db  8,  0, ABSOLUTE_TILE_ID, $fa
 	db  8,  8, ABSOLUTE_TILE_ID, $fb
-; 419a
 
 FacingShadow: ; shadow
 	db 2 ; #
 	db  0,  0, ABSOLUTE_TILE_ID, $fc
 	db  0,  8, ABSOLUTE_TILE_ID | X_FLIP, $fc
-; 41a3
 
 FacingBigDollSymmetric: ; big snorlax or lapras doll
 	db 16 ; #
@@ -199,23 +182,20 @@
 	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,7 +213,6 @@
 	db 16, 16, 0, $08
 	db 24, 24, X_FLIP, $04
 	db 24, 16, 0, $0b
-; 423f
 
 FacingBoulderDust1: ; boulder dust 1
 	db 4 ; #
@@ -241,7 +220,6 @@
 	db  0,  8, ABSOLUTE_TILE_ID, $fe
 	db  8,  0, ABSOLUTE_TILE_ID, $fe
 	db  8,  8, ABSOLUTE_TILE_ID, $fe
-; 4250
 
 FacingBoulderDust2: ; boulder dust 2
 	db 4 ; #
@@ -249,16 +227,13 @@
 	db  0,  8, ABSOLUTE_TILE_ID, $ff
 	db  8,  0, ABSOLUTE_TILE_ID, $ff
 	db  8,  8, ABSOLUTE_TILE_ID, $ff
-; 4261
 
-FacingGrass1: ; 4261
+FacingGrass1:
 	db 2 ; #
 	db  8,  0, ABSOLUTE_TILE_ID, $fe
 	db  8,  8, ABSOLUTE_TILE_ID | X_FLIP, $fe
-; 426a
 
-FacingGrass2: ; 426a
+FacingGrass2:
 	db 2 ; #
 	db  9, -1, ABSOLUTE_TILE_ID, $fe
 	db  9,  9, ABSOLUTE_TILE_ID | X_FLIP, $fe
-; 4273
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -1,4 +1,4 @@
-SpriteMovementData:: ; 4273
+SpriteMovementData::
 ; entries correspond to SPRITEMOVEDATA_* constants
 
 ; SPRITEMOVEDATA_00
@@ -304,5 +304,3 @@
 	db 0 ; flags1
 	db 0 ; flags2
 	db 0 ; palette flags
-
-; 4357
--- 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 @@
 	db GYARADOS
 	db LUGIA
 	db HO_OH
-; 144b8
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -4,7 +4,7 @@
 	db \2 tiles, BANK(\1), \3, \4
 ENDM
 
-OverworldSprites: ; 14736
+OverworldSprites:
 ; entries correspond to SPRITE_* constants
 	overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
 	overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -1,22 +1,20 @@
-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
@@ -23,90 +21,77 @@
 	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 "@"
@@ -113,9 +98,8 @@
 	text_from_ram wStringBuffer1
 	text "."
 	prompt
-; 0x80899
 
-BattleText_UserRecoveredPPUsing: ; 0x80899
+BattleText_UserRecoveredPPUsing:
 	text "<USER>"
 	line "recovered PP using"
 	cont "@"
@@ -122,77 +106,65 @@
 	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_MonsLightScreenFell: ; 0x808e7
+BattleText_MonsLightScreenFell:
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "LIGHT SCREEN fell!"
 	prompt
-; 0x80905
 
-BattleText_MonsReflectFaded: ; 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_EnemyMonFainted: ; 0x809a8
+BattleText_EnemyMonFainted:
 	text "Enemy @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "fainted!"
 	prompt
-; 0x809be
 
 GotMoneyForWinningText:
 	text "<PLAYER> got ¥@"
@@ -201,17 +173,15 @@
 	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 @@
 	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_MonFainted: ; 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_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca
+BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
@@ -271,9 +236,8 @@
 	para "Will <PLAYER>"
 	line "change #MON?"
 	done
-; 0x80af8
 
-BattleText_EnemySentOut: ; 0x80af8
+BattleText_EnemySentOut:
 	text "<ENEMY>"
 	line "sent out"
 	cont "@"
@@ -280,36 +244,32 @@
 	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 "@"
@@ -316,20 +276,17 @@
 	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 "@"
@@ -336,9 +293,8 @@
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80bde
 
-BattleText_UsersStringBuffer1Activated: ; 0x80bde
+BattleText_UsersStringBuffer1Activated:
 	text "<USER>'s"
 	line "@"
 	text_from_ram wStringBuffer1
@@ -345,54 +301,46 @@
 	text_start
 	cont "activated!"
 	prompt
-; 0x80bf3
 
-BattleText_ItemsCantBeUsedHere: ; 0x80bf3
+BattleText_ItemsCantBeUsedHere:
 	text "Items can't be"
 	line "used here."
 	prompt
-; 0x80c0d
 
-BattleText_MonIsAlreadyOut: ; 0x80c0d
+BattleText_MonIsAlreadyOut:
 	text_from_ram wBattleMonNick
 	text_start
 	line "is already out."
 	prompt
-; 0x80c22
 
-BattleText_MonCantBeRecalled: ; 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_MonHasNoMovesLeft: ; 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 @@
 	text "!@"
 	sound_dex_fanfare_50_79
 	db "@@"
-; 0x80cb9
 
-BattleText_WildMonIsEating: ; 0x80cba
+BattleText_WildMonIsEating:
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
 	line "is eating!"
 	prompt
-; 0x80cd1
 
-BattleText_WildMonIsAngry: ; 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,15 +421,13 @@
 	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 "@"
@@ -500,9 +434,8 @@
 	text_from_ram wStringBuffer1
 	text "!"
 	prompt
-; 0x80df5
 
-BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
+BattleText_UserWasReleasedFromStringBuffer1:
 	text "<USER>"
 	line "was released from"
 	cont "@"
@@ -509,54 +442,46 @@
 	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 "@"
@@ -563,29 +488,25 @@
 	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
@@ -592,57 +513,49 @@
 	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 "@"
@@ -649,112 +562,94 @@
 	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 "@"
@@ -761,16 +656,14 @@
 	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,75 +672,63 @@
 	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
@@ -854,9 +735,8 @@
 	text " won't"
 	cont "rise anymore!"
 	prompt
-; 0x8128f
 
-WontDropAnymoreText: ; 0x8128f
+WontDropAnymoreText:
 	text "<TARGET>'s"
 	line "@"
 	text_from_ram wStringBuffer2
@@ -863,97 +743,82 @@
 	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 "@"
@@ -960,21 +825,18 @@
 	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
@@ -981,15 +843,13 @@
 	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 @"
@@ -996,15 +856,13 @@
 	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 "@"
@@ -1011,80 +869,67 @@
 	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 "@"
@@ -1091,15 +936,13 @@
 	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
@@ -1106,28 +949,24 @@
 	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"
 
@@ -1134,117 +973,99 @@
 	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"
 
@@ -1251,43 +1072,36 @@
 	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
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -93,7 +93,7 @@
 	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 "@@"
 
--- a/data/text/mail_input_chars.asm
+++ b/data/text/mail_input_chars.asm
@@ -1,6 +1,6 @@
 ; 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   , ? !"
@@ -7,9 +7,8 @@
 	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   . - /"
@@ -16,4 +15,3 @@
 	db "'d 'l 'm 'r 's 't 'v & ( )"
 	db "“ ” [ ] ' : ;      "
 	db "UPPER  DEL   END   "
-; 122c1
--- a/data/text/unused_gen1_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
--- a/data/text/unused_sweet_honey.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 @@
 	line "with you."
 	done
 
-UnusedSweetHoneyBagFullText: ; 0x557d6
+UnusedSweetHoneyBagFullText:
 	text "I want to give you"
 	line "some SWEET HONEY,"
 
@@ -25,17 +25,17 @@
 	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 @@
 	line "up to?"
 	done
 
-UnusedSweetHoneyAfterText2: ; 0x558b1
+UnusedSweetHoneyAfterText2:
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -54,7 +54,7 @@
 	line "it?"
 	done
 
-UnusedSweetHoneyAfterText3: ; 0x558ea
+UnusedSweetHoneyAfterText3:
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -63,6 +63,6 @@
 	cont "be drawn to it."
 	done
 
-UnusedSweetHoneyButterfreeText: ; 0x5593f
+UnusedSweetHoneyButterfreeText:
 	text "BUTTERFREE: Freeh!"
 	done
--- 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
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -8,9 +8,9 @@
 ; Associated data:
 ; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm
 ; - The *PalMap are defined in gfx/tileset_palette_maps.asm
-; - The *Anim are defined in engine/tileset_anims.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 @@
 	tileset TilesetKabutoWordRoom
 	tileset TilesetOmanyteWordRoom
 	tileset TilesetAerodactylWordRoom
-; 4d7c1
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -1,4 +1,4 @@
-TrainerClassAttributes: ; 3959c
+TrainerClassAttributes:
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 
 ; Falkner
@@ -402,5 +402,3 @@
 	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
--- 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@"
--- a/data/trainers/dvs.asm
+++ b/data/trainers/dvs.asm
@@ -1,4 +1,4 @@
-TrainerClassDVs: ; 270d6
+TrainerClassDVs:
 ; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	;  atk,def,spd,spc
 	dn  9, 10,  7,  7 ; FALKNER
@@ -68,4 +68,3 @@
 	dn  9,  8,  8,  8 ; OFFICER
 	dn  7, 14, 10,  8 ; GRUNTF
 	dn  9,  8,  8,  8 ; MYSTICALMAN
-; 2715c
--- 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
@@ -28,7 +28,7 @@
 	db SCIENTIST
 .End
 
-FemaleTrainers: ; 4e976
+FemaleTrainers:
 	db MEDIUM
 	db LASS
 	db BEAUTY
--- 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 @@
 	db MALE   ; BLUE
 	db MALE   ; OFFICER
 	db FEMALE ; GRUNTF
-; 11f332
--- 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/officer.pal"
 INCLUDE "gfx/trainers/grunt_f.pal"
 INCLUDE "gfx/trainers/mysticalman.pal"
-; b1de
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,3 +1,5 @@
+INCLUDE "data/trainers/party_pointers.asm"
+
 Trainers:
 ; Trainer data structure:
 ; - db "NAME@", TRAINERTYPE_* constant
@@ -8,7 +10,6 @@
 ;    * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
 ; - db -1 ; end
 
-
 FalknerGroup:
 	; FALKNER (1)
 	db "FALKNER@", TRAINERTYPE_MOVES
@@ -16,7 +17,6 @@
 	db  9, PIDGEOTTO,  TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
 
-
 WhitneyGroup:
 	; WHITNEY (1)
 	db "WHITNEY@", TRAINERTYPE_MOVES
@@ -24,7 +24,6 @@
 	db 20, MILTANK,    ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 	db -1 ; end
 
-
 BugsyGroup:
 	; BUGSY (1)
 	db "BUGSY@", TRAINERTYPE_MOVES
@@ -33,7 +32,6 @@
 	db 16, SCYTHER,    QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
 
-
 MortyGroup:
 	; MORTY (1)
 	db "MORTY@", TRAINERTYPE_MOVES
@@ -43,7 +41,6 @@
 	db 23, HAUNTER,    SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 	db -1 ; end
 
-
 PryceGroup:
 	; PRYCE (1)
 	db "PRYCE@", TRAINERTYPE_MOVES
@@ -52,7 +49,6 @@
 	db 31, PILOSWINE,  ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 	db -1 ; end
 
-
 JasmineGroup:
 	; JASMINE (1)
 	db "JASMINE@", TRAINERTYPE_MOVES
@@ -61,7 +57,6 @@
 	db 35, STEELIX,    SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 	db -1 ; end
 
-
 ChuckGroup:
 	; CHUCK (1)
 	db "CHUCK@", TRAINERTYPE_MOVES
@@ -69,7 +64,6 @@
 	db 30, POLIWRATH,  HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 	db -1 ; end
 
-
 ClairGroup:
 	; CLAIR (1)
 	db "CLAIR@", TRAINERTYPE_MOVES
@@ -79,7 +73,6 @@
 	db 40, KINGDRA,    SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 	db -1 ; end
 
-
 Rival1Group:
 	; RIVAL1 (1)
 	db "?@", TRAINERTYPE_NORMAL
@@ -198,10 +191,8 @@
 	db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 
-
 PokemonProfGroup:
 
-
 WillGroup:
 	; WILL (1)
 	db "WILL@", TRAINERTYPE_MOVES
@@ -212,7 +203,6 @@
 	db 42, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db -1 ; end
 
-
 PKMNTrainerGroup:
 	; CAL (1)
 	db "CAL@", TRAINERTYPE_NORMAL
@@ -235,7 +225,6 @@
 	db 50, FERALIGATR
 	db -1 ; end
 
-
 BrunoGroup:
 	; BRUNO (1)
 	db "BRUNO@", TRAINERTYPE_MOVES
@@ -246,7 +235,6 @@
 	db 46, MACHAMP,    ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
 
-
 KarenGroup:
 	; KAREN (1)
 	db "KAREN@", TRAINERTYPE_MOVES
@@ -257,7 +245,6 @@
 	db 47, HOUNDOOM,   ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 	db -1 ; end
 
-
 KogaGroup:
 	; KOGA (1)
 	db "KOGA@", TRAINERTYPE_MOVES
@@ -268,7 +255,6 @@
 	db 44, CROBAT,     DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
 
-
 ChampionGroup:
 	; CHAMPION (1)
 	db "LANCE@", TRAINERTYPE_MOVES
@@ -280,7 +266,6 @@
 	db 50, DRAGONITE,  FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
 
-
 BrockGroup:
 	; BROCK (1)
 	db "BROCK@", TRAINERTYPE_MOVES
@@ -291,7 +276,6 @@
 	db 42, KABUTOPS,   SLASH, SURF, ENDURE, GIGA_DRAIN
 	db -1 ; end
 
-
 MistyGroup:
 	; MISTY (1)
 	db "MISTY@", TRAINERTYPE_MOVES
@@ -301,7 +285,6 @@
 	db 47, STARMIE,    SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
 
-
 LtSurgeGroup:
 	; LT_SURGE (1)
 	db "LT.SURGE@", TRAINERTYPE_MOVES
@@ -312,7 +295,6 @@
 	db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 	db -1 ; end
 
-
 ScientistGroup:
 	; SCIENTIST (1)
 	db "ROSS@", TRAINERTYPE_NORMAL
@@ -344,7 +326,6 @@
 	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 
-
 ErikaGroup:
 	; ERIKA (1)
 	db "ERIKA@", TRAINERTYPE_MOVES
@@ -354,7 +335,6 @@
 	db 46, BELLOSSOM,  SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 	db -1 ; end
 
-
 YoungsterGroup:
 	; YOUNGSTER (1)
 	db "JOEY@", TRAINERTYPE_NORMAL
@@ -434,7 +414,6 @@
 	db 37, RATICATE,   HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 
-
 SchoolboyGroup:
 	; SCHOOLBOY (1)
 	db "JACK@", TRAINERTYPE_NORMAL
@@ -591,7 +570,6 @@
 	db 38, MAGNETON,   ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 	db -1 ; end
 
-
 BirdKeeperGroup:
 	; BIRD_KEEPER (1)
 	db "ROD@", TRAINERTYPE_NORMAL
@@ -708,7 +686,6 @@
 	db 38, PIDGEOT,    SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
 
-
 LassGroup:
 	; LASS (1)
 	db "CARRIE@", TRAINERTYPE_MOVES
@@ -814,7 +791,6 @@
 	db 36, GOLDUCK,    DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
 
-
 JanineGroup:
 	; JANINE (1)
 	db "JANINE@", TRAINERTYPE_MOVES
@@ -825,7 +801,6 @@
 	db 39, VENOMOTH,   FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 	db -1 ; end
 
-
 CooltrainerMGroup:
 	; COOLTRAINERM (1)
 	db "NICK@", TRAINERTYPE_MOVES
@@ -956,7 +931,6 @@
 	db 37, DRAGONAIR,  WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
 
-
 CooltrainerFGroup:
 	; COOLTRAINERF (1)
 	db "GWEN@", TRAINERTYPE_NORMAL
@@ -1088,7 +1062,6 @@
 	db 35, SEADRA,     SWIFT, LEER, WATERFALL, TWISTER
 	db -1 ; end
 
-
 BeautyGroup:
 	; BEAUTY (1)
 	db "VICTORIA@", TRAINERTYPE_NORMAL
@@ -1184,7 +1157,6 @@
 	db 19, CORSOLA
 	db -1 ; end
 
-
 PokemaniacGroup:
 	; POKEMANIAC (1)
 	db "LARRY@", TRAINERTYPE_NORMAL
@@ -1266,7 +1238,6 @@
 	db 17, NIDOQUEEN
 	db -1 ; end
 
-
 GruntMGroup:
 	; GRUNTM (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
@@ -1458,7 +1429,6 @@
 	db 30, GOLBAT
 	db -1 ; end
 
-
 GentlemanGroup:
 	; GENTLEMAN (1)
 	db "PRESTON@", TRAINERTYPE_NORMAL
@@ -1487,7 +1457,6 @@
 	db 20, NOCTOWL
 	db -1 ; end
 
-
 SkierGroup:
 	; SKIER (1)
 	db "ROXANNE@", TRAINERTYPE_NORMAL
@@ -1499,7 +1468,6 @@
 	db 28, DEWGONG
 	db -1 ; end
 
-
 TeacherGroup:
 	; TEACHER (1)
 	db "COLETTE@", TRAINERTYPE_NORMAL
@@ -1517,7 +1485,6 @@
 	db 35, JIGGLYPUFF
 	db -1 ; end
 
-
 SabrinaGroup:
 	; SABRINA (1)
 	db "SABRINA@", TRAINERTYPE_MOVES
@@ -1526,7 +1493,6 @@
 	db 48, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db -1 ; end
 
-
 BugCatcherGroup:
 	; BUG_CATCHER (1)
 	db "DON@", TRAINERTYPE_NORMAL
@@ -1647,7 +1613,6 @@
 	db 10, PARAS
 	db -1 ; end
 
-
 FisherGroup:
 	; FISHER (1)
 	db "JUSTIN@", TRAINERTYPE_NORMAL
@@ -1811,7 +1776,6 @@
 	db 37, QWILFISH,   ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end
 
-
 SwimmerMGroup:
 	; SWIMMERM (1)
 	db "HAROLD@", TRAINERTYPE_NORMAL
@@ -1953,7 +1917,6 @@
 	db 35, SEADRA
 	db -1 ; end
 
-
 SwimmerFGroup:
 	; SWIMMERF (1)
 	db "ELAINE@", TRAINERTYPE_NORMAL
@@ -2063,7 +2026,6 @@
 	db 35, SEAKING
 	db -1 ; end
 
-
 SailorGroup:
 	; SAILOR (1)
 	db "EUGENE@", TRAINERTYPE_NORMAL
@@ -2145,7 +2107,6 @@
 	db 38, POLIWRATH,  SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 	db -1 ; end
 
-
 SuperNerdGroup:
 	; SUPER_NERD (1)
 	db "STAN@", TRAINERTYPE_NORMAL
@@ -2231,7 +2192,6 @@
 	db 19, SLOWPOKE,   CURSE, WATER_GUN, GROWL, STRENGTH
 	db -1 ; end
 
-
 Rival2Group:
 	; RIVAL2 (1)
 	db "?@", TRAINERTYPE_MOVES
@@ -2293,7 +2253,6 @@
 	db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
 	db -1 ; end
 
-
 GuitaristGroup:
 	; GUITARIST (1)
 	db "CLYDE@", TRAINERTYPE_NORMAL
@@ -2308,7 +2267,6 @@
 	db 32, MAGNEMITE
 	db -1 ; end
 
-
 HikerGroup:
 	; HIKER (1)
 	db "ANTHONY@", TRAINERTYPE_NORMAL
@@ -2454,7 +2412,6 @@
 	db 34, MACHOKE,    KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 	db -1 ; end
 
-
 BikerGroup:
 	; BIKER (1)
 	db "BENNY@", TRAINERTYPE_NORMAL
@@ -2514,7 +2471,6 @@
 	db 32, WEEZING
 	db -1 ; end
 
-
 BlaineGroup:
 	; BLAINE (1)
 	db "BLAINE@", TRAINERTYPE_MOVES
@@ -2523,7 +2479,6 @@
 	db 50, RAPIDASH,   QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 
-
 BurglarGroup:
 	; BURGLAR (1)
 	db "DUNCAN@", TRAINERTYPE_NORMAL
@@ -2546,7 +2501,6 @@
 	db 30, KOFFING
 	db -1 ; end
 
-
 FirebreatherGroup:
 	; FIREBREATHER (1)
 	db "OTIS@", TRAINERTYPE_NORMAL
@@ -2597,7 +2551,6 @@
 	db 28, KOFFING
 	db -1 ; end
 
-
 JugglerGroup:
 	; JUGGLER (1)
 	db "IRWIN@", TRAINERTYPE_NORMAL
@@ -2646,7 +2599,6 @@
 	db 30, ELECTRODE
 	db -1 ; end
 
-
 BlackbeltGroup:
 	; BLACKBELT_T (1)
 	db "KENJI@", TRAINERTYPE_NORMAL
@@ -2705,7 +2657,6 @@
 	db 34, MACHOKE
 	db -1 ; end
 
-
 ExecutiveMGroup:
 	; EXECUTIVEM (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
@@ -2736,7 +2687,6 @@
 	db 22, KOFFING
 	db -1 ; end
 
-
 PsychicGroup:
 	; PSYCHIC_T (1)
 	db "NATHAN@", TRAINERTYPE_NORMAL
@@ -2809,7 +2759,6 @@
 	db 33, HYPNO
 	db -1 ; end
 
-
 PicnickerGroup:
 	; PICNICKER (1)
 	db "LIZ@", TRAINERTYPE_NORMAL
@@ -2965,7 +2914,6 @@
 	db 43, CLEFAIRY,   METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 	db -1 ; end
 
-
 CamperGroup:
 	; CAMPER (1)
 	db "ROLAND@", TRAINERTYPE_NORMAL
@@ -3109,7 +3057,6 @@
 	db 30, TAUROS
 	db -1 ; end
 
-
 ExecutiveFGroup:
 	; EXECUTIVEF (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
@@ -3125,7 +3072,6 @@
 	db 25, MURKROW,    PECK, PURSUIT, HAZE, NO_MOVE
 	db -1 ; end
 
-
 SageGroup:
 	; SAGE (1)
 	db "CHOW@", TRAINERTYPE_NORMAL
@@ -3203,7 +3149,6 @@
 	db 32, VAPOREON
 	db -1 ; end
 
-
 MediumGroup:
 	; MEDIUM (1)
 	db "MARTHA@", TRAINERTYPE_NORMAL
@@ -3245,7 +3190,6 @@
 	db 36, SLOWBRO
 	db -1 ; end
 
-
 BoarderGroup:
 	; BOARDER (1)
 	db "RONALD@", TRAINERTYPE_NORMAL
@@ -3267,7 +3211,6 @@
 	db 24, SHELLDER
 	db -1 ; end
 
-
 PokefanMGroup:
 	; POKEFANM (1)
 	db "WILLIAM@", TRAINERTYPE_ITEM
@@ -3350,7 +3293,6 @@
 	db 35, TEDDIURSA,  BERRY
 	db -1 ; end
 
-
 KimonoGirlGroup:
 	; KIMONO_GIRL (1)
 	db "NAOKO@", TRAINERTYPE_NORMAL
@@ -3384,7 +3326,6 @@
 	db 17, JOLTEON
 	db -1 ; end
 
-
 TwinsGroup:
 	; TWINS (1)
 	db "AMY & MAY@", TRAINERTYPE_NORMAL
@@ -3446,7 +3387,6 @@
 	db 38, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 	db -1 ; end
 
-
 PokefanFGroup:
 	; POKEFANF (1)
 	db "BEVERLY@", TRAINERTYPE_ITEM
@@ -3482,7 +3422,6 @@
 	db 16, MEOWTH,     BERRY
 	db -1 ; end
 
-
 RedGroup:
 	; RED (1)
 	db "RED@", TRAINERTYPE_MOVES
@@ -3494,7 +3433,6 @@
 	db 77, BLASTOISE,  RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 	db -1 ; end
 
-
 BlueGroup:
 	; BLUE (1)
 	db "BLUE@", TRAINERTYPE_MOVES
@@ -3506,7 +3444,6 @@
 	db 58, ARCANINE,   ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 	db -1 ; end
 
-
 OfficerGroup:
 	; OFFICER (1)
 	db "KEITH@", TRAINERTYPE_NORMAL
@@ -3519,7 +3456,6 @@
 	db 14, GROWLITHE
 	db -1 ; end
 
-
 GruntFGroup:
 	; GRUNTF (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
@@ -3551,7 +3487,6 @@
 	db 18, EKANS,      WRAP, LEER, POISON_STING, BITE
 	db 18, GLOOM,      ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 	db -1 ; end
-
 
 MysticalmanGroup:
 	; MYSTICALMAN (1)
--- 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
--- 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 @@
 Steel:     db "STEEL@"
 Dragon:    db "DRAGON@"
 Dark:      db "DARK@"
-
-; 50a28
--- 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 @@
 	db " DRAGON @"
 	db "  DARK  @"
 	db " STEEL  @"
-; 41086
--- 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 @@
 	db DRAGON
 	db DARK
 	db STEEL
-; 41107
--- a/data/types/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 @@
 	db HELD_DARK_BOOST,     DARK     ; BLACKGLASSES
 	db HELD_STEEL_BOOST,    STEEL    ; METAL_COAT
 	db -1
-; 35726
--- a/data/types/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
@@ -116,4 +116,3 @@
 	db FIGHTING,  GHOST,     NO_EFFECT
 
 	db -1 ; end
-; 34cfd
--- a/data/unused_53d84.asm
+++ /dev/null
@@ -1,13 +1,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
--- 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 @@
 	db  5, SCYTHER,    13, 14
 	db  5, PINSIR,     13, 14
 	db -1, VENOMOTH,   30, 40
-; 97db3
--- a/data/wild/fish.asm
+++ b/data/wild/fish.asm
@@ -5,7 +5,7 @@
 	dbwww \1, \2, \3, \4
 ENDM
 
-FishGroups: ; 92488
+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
@@ -21,151 +21,151 @@
 	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: ; 924e3
+.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
@@ -172,41 +172,39 @@
 	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 ; 0
 	db CORSOLA,    40,  STARYU,     40 ; 1
@@ -230,4 +228,3 @@
 	db HORSEA,     40,  HORSEA,     40 ; 19
 	db TENTACOOL,  20,  TENTACOOL,  20 ; 20
 	db TENTACOOL,  40,  TENTACOOL,  40 ; 21
-; 926c7
--- 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 @@
 	db HERACROSS
 	db -1
 
-OftenFleeMons: ; 3c5a8
+OftenFleeMons:
 	db CUBONE
 	db ARTICUNO
 	db ZAPDOS
@@ -28,8 +28,7 @@
 	db TEDDIURSA
 	db -1
 
-AlwaysFleeMons: ; 3c5b1
+AlwaysFleeMons:
 	db RAIKOU
 	db ENTEI
 	db -1
-; 3c5b4
--- a/data/wild/johto_grass.asm
+++ b/data/wild/johto_grass.asm
@@ -1,6 +1,6 @@
 ; Johto Pokémon in grass
 
-JohtoGrassWildMons: ; 0x2a5e9
+JohtoGrassWildMons:
 
 	map_id SPROUT_TOWER_2F
 	db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
--- a/data/wild/johto_water.asm
+++ b/data/wild/johto_water.asm
@@ -1,6 +1,6 @@
 ; Johto Pokémon in water
 
-JohtoWaterWildMons: ; 0x2b11d
+JohtoWaterWildMons:
 
 	map_id RUINS_OF_ALPH_OUTSIDE
 	db 2 percent ; encounter rate
--- a/data/wild/kanto_grass.asm
+++ b/data/wild/kanto_grass.asm
@@ -1,6 +1,6 @@
 ; Kanto Pokémon in grass
 
-KantoGrassWildMons: ; 0x2b274
+KantoGrassWildMons:
 
 	map_id DIGLETTS_CAVE
 	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
--- a/data/wild/kanto_water.asm
+++ b/data/wild/kanto_water.asm
@@ -1,6 +1,6 @@
 ; Kanto Pokémon in water
 
-KantoWaterWildMons: ; 0x2b7f7
+KantoWaterWildMons:
 
 	map_id TOHJO_FALLS
 	db 4 percent ; encounter rate
--- a/data/wild/probabilities.asm
+++ b/data/wild/probabilities.asm
@@ -3,7 +3,7 @@
 	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 @@
 	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
--- a/data/wild/roammon_maps.asm
+++ b/data/wild/roammon_maps.asm
@@ -11,7 +11,7 @@
 	db 0
 ENDM
 
-RoamMaps: ; 2a40f
+RoamMaps:
 ; there are NUM_ROAMMON_MAPS entries
 	; start map, ...other maps
 	roam_map ROUTE_29, ROUTE_30, ROUTE_46
@@ -31,4 +31,3 @@
 	roam_map ROUTE_45, ROUTE_44, ROUTE_46
 	roam_map ROUTE_46, ROUTE_45, ROUTE_29
 	db -1 ; end
-; 2a4a0
--- a/data/wild/swarm_grass.asm
+++ b/data/wild/swarm_grass.asm
@@ -1,6 +1,6 @@
 ; Pokémon swarms in grass
 
-SwarmGrassWildMons: ; 0x2b8d0
+SwarmGrassWildMons:
 
 ; Dunsparce swarm
 	map_id DARK_CAVE_VIOLET_ENTRANCE
--- 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
 
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -3,7 +3,7 @@
 	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
@@ -39,12 +39,10 @@
 	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
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -1,4 +1,4 @@
-TreeMons: ; b82e8
+TreeMons:
 ; entries correspond to TREEMON_SET_* constants
 	dw TreeMonSet_City
 	dw TreeMonSet_Canyon
@@ -15,7 +15,7 @@
 ;	db  %, species, level
 
 TreeMonSet_City:
-TreeMonSet_Canyon: ; b82fa
+TreeMonSet_Canyon:
 ; common
 	db 50, SPEAROW,    10
 	db 15, SPEAROW,    10
@@ -33,7 +33,7 @@
 	db  5, AIPOM,      10
 	db -1
 
-TreeMonSet_Town: ; b8320
+TreeMonSet_Town:
 ; common
 	db 50, SPEAROW,    10
 	db 15, EKANS,      10
@@ -51,7 +51,7 @@
 	db  5, AIPOM,      10
 	db -1
 
-TreeMonSet_Route: ; b8346
+TreeMonSet_Route:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, SPINARAK,   10
@@ -69,7 +69,7 @@
 	db  5, EXEGGCUTE,  10
 	db -1
 
-TreeMonSet_Kanto: ; b836c
+TreeMonSet_Kanto:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, EKANS,      10
@@ -87,7 +87,7 @@
 	db  5, EXEGGCUTE,  10
 	db -1
 
-TreeMonSet_Lake: ; b8392
+TreeMonSet_Lake:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, VENONAT,    10
@@ -105,7 +105,7 @@
 	db  5, EXEGGCUTE,  10
 	db -1
 
-TreeMonSet_Forest: ; b83b8
+TreeMonSet_Forest:
 ; common
 	db 50, HOOTHOOT,   10
 	db 15, PINECO,     10
@@ -123,8 +123,7 @@
 	db  5, KAKUNA,     10
 	db -1
 
-TreeMonSet_Rock: ; b83de
+TreeMonSet_Rock:
 	db 90, KRABBY,     15
 	db 10, SHUCKLE,    15
 	db -1
-; b83e5
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -49,7 +49,7 @@
 - [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)
@@ -162,7 +162,7 @@
 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.
@@ -180,7 +180,7 @@
 **Fix:**
 
 ```asm
-BattleCommand_BellyDrum: ; 37c1a
+BattleCommand_BellyDrum:
 ; bellydrum
 	callfar GetHalfMaxHP
 	callfar CheckUserHasEnoughHP
@@ -293,7 +293,7 @@
 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
@@ -390,7 +390,7 @@
 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: ; 355b5
+BattleCommand_BeatUpFailText:
 ; beatupfailtext
 
 	ld a, [wBeatUpHitAtLeastOnce]
@@ -403,7 +403,7 @@
 **Fix:**
 
 ```diff
-BattleCommand_BeatUpFailText: ; 355b5
+BattleCommand_BeatUpFailText:
 ; beatupfailtext
 
 	ld a, [wBeatUpHitAtLeastOnce]
@@ -428,7 +428,7 @@
 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]
@@ -451,7 +451,7 @@
 **Fix:**
 
 ```asm
-BattleCommand_Present: ; 37874
+BattleCommand_Present:
 ; present
 
 	push bc
@@ -484,13 +484,13 @@
 In [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
-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,
@@ -515,7 +515,7 @@
 This is a bug with `AI_HealStatus` in [engine/battle/ai/items.asm](/engine/battle/ai/items.asm):
 
 ```asm
-AI_HealStatus: ; 384e0
+AI_HealStatus:
 	ld a, [wCurOTMon]
 	ld hl, wOTPartyMon1Status
 	ld bc, PARTYMON_STRUCT_LENGTH
@@ -530,7 +530,6 @@
 	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
-; 384f7
 ```
 
 **Fix:** Uncomment `ld hl, wEnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`.
@@ -600,7 +599,7 @@
 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, [wBaseGrowthRate]
 	add a
@@ -614,7 +613,7 @@
 **Fix:**
 
 ```diff
-CalcExpAtLevel: ; 50e47
+CalcExpAtLevel:
 ; (a/b)*n**3 + c*n**2 + d*n - e
 +	ld a, d
 +	cp 1
@@ -712,7 +711,7 @@
 ; 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
@@ -821,7 +820,7 @@
 
 INCLUDE "data/events/happiness_probabilities.asm"
 
-CopyPokemonName_Buffer1_Buffer3: ; 746e
+CopyPokemonName_Buffer1_Buffer3:
 	ld hl, wStringBuffer1
 	ld de, wStringBuffer3
 	ld bc, MON_NAME_LENGTH
@@ -831,7 +830,7 @@
 In [data/events/happiness_probabilities.asm](/data/events/happiness_probabilities.asm):
 
 ```asm
-HappinessData_DaisysGrooming: ; 746b
+HappinessData_DaisysGrooming:
 	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
 ```
 
@@ -838,7 +837,7 @@
 **Fix:**
 
 ```diff
-HappinessData_DaisysGrooming: ; 746b
+HappinessData_DaisysGrooming:
 -	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance
 +	db $80, 2, HAPPINESS_GROOMING ; 50% chance
 +	db $ff, 2, HAPPINESS_GROOMING ; 50% chance
@@ -917,7 +916,7 @@
 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
@@ -927,7 +926,6 @@
 	ld a, c
 	cp e
 	ret
-; fbca1
 ```
 
 **Fix:** Delete `ret nc`.
@@ -940,7 +938,7 @@
 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: wBattleMonLevel and wEnemyMonLevel are not set at this point, so whatever
@@ -967,15 +965,13 @@
 	ld a, [hl]
 	ld [wJumptableIndex], a
 	ret
-; 8c38f (23:438f)
 
-.StartingPoints: ; 8c38f
+.StartingPoints:
 ; entries correspond to TRANS_* constants
 	db BATTLETRANSITION_CAVE
 	db BATTLETRANSITION_CAVE_STRONGER
 	db BATTLETRANSITION_NO_CAVE
 	db BATTLETRANSITION_NO_CAVE_STRONGER
-; 8c393
 ```
 
 *To do:* Fix this bug.
@@ -1114,7 +1110,7 @@
 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
@@ -1127,7 +1123,7 @@
 **Workaround:**
 
 ```asm
-.Cry: ; 40340
+.Cry:
 	ld a, [wCurPartySpecies]
 	call PlayMonCry
 	ret
@@ -1380,12 +1376,12 @@
 **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/pokemon/party_menu.asm](/engine/pokemon/party_menu.asm):
 
 ```asm
-.DetermineCompatibility: ; 50268
+.DetermineCompatibility:
 	ld de, wStringBuffer1
 	ld a, BANK(EvosAttacksPointers)
 	ld bc, 2
@@ -1395,7 +1391,7 @@
 	ld h, [hl]
 	ld l, a
 	ld de, wStringBuffer1
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	ld bc, 10
 	call FarCopyBytes
 ```
@@ -1481,7 +1477,7 @@
 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.
 
@@ -1507,7 +1503,6 @@
 	; pop bc
 	ld a, l
 	ret
-; 1431e
 ```
 
 **Fix:** Uncomment `push bc` and `pop bc`.
@@ -1518,7 +1513,7 @@
 In [engine/overworld/wildmons.asm](/engine/overworld/wildmons.asm):
 
 ```asm
-ChooseWildEncounter: ; 2a14f
+ChooseWildEncounter:
 ...
 	ld a, b
 	ld [wCurPartyLevel], a
@@ -1533,7 +1528,7 @@
 
 ...
 
-ValidateTempWildMonSpecies: ; 2a4a0
+ValidateTempWildMonSpecies:
 ; Due to a development oversight, this function is called with the wild Pokemon's level, not its species, in a.
 ```
 
@@ -1585,7 +1580,7 @@
 In [engine/events/bug_contest/contest_2.asm](/engine/events/bug_contest/contest_2.asm):
 
 ```asm
-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,
@@ -1602,7 +1597,6 @@
 	ld b, CHECK_FLAG
 	call EventFlagAction
 	ret
-; 139fe
 
 INCLUDE "data/events/bug_contest_flags.asm"
 ```
@@ -1615,7 +1609,7 @@
 In [home/init.asm](/home/init.asm):
 
 ```asm
-ClearWRAM:: ; 25a
+ClearWRAM::
 ; Wipe swappable WRAM banks (1-7)
 ; Assumes CGB or AGB
 
@@ -1632,7 +1626,6 @@
 	cp 8
 	jr nc, .bank_loop ; Should be jr c
 	ret
-; 270
 ```
 
 **Fix:** Change `jr nc, .bank_loop` to `jr c, .bank_loop`.
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -28,7 +28,7 @@
 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
@@ -46,7 +46,7 @@
 	pop hl
 	ret
 
-.PicsBanks: ; 511d4
+.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
@@ -84,6 +84,7 @@
 ; 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"
@@ -315,7 +316,7 @@
 `GetTMHMNumber` and `GetNumberedTMHM` in [engine/items/items.asm](/engine/items/items.asm) have to compensate for this:
 
 ```asm
-GetTMHMNumber:: ; d407
+GetTMHMNumber::
 ; Return the number of a TM/HM by item id c.
 	ld a, c
 ; Skip any dummy items.
@@ -332,7 +333,7 @@
 	ld c, a
 	ret
 
-GetNumberedTMHM: ; d417
+GetNumberedTMHM:
 ; Return the item id of a TM/HM by number c.
 	ld a, c
 ; Skip any gaps.
@@ -358,7 +359,7 @@
 Modify engine/items/items.asm:
 
 ```diff
-GetTMHMNumber:: ; d407
+GetTMHMNumber::
 ; Return the number of a TM/HM by item id c.
 	ld a, c
 -; Skip any dummy items.
@@ -375,7 +376,7 @@
 	ld c, a
 	ret
 
-GetNumberedTMHM: ; d417
+GetNumberedTMHM:
 ; Return the item id of a TM/HM by number c.
 	ld a, c
 -; Skip any gaps.
@@ -402,7 +403,7 @@
 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
@@ -429,10 +430,10 @@
 	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")
 ```
 
 `GetPokedexEntryBank` in [engine/items/item_effects.asm](/engine/items/item_effects.asm):
@@ -455,10 +456,10 @@
 	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")
 ```
 
 And `PokedexShow_GetDexEntryBank` in [engine/pokegear/radio.asm](/engine/pokegear/radio.asm):
@@ -482,10 +483,10 @@
 	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")
 ```
 
 **Fix:** Use `dba` instead of `dw` in `PokedexDataPointerTable`, and modify the code that accesses it to match.
@@ -496,7 +497,7 @@
 `_Sine` in [engine/math/sine.asm](/engine/math/sine.asm):
 
 ```asm
-_Sine:: ; 84d9
+_Sine::
 ; a = d * sin(e * pi/32)
 	ld a, e
 	calc_sine_wave
@@ -505,11 +506,11 @@
 `Sprites_Cosine` and `Sprites_Sine` in [engine/gfx/sprites.asm](/engine/gfx/sprites.asm):
 
 ```asm
-Sprites_Cosine: ; 8e72a
+Sprites_Cosine:
 ; a = d * cos(a * pi/32)
 	add %010000 ; cos(x) = sin(x + pi/2)
 	; fallthrough
-Sprites_Sine: ; 8e72c
+Sprites_Sine:
 ; a = d * sin(a * pi/32)
 	calc_sine_wave
 ```
@@ -517,37 +518,34 @@
 `BattleAnim_Cosine` and `BattleAnim_Sine` in [engine/battle_anims/functions.asm](/engine/battle_anims/functions.asm):
 
 ```asm
-BattleAnim_Cosine: ; ce732 (33:6732)
+BattleAnim_Cosine:
 ; a = d * cos(a * pi/32)
 	add %010000 ; cos(x) = sin(x + pi/2)
 	; fallthrough
-BattleAnim_Sine: ; ce734 (33:6734)
+BattleAnim_Sine:
 ; a = d * sin(a * pi/32)
 	calc_sine_wave BattleAnimSineWave
 
 ...
 
-BattleAnimSineWave: ; ce77f
+BattleAnimSineWave:
 	sine_table 32
-; ce7bf
 ```
 
 `StartTrainerBattle_DrawSineWave` in [engine/battle/battle_transition.asm](/engine/battle/battle_transition.asm):
 
 ```asm
-StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
+StartTrainerBattle_DrawSineWave:
 	calc_sine_wave
-; 8c768
 ```
 
 And `CelebiEvent_Cosine` in [engine/events/celebi.asm](/engine/events/celebi.asm):
 
 ```asm
-CelebiEvent_Cosine: ; 49b3b (12:5b3b)
+CelebiEvent_Cosine:
 ; a = d * cos(a * pi/32)
 	add %010000 ; cos(x) = sin(x + pi/2)
 	calc_sine_wave
-; 49bae
 ```
 
 They all rely on `calc_sine_wave` in [macros/code.asm](/macros/code.asm):
@@ -622,7 +620,7 @@
 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
@@ -645,16 +643,14 @@
 .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
 ```
--- a/docs/menu.md
+++ b/docs/menu.md
@@ -54,8 +54,8 @@
 
 ```
 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
@@ -90,7 +90,7 @@
 ...
 ```
 
-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`
 
@@ -208,7 +208,7 @@
 
 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
 ```
 
--- 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 @@
 	jp nz, SwitchSometimes
 	; fallthrough
 
-DontSwitch: ; 38041
+DontSwitch:
 	call AI_TryItem
 	ret
-; 38045
 
-SwitchOften: ; 38045
+SwitchOften:
 	callfar CheckAbleToSwitch
 	ld a, [wEnemySwitchMonParam]
 	and $f0
@@ -77,9 +76,8 @@
 	; 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
@@ -112,9 +110,8 @@
 	inc a
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
-; 380c1
 
-SwitchSometimes: ; 380c1
+SwitchSometimes:
 	callfar CheckAbleToSwitch
 	ld a, [wEnemySwitchMonParam]
 	and $f0
@@ -147,17 +144,13 @@
 	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 @@
 	scf
 	ret
 
-
-.IsHighestLevel: ; 38170
+.IsHighestLevel:
 	ld a, [wOTPartyCount]
 	ld d, a
 	ld e, 0
@@ -274,10 +266,8 @@
 .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 @@
 	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
@@ -332,9 +320,8 @@
 	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 @@
 .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
@@ -370,7 +356,7 @@
 	jp c, .UseHealItem
 	jp .DontUse
 
-.CheckQuarterHP: ; 38254 (e:4254)
+.CheckQuarterHP:
 	callfar AICheckEnemyQuarterHP
 	jp c, .DontUse
 	call Random
@@ -378,7 +364,7 @@
 	jp c, .DontUse
 	jr .UseHealItem
 
-.CheckHalfOrQuarterHP: ; 38267 (e:4267)
+.CheckHalfOrQuarterHP:
 	callfar AICheckEnemyHalfHP
 	jp c, .DontUse
 	callfar AICheckEnemyQuarterHP
@@ -387,33 +373,29 @@
 	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
@@ -457,58 +439,50 @@
 	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
@@ -542,8 +516,7 @@
 	and a
 	ret
 
-
-AIUpdateHUD: ; 38387
+AIUpdateHUD:
 	call UpdateEnemyMonInParty
 	farcall UpdateEnemyHUD
 	ld a, $1
@@ -552,29 +525,26 @@
 	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 @@
 	xor a
 	ld [wEnemyConfuseCount], a
 
-FullRestoreContinue: ; 383c6
+FullRestoreContinue:
 	ld de, wCurHPAnimOldHP
 	ld hl, wEnemyMonHP + 1
 	ld a, [hld]
@@ -603,23 +573,22 @@
 	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 @@
 	ld [hl], a
 	ld [wCurHPAnimNewHP + 1], a
 
-EnemyPotionFinish: ; 38436
+EnemyPotionFinish:
 	call PrintText_UsedItemOn
 	hlcoord 2, 2
 	xor a
@@ -667,8 +636,7 @@
 	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 @@
 	jp nc, AI_Switch
 	and a
 	ret
-; 3846c
 
-AI_Switch: ; 3846c
+AI_Switch:
 	ld a, $1
 	ld [wEnemyIsSwitching], a
 	ld [wEnemyGoesFirst], a
@@ -739,12 +706,10 @@
 	ret nz
 	scf
 	ret
-; 384d0
 
-TextJump_EnemyWithdrew: ; 384d0
+TextJump_EnemyWithdrew:
 	text_jump Text_EnemyWithdrew
 	db "@"
-; 384d5
 
 Function384d5: ; This appears to be unused
 	call AIUsedItemSound
@@ -751,9 +716,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call CopyBytes
 	ld hl, TextJump_EnemyUsedOn
 	jp PrintText
-; 3858c
 
-TextJump_EnemyUsedOn: ; 3858c
+TextJump_EnemyUsedOn:
 	text_jump Text_EnemyUsedOn
 	db "@"
-; 38591
--- 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 @@
 	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 @@
 	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,8 @@
 	ld a, c
 	ld [wCurEnemyMoveNum], a
 	ret
-; 441af
 
-
-AIScoringPointers: ; 441af
+AIScoringPointers:
 ; entries correspond to AI_* constants
 	dw AI_Basic
 	dw AI_Setup
@@ -219,4 +215,3 @@
 	dw AI_None
 	dw AI_None
 	dw AI_None
-; 441cf
--- 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 @@
 	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 @@
 	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 @@
 	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,28 +119,28 @@
 	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]
@@ -147,35 +147,35 @@
 	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 @@
 .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
--- 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
@@ -61,13 +61,11 @@
 .discourage
 	call AIDiscourageMove
 	jr .checkmove
-; 385db
 
 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.
@@ -140,11 +138,9 @@
 	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
@@ -232,11 +228,9 @@
 .immune
 	call AIDiscourageMove
 	jr .checkmove
-; 386a2
 
 
-
-AI_Offensive: ; 386a2
+AI_Offensive:
 ; Greatly discourage non-damaging moves.
 
 	ld hl, wBuffer1 - 1
@@ -261,11 +255,9 @@
 	inc [hl]
 	inc [hl]
 	jr .checkmove
-; 386be
 
 
-
-AI_Smart: ; 386be
+AI_Smart:
 ; Context-specific scoring.
 
 	ld hl, wBuffer1
@@ -395,10 +387,8 @@
 	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.
 
@@ -416,10 +406,8 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 387f7
 
-
-AI_Smart_LeechHit: ; 387f7
+AI_Smart_LeechHit:
 	push hl
 	ld a, 1
 	ld [hBattleTurn], a
@@ -452,10 +440,8 @@
 
 	inc [hl]
 	ret
-; 3881d
 
-
-AI_Smart_LockOn: ; 3881d
+AI_Smart_LockOn:
 	ld a, [wPlayerSubStatus5]
 	bit SUBSTATUS_LOCK_ON, a
 	jr nz, .asm_38882
@@ -558,10 +544,8 @@
 .asm_388a2
 	pop hl
 	jp AIDiscourageMove
-; 388a6
 
-
-AI_Smart_Selfdestruct: ; 388a6
+AI_Smart_Selfdestruct:
 ; Selfdestruct, Explosion
 
 ; Unless this is the enemy's last Pokemon...
@@ -596,10 +580,8 @@
 	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.
@@ -610,11 +592,8 @@
 	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
@@ -698,7 +677,6 @@
 	bit SUBSTATUS_ROLLOUT, a
 	jr nz, .asm_388ef
 
-
 .asm_38936
 	inc [hl]
 	ret
@@ -723,10 +701,8 @@
 
 	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
@@ -746,11 +722,8 @@
 	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
@@ -790,11 +763,8 @@
 
 	dec [hl]
 	ret
-; 38985
 
-
-AI_Smart_AccuracyDown: ; 38985
-
+AI_Smart_AccuracyDown:
 ; If player's HP is full...
 	call AICheckPlayerMaxHP
 	jr nc, .asm_389a0
@@ -897,11 +867,8 @@
 
 	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
@@ -940,10 +907,8 @@
 	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
@@ -953,10 +918,8 @@
 	ret c
 	inc [hl]
 	ret
-; 38a2a
 
-
-AI_Smart_ForceSwitch: ; 38a2a
+AI_Smart_ForceSwitch:
 ; Whirlwind, Roar.
 
 ; Discourage this move if the player has not shown
@@ -971,13 +934,11 @@
 	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.
@@ -996,11 +957,9 @@
 	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
@@ -1007,11 +966,9 @@
 	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
@@ -1021,10 +978,8 @@
 	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%.
 
@@ -1037,10 +992,8 @@
 	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.
@@ -1078,11 +1031,9 @@
 	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
@@ -1133,11 +1084,8 @@
 	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
@@ -1152,11 +1100,8 @@
 	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
@@ -1188,10 +1133,8 @@
 .asm_38b10
 	inc [hl]
 	ret
-; 38b12
 
-
-AI_Smart_Fly: ; 38b12
+AI_Smart_Fly:
 ; Fly, Dig
 
 ; Greatly encourage this move if the player is
@@ -1208,10 +1151,8 @@
 	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
@@ -1218,11 +1159,8 @@
 	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
@@ -1244,10 +1182,8 @@
 	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:
@@ -1271,19 +1207,15 @@
 	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
 
@@ -1305,10 +1237,8 @@
 	ret c
 	inc [hl]
 	ret
-; 38b7f
 
-
-AI_Smart_Rage: ; 38b7f
+AI_Smart_Rage:
 	ld a, [wEnemySubStatus4]
 	bit SUBSTATUS_RAGE, a
 	jr z, .asm_38b9b
@@ -1345,10 +1275,8 @@
 .asm_38ba6
 	inc [hl]
 	ret
-; 38ba8
 
-
-AI_Smart_Mimic: ; 38ba8
+AI_Smart_Mimic:
 	ld a, [wLastPlayerCounterMove]
 	and a
 	jr z, .asm_38be9
@@ -1396,10 +1324,8 @@
 .asm_38bef
 	inc [hl]
 	ret
-; 38bf1
 
-
-AI_Smart_Counter: ; 38bf1
+AI_Smart_Counter:
 	push hl
 	ld hl, wPlayerUsedMoves
 	ld c, 4
@@ -1448,7 +1374,6 @@
 	cp SPECIAL
 	jr nc, .asm_38c38
 
-
 .asm_38c30
 	call Random
 	cp 39 percent + 1
@@ -1462,10 +1387,8 @@
 .asm_38c39
 	inc [hl]
 	ret
-; 38c3b
 
-
-AI_Smart_Encore: ; 38c3b
+AI_Smart_Encore:
 	call AICompareSpeed
 	jr nc, .asm_38c81
 
@@ -1518,8 +1441,7 @@
 
 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
@@ -1538,11 +1460,9 @@
 	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.
 
@@ -1561,10 +1481,8 @@
 	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.
 
@@ -1575,10 +1493,8 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 38cd5
 
-
-AI_Smart_Spite: ; 38cd5
+AI_Smart_Spite:
 	ld a, [wLastPlayerCounterMove]
 	and a
 	jr nz, .asm_38ce7
@@ -1633,17 +1549,13 @@
 	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
@@ -1650,10 +1562,8 @@
 	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.
@@ -1709,10 +1619,8 @@
 	ret nz
 	jp AIDiscourageMove
 
-; 38d5a
 
-
-AI_Smart_PriorityHit: ; 38d5a
+AI_Smart_PriorityHit:
 	call AICompareSpeed
 	ret c
 
@@ -1742,10 +1650,8 @@
 	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]
@@ -1752,10 +1658,8 @@
 	add $1e
 	ld [hl], a
 	ret
-; 38d98
 
-
-AI_Smart_Conversion2: ; 38d98
+AI_Smart_Conversion2:
 	ld a, [wLastPlayerMove]
 	and a
 	jr nz, .asm_38dc9
@@ -1793,10 +1697,8 @@
 	ret c
 	inc [hl]
 	ret
-; 38dd1
 
-
-AI_Smart_Disable: ; 38dd1
+AI_Smart_Disable:
 	call AICompareSpeed
 	jr nc, .asm_38df3
 
@@ -1826,10 +1728,8 @@
 	ret c
 	inc [hl]
 	ret
-; 38dfb
 
-
-AI_Smart_MeanLook: ; 38dfb
+AI_Smart_MeanLook:
 	call AICheckEnemyHalfHP
 	jr nc, .asm_38e24
 
@@ -1869,10 +1769,8 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 38e2e
 
-
-AICheckLastPlayerMon: ; 38e2e
+AICheckLastPlayerMon:
 	ld a, [wPartyCount]
 	ld b, a
 	ld c, 0
@@ -1896,10 +1794,8 @@
 	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.
@@ -1908,10 +1804,8 @@
 	ret c
 	dec [hl]
 	ret
-; 38e50
 
-
-AI_Smart_FlameWheel: ; 38e50
+AI_Smart_FlameWheel:
 ; Use this move if the enemy is frozen.
 
 	ld a, [wEnemyMonStatus]
@@ -1921,10 +1815,8 @@
 	dec [hl]
 endr
 	ret
-; 38e5c
 
-
-AI_Smart_Curse: ; 38e5c
+AI_Smart_Curse:
 	ld a, [wEnemyMonType1]
 	cp GHOST
 	jr z, .ghostcurse
@@ -1981,7 +1873,6 @@
 
 	jr .asm_38eb7
 
-
 .asm_38eb0
 	push hl
 	call AICheckLastPlayerMon
@@ -1988,7 +1879,6 @@
 	pop hl
 	jr z, .asm_38ecb
 
-
 .asm_38eb7
 	call AICheckEnemyQuarterHP
 	jp nc, .asm_38e90
@@ -2010,10 +1900,8 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 38ed2
 
-
-AI_Smart_Protect: ; 38ed2
+AI_Smart_Protect:
 	ld a, [wEnemyProtectCount]
 	and a
 	jr nz, .asm_38f13
@@ -2063,10 +1951,8 @@
 	inc [hl]
 	inc [hl]
 	ret
-; 38f1d
 
-
-AI_Smart_Foresight: ; 38f1d
+AI_Smart_Foresight:
 	ld a, [wEnemyAccLevel]
 	cp $5
 	jr c, .asm_38f41
@@ -2094,10 +1980,8 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 38f4a
 
-
-AI_Smart_PerishSong: ; 38f4a
+AI_Smart_PerishSong:
 	push hl
 	callfar FindAliveEnemyMons
 	pop hl
@@ -2132,11 +2016,8 @@
 	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
@@ -2177,10 +2058,8 @@
 	db GROUND
 	db STEEL
 	db -1 ; end
-; 38fac
 
-
-AI_Smart_Endure: ; 38fac
+AI_Smart_Endure:
 	ld a, [wEnemyProtectCount]
 	and a
 	jr nz, .asm_38fd8
@@ -2221,10 +2100,8 @@
 .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]
@@ -2246,10 +2123,8 @@
 .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.
@@ -2290,11 +2165,9 @@
 	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.
 
@@ -2313,10 +2186,8 @@
 	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
@@ -2325,12 +2196,9 @@
 	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
@@ -2358,10 +2226,8 @@
 
 	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.
 
@@ -2373,10 +2239,8 @@
 	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.
 
@@ -2393,10 +2257,8 @@
 	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.
 
@@ -2419,10 +2281,8 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 3909e
 
-
-AI_Smart_HiddenPower: ; 3909e
+AI_Smart_HiddenPower:
 	push hl
 	ld a, 1
 	ld [hBattleTurn], a
@@ -2459,11 +2319,8 @@
 .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]
@@ -2481,13 +2338,10 @@
 	push hl
 	ld hl, RainDanceMoves
 	jr AI_Smart_WeatherMove
-; 390e7
 
 INCLUDE "data/battle/ai/rain_dance_moves.asm"
 
-
-AI_Smart_SunnyDay: ; 390f3
-
+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]
@@ -2506,10 +2360,8 @@
 	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
@@ -2528,16 +2380,14 @@
 
 	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%...
@@ -2559,13 +2409,10 @@
 	dec [hl]
 	dec [hl]
 	ret
-; 39134
 
-
 INCLUDE "data/battle/ai/sunny_day_moves.asm"
 
-
-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.
 
@@ -2586,10 +2433,8 @@
 	add $5
 	ld [hl], a
 	ret
-; 39152
 
-
-AI_Smart_PsychUp: ; 39152
+AI_Smart_PsychUp:
 	push hl
 	ld hl, wEnemyAtkLevel
 	ld b, $8
@@ -2645,10 +2490,8 @@
 	inc [hl]
 	inc [hl]
 	ret
-; 3918b
 
-
-AI_Smart_MirrorCoat: ; 3918b
+AI_Smart_MirrorCoat:
 	push hl
 	ld hl, wPlayerUsedMoves
 	ld c, $4
@@ -2697,7 +2540,6 @@
 	cp SPECIAL
 	jr c, .asm_391d2
 
-
 .asm_391ca
 	call Random
 	cp 100
@@ -2710,12 +2552,9 @@
 .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
@@ -2742,10 +2581,8 @@
 	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.
 
@@ -2759,10 +2596,8 @@
 	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]
@@ -2774,11 +2609,9 @@
 
 	dec [hl]
 	ret
-; 3920b
 
-
-AI_Smart_Solarbeam: ; 3920b
-; 80% chance to encourage this move when it's sunny.
+AI_Smart_Solarbeam:
+; 80% chance to encourage this move when it's sunny.
 ; 90% chance to discourage this move when it's raining.
 
 	ld a, [wBattleWeather]
@@ -2803,10 +2636,8 @@
 	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]
@@ -2819,10 +2650,8 @@
 
 	inc [hl]
 	ret
-; 39233
 
-
-AICompareSpeed: ; 39233
+AICompareSpeed:
 ; Return carry if enemy is faster than player.
 
 	push bc
@@ -2836,10 +2665,8 @@
 	sbc b
 	pop bc
 	ret
-; 39246
 
-
-AICheckPlayerMaxHP: ; 39246
+AICheckPlayerMaxHP:
 	push hl
 	push de
 	push bc
@@ -2846,10 +2673,8 @@
 	ld de, wBattleMonHP
 	ld hl, wBattleMonMaxHP
 	jr AICheckMaxHP
-; 39251
 
-
-AICheckEnemyMaxHP: ; 39251
+AICheckEnemyMaxHP:
 	push hl
 	push de
 	push bc
@@ -2856,10 +2681,8 @@
 	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]
@@ -2884,10 +2707,8 @@
 	pop hl
 	and a
 	ret
-; 3926e
 
-
-AICheckPlayerHalfHP: ; 3926e
+AICheckPlayerHalfHP:
 	push hl
 	ld hl, wBattleMonHP
 	ld b, [hl]
@@ -2903,10 +2724,8 @@
 	sbc b
 	pop hl
 	ret
-; 39281
 
-
-AICheckEnemyHalfHP: ; 39281
+AICheckEnemyHalfHP:
 	push hl
 	push de
 	push bc
@@ -2926,10 +2745,8 @@
 	pop de
 	pop hl
 	ret
-; 39298
 
-
-AICheckEnemyQuarterHP: ; 39298
+AICheckEnemyQuarterHP:
 	push hl
 	push de
 	push bc
@@ -2951,10 +2768,8 @@
 	pop de
 	pop hl
 	ret
-; 392b3
 
-
-AICheckPlayerQuarterHP: ; 392b3
+AICheckPlayerQuarterHP:
 	push hl
 	ld hl, wBattleMonHP
 	ld b, [hl]
@@ -2972,10 +2787,8 @@
 	sbc b
 	pop hl
 	ret
-; 392ca
 
-
-AIHasMoveEffect: ; 392ca
+AIHasMoveEffect:
 ; Return carry if the enemy has move b.
 
 	push hl
@@ -3005,10 +2818,8 @@
 	pop hl
 	scf
 	ret
-; 392e6
 
-
-AIHasMoveInArray: ; 392e6
+AIHasMoveInArray:
 ; Return carry if the enemy has a move in array hl.
 
 	push hl
@@ -3040,13 +2851,10 @@
 	pop de
 	pop hl
 	ret
-; 39301
 
-
 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%.
@@ -3096,8 +2904,7 @@
 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.
@@ -3204,8 +3011,7 @@
 
 INCLUDE "data/battle/ai/reckless_moves.asm"
 
-
-AIDamageCalc: ; 393e7
+AIDamageCalc:
 	ld a, 1
 	ld [hBattleTurn], a
 	ld a, [wEnemyMoveStruct + MOVE_EFFECT]
@@ -3224,8 +3030,7 @@
 
 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]
@@ -3267,8 +3072,7 @@
 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
@@ -3328,11 +3132,9 @@
 .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).
 
@@ -3401,21 +3203,16 @@
 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
@@ -3434,18 +3231,13 @@
 	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
--- 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 @@
 	pop de
 	pop hl
 	ret
-; 348de
 
-
-.CheckEnemyMoveMatchups: ; 348de
+.CheckEnemyMoveMatchups:
 	ld de, wEnemyMonMoves
 	ld b, NUM_MOVES + 1
 	ld c, 0
@@ -163,21 +161,19 @@
 
 .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 @@
 	add $10
 	ld [wEnemySwitchMonParam], a
 	ret
-; 349f4
 
-
-FindAliveEnemyMons: ; 349f4
+FindAliveEnemyMons:
 	ld a, [wOTPartyCount]
 	cp 2
 	jr c, .only_one
@@ -344,10 +338,8 @@
 .more_than_one
 	and a
 	ret
-; 34a2a
 
-
-FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
+FindEnemyMonsImmuneToLastCounterMove:
 	ld hl, wOTPartyMon1
 	ld a, [wOTPartyCount]
 	ld b, a
@@ -412,10 +404,8 @@
 	inc d
 	srl c
 	jr .loop
-; 34a85
 
-
-FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
+FindAliveEnemyMonsWithASuperEffectiveMove:
 	push bc
 	ld a, [wOTPartyCount]
 	ld e, a
@@ -445,8 +435,9 @@
 
 	and c
 	ld c, a
-FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
+	; fallthrough
 
+FindEnemyMonsWithASuperEffectiveMove:
 	ld a, -1
 	ld [wEnemyAISwitchScore], a
 	ld hl, wOTPartyMon1Moves
@@ -551,10 +542,8 @@
 	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 @@
 	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 @@
 	and c
 	ld c, a
 	ret
-; 34bb1
--- 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 @@
 	pop af
 	jr nc, .LongAnimLoop
 	ret
-; d65f
 
-.IsMaximumMoreThan48Pixels: ; d65f
+.IsMaximumMoreThan48Pixels:
 	ld a, [wCurHPAnimMaxHP + 1]
 	and a
 	jr nz, .player
@@ -53,9 +52,8 @@
 .player
 	scf
 	ret
-; d670
 
-.ComputePixels: ; d670
+.ComputePixels:
 	push hl
 	ld hl, wCurHPAnimMaxHP
 	ld a, [hli]
@@ -127,9 +125,8 @@
 	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 @@
 	call ShortHPBar_CalcPixelFrame
 	and a
 	ret
-; d6f5
 
-LongAnim_UpdateVariables: ; d6f5
+LongAnim_UpdateVariables:
 .loop
 	ld hl, wCurHPAnimOldHP
 	ld a, [hli]
@@ -199,9 +195,8 @@
 	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 @@
 	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 @@
 	pop de
 	call HPBarAnim_PaletteUpdate
 	ret
-; d771
 
-HPBarAnim_RedrawHPBar: ; d771
+HPBarAnim_RedrawHPBar:
 	ld a, [wWhichHPBar]
 	cp $2
 	jr nz, .skip
@@ -253,9 +246,8 @@
 .skip
 	call DrawBattleHPBar
 	ret
-; d784
 
-HPBarAnim_UpdateHPRemaining: ; d784
+HPBarAnim_UpdateHPRemaining:
 	ld a, [wWhichHPBar]
 	and a
 	ret z
@@ -283,9 +275,8 @@
 	call PrintNum
 	pop hl
 	ret
-; d7b4
 
-HPBarAnim_PaletteUpdate: ; d7b4
+HPBarAnim_PaletteUpdate:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -295,9 +286,8 @@
 	ld c, a
 	farcall ApplyHPBarPals
 	ret
-; d7c9
 
-HPBarAnim_BGMapUpdate: ; d7c9
+HPBarAnim_BGMapUpdate:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -369,9 +359,8 @@
 	ld [hBGMapThird], a
 	call DelayFrame
 	ret
-; d839
 
-ShortHPBar_CalcPixelFrame: ; d839
+ShortHPBar_CalcPixelFrame:
 	ld a, [wCurHPAnimMaxHP]
 	ld c, a
 	ld b, 0
@@ -433,4 +422,3 @@
 	ld a, [wCurHPAnimMaxHP]
 	ld [wCurHPAnimOldHP], a
 	ret
-; d88c
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -6,7 +6,9 @@
 BATTLETRANSITION_FINISH           EQU $20
 BATTLETRANSITION_END              EQU $80
 
-DoBattleTransition: ; 8c20f
+BATTLETRANSITION_SQUARE EQUS "\"8\"" ; $fe
+
+DoBattleTransition:
 	call .InitGFX
 	ld a, [rBGP]
 	ld [wBGP], a
@@ -58,9 +60,8 @@
 	ld [hVBlank], a
 	call DelayFrame
 	ret
-; 8c26d
 
-.InitGFX: ; 8c26d
+.InitGFX:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jr z, .mobile
@@ -87,20 +88,18 @@
 	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
@@ -111,7 +110,7 @@
 	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
@@ -119,9 +118,8 @@
 	pop af
 	ld [rVBK], a
 	ret
-; 8c2cf
 
-ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
+ConvertTrainerBattlePokeballTilesTo2bpp:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -146,17 +144,14 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 8c2f4
 
-TrainerBattlePokeballTiles: ; 8c2f4
+TrainerBattlePokeballTiles:
 INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
 
-
-BattleTransitionJumptable: ; 8c314
+BattleTransitionJumptable:
 	jumptable .Jumptable, wJumptableIndex
-; 8c323
 
-.Jumptable ; 8c323 (23:4323)
+.Jumptable
 	dw StartTrainerBattle_DetermineWhichAnimation ; 00
 
 	; BATTLETRANSITION_CAVE
@@ -213,7 +208,7 @@
 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
@@ -240,28 +235,26 @@
 	ld a, [hl]
 	ld [wJumptableIndex], a
 	ret
-; 8c38f (23:438f)
 
-.StartingPoints: ; 8c38f
+.StartingPoints:
 ; entries correspond to TRANS_* constants
 	db BATTLETRANSITION_CAVE
 	db BATTLETRANSITION_CAVE_STRONGER
 	db BATTLETRANSITION_NO_CAVE
 	db BATTLETRANSITION_NO_CAVE_STRONGER
-; 8c393
 
-StartTrainerBattle_Finish: ; 8c393 (23:4393)
+StartTrainerBattle_Finish:
 	call ClearSprites
 	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
@@ -268,13 +261,13 @@
 	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
@@ -299,9 +292,8 @@
 	ld [wcf64], a
 	scf
 	ret
-; 8c3db (23:43db)
 
-.pals ; 8c3db
+.pals
 	db %11111001 ; 3321
 	db %11111110 ; 3332
 	db %11111111 ; 3333
@@ -315,9 +307,8 @@
 	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
@@ -335,7 +326,7 @@
 	ld [wcf65], a
 	ret
 
-StartTrainerBattle_SineWave: ; 8c408 (23:4408)
+StartTrainerBattle_SineWave:
 	ld a, [wcf64]
 	cp $60
 	jr nc, .end
@@ -347,7 +338,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-.DoSineWave: ; 8c419 (23:4419)
+.DoSineWave:
 	ld hl, wcf65
 	ld a, [hl]
 	inc [hl]
@@ -375,7 +366,7 @@
 	jr nz, .loop
 	ret
 
-StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
+StartTrainerBattle_SetUpForSpinOutro:
 	farcall Function5602
 	ld a, BANK(wLYOverrides)
 	ld [rSVBK], a
@@ -384,7 +375,7 @@
 	ld [wcf64], a
 	ret
 
-StartTrainerBattle_SpinToBlack: ; 8c44f (23:444f)
+StartTrainerBattle_SpinToBlack:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [wcf64]
@@ -418,7 +409,6 @@
 	ld a, BATTLETRANSITION_FINISH
 	ld [wJumptableIndex], a
 	ret
-; 8c490 (23:4490)
 
 ; quadrants
 	const_def
@@ -431,7 +421,7 @@
 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 ; 8c490
+.spintable
 spintable_entry: MACRO
 	db \1
 	dw .wedge\2
@@ -458,9 +448,8 @@
 	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]
@@ -512,7 +501,6 @@
 	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
@@ -519,9 +507,8 @@
 .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
@@ -532,7 +519,7 @@
 	ld [hBGMapMode], a
 	ret
 
-StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
+StartTrainerBattle_SpeckleToBlack:
 	ld hl, wcf64
 	ld a, [hl]
 	and a
@@ -559,7 +546,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-.BlackOutRandomTile: ; 8c5b8 (23:45b8)
+.BlackOutRandomTile:
 .y_loop
 	call Random
 	cp SCREEN_HEIGHT
@@ -590,7 +577,7 @@
 	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
@@ -631,7 +618,7 @@
 	jr z, .done
 	sla a
 	jr nc, .no_load
-	ld [hl], $fe
+	ld [hl], BATTLETRANSITION_SQUARE
 .no_load
 	inc hl
 	jr .loop4
@@ -690,11 +677,11 @@
 	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
@@ -707,21 +694,18 @@
 	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]
@@ -746,7 +730,7 @@
 	db %00001111, %11110000
 	db %00000011, %11000000
 
-WipeLYOverrides: ; 8c6d8
+WipeLYOverrides:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -760,9 +744,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 8c6ef
 
-.wipe ; 8c6ef
+.wipe
 	xor a
 	ld c, SCREEN_HEIGHT_PX
 .loop
@@ -770,14 +753,11 @@
 	dec c
 	jr nz, .loop
 	ret
-; 8c6f7
 
-
-StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
+StartTrainerBattle_DrawSineWave:
 	calc_sine_wave
-; 8c768
 
-StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
+StartTrainerBattle_ZoomToBlack:
 	farcall Function5602
 	ld de, .boxes
 
@@ -806,9 +786,8 @@
 	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
@@ -824,9 +803,8 @@
 	zoombox 18, 16,  1, 1
 	zoombox 20, 18,  0, 0
 	db -1
-; 8c7b7
 
-.Copy: ; 8c7b7 (23:47b7)
+.Copy:
 	ld a, $ff
 .row
 	push bc
@@ -842,7 +820,6 @@
 	dec b
 	jr nz, .row
 	ret
-; 8c7c9 (23:47c9)
 
 Unreferenced_Function8c7c9:
 	ld a, $1
--- 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
--- a/engine/battle/check_battle_scene.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)
--- a/engine/battle/consume_held_item.asm
+++ b/engine/battle/consume_held_item.asm
@@ -1,4 +1,4 @@
-ConsumeHeldItem: ; 27192
+ConsumeHeldItem:
 	push hl
 	push de
 	push bc
--- 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
@@ -114,9 +114,8 @@
 
 .tutorial_debug
 	jp BattleMenu
-; 3c0e5
 
-WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
+WildFled_EnemyFled_LinkBattleCanceled:
 	call Call_LoadTempTileMapToTileMap
 	ld a, [wBattleResult]
 	and BATTLERESULT_BITMASK
@@ -156,9 +155,8 @@
 	ld a, 1
 	ld [wBattleEnded], a
 	ret
-; 3c12f
 
-BattleTurn: ; 3c12f
+BattleTurn:
 .loop
 	call Stubbed_Function3c1bf
 	call CheckContestBattleOver
@@ -229,7 +227,6 @@
 
 .quit
 	ret
-; 3c1bf
 
 Stubbed_Function3c1bf:
 	ret
@@ -248,9 +245,8 @@
 .finish
 	call CloseSRAM
 	ret
-; 3c1d6
 
-HandleBetweenTurnEffects: ; 3c1d6
+HandleBetweenTurnEffects:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .CheckEnemyFirst
@@ -297,9 +293,8 @@
 	call UpdateBattleMonInParty
 	call LoadTileMapToTempTileMap
 	jp HandleEncore
-; 3c23c
 
-CheckFaint_PlayerThenEnemy: ; 3c23c
+CheckFaint_PlayerThenEnemy:
 	call HasPlayerFainted
 	jr nz, .PlayerNotFainted
 	call HandlePlayerMonFaint
@@ -322,9 +317,8 @@
 .BattleIsOver:
 	scf
 	ret
-; 3c25c
 
-CheckFaint_EnemyThenPlayer: ; 3c25c
+CheckFaint_EnemyThenPlayer:
 	call HasEnemyFainted
 	jr nz, .EnemyNotFainted
 	call HandleEnemyMonFaint
@@ -347,9 +341,8 @@
 .BattleIsOver:
 	scf
 	ret
-; 3c27c
 
-HandleBerserkGene: ; 3c27c
+HandleBerserkGene:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .reverse
@@ -424,9 +417,8 @@
 	call SwitchTurnCore
 	ld hl, BecameConfusedText
 	jp StdBattleTextBox
-; 3c300
 
-EnemyTriesToFlee: ; 3c300
+EnemyTriesToFlee:
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
@@ -442,9 +434,8 @@
 	call WildFled_EnemyFled_LinkBattleCanceled
 	scf
 	ret
-; 3c314
 
-DetermineMoveOrder: ; 3c314
+DetermineMoveOrder:
 	ld a, [wLinkMode]
 	and a
 	jr z, .use_move
@@ -560,14 +551,12 @@
 .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
@@ -584,9 +573,8 @@
 .contest_not_over
 	and a
 	ret
-; 3c410
 
-CheckPlayerLockedIn: ; 3c410
+CheckPlayerLockedIn:
 	ld a, [wPlayerSubStatus4]
 	and 1 << SUBSTATUS_RECHARGE
 	jp nz, .quit
@@ -610,9 +598,8 @@
 .quit
 	scf
 	ret
-; 3c434
 
-ParsePlayerAction: ; 3c434
+ParsePlayerAction:
 	call CheckPlayerLockedIn
 	jp c, .locked_in
 	ld hl, wPlayerSubStatus5
@@ -706,9 +693,8 @@
 	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 @@
 	call SetPlayerTurn
 	ld hl, BattleText_TargetsEncoreEnded
 	jp StdBattleTextBox
-; 3c543
 
-TryEnemyFlee: ; 3c543
+TryEnemyFlee:
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .Stay
@@ -819,11 +804,10 @@
 .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 @@
 	pop bc
 	cp b
 	ret
-; 3c5c5
 
-GetMovePriority: ; 3c5c5
+GetMovePriority:
 ; Return the priority (0-3) of move a.
 
 	ld b, a
@@ -864,11 +847,10 @@
 .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 @@
 	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 @@
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3c664
 
-Battle_PlayerFirst: ; 3c664
+Battle_PlayerFirst:
 	xor a
 	ld [wEnemyGoesFirst], a
 	call SetEnemyTurn
@@ -972,23 +952,20 @@
 	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 @@
 	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 @@
 	call DelayFrames
 	xor a
 	ret
-; 3c801
 
-HandlePerishSong: ; 3c801
+HandlePerishSong:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .EnemyFirst
@@ -1227,9 +1200,8 @@
 	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 @@
 
 .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 @@
 	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 @@
 	call SwitchTurnCore
 	ld hl, BattleText_UserRecoveredPPUsing
 	jp StdBattleTextBox
-; 3ca26
 
-HandleFutureSight: ; 3ca26
+HandleFutureSight:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .enemy_first
@@ -1547,9 +1515,8 @@
 
 	call UpdateBattleMonInParty
 	jp UpdateEnemyMonInParty
-; 3ca8f
 
-HandleDefrost: ; 3ca8f
+HandleDefrost:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .enemy_first
@@ -1607,9 +1574,8 @@
 	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 @@
 	ld hl, BattleText_SafeguardFaded
 	jp StdBattleTextBox
 
-HandleScreens: ; 3cb36
+HandleScreens:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .Both
@@ -1681,15 +1647,13 @@
 .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
@@ -1702,9 +1666,8 @@
 	pop de
 	pop hl
 	ret
-; 3cb91
 
-.ReflectTick: ; 3cb91
+.ReflectTick:
 	inc de
 	ld a, [de]
 	dec a
@@ -1713,9 +1676,8 @@
 	res SCREENS_REFLECT, [hl]
 	ld hl, BattleText_MonsReflectFaded
 	jp StdBattleTextBox
-; 3cb9e
 
-HandleWeather: ; 3cb9e
+HandleWeather:
 	ld a, [wBattleWeather]
 	cp WEATHER_NONE
 	ret z
@@ -1804,7 +1766,6 @@
 	ld h, [hl]
 	ld l, a
 	jp StdBattleTextBox
-; 3cc2d
 
 .WeatherMessages:
 ; entries correspond to WEATHER_* constants
@@ -1817,20 +1778,17 @@
 	dw BattleText_TheRainStopped
 	dw BattleText_TheSunlightFaded
 	dw BattleText_TheSandstormSubsided
-; 3cc39
 
-SubtractHPFromTarget: ; 3cc39
+SubtractHPFromTarget:
 	call SubtractHP
 	jp UpdateHPBar
-; 3cc3f
 
-SubtractHPFromUser: ; 3cc3f
+SubtractHPFromUser:
 ; Subtract HP from mon
 	call SubtractHP
 	jp UpdateHPBarBattleHuds
-; 3cc45
 
-SubtractHP: ; 3cc45
+SubtractHP:
 	ld hl, wBattleMonHP
 	ld a, [hBattleTurn]
 	and a
@@ -1860,9 +1818,8 @@
 	ld [wBuffer5], a
 	ld [wBuffer6], a
 	ret
-; 3cc76
 
-GetSixteenthMaxHP: ; 3cc76
+GetSixteenthMaxHP:
 	call GetQuarterMaxHP
 	; quarter result
 	srl c
@@ -1874,9 +1831,8 @@
 	inc c
 .ok
 	ret
-; 3cc83
 
-GetEighthMaxHP: ; 3cc83
+GetEighthMaxHP:
 ; output: bc
 	call GetQuarterMaxHP
 ; assumes nothing can have 1024 or more hp
@@ -1889,9 +1845,8 @@
 	inc c
 .end
 	ret
-; 3cc8e
 
-GetQuarterMaxHP: ; 3cc8e
+GetQuarterMaxHP:
 ; output: bc
 	call GetMaxHP
 
@@ -1909,9 +1864,8 @@
 	inc c
 .end
 	ret
-; 3cc9f
 
-GetHalfMaxHP: ; 3cc9f
+GetHalfMaxHP:
 ; output: bc
 	call GetMaxHP
 
@@ -1926,9 +1880,8 @@
 	inc c
 .end
 	ret
-; 3ccac
 
-GetMaxHP: ; 3ccac
+GetMaxHP:
 ; output: bc, wBuffer1-2
 
 	ld hl, wBattleMonMaxHP
@@ -1945,9 +1898,8 @@
 	ld [wBuffer1], a
 	ld c, a
 	ret
-; 3ccc2
 
-Unreferenced_GetHalfHP: ; 3ccc2
+Unreferenced_GetHalfHP:
 	ld hl, wBattleMonHP
 	ld a, [hBattleTurn]
 	and a
@@ -1965,9 +1917,8 @@
 	ld a, [hl]
 	ld [wBuffer1], a
 	ret
-; 3ccde
 
-CheckUserHasEnoughHP: ; 3ccde
+CheckUserHasEnoughHP:
 	ld hl, wBattleMonHP + 1
 	ld a, [hBattleTurn]
 	and a
@@ -1980,9 +1931,8 @@
 	ld a, b
 	sbc [hl]
 	ret
-; 3ccef
 
-RestoreHP ; 3ccef
+RestoreHP
 	ld hl, wEnemyMonMaxHP
 	ld a, [hBattleTurn]
 	and a
@@ -2025,14 +1975,12 @@
 	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
@@ -2046,9 +1994,8 @@
 	predef AnimateHPBar
 	pop bc
 	ret
-; 3cd55
 
-HandleEnemyMonFaint: ; 3cd55
+HandleEnemyMonFaint:
 	call FaintEnemyPokemon
 	ld hl, wBattleMonHP
 	ld a, [hli]
@@ -2115,9 +2062,8 @@
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3cdca
 
-DoubleSwitch: ; 3cdca
+DoubleSwitch:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .player_1
@@ -2145,9 +2091,8 @@
 	xor a
 	ld [wBattlePlayerAction], a
 	ret
-; 3ce01
 
-UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
+UpdateBattleStateAndExperienceAfterEnemyFaint:
 	call UpdateBattleMonInParty
 	ld a, [wBattleMode]
 	dec a
@@ -2236,9 +2181,8 @@
 	pop af
 	ld [wBattleParticipantsNotFainted], a
 	ret
-; 3ceaa
 
-IsAnyMonHoldingExpShare: ; 3ceaa
+IsAnyMonHoldingExpShare:
 	ld a, [wPartyCount]
 	ld b, a
 	ld hl, wPartyMon1
@@ -2292,15 +2236,13 @@
 	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
@@ -2313,9 +2255,8 @@
 	call ClearBox
 	ld hl, BattleText_MonFainted
 	jp StdBattleTextBox
-; 3cf14
 
-FaintEnemyPokemon: ; 3cf14
+FaintEnemyPokemon:
 	call WaitSFX
 	ld de, SFX_KINESIS
 	call PlaySFX
@@ -2327,9 +2268,8 @@
 	call ClearBox
 	ld hl, BattleText_EnemyMonFainted
 	jp StdBattleTextBox
-; 3cf35
 
-CheckEnemyTrainerDefeated: ; 3cf35
+CheckEnemyTrainerDefeated:
 	ld a, [wOTPartyCount]
 	ld b, a
 	xor a
@@ -2347,9 +2287,8 @@
 
 	and a
 	ret
-; 3cf4a
 
-HandleEnemySwitch: ; 3cf4a
+HandleEnemySwitch:
 	ld hl, wEnemyHPPal
 	ld e, HP_BAR_LENGTH_PX
 	call UpdateHPPal
@@ -2374,9 +2313,8 @@
 	jr nz, EnemyPartyMonEntrance
 	inc a
 	ret
-; 3cf78
 
-EnemyPartyMonEntrance: ; 3cf78
+EnemyPartyMonEntrance:
 	push af
 	xor a
 	ld [wEnemySwitchMonIndex], a
@@ -2400,9 +2338,8 @@
 	ld [wBattlePlayerAction], a
 	inc a
 	ret
-; 3cfa4
 
-WinTrainerBattle: ; 3cfa4
+WinTrainerBattle:
 ; Player won the battle
 	call StopDangerSound
 	ld a, $1
@@ -2524,9 +2461,8 @@
 .KeepItAll:
 	ld hl, GotMoneyForWinningText
 	jp StdBattleTextBox
-; 3d081
 
-.AddMoneyToMom: ; 3d081
+.AddMoneyToMom:
 	push bc
 	ld hl, wBattleReward + 2
 	ld de, wMomsMoney + 2
@@ -2533,9 +2469,8 @@
 	call AddBattleMoneyToAccount
 	pop bc
 	ret
-; 3d08d
 
-.AddMoneyToWallet: ; 3d08d
+.AddMoneyToWallet:
 	push bc
 	ld hl, wBattleReward + 2
 	ld de, wMoney + 2
@@ -2542,9 +2477,8 @@
 	call AddBattleMoneyToAccount
 	pop bc
 	ret
-; 3d099
 
-.DoubleReward: ; 3d099
+.DoubleReward:
 	ld hl, wBattleReward + 2
 	sla [hl]
 	dec hl
@@ -2557,16 +2491,14 @@
 	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)
@@ -2575,9 +2507,8 @@
 	ld a, [hl]
 	sbc HIGH(MAX_MONEY >> 8)
 	ret
-; 3d0be
 
-AddBattleMoneyToAccount: ; 3d0be
+AddBattleMoneyToAccount:
 	ld c, 3
 	and a
 	push de
@@ -2610,9 +2541,8 @@
 	inc hl
 	ld [hl], LOW(MAX_MONEY)
 	ret
-; 3d0ea
 
-PlayVictoryMusic: ; 3d0ea
+PlayVictoryMusic:
 	push de
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -2646,13 +2576,12 @@
 .lost
 	pop de
 	ret
-; 3d123
 
-IsKantoGymLeader: ; 0x3d123
+IsKantoGymLeader:
 	ld hl, KantoGymLeaders
 	jr IsGymLeaderCommon
 
-IsGymLeader: ; 0x3d128
+IsGymLeader:
 	ld hl, GymLeaders
 IsGymLeaderCommon:
 	push de
@@ -2661,11 +2590,10 @@
 	call IsInArray
 	pop de
 	ret
-; 0x3d137
 
 INCLUDE "data/trainers/leaders.asm"
 
-HandlePlayerMonFaint: ; 3d14e
+HandlePlayerMonFaint:
 	call FaintYourPokemon
 	ld hl, wEnemyMonHP
 	ld a, [hli]
@@ -2713,9 +2641,8 @@
 	call HandleEnemySwitch
 	jp z, WildFled_EnemyFled_LinkBattleCanceled
 	jp DoubleSwitch
-; 3d1aa
 
-PlayerMonFaintHappinessMod: ; 3d1aa
+PlayerMonFaintHappinessMod:
 	ld a, [wCurBattleMon]
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
@@ -2752,9 +2679,8 @@
 	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,
@@ -2781,9 +2707,8 @@
 	ld hl, wPartyMon1Speed
 	ld de, wEnemyMonSpeed
 	jp TryToRunAwayFromBattle
-; 3d227
 
-ForcePlayerMonChoice: ; 3d227
+ForcePlayerMonChoice:
 	call EmptyBattleTextBox
 	call LoadStandardMenuHeader
 	call SetUpBattlePartyMenu_NoLoop
@@ -2845,9 +2770,8 @@
 	and a
 	ld c, a
 	ret
-; 3d2b3
 
-PlayerPartyMonEntrance: ; 3d2b3
+PlayerPartyMonEntrance:
 	ld a, [wCurBattleMon]
 	ld [wLastPlayerMon], a
 	ld a, [wCurPartyMon]
@@ -2863,9 +2787,8 @@
 	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
@@ -2881,15 +2804,13 @@
 .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
@@ -2897,9 +2818,8 @@
 	farcall InitPartyMenuBGPal7
 	farcall InitPartyMenuGFX
 	ret
-; 3d313
 
-JumpToPartyMenuAndPrintText: ; 3d313
+JumpToPartyMenuAndPrintText:
 	farcall WritePartyMenuTilemap
 	farcall PrintPartyMenuText
 	call WaitBGMap
@@ -2906,9 +2826,8 @@
 	call SetPalettes
 	call DelayFrame
 	ret
-; 3d329
 
-SelectBattleMon: ; 3d329
+SelectBattleMon:
 	call IsMobileBattle
 	jr z, .mobile
 	farcall PartyMenuSelect
@@ -2917,9 +2836,8 @@
 .mobile
 	farcall Mobile_PartyMenuSelect
 	ret
-; 3d33c
 
-PickPartyMonInBattle: ; 3d33c
+PickPartyMonInBattle:
 .loop
 	ld a, PARTYMENUACTION_SWITCH ; Which PKMN?
 	ld [wPartyMenuActionText], a
@@ -2930,9 +2848,8 @@
 	jr z, .loop
 	xor a
 	ret
-; 3d34f
 
-SwitchMonAlreadyOut: ; 3d34f
+SwitchMonAlreadyOut:
 	ld hl, wCurBattleMon
 	ld a, [wCurPartyMon]
 	cp [hl]
@@ -2946,9 +2863,8 @@
 .notout
 	xor a
 	ret
-; 3d362
 
-ForcePickPartyMonInBattle: ; 3d362
+ForcePickPartyMonInBattle:
 ; Can't back out.
 
 .pick
@@ -2961,9 +2877,8 @@
 	call PlaySFX
 	call WaitSFX
 	jr .pick
-; 3d375
 
-PickSwitchMonInBattle: ; 3d375
+PickSwitchMonInBattle:
 .pick
 	call PickPartyMonInBattle
 	ret c
@@ -2971,9 +2886,8 @@
 	jr c, .pick
 	xor a
 	ret
-; 3d380
 
-ForcePickSwitchMonInBattle: ; 3d380
+ForcePickSwitchMonInBattle:
 ; Can't back out.
 
 .pick
@@ -2985,9 +2899,8 @@
 
 	xor a
 	ret
-; 3d38e
 
-LostBattle: ; 3d38e
+LostBattle:
 	ld a, 1
 	ld [wBattleEnded], a
 
@@ -3081,21 +2994,18 @@
 	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
@@ -3144,13 +3054,11 @@
 	pop af
 	ld [wcfbe], a
 	ret
-; 3d488
 
 .Spaces:
 	db "       @"
-; 3d490
 
-SlideBattlePicOut: ; 3d490
+SlideBattlePicOut:
 	ld [hMapObjectIndexBuffer], a
 	ld c, a
 .loop
@@ -3172,9 +3080,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 3d4ae
 
-.DoFrame: ; 3d4ae
+.DoFrame:
 	ld a, [hMapObjectIndexBuffer]
 	ld c, a
 	cp $8
@@ -3194,9 +3101,8 @@
 	dec c
 	jr nz, .back
 	ret
-; 3d4c3
 
-ForceEnemySwitch: ; 3d4c3
+ForceEnemySwitch:
 	call ResetEnemyBattleVars
 	ld a, [wEnemySwitchMonIndex]
 	dec a
@@ -3209,9 +3115,8 @@
 	call BreakAttraction
 	call ResetBattleParticipants
 	ret
-; 3d4e1
 
-EnemySwitch: ; 3d4e1
+EnemySwitch:
 	call CheckWhetherToAskSwitch
 	jr nc, EnemySwitch_SetMode
 	; Shift Mode
@@ -3238,9 +3143,8 @@
 	ld [wEnemyIsSwitching], a
 	call LoadTileMapToTempTileMap
 	jp PlayerSwitch
-; 3d517
 
-EnemySwitch_SetMode: ; 3d517
+EnemySwitch_SetMode:
 	call ResetEnemyBattleVars
 	call CheckWhetherSwitchmonIsPredetermined
 	jr c, .skip
@@ -3253,9 +3157,8 @@
 	call ClearEnemyMonBox
 	call Function_BattleTextEnemySentOut
 	jp Function_SetEnemyMonAndSendOutAnimation
-; 3d533
 
-CheckWhetherSwitchmonIsPredetermined: ; 3d533
+CheckWhetherSwitchmonIsPredetermined:
 ; returns carry if: ???
 	ld a, [wLinkMode]
 	and a
@@ -3287,9 +3190,8 @@
 .return_carry
 	scf
 	ret
-; 3d557
 
-ResetEnemyBattleVars: ; 3d557
+ResetEnemyBattleVars:
 ; and draw empty TextBox
 	xor a
 	ld [wLastPlayerCounterMove], a
@@ -3305,13 +3207,12 @@
 	call SlideBattlePicOut
 	call EmptyBattleTextBox
 	jp LoadStandardMenuHeader
-; 3d57a
 
-ResetBattleParticipants: ; 3d57a
+ResetBattleParticipants:
 	xor a
 	ld [wBattleParticipantsNotFainted], a
 	ld [wBattleParticipantsIncludingFainted], a
-AddBattleParticipant: ; 3d581
+AddBattleParticipant:
 	ld a, [wCurBattleMon]
 	ld c, a
 	ld hl, wBattleParticipantsNotFainted
@@ -3321,9 +3222,8 @@
 	pop bc
 	ld hl, wBattleParticipantsIncludingFainted
 	predef_jump SmallFarFlagAction
-; 3d599
 
-FindMonInOTPartyToSwitchIntoBattle: ; 3d599
+FindMonInOTPartyToSwitchIntoBattle:
 	ld b, -1
 	ld a, $1
 	ld [wBuffer1], a
@@ -3358,9 +3258,8 @@
 	ld hl, wBuffer2
 	set 0, [hl]
 	jr .loop
-; 3d5d7
 
-LookUpTheEffectivenessOfEveryMove: ; 3d5d7
+LookUpTheEffectivenessOfEveryMove:
 	push bc
 	ld hl, wOTPartyMon1Moves
 	ld a, b
@@ -3396,9 +3295,8 @@
 	ret
 .done
 	ret
-; 3d618
 
-IsThePlayerMonTypesEffectiveAgainstOTMon: ; 3d618
+IsThePlayerMonTypesEffectiveAgainstOTMon:
 ; Calculates the effectiveness of the types of the PlayerMon
 ; against the OTMon
 	push bc
@@ -3445,9 +3343,8 @@
 .reset
 	res 0, [hl]
 	ret
-; 3d672
 
-ScoreMonTypeMatchups: ; 3d672
+ScoreMonTypeMatchups:
 .loop1
 	ld hl, wBuffer1
 	sla [hl]
@@ -3510,9 +3407,8 @@
 
 .quit
 	ret
-; 3d6ca
 
-LoadEnemyMonToSwitchTo: ; 3d6ca
+LoadEnemyMonToSwitchTo:
 	; 'b' contains the PartyNr of the mon the AI will switch to
 	ld a, b
 	ld [wCurPartyMon], a
@@ -3549,9 +3445,8 @@
 	ld a, [hl]
 	ld [wEnemyHPAtTimeOfPlayerSwitch + 1], a
 	ret
-; 3d714
 
-CheckWhetherToAskSwitch: ; 3d714
+CheckWhetherToAskSwitch:
 	ld a, [wBattleHasJustStarted]
 	dec a
 	jp z, .return_nc
@@ -3579,9 +3474,8 @@
 .return_nc
 	and a
 	ret
-; 3d74b
 
-OfferSwitch: ; 3d74b
+OfferSwitch:
 	ld a, [wCurPartyMon]
 	push af
 	callfar Battle_GetTrainerName
@@ -3620,9 +3514,8 @@
 	ld [wCurPartyMon], a
 	scf
 	ret
-; 3d7a0
 
-ClearEnemyMonBox: ; 3d7a0
+ClearEnemyMonBox:
 	xor a
 	ld [hBGMapMode], a
 	call ExitMenu
@@ -3632,16 +3525,14 @@
 	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_SetEnemyMonAndSendOutAnimation: ; 3d7c7
+Function_SetEnemyMonAndSendOutAnimation:
 	ld a, [wTempEnemyMonSpecies]
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
@@ -3688,9 +3579,8 @@
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 3d834
 
-NewEnemyMonStatus: ; 3d834
+NewEnemyMonStatus:
 	xor a
 	ld [wLastPlayerCounterMove], a
 	ld [wLastEnemyCounterMove], a
@@ -3712,9 +3602,8 @@
 	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
@@ -3723,18 +3612,17 @@
 	dec b
 	jr nz, .loop
 	ret
-; 3d873
 
-CheckPlayerPartyForFitMon: ; 3d873
+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
@@ -3741,9 +3629,8 @@
 	jr nz, .loop
 	ld d, a
 	ret
-; 3d887
 
-CheckIfCurPartyMonIsFitToFight: ; 3d887
+CheckIfCurPartyMonIsFitToFight:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1HP
 	call GetPartyLocation
@@ -3772,9 +3659,8 @@
 .finish_fail
 	xor a
 	ret
-; 3d8b3
 
-TryToRunAwayFromBattle: ; 3d8b3
+TryToRunAwayFromBattle:
 ; Run away from battle, with or without item
 	ld a, [wBattleType]
 	cp BATTLETYPE_DEBUG
@@ -3961,9 +3847,8 @@
 	call LoadTileMapToTempTileMap
 	scf
 	ret
-; 3da0d
 
-InitBattleMon: ; 3da0d
+InitBattleMon:
 	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld de, wBattleMonSpecies
@@ -4002,23 +3887,21 @@
 	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
@@ -4026,9 +3909,8 @@
 	ld hl, wPartyMon1DVs
 	ld a, [wCurBattleMon]
 	jp GetPartyLocation
-; 3da97
 
-GetEnemyMonDVs: ; 3da97
+GetEnemyMonDVs:
 	ld hl, wEnemyMonDVs
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_TRANSFORMED, a
@@ -4040,9 +3922,8 @@
 	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
@@ -4051,9 +3932,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 3dabd
 
-InitEnemyMon: ; 3dabd
+InitEnemyMon:
 	ld a, [wCurPartyMon]
 	ld hl, wOTPartyMon1Species
 	call GetPartyLocation
@@ -4104,9 +3984,8 @@
 	ld a, [wCurPartyMon]
 	ld [wCurOTMon], a
 	ret
-; 3db32
 
-SwitchPlayerMon: ; 3db32
+SwitchPlayerMon:
 	call ClearSprites
 	ld a, [wCurBattleMon]
 	ld [wLastPlayerMon], a
@@ -4124,9 +4003,8 @@
 	ld a, [hli]
 	or [hl]
 	ret
-; 3db5f
 
-SendOutPlayerMon: ; 3db5f
+SendOutPlayerMon:
 	ld hl, wBattleMonDVs
 	predef GetUnownLetter
 	hlcoord 1, 5
@@ -4180,9 +4058,8 @@
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 3dbde
 
-NewBattleMonStatus: ; 3dbde
+NewBattleMonStatus:
 	xor a
 	ld [wLastPlayerCounterMove], a
 	ld [wLastEnemyCounterMove], a
@@ -4209,17 +4086,15 @@
 	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
@@ -4258,9 +4133,8 @@
 
 .hl
 	jp hl
-; 3dc5b
 
-PursuitSwitch: ; 3dc5b
+PursuitSwitch:
 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVar
 	ld b, a
@@ -4338,9 +4212,8 @@
 .done
 	and a
 	ret
-; 3dce6
 
-RecallPlayerMon: ; 3dce6
+RecallPlayerMon:
 	ld a, [hBattleTurn]
 	push af
 	xor a
@@ -4351,9 +4224,8 @@
 	pop af
 	ld [hBattleTurn], a
 	ret
-; 3dcf9
 
-HandleHealingItems: ; 3dcf9
+HandleHealingItems:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	jr z, .player_1
@@ -4375,9 +4247,8 @@
 	call HandleHPHealingItem
 	call UseHeldStatusHealingItem
 	jp UseConfusionHealingItem
-; 3dd2f
 
-HandleHPHealingItem: ; 3dd2f
+HandleHPHealingItem:
 	callfar GetOpponentItem
 	ld a, b
 	cp HELD_BERRY
@@ -4469,9 +4340,8 @@
 	callfar ConsumeHeldItem
 	ld hl, RecoveredUsingText
 	jp StdBattleTextBox
-; 3ddc8
 
-ItemRecoveryAnim: ; 3ddc8
+ItemRecoveryAnim:
 	push hl
 	push de
 	push bc
@@ -4488,9 +4358,8 @@
 	pop de
 	pop hl
 	ret
-; 3dde9
 
-UseHeldStatusHealingItem: ; 3dde9
+UseHeldStatusHealingItem:
 	callfar GetOpponentItem
 	ld hl, HeldStatusHealingEffects
 .loop
@@ -4543,11 +4412,10 @@
 	ld a, $1
 	and a
 	ret
-; 3de44
 
 INCLUDE "data/battle/held_heal_status.asm"
 
-UseConfusionHealingItem: ; 3de51
+UseConfusionHealingItem:
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
 	bit SUBSTATUS_CONFUSED, a
@@ -4587,9 +4455,8 @@
 	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
@@ -4600,18 +4467,16 @@
 .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
@@ -4658,27 +4523,24 @@
 	pop bc
 	pop de
 	ret
-; 3defc
 
 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
@@ -4693,9 +4555,8 @@
 	pop de
 	pop hl
 	ret
-; 3df48
 
-UpdatePlayerHUD:: ; 3df48
+UpdatePlayerHUD::
 	push hl
 	push de
 	push bc
@@ -4706,9 +4567,8 @@
 	pop de
 	pop hl
 	ret
-; 3df58
 
-DrawPlayerHUD: ; 3df58
+DrawPlayerHUD:
 	xor a
 	ld [hBGMapMode], a
 
@@ -4744,14 +4604,12 @@
 	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]
@@ -4774,9 +4632,8 @@
 
 .done
 	ret
-; 3dfbf
 
-PrintPlayerHUD: ; 3dfbf
+PrintPlayerHUD:
 	ld de, wBattleMonNick
 	hlcoord 10, 7
 	call ret_3e138
@@ -4837,9 +4694,8 @@
 	ld a, [wBattleMonLevel]
 	ld [wTempMonLevel], a
 	jp PrintLevel
-; 3e036
 
-UpdateEnemyHUD:: ; 3e036
+UpdateEnemyHUD::
 	push hl
 	push de
 	push bc
@@ -4849,9 +4705,8 @@
 	pop de
 	pop hl
 	ret
-; 3e043
 
-DrawEnemyHUD: ; 3e043
+DrawEnemyHUD:
 	xor a
 	ld [hBGMapMode], a
 
@@ -4982,15 +4837,13 @@
 	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]
@@ -4997,13 +4850,11 @@
 	cp b
 	ret z
 	jp FinishBattleAnim
-; 3e138
 
-ret_3e138: ; 3e138
+ret_3e138:
 	ret
-; 3e139
 
-BattleMenu: ; 3e139
+BattleMenu:
 	xor a
 	ld [hBGMapMode], a
 	call LoadTempTileMapToTileMap
@@ -5049,17 +4900,15 @@
 	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
 
@@ -5083,9 +4932,8 @@
 .error
 	scf
 	ret
-; 3e1c7
 
-BattleMenu_Pack: ; 3e1c7
+BattleMenu_Pack:
 	ld a, [wLinkMode]
 	and a
 	jp nz, .ItemsCantBeUsed
@@ -5135,15 +4983,13 @@
 	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
@@ -5186,9 +5032,8 @@
 	call SetPalettes
 	scf
 	ret
-; 3e28d
 
-BattleMenu_PKMN: ; 3e28d
+BattleMenu_PKMN:
 	call LoadStandardMenuHeader
 BattleMenuPKMN_ReturnFromStats:
 	call ExitMenu
@@ -5236,9 +5081,8 @@
 	call GetMemSGBLayout
 	call SetPalettes
 	jp BattleMenu
-; 3e2f5
 
-.GetMenu: ; 3e2f5
+.GetMenu:
 	call IsMobileBattle
 	jr z, .mobile
 	farcall BattleMonMenu
@@ -5247,9 +5091,8 @@
 .mobile
 	farcall MobileBattleMonMenu
 	ret
-; 3e308
 
-Battle_StatsScreen: ; 3e308
+Battle_StatsScreen:
 	call DisableLCD
 
 	ld hl, vTiles2 tile $31
@@ -5285,9 +5128,8 @@
 
 	call EnableLCD
 	ret
-; 3e358
 
-TryPlayerSwitch: ; 3e358
+TryPlayerSwitch:
 	ld a, [wCurBattleMon]
 	ld d, a
 	ld a, [wCurPartyMon]
@@ -5326,7 +5168,7 @@
 	call SetPalettes
 	ld a, [wCurPartyMon]
 	ld [wCurBattleMon], a
-PlayerSwitch: ; 3e3ad
+PlayerSwitch:
 	ld a, 1
 	ld [wPlayerIsSwitching], a
 	ld a, [wLinkMode]
@@ -5374,15 +5216,13 @@
 	call BattleMonEntrance
 	and a
 	ret
-; 3e3ff
 
-EnemyMonEntrance: ; 3e3ff
+EnemyMonEntrance:
 	callfar AI_Switch
 	call SetEnemyTurn
 	jp SpikesDamage
-; 3e40b
 
-BattleMonEntrance: ; 3e40b
+BattleMonEntrance:
 	call WithdrawMonText
 
 	ld c, 50
@@ -5417,9 +5257,8 @@
 	ld a, $2
 	ld [wMenuCursorY], a
 	ret
-; 3e459
 
-PassedBattleMonEntrance: ; 3e459
+PassedBattleMonEntrance:
 	ld c, 50
 	call DelayFrames
 
@@ -5439,9 +5278,8 @@
 	call LoadTileMapToTempTileMap
 	call SetPlayerTurn
 	jp SpikesDamage
-; 3e489
 
-BattleMenu_Run: ; 3e489
+BattleMenu_Run:
 	call Call_LoadTempTileMapToTileMap
 	ld a, $3
 	ld [wMenuCursorY], a
@@ -5455,9 +5293,8 @@
 	and a
 	ret nz
 	jp BattleMenu
-; 3e4a8
 
-CheckAmuletCoin: ; 3e4a8
+CheckAmuletCoin:
 	ld a, [wBattleMonItem]
 	ld b, a
 	callfar GetItemHeldEffect
@@ -5467,9 +5304,8 @@
 	ld a, 1
 	ld [wAmuletCoin], a
 	ret
-; 3e4bc
 
-MoveSelectionScreen: ; 3e4bc
+MoveSelectionScreen:
 	call IsMobileBattle
 	jr nz, .not_mobile
 	farcall MobileMoveSelectionScreen
@@ -5671,11 +5507,9 @@
 	call StdBattleTextBox
 	call Call_LoadTempTileMapToTileMap
 	jp MoveSelectionScreen
-; 3e61c
 
-.string_3e61c ; 3e61c
+.string_3e61c
 	db "@"
-; 3e61d
 
 .pressed_up
 	ld a, [wMenuCursorY]
@@ -5685,9 +5519,8 @@
 	inc a
 	ld [wMenuCursorY], a
 	jp .menu_loop
-; 3e62e
 
-.pressed_down ; 3e62e
+.pressed_down
 	ld a, [wMenuCursorY]
 	ld b, a
 	ld a, [wNumMoves]
@@ -5698,9 +5531,8 @@
 	ld a, $1
 	ld [wMenuCursorY], a
 	jp .menu_loop
-; 3e643
 
-.pressed_select ; 3e643
+.pressed_select
 	ld a, [wMoveSwapBuffer]
 	and a
 	jr z, .start_swap
@@ -5783,9 +5615,8 @@
 	ld a, [wMenuCursorY]
 	ld [wMoveSwapBuffer], a
 	jp MoveSelectionScreen
-; 3e6c8
 
-MoveInfoBox: ; 3e6c8
+MoveInfoBox:
 	xor a
 	ld [hBGMapMode], a
 
@@ -5855,15 +5686,13 @@
 
 .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
@@ -5883,9 +5712,8 @@
 	lb bc, 1, 2
 	call PrintNum
 	ret
-; 3e786
 
-CheckPlayerHasUsableMoves: ; 3e786
+CheckPlayerHasUsableMoves:
 	ld a, STRUGGLE
 	ld [wCurPlayerMove], a
 	ld a, [wPlayerDisableCount]
@@ -5931,9 +5759,8 @@
 	call DelayFrames
 	xor a
 	ret
-; 3e7c1
 
-ParseEnemyAction: ; 3e7c1
+ParseEnemyAction:
 	ld a, [wEnemyIsSwitching]
 	and a
 	ret nz
@@ -6081,9 +5908,8 @@
 .struggle
 	ld a, STRUGGLE
 	jr .finish
-; 3e8c1
 
-ResetVarsForSubstatusRage: ; 3e8c1
+ResetVarsForSubstatusRage:
 	xor a
 	ld [wEnemyFuryCutterCount], a
 	ld [wEnemyProtectCount], a
@@ -6091,9 +5917,8 @@
 	ld hl, wEnemySubStatus4
 	res SUBSTATUS_RAGE, [hl]
 	ret
-; 3e8d1
 
-CheckEnemyLockedIn: ; 3e8d1
+CheckEnemyLockedIn:
 	ld a, [wEnemySubStatus4]
 	and 1 << SUBSTATUS_RECHARGE
 	ret nz
@@ -6106,14 +5931,12 @@
 	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
 
@@ -6213,7 +6036,6 @@
 	jp .Happiness
 
 .InitDVs:
-
 ; Trainer DVs
 
 ; All trainers have preset DVs, determined by class
@@ -6582,9 +6404,8 @@
 	call CopyBytes
 
 	ret
-; 3eb38
 
-CheckSleepingTreeMon: ; 3eb38
+CheckSleepingTreeMon:
 ; Return carry if species is in the list
 ; for the current time of day
 
@@ -6615,7 +6436,7 @@
 
 INCLUDE "data/wild/treemons_asleep.asm"
 
-CheckUnownLetter: ; 3eb75
+CheckUnownLetter:
 ; Return carry if the Unown letter hasn't been unlocked yet
 
 	ld a, [wUnlockedUnowns]
@@ -6664,8 +6485,7 @@
 
 INCLUDE "data/wild/unlocked_unowns.asm"
 
-
-Unreferenced_SwapBattlerLevels: ; 3ebc7
+Unreferenced_SwapBattlerLevels:
 	push bc
 	ld a, [wBattleMonLevel]
 	ld b, a
@@ -6675,9 +6495,8 @@
 	ld [wEnemyMonLevel], a
 	pop bc
 	ret
-; 3ebd8
 
-BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8
+BattleWinSlideInEnemyTrainerFrontpic:
 	xor a
 	ld [wTempEnemyMonSpecies], a
 	call FinishBattleAnim
@@ -6717,9 +6536,8 @@
 	pop bc
 	dec hl
 	jr .outer_loop
-; 3ec1a
 
-.CopyColumn: ; 3ec1a
+.CopyColumn:
 	push hl
 	push de
 	push bc
@@ -6737,24 +6555,20 @@
 	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
@@ -6798,9 +6612,8 @@
 .enemy_ok
 	ld [hl], b
 	ret
-; 3ec76
 
-ApplyBrnEffectOnAttack: ; 3ec76
+ApplyBrnEffectOnAttack:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .enemy
@@ -6840,9 +6653,8 @@
 .enemy_ok
 	ld [hl], b
 	ret
-; 3ecab
 
-ApplyStatLevelMultiplierOnAllStats: ; 3ecab
+ApplyStatLevelMultiplierOnAllStats:
 ; Apply StatLevelMultipliers on all 5 Stats
 	ld c, 0
 .stat_loop
@@ -6852,9 +6664,8 @@
 	cp 5
 	jr nz, .stat_loop
 	ret
-; 3ecb7
 
-ApplyStatLevelMultiplier: ; 3ecb7
+ApplyStatLevelMultiplier:
 	push bc
 	push bc
 	ld a, [wd265]
@@ -6936,11 +6747,10 @@
 .okay4
 	pop bc
 	ret
-; 3ed2b
 
 INCLUDE "data/battle/stat_multipliers_2.asm"
 
-BadgeStatBoosts: ; 3ed45
+BadgeStatBoosts:
 ; Raise the stats of the battle mon in wBattleMon
 ; depending on which badges have been obtained.
 
@@ -6997,9 +6807,8 @@
 	srl a
 	call c, BoostStat
 	ret
-; 3ed7c
 
-BoostStat: ; 3ed7c
+BoostStat:
 ; Raise stat at hl by 1/8.
 
 	ld a, [hli]
@@ -7029,17 +6838,14 @@
 	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
@@ -7054,16 +6860,14 @@
 	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.
 
@@ -7130,16 +6934,14 @@
 	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
@@ -7146,9 +6948,8 @@
 	ld [wFXAnimID + 1], a
 	call WaitBGMap
 	predef_jump PlayBattleAnim
-; 3ee27
 
-FinishBattleAnim: ; 3ee27
+FinishBattleAnim:
 	push af
 	push bc
 	push de
@@ -7162,9 +6963,8 @@
 	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]
@@ -7192,7 +6992,7 @@
 	ld a, [wCurPartyMon]
 	ld c, a
 	ld b, CHECK_FLAG
-	ld d, $0
+	ld d, FALSE
 	predef SmallFarFlagAction
 	ld a, c
 	and a
@@ -7206,7 +7006,7 @@
 	ld e, l
 	ld hl, wEnemyMonBaseStats - 1
 	push bc
-	ld c, $5
+	ld c, NUM_EXP_STATS
 .loop1
 	inc hl
 	ld a, [de]
@@ -7486,13 +7286,13 @@
 	ld [wMonType], a
 	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
@@ -7542,7 +7342,6 @@
 
 .done
 	jp ResetBattleParticipants
-; 3f0d4
 
 .EvenlyDivideExpAmongParticipants:
 ; count number of battle participants
@@ -7577,9 +7376,8 @@
 	dec c
 	jr nz, .count_loop2
 	ret
-; 3f106
 
-BoostExp: ; 3f106
+BoostExp:
 ; Multiply experience by 1.5x
 	push bc
 ; load experience value
@@ -7598,9 +7396,8 @@
 	ld [hProduct + 2], a
 	pop bc
 	ret
-; 3f11b
 
-Text_MonGainedExpPoint: ; 3f11b
+Text_MonGainedExpPoint:
 	text_jump Text_Gained
 	start_asm
 	ld hl, TextJump_StringBuffer2ExpPoints
@@ -7610,19 +7407,16 @@
 
 	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
@@ -7808,7 +7602,7 @@
 	ld [hBGMapMode], a
 	ret
 
-SendOutMonText: ; 3f26d
+SendOutMonText:
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
@@ -7868,40 +7662,34 @@
 	ld hl, JumpText_YourFoesWeakGetmMon
 .skip_to_textbox
 	jp BattleTextBox
-; 3f2d1
 
-JumpText_GoMon: ; 3f2d1
+JumpText_GoMon:
 	text_jump Text_GoMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
-; 3f2d6
 
-JumpText_DoItMon: ; 3f2d8
+JumpText_DoItMon:
 	text_jump Text_DoItMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
-; 3f2dd
 
-JumpText_GoForItMon: ; 3f2df
+JumpText_GoForItMon:
 	text_jump Text_GoForItMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
-; 3f2e4
 
-JumpText_YourFoesWeakGetmMon: ; 3f2e6
+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
 
-WithdrawMonText: ; 3f2f4
+WithdrawMonText:
 	ld hl, .WithdrawMonText
 	jp BattleTextBox
 
@@ -7955,33 +7743,27 @@
 
 	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
@@ -8013,9 +7795,8 @@
 	call Call_LoadTempTileMapToTileMap
 	pop hl
 	jp StdBattleTextBox
-; 3f390
 
-FillInExpBar: ; 3f390
+FillInExpBar:
 	push hl
 	call CalcExpBar
 	pop hl
@@ -8022,9 +7803,8 @@
 	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
@@ -8123,9 +7903,8 @@
 	sub b
 	ld b, a
 	ret
-; 3f41c
 
-PlaceExpBar: ; 3f41c
+PlaceExpBar:
 	ld c, $8 ; number of tiles
 .loop1
 	ld a, b
@@ -8155,15 +7934,14 @@
 
 .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
@@ -8179,9 +7957,8 @@
 	pop af
 	ld [wCurPartySpecies], a
 	ret
-; 3f46f
 
-GetBattleMonBackpic_DoAnim: ; 3f46f
+GetBattleMonBackpic_DoAnim:
 	ld a, [hBattleTurn]
 	push af
 	xor a
@@ -8191,15 +7968,14 @@
 	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
@@ -8218,9 +7994,8 @@
 	pop af
 	ld [wCurPartySpecies], a
 	ret
-; 3f4b4
 
-GetEnemyMonFrontpic_DoAnim: ; 3f4b4
+GetEnemyMonFrontpic_DoAnim:
 	ld a, [hBattleTurn]
 	push af
 	call SetEnemyTurn
@@ -8229,9 +8004,8 @@
 	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.
@@ -8248,14 +8022,12 @@
 	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
@@ -8294,9 +8066,8 @@
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 3f54e
 
-LoadTrainerOrWildMonPic: ; 3f54e
+LoadTrainerOrWildMonPic:
 	ld a, [wOtherTrainerClass]
 	and a
 	jr nz, .Trainer
@@ -8306,16 +8077,14 @@
 .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)
@@ -8337,9 +8106,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 3f594
 
-InitEnemyTrainer: ; 3f594
+InitEnemyTrainer:
 	ld [wTrainerClass], a
 	farcall StubbedTrainerRankings_TrainerBattles
 	xor a
@@ -8393,9 +8161,8 @@
 	jr .partyloop
 .done
 	ret
-; 3f607
 
-InitEnemyWildmon: ; 3f607
+InitEnemyWildmon:
 	ld a, WILD_BATTLE
 	ld [wBattleMode], a
 	farcall StubbedTrainerRankings_WildBattles
@@ -8428,9 +8195,8 @@
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 3f662
 
-Unreferenced_Function3f662: ; 3f662
+Unreferenced_Function3f662:
 	ld hl, wEnemyMonMoves
 	ld de, wListMoves_MoveIndicesBuffer
 	ld b, NUM_MOVES
@@ -8480,15 +8246,13 @@
 	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
@@ -8508,9 +8272,8 @@
 	predef EvolveAfterBattle
 	farcall GivePokerusAndConvertBerries
 	ret
-; 3f6d0
 
-CleanUpBattleRAM: ; 3f6d0
+CleanUpBattleRAM:
 	call BattleEnd_HandleRoamMons
 	xor a
 	ld [wLowHealthAlarm], a
@@ -8541,9 +8304,8 @@
 	jr nz, .loop
 	call WaitSFX
 	ret
-; 3f71d
 
-CheckPayDay: ; 3f71d
+CheckPayDay:
 	ld hl, wPayDayMoney
 	ld a, [hli]
 	or [hl]
@@ -8577,9 +8339,8 @@
 	call ClearTileMap
 	call ClearBGPalettes
 	ret
-; 3f759
 
-ShowLinkBattleParticipantsAfterEnd: ; 3f759
+ShowLinkBattleParticipantsAfterEnd:
 	farcall StubbedTrainerRankings_LinkBattles
 	farcall BackupMobileEventIndex
 	ld a, [wCurOTMon]
@@ -8590,9 +8351,8 @@
 	call ClearTileMap
 	farcall _ShowLinkBattleParticipants
 	ret
-; 3f77c
 
-DisplayLinkBattleResult: ; 3f77c
+DisplayLinkBattleResult:
 	farcall CheckMobileBattleError
 	jp c, .Mobile_InvalidBattle
 	call IsMobileBattle2
@@ -8651,7 +8411,6 @@
 	call DelayFrames
 	call ClearTileMap
 	ret
-; 3f7f7
 
 .Win:
 	db "YOU WIN@"
@@ -8659,9 +8418,8 @@
 	db "YOU LOSE@"
 .Draw:
 	db "  DRAW@"
-; 3f80f
 
-.Mobile_InvalidBattle: ; 3f80f
+.Mobile_InvalidBattle:
 	hlcoord 6, 8
 	ld de, .Invalid
 	call PlaceString
@@ -8669,19 +8427,16 @@
 	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
 
@@ -8700,9 +8455,8 @@
 	call DelayFrames
 	call WaitPressAorB_BlinkCursor
 	ret
-; 3f85f
 
-ReadAndPrintLinkBattleRecord: ; 3f85f
+ReadAndPrintLinkBattleRecord:
 	call ClearTileMap
 	call ClearSprites
 	call .PrintBattleRecord
@@ -8819,24 +8573,21 @@
 	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
@@ -8867,9 +8618,8 @@
 .update_roam_mons
 	callfar UpdateRoamMons
 	ret
-; 3f9d1
 
-GetRoamMonMapGroup: ; 3f9d1
+GetRoamMonMapGroup:
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
 	ld a, [wRoamMon1Species]
@@ -8882,9 +8632,8 @@
 	ret z
 	ld hl, wRoamMon3MapGroup
 	ret
-; 3f9e9
 
-GetRoamMonMapNumber: ; 3f9e9
+GetRoamMonMapNumber:
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
 	ld a, [wRoamMon1Species]
@@ -8897,9 +8646,8 @@
 	ret z
 	ld hl, wRoamMon3MapNumber
 	ret
-; 3fa01
 
-GetRoamMonHP: ; 3fa01
+GetRoamMonHP:
 ; output: hl = wRoamMonHP
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
@@ -8913,9 +8661,8 @@
 	ret z
 	ld hl, wRoamMon3HP
 	ret
-; 3fa19
 
-GetRoamMonDVs: ; 3fa19
+GetRoamMonDVs:
 ; output: hl = wRoamMonDVs
 	ld a, [wTempEnemyMonSpecies]
 	ld b, a
@@ -8929,9 +8676,8 @@
 	ret z
 	ld hl, wRoamMon3DVs
 	ret
-; 3fa31
 
-GetRoamMonSpecies: ; 3fa31
+GetRoamMonSpecies:
 	ld a, [wTempEnemyMonSpecies]
 	ld hl, wRoamMon1Species
 	cp [hl]
@@ -8941,9 +8687,8 @@
 	ret z
 	ld hl, wRoamMon3Species
 	ret
-; 3fa42
 
-AddLastMobileBattleToLinkRecord: ; 3fa42
+AddLastMobileBattleToLinkRecord:
 	ld hl, wOTPlayerID
 	ld de, wStringBuffer1
 	ld bc, 2
@@ -8998,8 +8743,7 @@
 	call .StoreResult
 	call .FindOpponentAndAppendRecord
 	ret
-; 3faa0
-.StoreResult: ; 3faa0
+.StoreResult:
 	ld a, [wBattleResult]
 	and $f
 	cp LOSE
@@ -9018,9 +8762,8 @@
 	dec hl
 	inc [hl]
 	ret
-; 3fabe
 
-.CheckOverflow: ; 3fabe
+.CheckOverflow:
 	dec hl
 	ld a, [hl]
 	inc hl
@@ -9029,9 +8772,8 @@
 	ld a, [hl]
 	cp LOW(MAX_LINK_RECORD)
 	ret
-; 3fac8
 
-.FindOpponentAndAppendRecord: ; 3fac8
+.FindOpponentAndAppendRecord:
 	ld b, 5
 	ld hl, sLinkBattleRecord + 17
 	ld de, wd002
@@ -9123,9 +8865,8 @@
 	pop de
 	call CopyBytes
 	ret
-; 3fb54
 
-.LoadPointer: ; 3fb54
+.LoadPointer:
 	ld e, $0
 	ld a, [hld]
 	ld c, a
@@ -9150,9 +8891,8 @@
 	ret nc
 	inc e
 	ret
-; 3fb6c
 
-InitBattleDisplay: ; 3fb6c
+InitBattleDisplay:
 	call .InitBackPic
 	hlcoord 0, 12
 	ld b, 4
@@ -9195,9 +8935,8 @@
 	xor a
 	ld [hSCX], a
 	ret
-; 3fbd6
 
-.BlankBGMap: ; 3fbd6
+.BlankBGMap:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -9216,15 +8955,13 @@
 	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.
@@ -9256,9 +8993,8 @@
 	ld c, 7 * 7
 	predef DecompressGet2bpp
 	ret
-; 3fc30
 
-CopyBackpic: ; 3fc30
+CopyBackpic:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -9278,9 +9014,8 @@
 	lb bc, 6, 6
 	predef PlaceGraphic
 	ret
-; 3fc5b
 
-.LoadTrainerBackpicAsOAM: ; 3fc5b
+.LoadTrainerBackpicAsOAM:
 	ld hl, wVirtualOAMSprite00
 	xor a
 	ld [hMapObjectIndexBuffer], a
@@ -9314,9 +9049,8 @@
 	dec b
 	jr nz, .outer_loop
 	ret
-; 3fc8b
 
-BattleStartMessage: ; 3fc8b
+BattleStartMessage:
 	ld a, [wBattleMode]
 	dec a
 	jr z, .wild
@@ -9397,4 +9131,3 @@
 	farcall Mobile_PrintOpponentBattleMessage
 
 	ret
-; 3fd26
--- 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 @@
 
 	jr DoTurn
 
-; 3400a
-
-
-DoEnemyTurn: ; 3400a
+DoEnemyTurn:
 	call SetEnemyTurn
 
 	ld a, [wLinkMode]
@@ -24,10 +21,8 @@
 	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 @@
 	ret nz
 
 	call UpdateMoveData
-; 3402c
 
-
-DoMove: ; 3402c
+DoMove:
 ; Get the user's move effect.
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
@@ -75,7 +68,6 @@
 	ld [wBattleScriptBufferAddress + 1], a
 
 .ReadMoveEffectCommand:
-
 ; ld a, [wBattleScriptBufferAddress++]
 	ld a, [wBattleScriptBufferAddress]
 	ld l, a
@@ -115,11 +107,8 @@
 .DoMoveEffectCommand:
 	jp hl
 
-; 34084
-
-
 CheckTurn:
-BattleCommand_CheckTurn: ; 34084
+BattleCommand_CheckTurn:
 ; checkturn
 
 ; Repurposed as hardcoded turn handling. Useless as a command.
@@ -145,9 +134,7 @@
 	and a
 	jp nz, CheckEnemyTurn
 
-
 CheckPlayerTurn:
-
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@@ -160,7 +147,6 @@
 
 .no_recharge
 
-
 	ld hl, wBattleMonStatus
 	ld a, [hl]
 	and SLP
@@ -206,7 +192,6 @@
 
 .not_asleep
 
-
 	ld hl, wBattleMonStatus
 	bit FRZ, [hl]
 	jr z, .not_frozen
@@ -226,7 +211,6 @@
 
 .not_frozen
 
-
 	ld hl, wPlayerSubStatus3
 	bit SUBSTATUS_FLINCHED, [hl]
 	jr z, .not_flinched
@@ -240,7 +224,6 @@
 
 .not_flinched
 
-
 	ld hl, wPlayerDisableCount
 	ld a, [hl]
 	and a
@@ -258,7 +241,6 @@
 
 .not_disabled
 
-
 	ld a, [wPlayerSubStatus3]
 	add a
 	jr nc, .not_confused
@@ -297,7 +279,6 @@
 
 .not_confused
 
-
 	ld a, [wPlayerSubStatus1]
 	add a ; bit SUBSTATUS_ATTRACT
 	jr nc, .not_infatuated
@@ -321,7 +302,6 @@
 
 .not_infatuated
 
-
 	; We can't disable a move that doesn't exist.
 	ld a, [wDisabledMove]
 	and a
@@ -338,7 +318,6 @@
 
 .no_disabled_move
 
-
 	ld hl, wBattleMonStatus
 	bit PAR, [hl]
 	ret z
@@ -353,10 +332,7 @@
 	call CantMove
 	jp EndTurn
 
-; 341f0
-
-
-CantMove: ; 341f0
+CantMove:
 	ld a, BATTLE_VARS_SUBSTATUS1
 	call GetBattleVarAddr
 	res SUBSTATUS_ROLLOUT, [hl]
@@ -382,21 +358,12 @@
 	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 @@
 
 .no_recharge
 
-
 	ld hl, wEnemyMonStatus
 	ld a, [hl]
 	and SLP
@@ -453,7 +419,6 @@
 
 .not_asleep
 
-
 	ld hl, wEnemyMonStatus
 	bit FRZ, [hl]
 	jr z, .not_frozen
@@ -472,7 +437,6 @@
 
 .not_frozen
 
-
 	ld hl, wEnemySubStatus3
 	bit SUBSTATUS_FLINCHED, [hl]
 	jr z, .not_flinched
@@ -486,7 +450,6 @@
 
 .not_flinched
 
-
 	ld hl, wEnemyDisableCount
 	ld a, [hl]
 	and a
@@ -505,7 +468,6 @@
 
 .not_disabled
 
-
 	ld a, [wEnemySubStatus3]
 	add a ; bit SUBSTATUS_CONFUSED
 	jr nc, .not_confused
@@ -520,7 +482,6 @@
 	call StdBattleTextBox
 	jr .not_confused
 
-
 .confused
 	ld hl, IsConfusedText
 	call StdBattleTextBox
@@ -564,7 +525,6 @@
 
 .not_confused
 
-
 	ld a, [wEnemySubStatus1]
 	add a ; bit SUBSTATUS_ATTRACT
 	jr nc, .not_infatuated
@@ -588,7 +548,6 @@
 
 .not_infatuated
 
-
 	; We can't disable a move that doesn't exist.
 	ld a, [wEnemyDisabledMove]
 	and a
@@ -606,7 +565,6 @@
 
 .no_disabled_move
 
-
 	ld hl, wEnemyMonStatus
 	bit PAR, [hl]
 	ret z
@@ -621,19 +579,13 @@
 	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 @@
 	ld hl, DisabledMoveText
 	jp StdBattleTextBox
 
-; 343a5
-
-
-HitConfusion: ; 343a5
-
+HitConfusion:
 	ld hl, HurtItselfText
 	call StdBattleTextBox
 
@@ -680,10 +628,7 @@
 	call DoPlayerDamage
 	jp BattleCommand_RaiseSub
 
-; 343db
-
-
-BattleCommand_CheckObedience: ; 343db
+BattleCommand_CheckObedience:
 ; checkobedience
 
 	; Enemy can't disobey
@@ -725,7 +670,6 @@
 	cp [hl]
 	ret z
 
-
 .obeylevel
 	; The maximum obedience level is constrained by owned badges:
 	ld hl, wJohtoBadges
@@ -753,7 +697,6 @@
 	; no badges
 	ld a, 10
 
-
 .getlevel
 ; c = obedience level
 ; d = monster level
@@ -772,7 +715,6 @@
 	jr nc, .checklevel
 	ld b, $ff
 
-
 .checklevel
 ; If the monster's level is lower than the obedience level, it will obey.
 	ld a, c
@@ -779,7 +721,6 @@
 	cp d
 	ret nc
 
-
 ; Random number from 0 to obedience level + monster level
 .rand1
 	call BattleRandom
@@ -797,7 +738,6 @@
 	call IgnoreSleepOnly
 	ret c
 
-
 ; Another random number from 0 to obedience level + monster level
 .rand2
 	call BattleRandom
@@ -808,7 +748,6 @@
 	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 @@
 	call HitConfusion
 	jp .EndDisobedience
 
-
 .Nap:
 	call BattleRandom
 	add a
@@ -844,7 +782,6 @@
 	ld hl, BeganToNapText
 	jr .Print
 
-
 .DoNothing:
 	; 4 random choices
 	call BattleRandom
@@ -868,9 +805,7 @@
 	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 @@
 	and a
 	jr nz, .DoNothing
 
-
 	ld hl, wBattleMonPP
 	ld de, wBattleMonMoves
 	ld b, 0
@@ -902,7 +836,6 @@
 	and a
 	jr nz, .GetTotalPP
 
-
 .CheckMovePP:
 	ld hl, wBattleMonPP
 	ld a, [wCurMoveNum]
@@ -916,7 +849,6 @@
 	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 @@
 	ld c, a
 	push af
 
-
 .RandomMove:
 	call BattleRandom
 	maskbits NUM_MOVES
@@ -951,7 +882,6 @@
 	and PP_MASK
 	jr z, .RandomMove
 
-
 ; Use it.
 	ld a, [wCurMoveNum]
 	ld c, a
@@ -965,12 +895,10 @@
 	call UpdateMoveData
 	call DoMove
 
-
 ; Restore original move choice.
 	pop af
 	ld [wCurMoveNum], a
 
-
 .EndDisobedience:
 	xor a
 	ld [wLastPlayerMove], a
@@ -984,11 +912,7 @@
 
 	jp EndMoveEffect
 
-; 3451f
-
-
-IgnoreSleepOnly: ; 3451f
-
+IgnoreSleepOnly:
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 
@@ -1015,19 +939,12 @@
 	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 @@
 	and a
 	ret
 
-; 34555
-
-
-BattleCommand_DoTurn: ; 34555
+BattleCommand_DoTurn:
 	call CheckUserIsCharging
 	ret nz
 
@@ -1165,9 +1079,7 @@
 	ld b, 1
 	ret
 
-; 34602
-
-.continuousmoves ; 34602
+.continuousmoves
 	db EFFECT_RAZOR_WIND
 	db EFFECT_SKY_ATTACK
 	db EFFECT_SKULL_BASH
@@ -1177,9 +1089,8 @@
 	db EFFECT_BIDE
 	db EFFECT_RAMPAGE
 	db -1
-; 3460b
 
-CheckMimicUsed: ; 3460b
+CheckMimicUsed:
 	ld a, [hBattleTurn]
 	and a
 	ld a, [wCurMoveNum]
@@ -1209,10 +1120,7 @@
 	and a
 	ret
 
-; 34631
-
-
-BattleCommand_Critical: ; 34631
+BattleCommand_Critical:
 ; critical
 
 ; Determine whether this attack's hit will be critical.
@@ -1302,14 +1210,13 @@
 	ld [wCriticalHit], a
 	ret
 
-INCLUDE "data/battle/critical_hits.asm"
-; 346b2
+INCLUDE "data/moves/critical_hit_moves.asm"
 
+INCLUDE "data/battle/critical_hit_chances.asm"
 
 INCLUDE "engine/battle/move_effects/triple_kick.asm"
 
-
-BattleCommand_Stab: ; 346d2
+BattleCommand_Stab:
 ; STAB = Same Type Attack Bonus
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
@@ -1493,16 +1400,13 @@
 	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,
@@ -1575,10 +1479,7 @@
 	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
@@ -1597,15 +1498,11 @@
 	ld [wTypeMatchup], a
 	ret
 
-; 3484e
-
-
 INCLUDE "engine/battle/ai/switch.asm"
 
 INCLUDE "data/types/type_matchups.asm"
 
-
-BattleCommand_DamageVariation: ; 34cfd
+BattleCommand_DamageVariation:
 ; damagevariation
 
 ; Modify the damage spread between 85% and 100%.
@@ -1614,7 +1511,6 @@
 ; 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]
@@ -1658,10 +1554,7 @@
 	ld [hl], a
 	ret
 
-; 34d32
-
-
-BattleCommand_CheckHit: ; 34d32
+BattleCommand_CheckHit:
 ; checkhit
 
 	call .DreamEater
@@ -1729,7 +1622,6 @@
 .Hit:
 	ret
 
-
 .Miss:
 ; Keep the damage value intact if we're using (Hi) Jump Kick.
 	ld a, BATTLE_VARS_MOVE_EFFECT
@@ -1743,7 +1635,6 @@
 	ld [wAttackMissed], a
 	ret
 
-
 .DreamEater:
 ; Return z if we're trying to eat the dream of
 ; a monster that isn't sleeping.
@@ -1757,7 +1648,6 @@
 	and SLP
 	ret
 
-
 .Protect:
 ; Return nz if the opponent is protected.
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
@@ -1779,7 +1669,6 @@
 	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.
@@ -1809,7 +1698,6 @@
 	and a
 	ret
 
-
 .DrainSub:
 ; Return z if using an HP drain move on a substitute.
 	call CheckSubstituteOpp
@@ -1828,7 +1716,6 @@
 	and a
 	ret
 
-
 .FlyDigMoves:
 ; Check for moves that can hit underground/flying opponents.
 ; Return z if the current move can hit the opponent.
@@ -1864,7 +1751,6 @@
 	cp MAGNITUDE
 	ret
 
-
 .ThunderRain:
 ; Return z if the current move always hits in rain, and it is raining.
 	ld a, BATTLE_VARS_MOVE_EFFECT
@@ -1876,7 +1762,6 @@
 	cp WEATHER_RAIN
 	ret
 
-
 .XAccuracy:
 	ld a, BATTLE_VARS_SUBSTATUS4
 	call GetBattleVar
@@ -1883,9 +1768,7 @@
 	bit SUBSTATUS_X_ACCURACY, a
 	ret
 
-
 .StatModifiers:
-
 	ld a, [hBattleTurn]
 	and a
 
@@ -1977,10 +1860,8 @@
 	ret
 
 INCLUDE "data/battle/accuracy_multipliers.asm"
-; 34ecc
 
-
-BattleCommand_EffectChance: ; 34ecc
+BattleCommand_EffectChance:
 ; effectchance
 
 	xor a
@@ -2007,10 +1888,7 @@
 	and a
 	ret
 
-; 34eee
-
-
-BattleCommand_LowerSub: ; 34eee
+BattleCommand_LowerSub:
 ; lowersub
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -2078,19 +1956,13 @@
 	ld [wSomeoneIsRampaging], a
 	ret
 
-; 34f57
-
-
-BattleCommand_MoveAnim: ; 34f57
+BattleCommand_MoveAnim:
 ; moveanim
 	call BattleCommand_LowerSub
 	call BattleCommand_MoveAnimNoSub
 	jp BattleCommand_RaiseSub
 
-; 34f60
-
-
-BattleCommand_MoveAnimNoSub: ; 34f60
+BattleCommand_MoveAnimNoSub:
 	ld a, [wAttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2154,10 +2026,7 @@
 	ld [wNumHits], a
 	jp PlayFXAnimID
 
-; 34fd1
-
-
-BattleCommand_StatUpAnim: ; 34fd1
+BattleCommand_StatUpAnim:
 	ld a, [wAttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2165,10 +2034,7 @@
 	xor a
 	jr BattleCommand_StatUpDownAnim
 
-; 34fdb
-
-
-BattleCommand_StatDownAnim: ; 34fdb
+BattleCommand_StatDownAnim:
 	ld a, [wAttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2180,10 +2046,8 @@
 	ld a, BATTLEANIM_WOBBLE
 
 	; fallthrough
-; 34feb
 
-
-BattleCommand_StatUpDownAnim: ; 34feb
+BattleCommand_StatUpDownAnim:
 	ld [wNumHits], a
 	xor a
 	ld [wKickCounter], a
@@ -2193,10 +2057,7 @@
 	ld d, 0
 	jp PlayFXAnimID
 
-; 34ffd
-
-
-BattleCommand_SwitchTurn: ; 34ffd
+BattleCommand_SwitchTurn:
 ; switchturn
 
 	ld a, [hBattleTurn]
@@ -2204,10 +2065,7 @@
 	ld [hBattleTurn], a
 	ret
 
-; 35004
-
-
-BattleCommand_RaiseSub: ; 35004
+BattleCommand_RaiseSub:
 ; raisesub
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -2226,10 +2084,7 @@
 	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-
@@ -2271,10 +2126,7 @@
 	call AppearUserRaiseSub
 	jp EndMoveEffect
 
-; 3505e
-
-
-BattleCommand_ApplyDamage: ; 3505e
+BattleCommand_ApplyDamage:
 ; applydamage
 
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
@@ -2366,10 +2218,7 @@
 	ld [de], a
 	ret
 
-; 350e4
-
-
-GetFailureResultText: ; 350e4
+GetFailureResultText:
 	ld hl, DoesntAffectText
 	ld de, DoesntAffectText
 	ld a, [wTypeModifier]
@@ -2427,7 +2276,7 @@
 	jp nz, DoEnemyDamage
 	jp DoPlayerDamage
 
-FailText_CheckOpponentProtect: ; 35157
+FailText_CheckOpponentProtect:
 	ld a, BATTLE_VARS_SUBSTATUS1_OPP
 	call GetBattleVar
 	bit SUBSTATUS_PROTECT, a
@@ -2437,10 +2286,7 @@
 .not_protected
 	jp StdBattleTextBox
 
-; 35165
-
-
-BattleCommand_BideFailText: ; 35165
+BattleCommand_BideFailText:
 	ld a, [wAttackMissed]
 	and a
 	ret z
@@ -2450,10 +2296,7 @@
 	jp z, PrintDoesntAffect
 	jp PrintButItFailed
 
-; 35175
-
-
-BattleCommand_CriticalText: ; 35175
+BattleCommand_CriticalText:
 ; criticaltext
 ; Prints the message for critical hits or one-hit KOs.
 
@@ -2483,10 +2326,8 @@
 .texts
 	dw CriticalHitText
 	dw OneHitKOText
-; 35197
 
-
-BattleCommand_StartLoop: ; 35197
+BattleCommand_StartLoop:
 ; startloop
 
 	ld hl, wPlayerRolloutCount
@@ -2499,10 +2340,7 @@
 	ld [hl], a
 	ret
 
-; 351a5
-
-
-BattleCommand_SuperEffectiveLoopText: ; 351a5
+BattleCommand_SuperEffectiveLoopText:
 ; supereffectivelooptext
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -2511,10 +2349,8 @@
 	ret nz
 
 	; fallthrough
-; 351ad
 
-
-BattleCommand_SuperEffectiveText: ; 351ad
+BattleCommand_SuperEffectiveText:
 ; supereffectivetext
 
 	ld a, [wTypeModifier]
@@ -2527,10 +2363,7 @@
 .print
 	jp StdBattleTextBox
 
-; 351c0
-
-
-BattleCommand_CheckDestinyBond: ; 351c0
+BattleCommand_CheckDestinyBond:
 ; checkdestinybond
 
 ; Faint the user if it fainted an opponent using Destiny Bond.
@@ -2617,10 +2450,7 @@
 .finish
 	jp EndMoveEffect
 
-; 35250
-
-
-BattleCommand_BuildOpponentRage: ; 35250
+BattleCommand_BuildOpponentRage:
 ; buildopponentrage
 
 	jp .start
@@ -2651,10 +2481,7 @@
 	call StdBattleTextBox
 	jp BattleCommand_SwitchTurn
 
-; 3527b
-
-
-BattleCommand_RageDamage: ; 3527b
+BattleCommand_RageDamage:
 ; ragedamage
 
 	ld a, [wCurDamage]
@@ -2682,10 +2509,7 @@
 	ld [wCurDamage + 1], a
 	ret
 
-; 352a3
-
-
-EndMoveEffect: ; 352a3
+EndMoveEffect:
 	ld a, [wBattleScriptBufferAddress]
 	ld l, a
 	ld a, [wBattleScriptBufferAddress + 1]
@@ -2696,10 +2520,7 @@
 	ld [hl], a
 	ret
 
-; 352b1
-
-
-DittoMetalPowder: ; 352b1
+DittoMetalPowder:
 	ld a, MON_SPECIES
 	call BattlePartyAttr
 	ld a, [hBattleTurn]
@@ -2735,10 +2556,7 @@
 	rr c
 	ret
 
-; 352dc
-
-
-BattleCommand_DamageStats: ; 352dc
+BattleCommand_DamageStats:
 ; damagestats
 
 	ld a, [hBattleTurn]
@@ -2746,10 +2564,8 @@
 	jp nz, EnemyAttackDamage
 
 	; fallthrough
-; 352e2
 
-
-PlayerAttackDamage: ; 352e2
+PlayerAttackDamage:
 ; Return move power d, player level e, enemy defense c and player attack b.
 
 	call ResetDamage
@@ -2831,10 +2647,7 @@
 	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
@@ -2879,10 +2692,7 @@
 	ld b, l
 	ret
 
-; 35378
-
-
-GetDamageStatsCritical: ; 35378
+GetDamageStatsCritical:
 ; Return carry if non-critical.
 
 	ld a, [wCriticalHit]
@@ -2891,10 +2701,8 @@
 	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.
 
@@ -2934,10 +2742,7 @@
 	pop hl
 	ret
 
-; 353b5
-
-
-ThickClubBoost: ; 353b5
+ThickClubBoost:
 ; Return in hl the stat value at hl.
 
 ; If the attacking monster is Cubone or Marowak and
@@ -2952,10 +2757,7 @@
 	pop bc
 	ret
 
-; 353c3
-
-
-LightBallBoost: ; 353c3
+LightBallBoost:
 ; Return in hl the stat value at hl.
 
 ; If the attacking monster is Pikachu and it's
@@ -2970,10 +2772,7 @@
 	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
@@ -3013,10 +2812,7 @@
 	rl h
 	ret
 
-; 353f6
-
-
-EnemyAttackDamage: ; 353f6
+EnemyAttackDamage:
 	call ResetDamage
 
 ; No damage dealt with 0 power.
@@ -3094,13 +2890,9 @@
 	and a
 	ret
 
-; 35461
-
-
 INCLUDE "engine/battle/move_effects/beat_up.asm"
 
-
-BattleCommand_ClearMissDamage: ; 355d5
+BattleCommand_ClearMissDamage:
 ; clearmissdamage
 	ld a, [wAttackMissed]
 	and a
@@ -3108,10 +2900,7 @@
 
 	jp ResetDamage
 
-; 355dd
-
-
-HitSelfInConfusion: ; 355dd
+HitSelfInConfusion:
 	call ResetDamage
 	ld a, [hBattleTurn]
 	and a
@@ -3147,10 +2936,7 @@
 	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.
@@ -3273,12 +3059,11 @@
 	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]
@@ -3343,7 +3128,6 @@
 	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
@@ -3358,7 +3142,6 @@
 	and a
 	ret
 
-
 .CriticalMultiplier:
 	ld a, [wCriticalHit]
 	and a
@@ -3382,13 +3165,9 @@
 
 	ret
 
-; 35703
-
-
 INCLUDE "data/types/type_boost_items.asm"
 
-
-BattleCommand_ConstantDamage: ; 35726
+BattleCommand_ConstantDamage:
 ; constantdamage
 
 	ld hl, wBattleMonLevel
@@ -3548,7 +3327,6 @@
 
 INCLUDE "data/moves/flail_reversal_power.asm"
 
-
 INCLUDE "engine/battle/move_effects/counter.asm"
 
 INCLUDE "engine/battle/move_effects/encore.asm"
@@ -3563,8 +3341,7 @@
 
 INCLUDE "engine/battle/move_effects/sketch.asm"
 
-
-BattleCommand_DefrostOpponent: ; 35b16
+BattleCommand_DefrostOpponent:
 ; defrostopponent
 ; Thaw the opponent if frozen, and
 ; raise the user's Attack one stage.
@@ -3590,9 +3367,6 @@
 	ld [hl], a
 	ret
 
-; 35b33
-
-
 INCLUDE "engine/battle/move_effects/sleep_talk.asm"
 
 INCLUDE "engine/battle/move_effects/destiny_bond.asm"
@@ -3603,8 +3377,7 @@
 
 INCLUDE "engine/battle/move_effects/heal_bell.asm"
 
-
-FarPlayBattleAnimation: ; 35d00
+FarPlayBattleAnimation:
 ; play animation de
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -3613,9 +3386,8 @@
 	ret nz
 
 	; fallthrough
-; 35d08
 
-PlayFXAnimID: ; 35d08
+PlayFXAnimID:
 	ld a, e
 	ld [wFXAnimID], a
 	ld a, d
@@ -3626,10 +3398,7 @@
 	callfar PlayBattleAnim
 	ret
 
-; 35d1c
-
-
-DoEnemyDamage: ; 35d1c
+DoEnemyDamage:
 	ld hl, wCurDamage
 	ld a, [hli]
 	ld b, a
@@ -3689,10 +3458,7 @@
 .did_no_damage
 	jp RefreshBattleHuds
 
-; 35d7e
-
-
-DoPlayerDamage: ; 35d7e
+DoPlayerDamage:
 	ld hl, wCurDamage
 	ld a, [hli]
 	ld b, a
@@ -3752,10 +3518,7 @@
 .did_no_damage
 	jp RefreshBattleHuds
 
-; 35de0
-
-
-DoSubstituteDamage: ; 35de0
+DoSubstituteDamage:
 	ld hl, SubTookDamageText
 	call StdBattleTextBox
 
@@ -3812,11 +3575,7 @@
 .done
 	jp ResetDamage
 
-; 35e40
-
-
-UpdateMoveData: ; 35e40
-
+UpdateMoveData:
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVarAddr
 	ld d, h
@@ -3832,10 +3591,7 @@
 	call GetMoveName
 	jp CopyName1
 
-; 35e5c
-
-
-BattleCommand_SleepTarget: ; 35e5c
+BattleCommand_SleepTarget:
 ; sleeptarget
 
 	call GetOpponentItem
@@ -3906,10 +3662,7 @@
 	pop hl
 	jp StdBattleTextBox
 
-; 35ece
-
-
-.CheckAIRandomFail: ; 35ece
+.CheckAIRandomFail:
 	; Enemy turn
 	ld a, [hBattleTurn]
 	and a
@@ -3937,10 +3690,7 @@
 	xor a
 	ret
 
-; 35eee
-
-
-BattleCommand_PoisonTarget: ; 35eee
+BattleCommand_PoisonTarget:
 ; poisontarget
 
 	call CheckSubstituteOpp
@@ -3975,10 +3725,7 @@
 	farcall UseHeldStatusHealingItem
 	ret
 
-; 35f2c
-
-
-BattleCommand_Poison: ; 35f2c
+BattleCommand_Poison:
 ; poison
 
 	ld hl, DoesntAffectText
@@ -4066,18 +3813,12 @@
 	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]
@@ -4091,10 +3832,7 @@
 	cp EFFECT_TOXIC
 	ret
 
-; 35fe1
-
-
-CheckIfTargetIsPoisonType: ; 35fe1
+CheckIfTargetIsPoisonType:
 	ld de, wEnemyMonType1
 	ld a, [hBattleTurn]
 	and a
@@ -4109,37 +3847,25 @@
 	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]
@@ -4232,10 +3958,7 @@
 	call RefreshBattleHuds
 	jp UpdateBattleMonInParty
 
-; 3608c
-
-
-BattleCommand_BurnTarget: ; 3608c
+BattleCommand_BurnTarget:
 ; burntarget
 
 	xor a
@@ -4276,10 +3999,7 @@
 	farcall UseHeldStatusHealingItem
 	ret
 
-; 360dd
-
-
-Defrost: ; 360dd
+Defrost:
 	ld a, [hl]
 	and 1 << FRZ
 	ret z
@@ -4304,10 +4024,7 @@
 	ld hl, DefrostedOpponentText
 	jp StdBattleTextBox
 
-; 36102
-
-
-BattleCommand_FreezeTarget: ; 36102
+BattleCommand_FreezeTarget:
 ; freezetarget
 
 	xor a
@@ -4360,10 +4077,7 @@
 	ld [hl], $1
 	ret
 
-; 36165
-
-
-BattleCommand_ParalyzeTarget: ; 36165
+BattleCommand_ParalyzeTarget:
 ; paralyzetarget
 
 	xor a
@@ -4399,80 +4113,77 @@
 	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]
@@ -4480,10 +4191,7 @@
 	ret nz
 	jp StatUpAnimation
 
-; 361ef
-
-
-CheckIfStatCanBeRaised: ; 361ef
+CheckIfStatCanBeRaised:
 	ld a, b
 	ld [wLoweredStat], a
 	ld hl, wPlayerStatLevels
@@ -4562,17 +4270,12 @@
 	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
@@ -4579,18 +4282,12 @@
 	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]
@@ -4615,79 +4312,76 @@
 	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
@@ -4810,10 +4504,7 @@
 	ld [wAttackMissed], a
 	ret
 
-; 36391
-
-
-CheckMist: ; 36391
+CheckMist:
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_ATTACK_DOWN
@@ -4838,10 +4529,7 @@
 	bit SUBSTATUS_MIST, a
 	ret
 
-; 363b8
-
-
-BattleCommand_StatUpMessage: ; 363b8
+BattleCommand_StatUpMessage:
 	ld a, [wFailedMessage]
 	and a
 	ret nz
@@ -4871,10 +4559,7 @@
 	text_jump UnknownText_0x1c0ce0
 	db "@"
 
-; 363e9
-
-
-BattleCommand_StatDownMessage: ; 363e9
+BattleCommand_StatDownMessage:
 	ld a, [wFailedMessage]
 	and a
 	ret nz
@@ -4903,10 +4588,7 @@
 	text_jump UnknownText_0x1c0d06
 	db "@"
 
-; 3641a
-
-
-TryLowerStat: ; 3641a
+TryLowerStat:
 ; Lower stat c from stat struct hl (buffer de).
 
 	push bc
@@ -4949,10 +4631,7 @@
 	and a
 	ret
 
-; 3644c
-
-
-BattleCommand_StatUpFailText: ; 3644c
+BattleCommand_StatUpFailText:
 ; statupfailtext
 	ld a, [wFailedMessage]
 	and a
@@ -4970,10 +4649,7 @@
 	ld hl, WontRiseAnymoreText
 	jp StdBattleTextBox
 
-; 3646a
-
-
-BattleCommand_StatDownFailText: ; 3646a
+BattleCommand_StatDownFailText:
 ; statdownfailtext
 	ld a, [wFailedMessage]
 	and a
@@ -4994,10 +4670,7 @@
 	ld hl, WontDropAnymoreText
 	jp StdBattleTextBox
 
-; 3648f
-
-
-GetStatName: ; 3648f
+GetStatName:
 	ld hl, StatNames
 	ld c, "@"
 .CheckName:
@@ -5016,11 +4689,9 @@
 
 INCLUDE "data/battle/stat_names.asm"
 
-
 INCLUDE "data/battle/stat_multipliers.asm"
 
-
-BattleCommand_AllStatsUp: ; 36500
+BattleCommand_AllStatsUp:
 ; allstatsup
 
 ; Attack
@@ -5047,18 +4718,13 @@
 	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
@@ -5129,10 +4795,7 @@
 	ld [wFailedMessage], a
 	ret
 
-; 3658f
-
-
-BattleCommand_TriStatusChance: ; 3658f
+BattleCommand_TriStatusChance:
 ; tristatuschance
 
 	call BattleCommand_EffectChance
@@ -5152,10 +4815,8 @@
 	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
@@ -5162,10 +4823,7 @@
 	set SUBSTATUS_CURLED, [hl]
 	ret
 
-; 365af
-
-
-BattleCommand_RaiseSubNoAnim: ; 365af
+BattleCommand_RaiseSubNoAnim:
 	ld hl, GetBattleMonBackpic
 	ld a, [hBattleTurn]
 	and a
@@ -5177,10 +4835,7 @@
 	call CallBattleCore
 	jp WaitBGMap
 
-; 365c3
-
-
-BattleCommand_LowerSubNoAnim: ; 365c3
+BattleCommand_LowerSubNoAnim:
 	ld hl, DropPlayerSub
 	ld a, [hBattleTurn]
 	and a
@@ -5192,10 +4847,7 @@
 	call CallBattleCore
 	jp WaitBGMap
 
-; 365d7
-
-
-CalcPlayerStats: ; 365d7
+CalcPlayerStats:
 	ld hl, wPlayerAtkLevel
 	ld de, wPlayerStats
 	ld bc, wBattleMonAttack
@@ -5216,10 +4868,7 @@
 
 	jp BattleCommand_SwitchTurn
 
-; 365fd
-
-
-CalcEnemyStats: ; 365fd
+CalcEnemyStats:
 	ld hl, wEnemyAtkLevel
 	ld de, wEnemyStats
 	ld bc, wEnemyMonAttack
@@ -5237,10 +4886,7 @@
 
 	jp BattleCommand_SwitchTurn
 
-; 3661d
-
-
-CalcStats: ; 3661d
+CalcStats:
 .loop
 	push af
 	ld a, [hli]
@@ -5309,13 +4955,9 @@
 
 	ret
 
-; 36671
-
-
 INCLUDE "engine/battle/move_effects/bide.asm"
 
-
-BattleCommand_CheckRampage: ; 3671a
+BattleCommand_CheckRampage:
 ; checkrampage
 
 	ld de, wPlayerRolloutCount
@@ -5352,10 +4994,7 @@
 	ld b, rampage_command
 	jp SkipToBattleCommand
 
-; 36751
-
-
-BattleCommand_Rampage: ; 36751
+BattleCommand_Rampage:
 ; rampage
 
 ; No rampage during Sleep Talk.
@@ -5382,13 +5021,9 @@
 	ld [wSomeoneIsRampaging], a
 	ret
 
-; 36778
-
-
 INCLUDE "engine/battle/move_effects/teleport.asm"
 
-
-SetBattleDraw: ; 36804
+SetBattleDraw:
 	ld a, [wBattleResult]
 	and BATTLERESULT_BITMASK
 	or DRAW
@@ -5395,10 +5030,7 @@
 	ld [wBattleResult], a
 	ret
 
-; 3680f
-
-
-BattleCommand_ForceSwitch: ; 3680f
+BattleCommand_ForceSwitch:
 ; forceswitch
 
 	ld a, [wBattleType]
@@ -5617,10 +5249,7 @@
 .do_text
 	jp StdBattleTextBox
 
-; 36994
-
-
-CheckPlayerHasMonToSwitchTo: ; 36994
+CheckPlayerHasMonToSwitchTo:
 	ld a, [wPartyCount]
 	ld d, a
 	ld e, 0
@@ -5649,10 +5278,7 @@
 	and a
 	ret
 
-; 369b6
-
-
-BattleCommand_EndLoop: ; 369b6
+BattleCommand_EndLoop:
 ; endloop
 
 ; Loop back to 'critical'.
@@ -5786,10 +5412,7 @@
 	ld [wBattleScriptBufferAddress], a
 	ret
 
-; 36a82
-
-
-BattleCommand_FakeOut: ; 36a82
+BattleCommand_FakeOut:
 	ld a, [wAttackMissed]
 	and a
 	ret nz
@@ -5810,10 +5433,7 @@
 	ld [wAttackMissed], a
 	ret
 
-; 36aa0
-
-
-BattleCommand_FlinchTarget: ; 36aa0
+BattleCommand_FlinchTarget:
 	call CheckSubstituteOpp
 	ret nz
 
@@ -5830,19 +5450,14 @@
 	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
@@ -5853,10 +5468,7 @@
 	pop bc
 	ret
 
-; 36ac9
-
-
-BattleCommand_HeldFlinch: ; 36ac9
+BattleCommand_HeldFlinch:
 ; kingsrock
 
 	ld a, [wAttackMissed]
@@ -5884,10 +5496,7 @@
 	set SUBSTATUS_FLINCHED, [hl]
 	ret
 
-; 36af3
-
-
-BattleCommand_OHKO: ; 36af3
+BattleCommand_OHKO:
 ; ohko
 
 	call ResetDamage
@@ -5933,10 +5542,7 @@
 	ld [wAttackMissed], a
 	ret
 
-; 36b3a
-
-
-BattleCommand_CheckCharge: ; 36b3a
+BattleCommand_CheckCharge:
 ; checkcharge
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -5949,10 +5555,7 @@
 	ld b, charge_command
 	jp SkipToBattleCommand
 
-; 36b4d
-
-
-BattleCommand_Charge: ; 36b4d
+BattleCommand_Charge:
 ; charge
 
 	call BattleCommand_ClearText
@@ -6092,17 +5695,12 @@
 ; 'dug a hole!'
 	text_jump UnknownText_0x1c0d6c
 	db "@"
-; 36c2c
 
-
-BattleCommand3c: ; 36c2c
+BattleCommand3c:
 ; unused
 	ret
 
-; 36c2d
-
-
-BattleCommand_TrapTarget: ; 36c2d
+BattleCommand_TrapTarget:
 ; traptarget
 
 	ld a, [wAttackMissed]
@@ -6157,15 +5755,12 @@
 	dbw FIRE_SPIN, FireSpinTrapText  ; 'was trapped!'
 	dbw CLAMP,     ClampedByText     ; 'was CLAMPED by'
 	dbw WHIRLPOOL, WhirlpoolTrapText ; 'was trapped!'
-; 36c7e
 
-
 INCLUDE "engine/battle/move_effects/mist.asm"
 
 INCLUDE "engine/battle/move_effects/focus_energy.asm"
 
-
-BattleCommand_Recoil: ; 36cb2
+BattleCommand_Recoil:
 ; recoil
 
 	ld hl, wBattleMonMaxHP
@@ -6229,10 +5824,7 @@
 	ld hl, RecoilText
 	jp StdBattleTextBox
 
-; 36d1d
-
-
-BattleCommand_ConfuseTarget: ; 36d1d
+BattleCommand_ConfuseTarget:
 ; confusetarget
 
 	call GetOpponentItem
@@ -6252,8 +5844,7 @@
 	ret nz
 	jr BattleCommand_FinishConfusingTarget
 
-
-BattleCommand_Confuse: ; 36d3b
+BattleCommand_Confuse:
 ; confuse
 
 	call GetOpponentItem
@@ -6282,7 +5873,7 @@
 	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
@@ -6325,9 +5916,7 @@
 	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
@@ -6338,10 +5927,7 @@
 	ret z
 	jp PrintDidntAffect2
 
-; 36dc7
-
-
-BattleCommand_Paralyze: ; 36dc7
+BattleCommand_Paralyze:
 ; paralyze
 
 	ld a, BATTLE_VARS_STATUS_OPP
@@ -6421,10 +6007,7 @@
 	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).
@@ -6459,13 +6042,9 @@
 	pop hl
 	ret
 
-; 36e7c
-
-
 INCLUDE "engine/battle/move_effects/substitute.asm"
 
-
-BattleCommand_RechargeNextTurn: ; 36f0b
+BattleCommand_RechargeNextTurn:
 ; rechargenextturn
 	ld a, BATTLE_VARS_SUBSTATUS4
 	call GetBattleVarAddr
@@ -6472,10 +6051,7 @@
 	set SUBSTATUS_RECHARGE, [hl]
 	ret
 
-; 36f13
-
-
-EndRechargeOpp: ; 36f13
+EndRechargeOpp:
 	push hl
 	ld a, BATTLE_VARS_SUBSTATUS4_OPP
 	call GetBattleVarAddr
@@ -6483,13 +6059,9 @@
 	pop hl
 	ret
 
-; 36f1d
-
-
 INCLUDE "engine/battle/move_effects/rage.asm"
 
-
-BattleCommand_DoubleFlyingDamage: ; 36f25
+BattleCommand_DoubleFlyingDamage:
 ; doubleflyingdamage
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -6497,10 +6069,7 @@
 	ret z
 	jr DoubleDamage
 
-; 36f2f
-
-
-BattleCommand_DoubleUndergroundDamage: ; 36f2f
+BattleCommand_DoubleUndergroundDamage:
 ; doubleundergrounddamage
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -6508,10 +6077,8 @@
 	ret z
 
 	; fallthrough
-; 36f37
 
-
-DoubleDamage: ; 36f37
+DoubleDamage:
 	ld hl, wCurDamage + 1
 	sla [hl]
 	dec hl
@@ -6524,9 +6091,6 @@
 .quit
 	ret
 
-; 36f46
-
-
 INCLUDE "engine/battle/move_effects/mimic.asm"
 
 INCLUDE "engine/battle/move_effects/leech_seed.asm"
@@ -6539,8 +6103,7 @@
 
 INCLUDE "engine/battle/move_effects/conversion.asm"
 
-
-BattleCommand_ResetStats: ; 3710e
+BattleCommand_ResetStats:
 ; resetstats
 
 	ld a, 7 ; neutral
@@ -6573,10 +6136,7 @@
 	jr nz, .next
 	ret
 
-; 3713e
-
-
-BattleCommand_Heal: ; 3713e
+BattleCommand_Heal:
 ; heal
 
 	ld de, wBattleMonHP
@@ -6658,13 +6218,9 @@
 	ld hl, HPIsFullText
 	jp StdBattleTextBox
 
-; 371cd
-
-
 INCLUDE "engine/battle/move_effects/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]
@@ -6679,17 +6235,11 @@
 .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
@@ -6701,10 +6251,7 @@
 	ld [hl], a
 	ret
 
-; 372e7
-
-
-ResetActorDisable: ; 372e7
+ResetActorDisable:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .player
@@ -6720,10 +6267,7 @@
 	ld [wDisabledMove], a
 	ret
 
-; 372fc
-
-
-BattleCommand_Screen: ; 372fc
+BattleCommand_Screen:
 ; screen
 
 	ld hl, wPlayerScreens
@@ -6768,89 +6312,59 @@
 	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
-
-
 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
-
-
 INCLUDE "engine/battle/move_effects/selfdestruct.asm"
 
 INCLUDE "engine/battle/move_effects/mirror_move.asm"
@@ -6857,8 +6371,7 @@
 
 INCLUDE "engine/battle/move_effects/metronome.asm"
 
-
-CheckUserMove: ; 37462
+CheckUserMove:
 ; Return z if the user has move a.
 	ld b, a
 	ld de, wBattleMonMoves
@@ -6882,10 +6395,7 @@
 	and a
 	ret
 
-; 3747b
-
-
-ResetTurn: ; 3747b
+ResetTurn:
 	ld hl, wPlayerCharging
 	ld a, [hBattleTurn]
 	and a
@@ -6899,13 +6409,9 @@
 	call DoMove
 	jp EndMoveEffect
 
-; 37492
-
-
 INCLUDE "engine/battle/move_effects/thief.asm"
 
-
-BattleCommand_ArenaTrap: ; 37517
+BattleCommand_ArenaTrap:
 ; arenatrap
 
 ; Doesn't work on an absent opponent.
@@ -6931,13 +6437,9 @@
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-; 37536
-
-
 INCLUDE "engine/battle/move_effects/nightmare.asm"
 
-
-BattleCommand_Defrost: ; 37563
+BattleCommand_Defrost:
 ; defrost
 
 ; Thaw the user.
@@ -6968,9 +6470,6 @@
 	ld hl, WasDefrostedText
 	jp StdBattleTextBox
 
-; 37588
-
-
 INCLUDE "engine/battle/move_effects/curse.asm"
 
 INCLUDE "engine/battle/move_effects/protect.asm"
@@ -6987,14 +6486,10 @@
 
 INCLUDE "engine/battle/move_effects/rollout.asm"
 
-
-BattleCommand5d: ; 37791
+BattleCommand5d:
 ; unused
 	ret
 
-; 37792
-
-
 INCLUDE "engine/battle/move_effects/fury_cutter.asm"
 
 INCLUDE "engine/battle/move_effects/attract.asm"
@@ -7007,8 +6502,7 @@
 
 INCLUDE "engine/battle/move_effects/safeguard.asm"
 
-
-SafeCheckSafeguard: ; 37962
+SafeCheckSafeguard:
 	push hl
 	ld hl, wEnemyScreens
 	ld a, [hBattleTurn]
@@ -7021,10 +6515,7 @@
 	pop hl
 	ret
 
-; 37972
-
-
-BattleCommand_CheckSafeguard: ; 37972
+BattleCommand_CheckSafeguard:
 ; checksafeguard
 	ld hl, wEnemyScreens
 	ld a, [hBattleTurn]
@@ -7041,9 +6532,6 @@
 	call StdBattleTextBox
 	jp EndMoveEffect
 
-; 37991
-
-
 INCLUDE "engine/battle/move_effects/magnitude.asm"
 
 INCLUDE "engine/battle/move_effects/baton_pass.asm"
@@ -7052,28 +6540,22 @@
 
 INCLUDE "engine/battle/move_effects/rapid_spin.asm"
 
-
-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
@@ -7154,9 +6636,7 @@
 	dw GetQuarterMaxHP
 	dw GetHalfMaxHP
 	dw GetMaxHP
-; 37be8
 
-
 INCLUDE "engine/battle/move_effects/hidden_power.asm"
 
 INCLUDE "engine/battle/move_effects/rain_dance.asm"
@@ -7169,8 +6649,7 @@
 
 INCLUDE "engine/battle/move_effects/mirror_coat.asm"
 
-
-BattleCommand_DoubleMinimizeDamage: ; 37ce6
+BattleCommand_DoubleMinimizeDamage:
 ; doubleminimizedamage
 
 	ld hl, wEnemyMinimized
@@ -7192,10 +6671,7 @@
 	ld [hl], a
 	ret
 
-; 37d02
-
-
-BattleCommand_SkipSunCharge: ; 37d02
+BattleCommand_SkipSunCharge:
 ; mimicsuncharge
 	ld a, [wBattleWeather]
 	cp WEATHER_SUN
@@ -7203,15 +6679,11 @@
 	ld b, charge_command
 	jp SkipToBattleCommand
 
-; 37d0d
-
-
 INCLUDE "engine/battle/move_effects/future_sight.asm"
 
 INCLUDE "engine/battle/move_effects/thunder.asm"
 
-
-CheckHiddenOpponent: ; 37daa
+CheckHiddenOpponent:
 ; BUG: This routine should account for Lock-On and Mind Reader.
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -7218,10 +6690,7 @@
 	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]
@@ -7232,10 +6701,7 @@
 	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]
@@ -7246,10 +6712,7 @@
 	ld b, [hl]
 	jp GetItemHeldEffect
 
-; 37dd0
-
-
-GetItemHeldEffect: ; 37dd0
+GetItemHeldEffect:
 ; Return the effect of item b in bc.
 	ld a, b
 	and a
@@ -7269,10 +6732,7 @@
 	pop hl
 	ret
 
-; 37de9
-
-
-AnimateCurrentMoveEitherSide: ; 37de9
+AnimateCurrentMoveEitherSide:
 	push hl
 	push de
 	push bc
@@ -7288,10 +6748,7 @@
 	pop hl
 	ret
 
-; 37e01
-
-
-AnimateCurrentMove: ; 37e01
+AnimateCurrentMove:
 	push hl
 	push de
 	push bc
@@ -7307,10 +6764,7 @@
 	pop hl
 	ret
 
-; 37e19
-
-
-PlayDamageAnim: ; 37e19
+PlayDamageAnim:
 	xor a
 	ld [wFXAnimID + 1], a
 
@@ -7332,10 +6786,7 @@
 
 	jp PlayUserBattleAnim
 
-; 37e36
-
-
-LoadMoveAnim: ; 37e36
+LoadMoveAnim:
 	xor a
 	ld [wNumHits], a
 	ld [wFXAnimID + 1], a
@@ -7346,17 +6797,13 @@
 	ret z
 
 	; fallthrough
-; 37e44
 
-
-LoadAnim: ; 37e44
+LoadAnim:
 	ld [wFXAnimID], a
 
 	; fallthrough
-; 37e47
 
-
-PlayUserBattleAnim: ; 37e47
+PlayUserBattleAnim:
 	push hl
 	push de
 	push bc
@@ -7366,10 +6813,7 @@
 	pop hl
 	ret
 
-; 37e54
-
-
-PlayOpponentBattleAnim: ; 37e54
+PlayOpponentBattleAnim:
 	ld a, e
 	ld [wFXAnimID], a
 	ld a, d
@@ -7390,35 +6834,23 @@
 	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.
@@ -7427,10 +6859,8 @@
 
 .text
 	db "@"
-; 37e8c
 
-
-SkipToBattleCommand: ; 37e8c
+SkipToBattleCommand:
 ; Skip over commands until reaching command b.
 	ld a, [wBattleScriptBufferAddress + 1]
 	ld h, a
@@ -7447,10 +6877,7 @@
 	ld [wBattleScriptBufferAddress], a
 	ret
 
-; 37ea1
-
-
-GetMoveAttr: ; 37ea1
+GetMoveAttr:
 ; Assuming hl = Moves + x, return attribute x of move a.
 	push bc
 	ld bc, MOVE_LENGTH
@@ -7459,49 +6886,31 @@
 	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
@@ -7511,5 +6920,3 @@
 	pop de
 	pop hl
 	ret
-
-; 37ee2
--- 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 @@
 	ld hl, wEnemyMonDVs
 .got_dvs
 
-
 ; Power:
 
 ; Take the top bit from each stat
@@ -62,7 +61,6 @@
 
 	ld d, a
 
-
 ; Type:
 
 	; Def & 3
@@ -108,4 +106,3 @@
 	pop af
 	ld d, a
 	ret
-; fbd54
--- 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
@@ -58,7 +58,7 @@
 	ld [wBattleResult], a
 	ret
 
-.CountMonsRemaining: ; 2b995
+.CountMonsRemaining:
 	ld c, 0
 	ld b, 3
 	ld de, PARTYMON_STRUCT_LENGTH - 1
@@ -74,7 +74,7 @@
 	jr nz, .loop
 	ret
 
-.CalcPercentHPRemaining: ; 2b9a6
+.CalcPercentHPRemaining:
 	ld de, 0
 	ld c, $3
 .loop2
@@ -117,7 +117,7 @@
 	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
@@ -136,7 +136,7 @@
 	and a
 	ret
 
-.CheckFaintedOrFullHealth: ; 2ba01
+.CheckFaintedOrFullHealth:
 	ld d, 3
 .loop3
 	ld a, [hli]
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -1,4 +1,4 @@
-LoadBattleMenu: ; 24ef2
+LoadBattleMenu:
 	ld hl, BattleMenuHeader
 	call LoadMenuHeader
 	ld a, [wBattleMenuCursorBuffer]
@@ -8,21 +8,18 @@
 	ld [wBattleMenuCursorBuffer], a
 	call ExitMenu
 	ret
-; 24f0b
 
-SafariBattleMenu: ; 24f0b
+SafariBattleMenu:
 ; untranslated
 	ld hl, MenuHeader_0x24f4e
 	call LoadMenuHeader
 	jr Function24f19
-; 24f13
 
-ContestBattleMenu: ; 24f13
+ContestBattleMenu:
 	ld hl, MenuHeader_0x24f89
 	call LoadMenuHeader
-; 24f19
 
-Function24f19: ; 24f19
+Function24f19:
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
 	call _2DMenu
@@ -30,86 +27,74 @@
 	ld [wBattleMenuCursorBuffer], a
 	call ExitMenu
 	ret
-; 24f2c
 
-BattleMenuHeader: ; 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
 
-MenuHeader_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
 
-MenuHeader_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
--- 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 @@
 	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,24 +34,22 @@
 .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
-
+DoWeatherModifiers:
 	ld de, WeatherTypeModifiers
 	ld a, [wBattleWeather]
 	ld b, a
@@ -76,7 +74,6 @@
 	inc de
 	jr .CheckWeatherType
 
-
 .done_weather_types
 	ld de, WeatherMoveModifiers
 
@@ -147,8 +144,7 @@
 
 INCLUDE "data/battle/weather_modifiers.asm"
 
-
-DoBadgeTypeBoosts: ; fbe24
+DoBadgeTypeBoosts:
 	ld a, [wLinkMode]
 	and a
 	ret nz
--- a/engine/battle/move_effects/attract.asm
+++ b/engine/battle/move_effects/attract.asm
@@ -1,4 +1,4 @@
-BattleCommand_Attract: ; 377ce
+BattleCommand_Attract:
 ; attract
 	ld a, [wAttackMissed]
 	and a
@@ -21,10 +21,8 @@
 
 .failed
 	jp FailMove
-; 377f5
 
-
-CheckOppositeGender: ; 377f5
+CheckOppositeGender:
 	ld a, MON_SPECIES
 	call BattlePartyAttr
 	ld a, [hl]
@@ -76,4 +74,3 @@
 .genderless_samegender
 	scf
 	ret
-; 3784b
--- a/engine/battle/move_effects/baton_pass.asm
+++ b/engine/battle/move_effects/baton_pass.asm
@@ -1,4 +1,4 @@
-BattleCommand_BatonPass: ; 379c9
+BattleCommand_BatonPass:
 ; batonpass
 
 	ld a, [hBattleTurn]
@@ -5,7 +5,6 @@
 	and a
 	jp nz, .Enemy
 
-
 ; Need something to switch to
 	call CheckAnyOtherAlivePartyMons
 	jp z, FailedBatonPass
@@ -45,9 +44,7 @@
 	call ResetBatonPassStatus
 	ret
 
-
 .Enemy:
-
 ; Wildmons don't have anything to switch to
 	ld a, [wBattleMode]
 	dec a ; WILDMON
@@ -81,10 +78,7 @@
 
 	jr ResetBatonPassStatus
 
-; 37a67
-
-
-BatonPass_LinkPlayerSwitch: ; 37a67
+BatonPass_LinkPlayerSwitch:
 	ld a, [wLinkMode]
 	and a
 	ret z
@@ -101,10 +95,7 @@
 	ld [wBattlePlayerAction], a
 	ret
 
-; 37a82
-
-
-BatonPass_LinkEnemySwitch: ; 37a82
+BatonPass_LinkEnemySwitch:
 	ld a, [wLinkMode]
 	and a
 	ret z
@@ -129,17 +120,11 @@
 .switch
 	jp CloseWindow
 
-; 37aab
-
-
-FailedBatonPass: ; 37aab
+FailedBatonPass:
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-; 37ab1
-
-
-ResetBatonPassStatus: ; 37ab1
+ResetBatonPassStatus:
 ; Reset status changes that aren't passed by Baton Pass.
 
 	; Nightmare isn't passed.
@@ -178,10 +163,7 @@
 	ld [wEnemyWrapCount], a
 	ret
 
-; 37ae9
-
-
-CheckAnyOtherAlivePartyMons: ; 37ae9
+CheckAnyOtherAlivePartyMons:
 	ld hl, wPartyMon1HP
 	ld a, [wPartyCount]
 	ld d, a
@@ -189,10 +171,7 @@
 	ld e, a
 	jr CheckAnyOtherAliveMons
 
-; 37af6
-
-
-CheckAnyOtherAliveEnemyMons: ; 37af6
+CheckAnyOtherAliveEnemyMons:
 	ld hl, wOTPartyMon1HP
 	ld a, [wOTPartyCount]
 	ld d, a
@@ -200,9 +179,8 @@
 	ld e, a
 
 	; fallthrough
-; 37b01
 
-CheckAnyOtherAliveMons: ; 37b01
+CheckAnyOtherAliveMons:
 ; Check for nonzero HP starting from partymon
 ; HP at hl for d partymons, besides current mon e.
 
@@ -237,5 +215,3 @@
 	ld a, b
 	and a
 	ret
-
-; 37b1d
--- a/engine/battle/move_effects/beat_up.asm
+++ b/engine/battle/move_effects/beat_up.asm
@@ -1,4 +1,4 @@
-BattleCommand_BeatUp: ; 35461
+BattleCommand_BeatUp:
 ; beatup
 
 	call ResetDamage
@@ -193,17 +193,11 @@
 	ld d, a
 	ret
 
-; 355b0
-
-
-.beatup_fail ; 355b0
+.beatup_fail
 	ld b, buildopponentrage_command
 	jp SkipToBattleCommand
 
-; 355b5
-
-
-BattleCommand_BeatUpFailText: ; 355b5
+BattleCommand_BeatUpFailText:
 ; beatupfailtext
 
 	ld a, [wBeatUpHitAtLeastOnce]
@@ -212,10 +206,7 @@
 
 	jp PrintButItFailed
 
-; 355bd
-
-
-GetBeatupMonLocation: ; 355bd
+GetBeatupMonLocation:
 	push bc
 	ld c, a
 	ld b, 0
--- a/engine/battle/move_effects/belly_drum.asm
+++ b/engine/battle/move_effects/belly_drum.asm
@@ -1,4 +1,4 @@
-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.
@@ -32,5 +32,3 @@
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-
-; 37c55
--- a/engine/battle/move_effects/bide.asm
+++ b/engine/battle/move_effects/bide.asm
@@ -1,4 +1,4 @@
-BattleCommand_StoreEnergy: ; 36671
+BattleCommand_StoreEnergy:
 ; storeenergy
 
 	ld a, BATTLE_VARS_SUBSTATUS3
@@ -69,10 +69,7 @@
 	call StdBattleTextBox
 	jp EndMoveEffect
 
-; 366e5
-
-
-BattleCommand_UnleashEnergy: ; 366e5
+BattleCommand_UnleashEnergy:
 ; unleashenergy
 
 	ld de, wPlayerDamageTaken
@@ -101,5 +98,3 @@
 	ld [wKickCounter], a
 	call AnimateCurrentMove
 	jp EndMoveEffect
-
-; 3671a
--- a/engine/battle/move_effects/conversion.asm
+++ b/engine/battle/move_effects/conversion.asm
@@ -1,4 +1,4 @@
-BattleCommand_Conversion: ; 3707f
+BattleCommand_Conversion:
 ; conversion
 
 	ld hl, wBattleMonMoves
@@ -94,5 +94,3 @@
 	call AnimateCurrentMove
 	ld hl, TransformedTypeText
 	jp StdBattleTextBox
-
-; 3710e
--- a/engine/battle/move_effects/conversion2.asm
+++ b/engine/battle/move_effects/conversion2.asm
@@ -1,4 +1,4 @@
-BattleCommand_Conversion2: ; 359e6
+BattleCommand_Conversion2:
 ; conversion2
 
 	ld a, [wAttackMissed]
@@ -62,5 +62,3 @@
 
 .failed
 	jp FailMove
-
-; 35a53
--- a/engine/battle/move_effects/counter.asm
+++ b/engine/battle/move_effects/counter.asm
@@ -1,4 +1,4 @@
-BattleCommand_Counter: ; 35813
+BattleCommand_Counter:
 ; counter
 
 	ld a, 1
@@ -56,5 +56,3 @@
 	xor a
 	ld [wAttackMissed], a
 	ret
-
-; 35864
--- a/engine/battle/move_effects/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 @@
 	cp GHOST
 	jr z, .ghost
 
-
 ; If no stats can be increased, don't.
 
 ; Attack
@@ -54,7 +53,6 @@
 	call BattleCommand_DefenseUp
 	jp BattleCommand_StatUpMessage
 
-
 .ghost
 
 ; Cut HP in half and put a curse on the opponent.
@@ -84,7 +82,6 @@
 	call AnimateFailedMove
 	jp PrintButItFailed
 
-
 .cantraise
 
 ; Can't raise either stat.
@@ -94,4 +91,3 @@
 	call AnimateFailedMove
 	ld hl, WontRiseAnymoreText
 	jp StdBattleTextBox
-; 37618
--- a/engine/battle/move_effects/destiny_bond.asm
+++ b/engine/battle/move_effects/destiny_bond.asm
@@ -1,4 +1,4 @@
-BattleCommand_DestinyBond: ; 35bff
+BattleCommand_DestinyBond:
 ; destinybond
 
 	ld a, BATTLE_VARS_SUBSTATUS5
@@ -7,5 +7,3 @@
 	call AnimateCurrentMove
 	ld hl, DestinyBondEffectText
 	jp StdBattleTextBox
-
-; 35c0f
--- a/engine/battle/move_effects/disable.asm
+++ b/engine/battle/move_effects/disable.asm
@@ -1,4 +1,4 @@
-BattleCommand_Disable: ; 36fed
+BattleCommand_Disable:
 ; disable
 
 	ld a, [wAttackMissed]
@@ -70,5 +70,3 @@
 
 .failed
 	jp FailMove
-
-; 3705c
--- a/engine/battle/move_effects/encore.asm
+++ b/engine/battle/move_effects/encore.asm
@@ -1,4 +1,4 @@
-BattleCommand_Encore: ; 35864
+BattleCommand_Encore:
 ; encore
 
 	ld hl, wEnemyMonMoves
@@ -118,5 +118,3 @@
 
 .failed
 	jp PrintDidntAffect2
-
-; 35926
--- a/engine/battle/move_effects/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 @@
 
 	ld hl, BracedItselfText
 	jp StdBattleTextBox
-; 37683
--- a/engine/battle/move_effects/false_swipe.asm
+++ b/engine/battle/move_effects/false_swipe.asm
@@ -1,4 +1,4 @@
-BattleCommand_FalseSwipe: ; 35c94
+BattleCommand_FalseSwipe:
 ; falseswipe
 
 ; Makes sure wCurDamage < MonHP
@@ -46,5 +46,3 @@
 .done
 	and a
 	ret
-
-; 35cc9
--- a/engine/battle/move_effects/focus_energy.asm
+++ b/engine/battle/move_effects/focus_energy.asm
@@ -1,4 +1,4 @@
-BattleCommand_FocusEnergy: ; 36c98
+BattleCommand_FocusEnergy:
 ; focusenergy
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -13,5 +13,3 @@
 .already_pumped
 	call AnimateFailedMove
 	jp PrintButItFailed
-
-; 36cb2
--- a/engine/battle/move_effects/foresight.asm
+++ b/engine/battle/move_effects/foresight.asm
@@ -1,4 +1,4 @@
-BattleCommand_Foresight: ; 376a0
+BattleCommand_Foresight:
 ; foresight
 
 	ld a, [wAttackMissed]
@@ -20,4 +20,3 @@
 
 .failed
 	jp FailMove
-; 376c2
--- a/engine/battle/move_effects/frustration.asm
+++ b/engine/battle/move_effects/frustration.asm
@@ -1,4 +1,4 @@
-BattleCommand_FrustrationPower: ; 3790e
+BattleCommand_FrustrationPower:
 ; frustrationpower
 
 	push bc
@@ -25,5 +25,3 @@
 	ld d, a
 	pop bc
 	ret
-
-; 37939
--- a/engine/battle/move_effects/fury_cutter.asm
+++ b/engine/battle/move_effects/fury_cutter.asm
@@ -1,4 +1,4 @@
-BattleCommand_FuryCutter: ; 37792
+BattleCommand_FuryCutter:
 ; furycutter
 
 	ld hl, wPlayerFuryCutterCount
@@ -38,11 +38,7 @@
 	ld [hl], a
 	ret
 
-; 377be
-
-
-ResetFuryCutterCount: ; 377be
-
+ResetFuryCutterCount:
 	push hl
 
 	ld hl, wPlayerFuryCutterCount
@@ -57,5 +53,3 @@
 
 	pop hl
 	ret
-
-; 377ce
--- a/engine/battle/move_effects/future_sight.asm
+++ b/engine/battle/move_effects/future_sight.asm
@@ -1,4 +1,4 @@
-BattleCommand_CheckFutureSight: ; 37d0d
+BattleCommand_CheckFutureSight:
 ; checkfuturesight
 
 	ld hl, wPlayerFutureSightCount
@@ -25,9 +25,7 @@
 	ld b, futuresight_command
 	jp SkipToBattleCommand
 
-; 37d34
-
-BattleCommand_FutureSight: ; 37d34
+BattleCommand_FutureSight:
 ; futuresight
 
 	call CheckUserIsCharging
@@ -81,5 +79,3 @@
 	call AnimateFailedMove
 	call PrintButItFailed
 	jp EndMoveEffect
-
-; 37d94
--- a/engine/battle/move_effects/heal_bell.asm
+++ b/engine/battle/move_effects/heal_bell.asm
@@ -1,4 +1,4 @@
-BattleCommand_HealBell: ; 35cc9
+BattleCommand_HealBell:
 ; healbell
 
 	ld a, BATTLE_VARS_SUBSTATUS1
@@ -32,5 +32,3 @@
 	and a
 	jp z, CalcPlayerStats
 	jp CalcEnemyStats
-
-; 35d00
--- a/engine/battle/move_effects/hidden_power.asm
+++ b/engine/battle/move_effects/hidden_power.asm
@@ -1,4 +1,4 @@
-BattleCommand_HiddenPower: ; 37be8
+BattleCommand_HiddenPower:
 ; hiddenpower
 
 	ld a, [wAttackMissed]
@@ -6,5 +6,3 @@
 	ret nz
 	farcall HiddenPowerDamage
 	ret
-
-; 37bf4
--- a/engine/battle/move_effects/leech_seed.asm
+++ b/engine/battle/move_effects/leech_seed.asm
@@ -1,4 +1,4 @@
-BattleCommand_LeechSeed: ; 36f9d
+BattleCommand_LeechSeed:
 ; leechseed
 	ld a, [wAttackMissed]
 	and a
@@ -38,5 +38,3 @@
 	call AnimateFailedMove
 	ld hl, EvadedText
 	jp StdBattleTextBox
-
-; 36fe1
--- a/engine/battle/move_effects/lock_on.asm
+++ b/engine/battle/move_effects/lock_on.asm
@@ -1,4 +1,4 @@
-BattleCommand_LockOn: ; 35a53
+BattleCommand_LockOn:
 ; lockon
 
 	call CheckSubstituteOpp
@@ -19,5 +19,3 @@
 .fail
 	call AnimateFailedMove
 	jp PrintDidntAffect
-
-; 35a74
--- a/engine/battle/move_effects/magnitude.asm
+++ b/engine/battle/move_effects/magnitude.asm
@@ -1,4 +1,4 @@
-BattleCommand_GetMagnitude: ; 37991
+BattleCommand_GetMagnitude:
 ; getmagnitude
 
 	push bc
--- a/engine/battle/move_effects/metronome.asm
+++ b/engine/battle/move_effects/metronome.asm
@@ -1,4 +1,4 @@
-BattleCommand_Metronome: ; 37418
+BattleCommand_Metronome:
 ; metronome
 
 	call ClearLastMove
@@ -34,13 +34,10 @@
 	call CheckUserMove
 	jr z, .GetMove
 
-
 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVarAddr
 	ld [hl], b
 	call UpdateMoveData
 	jp ResetTurn
-; 37454
 
-
-INCLUDE "data/battle/metronome_exception_moves.asm"
+INCLUDE "data/moves/metronome_exception_moves.asm"
--- a/engine/battle/move_effects/mimic.asm
+++ b/engine/battle/move_effects/mimic.asm
@@ -1,4 +1,4 @@
-BattleCommand_Mimic: ; 36f46
+BattleCommand_Mimic:
 ; mimic
 
 	call ClearLastMove
@@ -48,5 +48,3 @@
 
 .fail
 	jp FailMimic
-
-; 36f9d
--- a/engine/battle/move_effects/mirror_coat.asm
+++ b/engine/battle/move_effects/mirror_coat.asm
@@ -1,4 +1,4 @@
-BattleCommand_MirrorCoat: ; 37c95
+BattleCommand_MirrorCoat:
 ; mirrorcoat
 
 	ld a, 1
@@ -57,5 +57,3 @@
 	xor a
 	ld [wAttackMissed], a
 	ret
-
-; 37ce6
--- a/engine/battle/move_effects/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 @@
 .done
 	call BattleCommand_MoveDelay
 	jp ResetTurn
-; 37418
--- a/engine/battle/move_effects/mist.asm
+++ b/engine/battle/move_effects/mist.asm
@@ -1,4 +1,4 @@
-BattleCommand_Mist: ; 36c7e
+BattleCommand_Mist:
 ; mist
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -13,5 +13,3 @@
 .already_mist
 	call AnimateFailedMove
 	jp PrintButItFailed
-
-; 36c98
--- a/engine/battle/move_effects/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 @@
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-; 37563
--- a/engine/battle/move_effects/pain_split.asm
+++ b/engine/battle/move_effects/pain_split.asm
@@ -1,4 +1,4 @@
-BattleCommand_PainSplit: ; 35926
+BattleCommand_PainSplit:
 ; painsplit
 
 	ld a, [wAttackMissed]
@@ -65,7 +65,7 @@
 	inc de
 	inc de
 
-.EnemyShareHP: ; 359ac
+.EnemyShareHP:
 	ld c, [hl]
 	dec hl
 	ld a, [wCurDamage + 1]
@@ -89,9 +89,5 @@
 	ld [wBuffer6], a
 	ret
 
-; 359cd
-
 .ButItFailed:
 	jp PrintDidntAffect2
-
-; 359d0
--- a/engine/battle/move_effects/pay_day.asm
+++ b/engine/battle/move_effects/pay_day.asm
@@ -1,4 +1,4 @@
-BattleCommand_PayDay: ; 3705c
+BattleCommand_PayDay:
 ; payday
 
 	xor a
@@ -24,5 +24,3 @@
 .done
 	ld hl, CoinsScatteredText
 	jp StdBattleTextBox
-
-; 3707f
--- a/engine/battle/move_effects/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 @@
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-; 376f8
--- a/engine/battle/move_effects/present.asm
+++ b/engine/battle/move_effects/present.asm
@@ -1,4 +1,4 @@
-BattleCommand_Present: ; 37874
+BattleCommand_Present:
 ; present
 
 	ld a, [wLinkMode]
@@ -32,12 +32,12 @@
 .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
@@ -56,12 +56,12 @@
 	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,12 +73,12 @@
 	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
--- a/engine/battle/move_effects/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 @@
 
 	ld hl, ProtectedItselfText
 	jp StdBattleTextBox
-; 3762c
 
-
-ProtectChance: ; 3762c
-
+ProtectChance:
 	ld de, wPlayerProtectCount
 	ld a, [hBattleTurn]
 	and a
@@ -69,7 +66,6 @@
 	and a
 	ret
 
-
 .failed
 	xor a
 	ld [de], a
@@ -77,4 +73,3 @@
 	call PrintButItFailed
 	scf
 	ret
-; 3766f
--- a/engine/battle/move_effects/psych_up.asm
+++ b/engine/battle/move_effects/psych_up.asm
@@ -1,4 +1,4 @@
-BattleCommand_PsychUp: ; 37c55
+BattleCommand_PsychUp:
 ; psychup
 
 	ld hl, wEnemyStatLevels
@@ -47,5 +47,3 @@
 	call AnimateCurrentMove
 	ld hl, CopiedStatsText
 	jp StdBattleTextBox
-
-; 37c95
--- a/engine/battle/move_effects/pursuit.asm
+++ b/engine/battle/move_effects/pursuit.asm
@@ -1,4 +1,4 @@
-BattleCommand_Pursuit: ; 37b1d
+BattleCommand_Pursuit:
 ; pursuit
 ; Double damage if the opponent is switching.
 
@@ -22,5 +22,3 @@
 	ld [hli], a
 	ld [hl], a
 	ret
-
-; 37b39
--- a/engine/battle/move_effects/rage.asm
+++ b/engine/battle/move_effects/rage.asm
@@ -1,8 +1,6 @@
-BattleCommand_Rage: ; 36f1d
+BattleCommand_Rage:
 ; rage
 	ld a, BATTLE_VARS_SUBSTATUS4
 	call GetBattleVarAddr
 	set SUBSTATUS_RAGE, [hl]
 	ret
-
-; 36f25
--- a/engine/battle/move_effects/rain_dance.asm
+++ b/engine/battle/move_effects/rain_dance.asm
@@ -1,4 +1,4 @@
-BattleCommand_StartRain: ; 37bf4
+BattleCommand_StartRain:
 ; startrain
 	ld a, WEATHER_RAIN
 	ld [wBattleWeather], a
@@ -7,5 +7,3 @@
 	call AnimateCurrentMove
 	ld hl, DownpourText
 	jp StdBattleTextBox
-
-; 37c07
--- a/engine/battle/move_effects/rapid_spin.asm
+++ b/engine/battle/move_effects/rapid_spin.asm
@@ -1,4 +1,4 @@
-BattleCommand_ClearHazards: ; 37b39
+BattleCommand_ClearHazards:
 ; clearhazards
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -34,5 +34,3 @@
 	ld [de], a
 	ld hl, ReleasedByText
 	jp StdBattleTextBox
-
-; 37b74
--- a/engine/battle/move_effects/return.asm
+++ b/engine/battle/move_effects/return.asm
@@ -1,4 +1,4 @@
-BattleCommand_HappinessPower: ; 3784b
+BattleCommand_HappinessPower:
 ; happinesspower
 	push bc
 	ld hl, wBattleMonHappiness
@@ -23,5 +23,3 @@
 	ld d, a
 	pop bc
 	ret
-
-; 37874
--- a/engine/battle/move_effects/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 @@
 	xor a
 	ld [de], a
 	ret
-; 37734
 
-
-BattleCommand_RolloutPower: ; 37734
+BattleCommand_RolloutPower:
 ; rolloutpower
 
 	ld a, BATTLE_VARS_STATUS
@@ -96,4 +93,3 @@
 
 .done_damage
 	ret
-; 37791
--- a/engine/battle/move_effects/safeguard.asm
+++ b/engine/battle/move_effects/safeguard.asm
@@ -1,4 +1,4 @@
-BattleCommand_Safeguard: ; 37939
+BattleCommand_Safeguard:
 ; safeguard
 
 	ld hl, wPlayerScreens
@@ -21,5 +21,3 @@
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-
-; 37962
--- a/engine/battle/move_effects/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 @@
 .failed
 	call AnimateFailedMove
 	jp PrintButItFailed
-; 37718
--- a/engine/battle/move_effects/selfdestruct.asm
+++ b/engine/battle/move_effects/selfdestruct.asm
@@ -1,4 +1,4 @@
-BattleCommand_Selfdestruct: ; 37380
+BattleCommand_Selfdestruct:
 	farcall StubbedTrainerRankings_Selfdestruct
 	ld a, BATTLEANIM_PLAYER_DAMAGE
 	ld [wNumHits], a
@@ -27,5 +27,3 @@
 	farcall DrawEnemyHUD
 	call WaitBGMap
 	jp RefreshBattleHuds
-
-; 373c9
--- a/engine/battle/move_effects/sketch.asm
+++ b/engine/battle/move_effects/sketch.asm
@@ -1,4 +1,4 @@
-BattleCommand_Sketch: ; 35a74
+BattleCommand_Sketch:
 ; sketch
 
 	call ClearLastMove
@@ -115,5 +115,3 @@
 .fail
 	call AnimateFailedMove
 	jp PrintDidntAffect
-
-; 35b16
--- a/engine/battle/move_effects/sleep_talk.asm
+++ b/engine/battle/move_effects/sleep_talk.asm
@@ -1,4 +1,4 @@
-BattleCommand_SleepTalk: ; 35b33
+BattleCommand_SleepTalk:
 ; sleeptalk
 
 	call ClearLastMove
@@ -141,5 +141,3 @@
 	ret z
 	cp EFFECT_BIDE
 	ret
-
-; 35bff
--- a/engine/battle/move_effects/snore.asm
+++ b/engine/battle/move_effects/snore.asm
@@ -1,4 +1,4 @@
-BattleCommand_Snore: ; 359d0
+BattleCommand_Snore:
 ; snore
 	ld a, BATTLE_VARS_STATUS
 	call GetBattleVar
@@ -9,5 +9,3 @@
 	ld [wAttackMissed], a
 	call FailMove
 	jp EndMoveEffect
-
-; 359e6
--- a/engine/battle/move_effects/spikes.asm
+++ b/engine/battle/move_effects/spikes.asm
@@ -1,4 +1,4 @@
-BattleCommand_Spikes: ; 37683
+BattleCommand_Spikes:
 ; spikes
 
 	ld hl, wEnemyScreens
@@ -24,4 +24,3 @@
 
 .failed
 	jp FailMove
-; 376a0
--- a/engine/battle/move_effects/spite.asm
+++ b/engine/battle/move_effects/spite.asm
@@ -1,4 +1,4 @@
-BattleCommand_Spite: ; 35c0f
+BattleCommand_Spite:
 ; spite
 
 	ld a, [wAttackMissed]
@@ -84,5 +84,3 @@
 
 .failed
 	jp PrintDidntAffect2
-
-; 35c94
--- a/engine/battle/move_effects/splash.asm
+++ b/engine/battle/move_effects/splash.asm
@@ -1,6 +1,4 @@
-BattleCommand_Splash: ; 36fe1
+BattleCommand_Splash:
 	call AnimateCurrentMove
 	farcall StubbedTrainerRankings_Splash
 	jp PrintNothingHappened
-
-; 36fed
--- a/engine/battle/move_effects/substitute.asm
+++ b/engine/battle/move_effects/substitute.asm
@@ -1,4 +1,4 @@
-BattleCommand_Substitute: ; 36e7c
+BattleCommand_Substitute:
 ; substitute
 
 	call BattleCommand_MoveDelay
@@ -86,5 +86,3 @@
 	ld hl, TooWeakSubText
 .jp_stdbattletextbox
 	jp StdBattleTextBox
-
-; 36f0b
--- a/engine/battle/move_effects/sunny_day.asm
+++ b/engine/battle/move_effects/sunny_day.asm
@@ -1,4 +1,4 @@
-BattleCommand_StartSun: ; 37c07
+BattleCommand_StartSun:
 ; startsun
 	ld a, WEATHER_SUN
 	ld [wBattleWeather], a
@@ -7,5 +7,3 @@
 	call AnimateCurrentMove
 	ld hl, SunGotBrightText
 	jp StdBattleTextBox
-
-; 37c1a
--- a/engine/battle/move_effects/teleport.asm
+++ b/engine/battle/move_effects/teleport.asm
@@ -1,4 +1,4 @@
-BattleCommand_Teleport: ; 36778
+BattleCommand_Teleport:
 ; teleport
 
 	ld a, [wBattleType]
@@ -87,5 +87,3 @@
 
 	ld hl, FledFromBattleText
 	jp StdBattleTextBox
-
-; 36804
--- a/engine/battle/move_effects/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 @@
 	ld [de], a
 	jr .stole
 
-
 .enemy
 
 ; The enemy can't already have an item.
@@ -91,13 +90,11 @@
 	ld [hl], a
 	ld [de], a
 
-
 .stole
 	call GetItemName
 	ld hl, StoleText
 	jp StdBattleTextBox
 
-
 .playeritem
 	ld a, 1
 	call BattlePartyAttr
@@ -113,4 +110,3 @@
 	ld e, l
 	ld hl, wEnemyMonItem
 	ret
-; 37517
--- a/engine/battle/move_effects/thunder.asm
+++ b/engine/battle/move_effects/thunder.asm
@@ -1,4 +1,4 @@
-BattleCommand_ThunderAccuracy: ; 37d94
+BattleCommand_ThunderAccuracy:
 ; thunderaccuracy
 
 	ld a, BATTLE_VARS_MOVE_TYPE
@@ -16,5 +16,3 @@
 	; Redundant with CheckHit guranteeing hit
 	ld [hl], 100 percent
 	ret
-
-; 37daa
--- a/engine/battle/move_effects/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 @@
 	call nz, LoadAnim
 	ld hl, TransformedText
 	jp StdBattleTextBox
-
-; 372c6
--- a/engine/battle/move_effects/triple_kick.asm
+++ b/engine/battle/move_effects/triple_kick.asm
@@ -1,4 +1,4 @@
-BattleCommand_TripleKick: ; 346b2
+BattleCommand_TripleKick:
 ; triplekick
 
 	ld a, [wKickCounter]
@@ -26,14 +26,9 @@
 	ld [hl], a
 	ret
 
-; 346cd
-
-
-BattleCommand_KickCounter: ; 346cd
+BattleCommand_KickCounter:
 ; kickcounter
 
 	ld hl, wKickCounter
 	inc [hl]
 	ret
-
-; 346d2
--- 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 @@
 	pop de
 	ret
 
-GetOTName: ; 39550
+GetOTName:
 	ld hl, wOTPlayerName
 	ld a, [wLinkMode]
 	and a
@@ -44,7 +44,7 @@
 	pop de
 	ret
 
-GetTrainerAttributes: ; 3957b
+GetTrainerAttributes:
 	ld a, [wTrainerClass]
 	ld c, a
 	call GetOTName
@@ -62,3 +62,5 @@
 	ld a, [hl]
 	ld [wEnemyTrainerBaseReward], a
 	ret
+
+INCLUDE "data/trainers/attributes.asm"
--- 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 @@
 
 	pop hl
 	ret
-; 270d6
+
+INCLUDE "data/trainers/dvs.asm"
--- 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
@@ -79,17 +79,15 @@
 	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
@@ -107,9 +105,8 @@
 	predef TryAddMonToParty
 	pop hl
 	jr .loop
-; 39806
 
-TrainerType2: ; 39806
+TrainerType2:
 ; moves
 	ld h, d
 	ld l, e
@@ -184,9 +181,8 @@
 
 	pop hl
 	jr .loop
-; 39871
 
-TrainerType3: ; 39871
+TrainerType3:
 ; item
 	ld h, d
 	ld l, e
@@ -213,9 +209,8 @@
 	ld a, [hli]
 	ld [de], a
 	jr .loop
-; 3989d (e:589d)
 
-TrainerType4: ; 3989d
+TrainerType4:
 ; item + moves
 	ld h, d
 	ld l, e
@@ -305,9 +300,8 @@
 
 	pop hl
 	jr .loop
-; 3991b
 
-ComputeTrainerReward: ; 3991b (e:591b)
+ComputeTrainerReward:
 	ld hl, hProduct
 	xor a
 	ld [hli], a
@@ -327,8 +321,7 @@
 	ld [hl], a
 	ret
 
-
-Battle_GetTrainerName:: ; 39939
+Battle_GetTrainerName::
 	ld a, [wInBattleTowerBattle]
 	bit 0, a
 	ld hl, wOTPlayerName
@@ -339,7 +332,7 @@
 	ld a, [wOtherTrainerClass]
 	ld c, a
 
-GetTrainerName:: ; 3994c
+GetTrainerName::
 	ld a, c
 	cp CAL
 	jr nz, .not_cal2
@@ -379,7 +372,7 @@
 	jr nz, .skip
 	jr .loop
 
-CopyTrainerName: ; 39984
+CopyTrainerName:
 	ld de, wStringBuffer1
 	push de
 	ld bc, NAME_LENGTH
@@ -386,9 +379,8 @@
 	call CopyBytes
 	pop de
 	ret
-; 39990
 
-Function39990: ; 39990
+Function39990:
 ; This function is useless.
 	ld de, wStringBuffer1
 	push de
@@ -395,4 +387,5 @@
 	ld bc, NAME_LENGTH
 	pop de
 	ret
-; 39999
+
+INCLUDE "data/trainers/parties.asm"
--- 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]
--- 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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 4e998
 
-.subfunction1 ; 4e998
+.subfunction1
 	call .subfunction4
 	ld a, $90
 	ld [hSCX], a
@@ -23,9 +22,8 @@
 	lb de, %11100100, %11100100
 	call DmgToCgbObjPals
 	ret
-; 4e9ab
 
-.subfunction2 ; 4e9ab
+.subfunction2
 	ld d, $90
 	ld e, $72
 	ld a, $48
@@ -57,9 +55,8 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .loop6
 	ret
-; 4ea0a
--- 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 @@
 	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 @@
 	ld [hMapAnims], a
 	ret
 
-PlayBattleMusic: ; 2ee6c
+PlayBattleMusic:
 	push hl
 	push de
 	push bc
@@ -148,7 +148,7 @@
 	pop hl
 	ret
 
-ClearBattleRAM: ; 2ef18
+ClearBattleRAM:
 	xor a
 	ld [wBattlePlayerAction], a
 	ld [wBattleResult], a
--- 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 @@
 	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 @@
 	ld [wPlaceBallsDirection], a
 	ld hl, wVirtualOAMSprite00
 	jp LoadTrainerHudOAM
-; 2c03a
 
-ShowOTTrainerMonsRemaining: ; 2c03a
+ShowOTTrainerMonsRemaining:
 	call DrawEnemyHUDBorder
 	ld hl, wOTPartyMon1HP
 	ld de, wOTPartyCount
@@ -46,9 +43,8 @@
 	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 @@
 	dec a
 	jr nz, .loop2
 	ret
-; 2c075
 
-.GetHUDTile: ; 2c075
+.GetHUDTile:
 	ld a, [hli]
 	and a
 	jr nz, .got_hp
@@ -102,9 +97,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $e4
 	ld [rOBP0], a
 	ret
-; 2c1ef
--- a/engine/battle/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
--- 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 @@
 	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 @@
 ; print "instead,"
 	ld hl, .UsedInsteadText
 	ret
-; 105e1a
 
 .UsedInsteadText:
 	text_jump _UsedInsteadText
@@ -85,9 +81,8 @@
 .GetMoveNameText:
 	ld hl, MoveNameText
 	ret
-; 105e23
 
-MoveNameText: ; 105e23
+MoveNameText:
 	text_jump _MoveNameText
 	start_asm
 ; get start address
@@ -111,9 +106,8 @@
 	ld h, [hl]
 	ld l, a
 	ret
-; 105e39
 
-.endusedmovetexts ; 105e39
+.endusedmovetexts
 ; entries correspond to MoveGrammar sets
 	dw EndUsedMove1Text
 	dw EndUsedMove2Text
@@ -120,31 +114,24 @@
 	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
@@ -178,12 +165,10 @@
 ; 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
@@ -237,4 +222,3 @@
 ; list updated
 	pop bc
 	ret
-; 105ef6
--- 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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; cc0e4
 
-_PlayBattleAnim: ; cc0e4
-
+_PlayBattleAnim:
 	ld c, 6
 .wait
 	call BattleAnimDelayFrame
@@ -52,10 +49,8 @@
 	call BattleAnimDelayFrame
 	call WaitSFX
 	ret
-; cc11c
 
-BattleAnimRunScript: ; cc11c
-
+BattleAnimRunScript:
 	ld a, [wFXAnimID + 1]
 	and a
 	jr nz, .hi_byte
@@ -97,10 +92,8 @@
 .done
 	call BattleAnim_RevertPals
 	ret
-; cc163
 
-RunBattleAnimScript: ; cc163
-
+RunBattleAnimScript:
 	call ClearBattleAnims
 
 .playframe
@@ -140,10 +133,8 @@
 
 	call BattleAnim_ClearCGB_OAMFlags
 	ret
-; cc1a1
 
-BattleAnimClearHud: ; cc1a1
-
+BattleAnimClearHud:
 	call BattleAnimDelayFrame
 	call WaitTop
 	call ClearActorHud
@@ -154,10 +145,8 @@
 	call BattleAnimDelayFrame
 	call WaitTop
 	ret
-; cc1bb
 
-BattleAnimRestoreHuds: ; cc1bb
-
+BattleAnimRestoreHuds:
 	call BattleAnimDelayFrame
 	call WaitTop
 
@@ -180,10 +169,8 @@
 	call BattleAnimDelayFrame
 	call WaitTop
 	ret
-; cc1e2
 
-BattleAnimRequestPals: ; cc1e2
-
+BattleAnimRequestPals:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -200,9 +187,8 @@
 	cp b
 	call nz, BattleAnim_SetOBPals
 	ret
-; cc1fb
 
-BattleAnimDelayFrame: ; cc1fb
+BattleAnimDelayFrame:
 ; Like DelayFrame but wastes battery life.
 
 	ld a, 1
@@ -212,10 +198,8 @@
 	and a
 	jr nz, .wait
 	ret
-; cc207
 
-ClearActorHud: ; cc207
-
+ClearActorHud:
 	ld a, [hBattleTurn]
 	and a
 	jr z, .player
@@ -230,9 +214,8 @@
 	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 @@
 	ld [hBGMapAddress + 1], a
 	call BattleAnimDelayFrame
 	ret
-; cc23d
 
-
-BattleAnim_ClearCGB_OAMFlags: ; cc23d
-
+BattleAnim_ClearCGB_OAMFlags:
 	ld a, [wBattleAnimFlags]
 	bit 3, a
 	jr z, .delete
@@ -279,16 +259,14 @@
 	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 @@
 .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 @@
 	call .DoCommand
 
 	jr .loop
-; cc293
 
-.DoCommand: ; cc293
+.DoCommand:
 ; Execute battle animation command in [wBattleAnimByte].
 	ld a, [wBattleAnimByte]
 	sub $d0
@@ -346,10 +322,8 @@
 	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 @@
 	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 @@
 	ld [hl], d
 	ret
 
-BattleAnimCmd_Call: ; cc317 (33:4317)
+BattleAnimCmd_Call:
 	call GetBattleAnimByte
 	ld e, a
 	call GetBattleAnimByte
@@ -443,7 +416,7 @@
 	set 1, [hl]
 	ret
 
-BattleAnimCmd_Jump: ; cc339 (33:4339)
+BattleAnimCmd_Jump:
 	call GetBattleAnimByte
 	ld e, a
 	call GetBattleAnimByte
@@ -454,7 +427,7 @@
 	ld [hl], d
 	ret
 
-BattleAnimCmd_Loop: ; cc348 (33:4348)
+BattleAnimCmd_Loop:
 	call GetBattleAnimByte
 	ld hl, wBattleAnimFlags
 	bit 2, [hl]
@@ -495,7 +468,7 @@
 	ld [hl], e
 	ret
 
-BattleAnimCmd_JumpUntil: ; cc383 (33:4383)
+BattleAnimCmd_JumpUntil:
 	ld hl, wBattleAnimParam
 	ld a, [hl]
 	and a
@@ -524,17 +497,17 @@
 	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 @@
 	ld [hl], d
 	ret
 
-BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6)
+BattleAnimCmd_IfParamEqual:
 	call GetBattleAnimByte
 	ld hl, wBattleAnimParam
 	cp [hl]
@@ -590,7 +563,7 @@
 	ld [hl], d
 	ret
 
-BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa)
+BattleAnimCmd_IfParamAnd:
 	call GetBattleAnimByte
 	ld e, a
 	ld a, [wBattleAnimParam]
@@ -619,7 +592,7 @@
 	ld [hl], d
 	ret
 
-BattleAnimCmd_Obj: ; cc41f (33:441f)
+BattleAnimCmd_Obj:
 ; index, x, y, param
 	call GetBattleAnimByte
 	ld [wBattleAnimTemp0], a
@@ -632,7 +605,7 @@
 	call QueueBattleAnimation
 	ret
 
-BattleAnimCmd_BGEffect: ; cc43b (33:443b)
+BattleAnimCmd_BGEffect:
 	call GetBattleAnimByte
 	ld [wBattleAnimTemp0], a
 	call GetBattleAnimByte
@@ -644,22 +617,22 @@
 	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 @@
 	ld [wOBP0], a
 	ret
 
-BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
+BattleAnimCmd_ClearObjs:
 	ld hl, wActiveAnimObjects
 	ld a, $a0
 .loop
@@ -683,7 +656,7 @@
 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 @@
 	jr nz, .loop
 	ret
 
-BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
+BattleAnimCmd_IncObj:
 	call GetBattleAnimByte
 	ld e, 10
 	ld bc, wActiveAnimObjects
@@ -743,7 +716,7 @@
 	inc [hl]
 	ret
 
-BattleAnimCmd_IncBGEffect: ; cc4e3 (33:44e3)
+BattleAnimCmd_IncBGEffect:
 	call GetBattleAnimByte
 	ld e, 5
 	ld bc, wActiveBGEffects
@@ -768,7 +741,7 @@
 	inc [hl]
 	ret
 
-BattleAnimCmd_SetObj: ; cc506 (33:4506)
+BattleAnimCmd_SetObj:
 	call GetBattleAnimByte
 	ld e, 10
 	ld bc, wActiveAnimObjects
@@ -794,8 +767,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
-
+BattleAnimCmd_EnemyFeetObj:
 	ld hl, wBattleAnimTileDict
 .loop
 	ld a, [hl]
@@ -828,7 +800,7 @@
 	call .LoadFootprint
 	ret
 
-.LoadFootprint: ; cc561 (33:4561)
+.LoadFootprint:
 	push af
 	push hl
 	push de
@@ -849,8 +821,7 @@
 	jr nz, .LoadFootprint
 	ret
 
-BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
-
+BattleAnimCmd_PlayerHeadObj:
 	ld hl, wBattleAnimTileDict
 .loop
 	ld a, [hl]
@@ -883,7 +854,7 @@
 	call .LoadHead
 	ret
 
-.LoadHead: ; cc5b3 (33:45b3)
+.LoadHead:
 	push af
 	push hl
 	push de
@@ -904,16 +875,16 @@
 	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 @@
 	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 @@
 	call Request2bpp
 	ret
 
-BattleAnimCmd_RaiseSub: ; cc640 (33:4640)
-
+BattleAnimCmd_RaiseSub:
 	ld a, [rSVBK]
 	push af
 	ld a, 1 ; unnecessary bankswitch?
@@ -977,7 +946,7 @@
 	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 @@
 	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 @@
 	ld [rSVBK], a
 	ret
 
-GetMinimizePic: ; cc6e7 (33:46e7)
+GetMinimizePic:
 	ld hl, sScratch
 	ld bc, $31 tiles
 .loop
@@ -1087,19 +1056,17 @@
 	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 @@
 	ld [rSVBK], a
 	ret
 
-BattleAnimCmd_DropSub: ; cc750 (33:4750)
+BattleAnimCmd_DropSub:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wCurPartySpecies)
@@ -1139,7 +1106,7 @@
 	ld [rSVBK], a
 	ret
 
-BattleAnimCmd_BeatUp: ; cc776 (33:4776)
+BattleAnimCmd_BeatUp:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wCurPartySpecies)
@@ -1175,31 +1142,31 @@
 	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 @@
 	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 @@
 	xor 1
 	ret
 
-BattleAnimCmd_Cry: ; cc807 (33:4807)
+BattleAnimCmd_Cry:
 	call GetBattleAnimByte
 	maskbits NUM_NOISE_CHANS
 	ld e, a
@@ -1315,18 +1280,15 @@
 	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
@@ -1350,9 +1312,8 @@
 .play
 	call PlaySFX
 	ret
-; cc8a4
 
-BattleAnimAssignPals: ; cc8a4
+BattleAnimAssignPals:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -1378,9 +1339,8 @@
 	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 @@
 	call BattleAnimAssignPals
 	call BattleAnimDelayFrame
 	ret
-; cc8f6
 
-BattleAnim_RevertPals: ; cc8f6
+BattleAnim_RevertPals:
 	call WaitTop
 	ld a, %11100100
 	ld [wBGP], a
@@ -1421,9 +1380,8 @@
 	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 @@
 	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 @@
 	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 @@
 
 .done
 	ret
-; cc9a1
--- 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 @@
 	jr nz, .loop
 	ret
 
-QueueBGEffect: ; c801a (32:401a)
+QueueBGEffect:
 	ld hl, wActiveBGEffects
 	ld e, 5
 .loop
@@ -58,13 +58,13 @@
 	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 @@
 	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 @@
 	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 @@
 	ld l, a
 	ret
 
-BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
+BattleBGEffects_AnonJumptable:
 	pop de
 	ld hl, BG_EFFECT_STRUCT_JT_INDEX
 	add hl, bc
@@ -164,13 +163,13 @@
 	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
 
@@ -177,9 +176,8 @@
 .inverted
 	db %11100100 ; 3210
 	db %00011011 ; 0123
-; c80f3
 
-BattleBGEffect_FlashWhite: ; c80f3 (32:40f3)
+BattleBGEffect_FlashWhite:
 	ld de, .white
 	jp BattleBGEffect_FlashContinue
 
@@ -186,9 +184,8 @@
 .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 @@
 	ld [wBGP], a
 	ret
 
-BattleBGEffect_WhiteHues: ; c812d (32:412d)
+BattleBGEffect_WhiteHues:
 	ld de, .Pals
 	call BattleBGEffect_GetNthDMGPal
 	jr c, .quit
@@ -242,9 +239,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	dw BattleBGEffects_IncrementJumptable
 	dw .four
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	push bc
@@ -384,7 +374,7 @@
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_ShowMon: ; c81ea (32:41ea)
+BattleBGEffect_ShowMon:
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying
 	call EndBattleBGEffect
@@ -412,9 +402,8 @@
 .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 @@
 	dw BattleBGEffects_IncrementJumptable
 	dw .five
 
-
 .zero
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying_digging
@@ -482,7 +470,7 @@
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_HeadFollow: ; c8281 (32:4281)
+BattleBGEffect_HeadFollow:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -492,7 +480,6 @@
 	dw BattleBGEffects_IncrementJumptable
 	dw .five
 
-
 .zero
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying_digging
@@ -550,11 +537,11 @@
 	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 @@
 	dw BattleBGEffects_IncrementJumptable
 	dw .four
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BGEffect_CheckBattleTurn
@@ -655,7 +641,7 @@
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_EnterMon: ; c837b (32:437b)
+BattleBGEffect_EnterMon:
 	call BGEffect_CheckBattleTurn
 	jr nz, .player_turn
 	ld de, .EnemyData
@@ -681,9 +667,8 @@
 	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 @@
 	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 @@
 	dw .restart
 	dw .end
 
-
 .zero
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
@@ -918,9 +901,8 @@
 	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
@@ -927,7 +909,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	lb de, 2, 2
@@ -987,7 +968,7 @@
 	jr c, .loop2
 	ret
 
-BattleBGEffect_Whirlpool: ; c8599 (32:4599)
+BattleBGEffect_Whirlpool:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -994,7 +975,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1016,7 +996,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_30: ; c85c2 (32:45c2)
+BattleBGEffect_30:
 	call BattleBGEffects_ClearLYOverrides
 	ld a, rSCY - $ff00
 	call BattleBGEffect_SetLCDStatCustoms1
@@ -1023,7 +1003,7 @@
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffect_31: ; c85ce (32:45ce)
+BattleBGEffect_31:
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -1057,11 +1037,11 @@
 	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
@@ -1068,7 +1048,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1099,7 +1078,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Teleport: ; c863f (32:463f)
+BattleBGEffect_Teleport:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1106,7 +1085,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1124,7 +1102,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_NightShade: ; c8662 (32:4662)
+BattleBGEffect_NightShade:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1131,7 +1109,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1152,7 +1129,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
+BattleBGEffect_DoubleTeam:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1162,7 +1139,6 @@
 	dw .four
 	dw .five
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1247,7 +1223,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_AcidArmor: ; c8709 (32:4709)
+BattleBGEffect_AcidArmor:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1254,7 +1230,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1310,7 +1285,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Withdraw: ; c8761 (32:4761)
+BattleBGEffect_Withdraw:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1317,7 +1292,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1359,7 +1333,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Dig: ; c87a7 (32:47a7)
+BattleBGEffect_Dig:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1367,7 +1341,6 @@
 	dw .two
 	dw .three
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1426,7 +1399,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_Tackle: ; c8805 (32:4805)
+BattleBGEffect_Tackle:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1434,7 +1407,6 @@
 	dw Tackle_BGEffect25_2d_two
 	dw .three
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1461,7 +1433,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_25: ; c8837 (32:4837)
+BattleBGEffect_25:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1469,7 +1441,6 @@
 	dw Tackle_BGEffect25_2d_two
 	dw .three
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1537,7 +1508,7 @@
 	ld [hl], a
 	ret
 
-Functionc88a5: ; c88a5 (32:48a5)
+Functionc88a5:
 	push af
 	ld a, [wFXAnimID + 1] ; FXAnimID + 1
 	or a
@@ -1589,7 +1560,7 @@
 	jr nz, .loop
 	ret
 
-BattleBGEffect_2d: ; c88e7 (32:48e7)
+BattleBGEffect_2d:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw BGEffect2d_2f_zero
@@ -1597,7 +1568,6 @@
 	dw Tackle_BGEffect25_2d_two
 	dw .three
 
-
 .three
 	call BattleAnim_ResetLCDStatCustom
 	ret
@@ -1624,7 +1594,7 @@
 	ld [hl], a
 	ret
 
-BattleBGEffect_2f: ; c8919 (32:4919)
+BattleBGEffect_2f:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw BGEffect2d_2f_zero
@@ -1638,7 +1608,7 @@
 .two
 	ret
 
-BattleBGEffect_26: ; c892a (32:492a)
+BattleBGEffect_26:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1645,7 +1615,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1677,7 +1646,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_2c: ; c8964 (32:4964)
+BattleBGEffect_2c:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1684,7 +1653,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1732,7 +1700,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_28: ; c89b5 (32:49b5)
+BattleBGEffect_28:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1739,7 +1707,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1775,7 +1742,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_BounceDown: ; c89ee (32:49ee)
+BattleBGEffect_BounceDown:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1782,7 +1749,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
@@ -1826,7 +1792,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_2a: ; c8a3a (32:4a3a)
+BattleBGEffect_2a:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1933,15 +1899,13 @@
 .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 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_1c: ; c8b00 (32:4b00)
+BattleBGEffect_1c:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -1982,7 +1946,6 @@
 	dw .one
 	dw .two
 
-
 .zero
 	call BattleBGEffects_IncrementJumptable
 	ld a, $e4
@@ -2130,9 +2093,8 @@
 	db $90, $f8
 	db $40, $fc
 	db $90, $f8
-; c8be8
 
-BattleBGEffect_RapidFlash: ; c8be8 (32:4be8)
+BattleBGEffect_RapidFlash:
 	ld de, .FlashPals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2139,9 +2101,8 @@
 
 .FlashPals:
 	db $e4, $6c, $fe
-; c8bf2
 
-BattleBGEffect_16: ; c8bf2 (32:4bf2)
+BattleBGEffect_16:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2148,9 +2109,8 @@
 
 .Pals:
 	db $e4, $90, $40, $ff
-; c8bfd
 
-BattleBGEffect_17: ; c8bfd (32:4bfd)
+BattleBGEffect_17:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2157,9 +2117,8 @@
 
 .Pals:
 	db $e4, $f8, $fc, $ff
-; c8c08
 
-BattleBGEffect_18: ; c8c08 (32:4c08)
+BattleBGEffect_18:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2166,9 +2125,8 @@
 
 .Pals:
 	db $e4, $90, $40, $90, $fe
-; c8c14
 
-BattleBGEffect_19: ; c8c14 (32:4c14)
+BattleBGEffect_19:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2175,9 +2133,8 @@
 
 .Pals:
 	db $e4, $f8, $fc, $f8, $fe
-; c8c20
 
-BattleBGEffect_1a: ; c8c20 (32:4c20)
+BattleBGEffect_1a:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2184,9 +2141,8 @@
 
 .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
@@ -2193,9 +2149,8 @@
 
 .Pals:
 	db $e4, $fc, $e4, $00, $fe
-; c8c3c
 
-BattleBGEffect_1d: ; c8c3c (32:4c3c)
+BattleBGEffect_1d:
 	ld de, .Pals
 	call BGEffect_RapidCyclePals
 	ret
@@ -2202,9 +2157,8 @@
 
 .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
@@ -2211,16 +2165,14 @@
 
 .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 @@
 	ld [hl], $20
 	ret
 
-.one ; c8c85 (32:4c85)
+.one
 	ld hl, BG_EFFECT_STRUCT_03
 	add hl, bc
 	ld a, [hl]
@@ -2258,7 +2210,7 @@
 	call BattleAnim_ResetLCDStatCustom
 	ret
 
-BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
+BattleBGEffect_WobbleMon:
 	call BattleBGEffects_AnonJumptable
 .anon_dw
 	dw .zero
@@ -2265,8 +2217,7 @@
 	dw .one
 	dw .two
 
-
-.zero ; c8cab (32:4cab)
+.zero
 	call BattleBGEffects_IncrementJumptable
 	call BattleBGEffects_ClearLYOverrides
 	ld a, rSCX - $ff00
@@ -2280,7 +2231,7 @@
 	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 @@
 	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 @@
 	ld [wAnimObject01YOffset], a
 	ret
 
-BattleBGEffect_1f: ; c8cf9 (32:4cf9)
+BattleBGEffect_1f:
 	call Functionc8d0b
 	jr nc, .skip
 	xor a
@@ -2325,7 +2276,7 @@
 	ld [hSCX], a
 	ret
 
-BattleBGEffect_20: ; c8d02 (32:4d02)
+BattleBGEffect_20:
 	call Functionc8d0b
 	jr nc, .skip
 	xor a
@@ -2333,7 +2284,7 @@
 	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 @@
 	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 @@
 	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 @@
 	call BattleBGEffect_GetFirstDMGPal
 	ret
 
-BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
+BGEffect_RapidCyclePals:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -2430,8 +2381,7 @@
 	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 @@
 	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 @@
 	dec [hl]
 	ret
 
-.two_dmg ; c8dc9 (32:4dc9)
+.two_dmg
 	call BattleBGEffects_ResetVideoHRAM
 	ld a, %11100100
 	ld [rBGP], a
@@ -2488,7 +2438,7 @@
 	pop de
 	jp hl
 
-.Jumptable_CGB: ; c8ddd (32:4ddd)
+.Jumptable_CGB:
 	dw .zero_cgb
 	dw .one_cgb
 	dw .two_cgb
@@ -2495,8 +2445,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [hLYOverrideEnd], a
 	ret
 
-BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
+BattleAnim_ResetLCDStatCustom:
 	xor a
 	ld [hLYOverrideStart], a
 	ld [hLYOverrideEnd], a
@@ -2713,7 +2662,7 @@
 	call EndBattleBGEffect
 	ret
 
-BattleBGEffects_ResetVideoHRAM: ; c8f19 (32:4f19)
+BattleBGEffects_ResetVideoHRAM:
 	xor a
 	ld [hLCDCPointer], a
 	ld a, %11100100
@@ -2725,7 +2674,7 @@
 	call BattleBGEffects_ClearLYOverrides
 	ret
 
-Functionc8f2e: ; c8f2e (32:4f2e)
+Functionc8f2e:
 	push bc
 	xor a
 	ld [wBattleAnimTemp0], a
@@ -2760,7 +2709,7 @@
 	pop bc
 	ret
 
-InitSurfWaves: ; c8f69 (32:4f69)
+InitSurfWaves:
 	push bc
 	xor a
 	ld [wBattleAnimTemp0], a
@@ -2788,7 +2737,7 @@
 	pop bc
 	ret
 
-Functionc8f9a: ; c8f9a (32:4f9a)
+Functionc8f9a:
 	push bc
 	ld [wBattleAnimTemp3], a
 	ld a, e
@@ -2847,7 +2796,7 @@
 	ld d, $0
 	ret
 
-BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
+BattleBGEffect_WavyScreenFX:
 	push bc
 	ld a, [hLYOverrideStart]
 	ld l, a
@@ -2874,7 +2823,7 @@
 	pop bc
 	ret
 
-BGEffect_FillLYOverridesBackup: ; c900b (32:500b)
+BGEffect_FillLYOverridesBackup:
 	push af
 	ld h, HIGH(wLYOverridesBackup)
 	ld a, [hLYOverrideStart]
@@ -2889,7 +2838,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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)
--- 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 @@
 	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 @@
 	ld [hl], a  ; 10
 	ret
 
-BattleAnimOAMUpdate: ; cca09
+BattleAnimOAMUpdate:
 	call InitBattleAnimBuffer
 	call GetBattleAnimFrame
 	cp -3
@@ -191,9 +189,7 @@
 	scf
 	ret
 
-; ccaaa
-
-InitBattleAnimBuffer: ; ccaaa
+InitBattleAnimBuffer:
 	ld hl, BATTLEANIMSTRUCT_01
 	add hl, bc
 	ld a, [hl]
@@ -276,9 +272,7 @@
 	ld [wBattleAnimTempXOffset], a
 	ret
 
-; ccb31
-
-GetBattleAnimTileOffset: ; ccb31 (33:4b31)
+GetBattleAnimTileOffset:
 	push hl
 	push bc
 	ld hl, wBattleAnimTileDict
@@ -301,14 +295,10 @@
 	pop hl
 	ret
 
-_ExecuteBGEffects: ; ccb48
+_ExecuteBGEffects:
 	callfar ExecuteBGEffects
 	ret
 
-; ccb4f
-
-_QueueBGEffect: ; ccb4f (33:4b4f)
+_QueueBGEffect:
 	callfar QueueBGEffect
 	ret
-
-; ccb56 (33:4b56)
--- 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 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; ccfce
 
 .Jumptable:
 ; entries correspond to BATTLEANIMFUNC_* constants
@@ -95,7 +94,7 @@
 	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 @@
 .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 @@
 	scf
 	ret
 
-BattleAnimFunction_04: ; cd0a6 (33:50a6)
+BattleAnimFunction_04:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -184,7 +183,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_03: ; cd0e3 (33:50e3)
+BattleAnimFunction_03:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -230,7 +229,7 @@
 	inc [hl]
 	ret
 
-BattleAnimFunction_01: ; cd12a (33:512a)
+BattleAnimFunction_01:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -251,7 +250,7 @@
 	call Functionce70a
 	ret
 
-BattleAnimFunction_02: ; cd146 (33:5146)
+BattleAnimFunction_02:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -267,7 +266,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_PokeBall: ; cd15c (33:515c)
+BattleAnimFunction_PokeBall:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -384,7 +383,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212)
+BattleAnimFunction_PokeBallBlocked:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -424,7 +423,7 @@
 	call DeinitBattleAnimation
 	ret
 
-GetBallAnimPal: ; cd249 (33:5249)
+GetBallAnimPal:
 	ld hl, BallColors
 	ld a, [rSVBK]
 	push af
@@ -449,11 +448,10 @@
 	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 @@
 .four
 	ret
 
-BattleAnimFunction_07: ; cd2be (33:52be)
+BattleAnimFunction_07:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -542,7 +540,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_08: ; cd306 (33:5306)
+BattleAnimFunction_08:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -654,7 +652,7 @@
 	jr nz, .loop
 	ret
 
-BattleAnimFunction_09: ; cd3ae (33:53ae)
+BattleAnimFunction_09:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -702,7 +700,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_0A: ; cd3f2 (33:53f2)
+BattleAnimFunction_0A:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -798,7 +796,7 @@
 .six
 	ret
 
-BattleAnimFunction_RazorLeaf: ; cd478 (33:5478)
+BattleAnimFunction_RazorLeaf:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -945,7 +943,7 @@
 	call Functionce70a
 	ret
 
-Functioncd557: ; cd557 (33:5557)
+Functioncd557:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -983,7 +981,7 @@
 	ld de, -$100
 	ret
 
-BattleAnimFunction_4E: ; cd58a (33:558a)
+BattleAnimFunction_4E:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1045,7 +1043,7 @@
 	ld [hl], e
 	ret
 
-BattleAnimFunction_0C: ; cd5e9 (33:55e9)
+BattleAnimFunction_0C:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1129,7 +1127,7 @@
 	ld [hl], d
 	ret
 
-BattleAnimFunction_0D: ; cd66a (33:566a)
+BattleAnimFunction_0D:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw .zero
@@ -1205,7 +1203,7 @@
 	call DeinitBattleAnimation
 	ret
 
-asm_cd6da: ; cd6da (33:56da)
+asm_cd6da:
 	inc a
 	inc a
 	ld [hl], a
@@ -1214,13 +1212,13 @@
 	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
@@ -1228,7 +1226,7 @@
 	add [hl] ; offset
 	call ReinitBattleAnimFrameset
 
-Functioncd6f7: ; cd6f7 (33:56f7)
+Functioncd6f7:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1251,7 +1249,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_0F: ; cd71a (33:571a)
+BattleAnimFunction_0F:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd725
@@ -1259,9 +1257,9 @@
 	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]
@@ -1295,7 +1293,7 @@
 	ld a, [hl]
 	and $1
 	ld [hl], a
-Functioncd763: ; cd763 (33:5763)
+Functioncd763:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -1308,10 +1306,10 @@
 	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]
@@ -1343,13 +1341,13 @@
 	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
@@ -1371,7 +1369,7 @@
 	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]
@@ -1411,7 +1409,7 @@
 	dec [hl]
 	ret
 
-BattleAnimFunction_15: ; cd80c (33:580c)
+BattleAnimFunction_15:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd81f
@@ -1419,18 +1417,18 @@
 	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
@@ -1441,7 +1439,7 @@
 	dw Functioncd88f
 	dw Functioncd893
 
-Functioncd835: ; cd835 (33:5835)
+Functioncd835:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -1468,7 +1466,7 @@
 	ld a, [hl]
 	and $7f
 	ld [hl], a
-Functioncd860: ; cd860 (33:5860)
+Functioncd860:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -1499,17 +1497,17 @@
 	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
@@ -1520,7 +1518,7 @@
 	dw Functioncd8f5
 	dw Functioncd8f9
 
-Functioncd8ab: ; cd8ab (33:58ab)
+Functioncd8ab:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -1542,7 +1540,7 @@
 	and $7f
 	ld [hl], a
 
-Functioncd8cc: ; cd8cc (33:58cc)
+Functioncd8cc:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -1570,23 +1568,23 @@
 	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
@@ -1593,7 +1591,7 @@
 	ld [hl], $28
 	inc hl
 	ld [hl], $0
-Functioncd913: ; cd913 (33:5913)
+Functioncd913:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -1637,7 +1635,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_19: ; cd954 (33:5954)
+BattleAnimFunction_19:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncd961
@@ -1646,16 +1644,16 @@
 	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]
@@ -1664,7 +1662,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncd97b: ; cd97b (33:597b)
+Functioncd97b:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1673,7 +1671,7 @@
 	call DeinitBattleAnimation
 	ret
 
-asm_cd988: ; cd988 (33:5988)
+asm_cd988:
 	call Functioncd99a
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -1686,7 +1684,7 @@
 	dec [hl]
 	ret
 
-Functioncd99a: ; cd99a (33:599a)
+Functioncd99a:
 	call Functioncd9f4
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -1746,7 +1744,7 @@
 	ld [hl], a
 	ret
 
-Functioncd9f4: ; cd9f4 (33:59f4)
+Functioncd9f4:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld e, [hl]
@@ -1756,12 +1754,10 @@
 	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]
@@ -1790,7 +1786,7 @@
 	jr nz, .asm_cda2c
 	ret
 
-BattleAnimFunction_1F: ; cda31 (33:5a31)
+BattleAnimFunction_1F:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncda4c
@@ -1797,7 +1793,7 @@
 	dw Functioncda3a
 	dw Functioncda4c
 
-Functioncda3a: ; cda3a (33:5a3a)
+Functioncda3a:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld a, [hl]
@@ -1807,10 +1803,10 @@
 	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
@@ -1817,7 +1813,7 @@
 	dw .one
 	dw .two
 	dw .three
-.zero: ; cda58 (33:5a58)
+.zero:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
@@ -1824,7 +1820,7 @@
 	ld [hl], $40
 	ret
 
-.one: ; cda62 (33:5a62)
+.one:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1840,7 +1836,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-.two: ; cda7a (33:5a7a)
+.two:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1853,10 +1849,10 @@
 	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
@@ -1904,7 +1900,7 @@
 	dec [hl]
 	ret
 
-BattleAnimFunction_3F: ; cdad6 (33:5ad6)
+BattleAnimFunction_3F:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdadf
@@ -1911,7 +1907,7 @@
 	dw Functioncdae9
 	dw Functioncdaf9
 
-Functioncdadf: ; cdadf (33:5adf)
+Functioncdadf:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
@@ -1918,7 +1914,7 @@
 	ld [hl], $40
 	ret
 
-Functioncdae9: ; cdae9 (33:5ae9)
+Functioncdae9:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -1929,10 +1925,10 @@
 
 .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
@@ -1941,7 +1937,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_1B: ; cdb06 (33:5b06)
+BattleAnimFunction_1B:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdb13
@@ -1950,10 +1946,10 @@
 	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]
@@ -1969,7 +1965,7 @@
 	ld [hl], a
 	ret
 
-Functioncdb28: ; cdb28 (33:5b28)
+Functioncdb28:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1994,7 +1990,7 @@
 	dec [hl]
 	ret
 
-Functioncdb50: ; cdb50 (33:5b50)
+Functioncdb50:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -2005,7 +2001,7 @@
 	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]
@@ -2024,7 +2020,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_1D: ; cdb80 (33:5b80)
+BattleAnimFunction_1D:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncdb9f
@@ -2042,7 +2038,7 @@
 	dw Functioncdc57
 	dw Functioncdc74
 
-Functioncdb9f: ; cdb9f (33:5b9f)
+Functioncdb9f:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld [hl], $28
@@ -2056,7 +2052,7 @@
 	ld [hl], a
 	ret
 
-Functioncdbb3: ; cdbb3 (33:5bb3)
+Functioncdbb3:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2067,7 +2063,7 @@
 	call Functioncdc75
 	ret
 
-Functioncdbc1: ; cdbc1 (33:5bc1)
+Functioncdbc1:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2078,7 +2074,7 @@
 	call Functioncdc75
 	ret
 
-Functioncdbcf: ; cdbcf (33:5bcf)
+Functioncdbcf:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2097,7 +2093,7 @@
 	inc [hl]
 	ret
 
-Functioncdbeb: ; cdbeb (33:5beb)
+Functioncdbeb:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2110,7 +2106,7 @@
 	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]
@@ -2132,17 +2128,17 @@
 	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]
@@ -2155,7 +2151,7 @@
 	ld [hl], a
 	ret
 
-Functioncdc39: ; cdc39 (33:5c39)
+Functioncdc39:
 	ld a, BATTLEANIMFRAMESET_50
 	call ReinitBattleAnimFrameset
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2164,7 +2160,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functioncdc48: ; cdc48 (33:5c48)
+Functioncdc48:
 	ld a, BATTLEANIMFRAMESET_4F
 	call ReinitBattleAnimFrameset
 	call BattleAnim_IncAnonJumptableIndex
@@ -2173,7 +2169,7 @@
 	ld [hl], $40
 	ret
 
-Functioncdc57: ; cdc57 (33:5c57)
+Functioncdc57:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2192,10 +2188,10 @@
 
 .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]
@@ -2227,7 +2223,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-BattleAnimFunction_1E: ; cdca6 (33:5ca6)
+BattleAnimFunction_1E:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -2249,13 +2245,13 @@
 	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
@@ -2277,7 +2273,7 @@
 	call ReinitBattleAnimFrameset
 	ret
 
-Functioncdced: ; cdced (33:5ced)
+Functioncdced:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2291,7 +2287,7 @@
 	call DeinitBattleAnimation
 	ret
 
-Functioncdcfe: ; cdcfe (33:5cfe)
+Functioncdcfe:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2324,13 +2320,13 @@
 	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
@@ -2349,7 +2345,7 @@
 	call ReinitBattleAnimFrameset
 	ret
 
-Functioncdd4f: ; cdd4f (33:5d4f)
+Functioncdd4f:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2392,13 +2388,13 @@
 	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
@@ -2420,7 +2416,7 @@
 	ld a, [hl]
 	and $7f
 	ld [hl], a
-Functioncddbc: ; cddbc (33:5dbc)
+Functioncddbc:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2461,7 +2457,7 @@
 	call ReinitBattleAnimFrameset
 	ret
 
-BattleAnimFunction_24: ; cddf9 (33:5df9)
+BattleAnimFunction_24:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functioncde02
@@ -2468,7 +2464,7 @@
 	dw Functioncde20
 	dw Functioncde21
 
-Functioncde02: ; cde02 (33:5e02)
+Functioncde02:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -2485,19 +2481,17 @@
 	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]
@@ -2526,7 +2520,7 @@
 	ld [hl], e
 	ret
 
-BattleAnimFunction_26: ; cde54 (33:5e54)
+BattleAnimFunction_26:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2542,13 +2536,13 @@
 	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
@@ -2561,16 +2555,16 @@
 .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
@@ -2602,7 +2596,7 @@
 	call ReinitBattleAnimFrameset
 	ret
 
-Functioncdebf: ; cdebf (33:5ebf)
+Functioncdebf:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2626,7 +2620,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_SpiralDescent: ; cdedd (33:5edd)
+BattleAnimFunction_SpiralDescent:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2667,7 +2661,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_2D: ; cdf1b (33:5f1b)
+BattleAnimFunction_2D:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2708,13 +2702,13 @@
 	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]
@@ -2744,7 +2738,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-BattleAnimFunction_34: ; cdf8c (33:5f8c)
+BattleAnimFunction_34:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2786,7 +2780,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_3C: ; cdfcb (33:5fcb)
+BattleAnimFunction_3C:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2829,7 +2823,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_35: ; ce00b (33:600b)
+BattleAnimFunction_35:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce014
@@ -2836,7 +2830,7 @@
 	dw Functionce023
 	dw Functionce05f
 
-Functionce014: ; ce014 (33:6014)
+Functionce014:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -2844,7 +2838,7 @@
 	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]
@@ -2883,11 +2877,11 @@
 	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
@@ -2894,7 +2888,7 @@
 	dw .one
 	dw .two
 	dw Functionce09e
-.zero: ; ce06e (33:606e)
+.zero:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2909,7 +2903,7 @@
 	ld [hl], a
 	ret
 
-.one: ; ce083 (33:6083)
+.one:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -2919,7 +2913,7 @@
 	call Functionce70a
 	ret
 
-.two: ; ce091 (33:6091)
+.two:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2928,7 +2922,7 @@
 	call DeinitBattleAnimation
 	ret
 
-Functionce09e: ; ce09e (33:609e)
+Functionce09e:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -2953,7 +2947,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_2C: ; ce0c5 (33:60c5)
+BattleAnimFunction_2C:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce0ce
@@ -2960,7 +2954,7 @@
 	dw Functionce0f8
 	dw Functionce0dd
 
-Functionce0ce: ; ce0ce (33:60ce)
+Functionce0ce:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -2971,7 +2965,7 @@
 	ld [hl], a
 	ret
 
-Functionce0dd: ; ce0dd (33:60dd)
+Functionce0dd:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -2988,7 +2982,7 @@
 	ld a, [hl]
 	sub $4
 	ld [hl], a
-Functionce0f8: ; ce0f8 (33:60f8)
+Functionce0f8:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -3004,13 +2998,13 @@
 	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
@@ -3022,7 +3016,7 @@
 	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]
@@ -3055,7 +3049,7 @@
 	srl [hl]
 	ret
 
-BattleAnimFunction_2F: ; ce15c (33:615c)
+BattleAnimFunction_2F:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3114,7 +3108,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_42: ; ce1b0 (33:61b0)
+BattleAnimFunction_42:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3153,13 +3147,13 @@
 	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
@@ -3167,7 +3161,7 @@
 	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]
@@ -3193,13 +3187,13 @@
 	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
@@ -3220,10 +3214,10 @@
 	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
@@ -3231,7 +3225,7 @@
 	dw Functionce278
 	dw Functionce289
 
-Functionce260: ; ce260 (33:6260)
+Functionce260:
 	call BattleAnim_IncAnonJumptableIndex
 	ld a, [hBattleTurn]
 	and a
@@ -3247,11 +3241,11 @@
 	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
@@ -3262,7 +3256,7 @@
 	call Functionce70a
 	ret
 
-Functionce289: ; ce289 (33:6289)
+Functionce289:
 	call Functionce29f
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
@@ -3277,7 +3271,7 @@
 	call DeinitBattleAnimation
 	ret
 
-Functionce29f: ; ce29f (33:629f)
+Functionce29f:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -3303,14 +3297,12 @@
 	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]
@@ -3340,7 +3332,7 @@
 	dec [hl]
 	ret
 
-BattleAnimFunction_36: ; ce2fd (33:62fd)
+BattleAnimFunction_36:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce306
@@ -3347,7 +3339,7 @@
 	dw Functionce330
 	dw Functionce34c
 
-Functionce306: ; ce306 (33:6306)
+Functionce306:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3376,7 +3368,7 @@
 	ld [hl], e
 	ret
 
-Functionce330: ; ce330 (33:6330)
+Functionce330:
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
 	ld a, [hl]
@@ -3399,7 +3391,7 @@
 	ld [hl], a
 	ret
 
-Functionce34c: ; ce34c (33:634c)
+Functionce34c:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -3413,13 +3405,13 @@
 	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
@@ -3427,7 +3419,7 @@
 	and $7f
 	add BATTLEANIMFRAMESET_81
 	call ReinitBattleAnimFrameset
-Functionce375: ; ce375 (33:6375)
+Functionce375:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	bit 7, [hl]
@@ -3443,7 +3435,7 @@
 	dec [hl]
 	ret
 
-BattleAnimFunction_38: ; ce389 (33:6389)
+BattleAnimFunction_38:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce392
@@ -3450,7 +3442,7 @@
 	dw Functionce39c
 	dw Functionce3ae
 
-Functionce392: ; ce392 (33:6392)
+Functionce392:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -3457,7 +3449,7 @@
 	ld [hl], $c
 	ret
 
-Functionce39c: ; ce39c (33:639c)
+Functionce39c:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3470,13 +3462,13 @@
 	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]
@@ -3496,7 +3488,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_3A: ; ce3d2 (33:63d2)
+BattleAnimFunction_3A:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3526,13 +3518,13 @@
 	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]
@@ -3542,11 +3534,11 @@
 	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]
@@ -3570,7 +3562,7 @@
 	inc [hl]
 	ret
 
-BattleAnimFunction_3E: ; ce43a (33:643a)
+BattleAnimFunction_3E:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce443
@@ -3577,7 +3569,7 @@
 	dw Functionce465
 	dw Functionce490
 
-Functionce443: ; ce443 (33:6443)
+Functionce443:
 	call BattleAnim_IncAnonJumptableIndex
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
@@ -3596,7 +3588,7 @@
 	and $f0
 	or $8
 	ld [hl], a
-Functionce465: ; ce465 (33:6465)
+Functionce465:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3625,7 +3617,7 @@
 .asm_ce48b
 	ld [hl], $10
 	call BattleAnim_IncAnonJumptableIndex
-Functionce490: ; ce490 (33:6490)
+Functionce490:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3635,13 +3627,13 @@
 	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
@@ -3648,7 +3640,7 @@
 	ld a, BATTLEANIMFRAMESET_24
 	add [hl]
 	call ReinitBattleAnimFrameset
-Functionce4b0: ; ce4b0 (33:64b0)
+Functionce4b0:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3678,7 +3670,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_41: ; ce4dc (33:64dc)
+BattleAnimFunction_41:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3708,7 +3700,7 @@
 	srl [hl]
 	ret
 
-BattleAnimFunction_43: ; ce508 (33:6508)
+BattleAnimFunction_43:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -3738,7 +3730,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_44: ; ce532 (33:6532)
+BattleAnimFunction_44:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld e, [hl]
@@ -3767,7 +3759,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_45: ; ce55b (33:655b)
+BattleAnimFunction_45:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce564
@@ -3774,7 +3766,7 @@
 	dw Functionce56e
 	dw Functionce577
 
-Functionce564: ; ce564 (33:6564)
+Functionce564:
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -3782,12 +3774,12 @@
 	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]
@@ -3805,17 +3797,17 @@
 	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]
@@ -3833,10 +3825,10 @@
 
 .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
@@ -3863,7 +3855,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_48: ; ce5dc (33:65dc)
+BattleAnimFunction_48:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3879,7 +3871,7 @@
 	call DeinitBattleAnimation
 	ret
 
-BattleAnimFunction_49: ; ce5ee (33:65ee)
+BattleAnimFunction_49:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce5f9
@@ -3887,7 +3879,7 @@
 	dw Functionce622
 	dw Functionce618
 
-Functionce5f9: ; ce5f9 (33:65f9)
+Functionce5f9:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3897,7 +3889,7 @@
 	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]
@@ -3909,14 +3901,14 @@
 	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]
@@ -3928,7 +3920,7 @@
 	dec [hl]
 	ret
 
-BattleAnimFunction_4A: ; ce62f (33:662f)
+BattleAnimFunction_4A:
 	call BattleAnim_AnonJumptable
 .anon_dw
 	dw Functionce63a
@@ -3936,7 +3928,7 @@
 	dw Functionce65c
 	dw Functionce672
 
-Functionce63a: ; ce63a (33:663a)
+Functionce63a:
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
 	ld a, [hl]
@@ -3946,7 +3938,7 @@
 	call BattleAnim_IncAnonJumptableIndex
 	ret
 
-Functionce648: ; ce648 (33:6648)
+Functionce648:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3962,7 +3954,7 @@
 	inc [hl]
 	ret
 
-Functionce65c: ; ce65c (33:665c)
+Functionce65c:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3979,7 +3971,7 @@
 	ld [hl], a
 	ret
 
-Functionce672: ; ce672 (33:6672)
+Functionce672:
 	ld hl, BATTLEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -3996,7 +3988,7 @@
 	ld [hl], a
 	ret
 
-BattleAnimFunction_4B: ; ce688 (33:6688)
+BattleAnimFunction_4B:
 	ld hl, BATTLEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld d, [hl]
@@ -4027,7 +4019,7 @@
 	ld [hl], e
 	ret
 
-BattleAnimFunction_4C: ; ce6b3 (33:66b3)
+BattleAnimFunction_4C:
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_0B
 	add hl, bc
@@ -4036,7 +4028,7 @@
 	call Functionce6f1
 	ret
 
-BattleAnimFunction_4F: ; ce6bf (33:66bf)
+BattleAnimFunction_4F:
 	ld d, $18
 	ld hl, BATTLEANIMSTRUCT_10
 	add hl, bc
@@ -4049,7 +4041,7 @@
 	call Functionce6f1
 	ret
 
-BattleAnimFunction_4D: ; ce6d2 (33:66d2)
+BattleAnimFunction_4D:
 	ld hl, BATTLEANIMSTRUCT_0F
 	add hl, bc
 	ld a, [hl]
@@ -4071,7 +4063,7 @@
 	call DeinitBattleAnimation
 	ret
 
-Functionce6f1: ; ce6f1 (33:66f1)
+Functionce6f1:
 	push af
 	push de
 	call BattleAnim_Sine
@@ -4088,7 +4080,7 @@
 	ld [hl], a
 	ret
 
-Functionce70a: ; ce70a (33:670a)
+Functionce70a:
 	and $f
 	ld e, a
 	ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -4104,7 +4096,7 @@
 	jr nz, .asm_ce719
 	ret
 
-BattleAnim_AnonJumptable: ; ce71e (33:671e)
+BattleAnim_AnonJumptable:
 	pop de
 	ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
 	add hl, bc
@@ -4117,49 +4109,45 @@
 	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 ; cos(x) = sin(x + pi/2)
 	; fallthrough
-BattleAnim_Sine: ; ce734 (33:6734)
+BattleAnim_Sine:
 ; a = d * sin(a * pi/32)
 	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
+BattleAnimSineWave:
 	sine_table 32
-; ce7bf
--- 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 @@
 	ld [hl], -1
 	ret
 
-GetBattleAnimFrame: ; ce7d1
+GetBattleAnimFrame:
 .loop
 	ld hl, BATTLEANIMSTRUCT_DURATION
 	add hl, bc
@@ -72,9 +72,7 @@
 	ld [hl], a
 	jr .loop
 
-; ce823
-
-.GetPointer: ; ce823
+.GetPointer:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld e, [hl]
@@ -93,9 +91,7 @@
 	add hl, de
 	ret
 
-; ce83c
-
-GetBattleAnimOAMPointer: ; ce83c
+GetBattleAnimOAMPointer:
 	ld l, a
 	ld h, 0
 	ld de, BattleAnimOAMData
@@ -104,9 +100,7 @@
 	add hl, de
 	ret
 
-; ce846
-
-LoadBattleAnimObj: ; ce846 (33:6846)
+LoadBattleAnimObj:
 	push hl
 	ld l, a
 	ld h, 0
@@ -126,5 +120,3 @@
 	call DecompressRequest2bpp
 	pop bc
 	ret
-
-; ce85e (33:685e)
--- a/engine/battle_anims/pokeball_wobble.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.
 
--- 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 @@
 	ld a, FALSE
 	ld [wItemEffectSucceeded], a
 	ret
-; 507e1
 
-.BasementKeyScript: ; 0x507e1
+.BasementKeyScript:
 	closetext
 	farjump BasementDoorScript
-; 0x507e6
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -1,17 +1,15 @@
-BattleTowerRoomMenu: ; 1700b0
+BattleTowerRoomMenu:
 ; special
 	call InitBattleTowerChallengeRAM
 	farcall _BattleTowerRoomMenu
 	ret
-; 1700ba
 
-Function1700ba: ; 1700ba
+Function1700ba:
 	call InitBattleTowerChallengeRAM
 	farcall Function11811a
 	ret
-; 1700c4
 
-Function1700c4: ; 1700c4
+Function1700c4:
 	ld a, [rSVBK]
 	push af
 	ld a, $3
@@ -51,16 +49,14 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 170114
 
-Function170114: ; 170114
+Function170114:
 	call InitBattleTowerChallengeRAM
 	call .Function170121
 	farcall Function11805f
 	ret
-; 170121
 
-.Function170121: ; 170121
+.Function170121:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a948
@@ -70,9 +66,8 @@
 	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
@@ -167,9 +162,8 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17020c
 
-.DecToBin: ; 17020c
+.DecToBin:
 	ld a, [de]
 	inc de
 	and a
@@ -180,20 +174,17 @@
 	dec a
 	jr nz, .digit_loop
 	ret
-; 170215
 
-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
@@ -200,9 +191,8 @@
 	ld [wcf65], a
 	ld [wcf66], a
 	ret
-; 17022c
 
-_BattleTowerBattle: ; 17022c
+_BattleTowerBattle:
 .loop
 	call .do_dw
 	call DelayFrame
@@ -210,9 +200,8 @@
 	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 @@
 	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
@@ -277,14 +264,13 @@
 	ld [wBattleTowerBattleEnded], a
 	ret
 
-
-ReadBTTrainerParty: ; 1702b7
+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_OTTempMon1Name ; $c643
+	ld de, wBT_OTTempMon1Name
 	ld c, MON_NAME_LENGTH
 	farcall CheckStringForErrors
 	jr nc, .skip_mon_1
@@ -294,35 +280,35 @@
 	call GetPokemonName
 	ld l, e
 	ld h, d
-	ld de, wBT_OTTempMon1Name ; $c643
+	ld de, wBT_OTTempMon1Name
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
 .skip_mon_1
-	ld de, wBT_OTTempMon2Name ; $c67e
+	ld de, wBT_OTTempMon2Name
 	ld c, MON_NAME_LENGTH
 	farcall CheckStringForErrors
 	jr nc, .skip_mon_2
-	ld a, [wBT_OTTempMon2] ; [$c64e]
+	ld a, [wBT_OTTempMon2]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld l, e
 	ld h, d
-	ld de, wBT_OTTempMon2Name ; $c67e
+	ld de, wBT_OTTempMon2Name
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
 .skip_mon_2
-	ld de, wBT_OTTempMon3Name ; $c686 + 51 = $c6b9
+	ld de, wBT_OTTempMon3Name
 	ld c, MON_NAME_LENGTH
 	farcall CheckStringForErrors
 	jr nc, .skip_mon_3
-	ld a, [wBT_OTTempMon3] ; [$c689]
+	ld a, [wBT_OTTempMon3]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld l, e
 	ld h, d
-	ld de, wBT_OTTempMon3Name ; $c686 + 51 = $c6b9
+	ld de, wBT_OTTempMon3Name
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
@@ -329,9 +315,9 @@
 .skip_mon_3
 ; Add the terminator character to each of these names
 	ld a, "@"
-	ld [wBT_OTTempMon1NameEnd - 1], a ; $c64d
-	ld [wBT_OTTempMon2NameEnd - 1], a ; $c688
-	ld [wBT_OTTempMon3NameEnd - 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 @@
 	jr .done_trainer_name
 
 .trainer_name_okay
-	ld hl, wBT_OTTempName ; 0xc608
+	ld hl, wBT_OTTempName
 
 .done_trainer_name
 	ld de, wOTPlayerName
@@ -394,9 +380,8 @@
 	ld a, -1
 	ld [bc], a
 	ret
-; 170394
 
-ValidateBTParty: ; 170394
+ValidateBTParty:
 ; Check for and fix errors in party data
 	ld hl, wBT_OTTempMon1Species
 	ld d, BATTLETOWER_PARTY_LENGTH
@@ -501,13 +486,11 @@
 	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 @@
 	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 @@
 	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,9 +597,8 @@
 
 .asm_1704e0
 	ret
-; 1704e1
 
-Function1704e1: ; 1704e1
+Function1704e1:
 	call SpeechTextBox
 	call FadeToMenu
 	call InitBattleTowerChallengeRAM
@@ -626,9 +605,8 @@
 	call .JumptableLoop
 	call CloseSubmenu
 	ret
-; 1704f1
 
-.JumptableLoop: ; 1704f1
+.JumptableLoop:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearScreen
@@ -643,9 +621,8 @@
 
 .done
 	ret
-; 170510
 
-.DoJumptable: ; 170510
+.DoJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -656,15 +633,13 @@
 	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
 
@@ -695,12 +670,10 @@
 	call .PlaceTextItems
 	jr .NextJumptableFunction
 
-
 .Jumptable_1:
 	call SetPalettes
 	call .NextJumptableFunction
 
-
 .Jumptable_2:
 	ld hl, hJoyPressed
 	ld a, [hl]
@@ -744,9 +717,8 @@
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
-; 1705b7
 
-.DrawBorder: ; 1705b7
+.DrawBorder:
 	hlcoord 0, 4
 	ld a, "┌"
 	ld [hli], a
@@ -786,9 +758,8 @@
 	dec c
 	jr nz, .right_border_loop
 	ret
-; 1705f0
 
-.PlaceTextItems: ; 1705f0
+.PlaceTextItems:
 	call .ClearBox
 	call .PlaceUpDownArrows
 	ld a, $50
@@ -855,9 +826,8 @@
 	dec a
 	jr nz, .loop1
 	ret
-; 17064b
 
-.ClearBox: ; 17064b
+.ClearBox:
 	hlcoord 1, 5
 	xor a
 	ld b, 12
@@ -872,9 +842,8 @@
 	dec b
 	jr nz, .clearbox_row
 	ret
-; 17065d
 
-.PlaceUpDownArrows: ; 17065d
+.PlaceUpDownArrows:
 	ld a, [wNrOfBeatenBattleTowerTrainers]
 	and a
 	jr z, .nope
@@ -890,17 +859,14 @@
 	ld a, "▼"
 	ld [hl], a
 	ret
-; 170676
 
-.String_Mail: ; 170676
+.String_Mail:
 	db "ルーム@"
-; 17067a
 
-.String_PastReaders: ; 17067a
+.String_PastReaders:
 	db "れきだいりーダーいちらん@"
-; 170687
 
-BattleTowerAction: ; 170687
+BattleTowerAction:
 	ld a, [wScriptVar]
 	ld e, a
 	ld d, 0
@@ -911,10 +877,8 @@
 	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 @@
 	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 @@
 
 	ret
 
-BattleTower_GiveReward: ; 1706ee (5c:46ee) BattleTowerAction $1b
+BattleTower_GiveReward: ; BattleTowerAction $1b
 	ld a, BANK(sBattleTowerReward)
 	call GetSRAMBank
 
@@ -995,7 +958,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call CloseSRAM
 	ret
 
-Function1707ac: ; 1707ac (5c:47ac) BattleTowerAction $05
+Function1707ac: ; BattleTowerAction $05
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa8c]
@@ -1123,7 +1086,7 @@
 	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 @@
 	call CloseSRAM
 	ret
 
-Function170807: ; 170807 (5c:4807) BattleTowerAction $16
+Function170807: ; BattleTowerAction $16
 	call UpdateTime
 	ld a, $5
 	call GetSRAMBank
@@ -1144,7 +1107,7 @@
 	call CloseSRAM
 	ret
 
-Function17081d: ; 17081d (5c:481d) BattleTowerAction $17
+Function17081d: ; BattleTowerAction $17
 	xor a
 	ld [wScriptVar], a
 	ld a, $5
@@ -1187,7 +1150,7 @@
 	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 @@
 	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 @@
 	call CloseSRAM
 	ret
 
-BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09
+BattleTower_CheckSaveFileExistsAndIsYours: ; BattleTowerAction $09
 	ld a, [wSaveFileExists]
 	and a
 	jr z, .nope
@@ -1230,16 +1193,14 @@
 .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 @@
 	call CloseSRAM
 	ret
 
-Function1708c8: ; 1708c8 (5c:48c8) BattleTowerAction $0c
+Function1708c8: ; BattleTowerAction $0c
 	call UpdateTime
 	ld a, $5
 	call GetSRAMBank
@@ -1266,7 +1227,7 @@
 	call CloseSRAM
 	ret
 
-Function1708f0: ; 1708f0 (5c:48f0) BattleTowerAction $0d
+Function1708f0: ; BattleTowerAction $0d
 	xor a
 	ld [wScriptVar], a
 	call UpdateTime
@@ -1292,8 +1253,7 @@
 	ld [wScriptVar], a
 	ret
 
-
-Function170923: ; 170923
+Function170923:
 	ld a, $5
 	call GetSRAMBank
 	xor a
@@ -1304,10 +1264,8 @@
 	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
@@ -1373,12 +1331,11 @@
 	dec c
 	jr nz, .loop
 	ret
-; 1709a4 (5c:49a4)
 
-String_MysteryJP: ; 1709a4
+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 @@
 	ld [rSVBK], a
 	ret
 
-Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
+Function1709bb: ; BattleTowerAction $10
 	xor a
 	ld [wScriptVar], a
 	ld a, $5
@@ -1415,9 +1372,8 @@
 	ld [$a800], a
 	call CloseSRAM
 	ret
-; 1709e7 (5c:49e7)
 
-.jumptable: ; 1709e7
+.jumptable:
 	dw .NoAction
 	dw .NoAction
 	dw .DoAction1
@@ -1424,9 +1380,8 @@
 	dw .DoAction1
 	dw .Action4
 	dw .Action5
-; 1709f3
 
-.DoAction1: ; 1709f3
+.DoAction1:
 	ld a, $5
 	call GetSRAMBank
 	ld a, $1
@@ -1433,11 +1388,10 @@
 	ld [$a800], a
 	call CloseSRAM
 
-.NoAction: ; 170a00
+.NoAction:
 	ret
-; 170a01
 
-.Action4: ; 170a01
+.Action4:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $b023
@@ -1454,9 +1408,8 @@
 	ld a, $1
 	ld [wScriptVar], a
 	ret
-; 170a33
 
-.Action5: ; 170a33
+.Action5:
 	ld a, $0
 	call GetSRAMBank
 	ld hl, wRTC
@@ -1516,15 +1469,14 @@
 
 .no_scene_2
 	ret
-; 170a9c
 
-Function170a9c: ; 170a9c (5c:4a9c) BattleTowerAction $11
+Function170a9c: ; BattleTowerAction $11
 	ld c, FALSE
 	jr asm_170aa2
 
-Function170aa0: ; 170aa0 (5c:4aa0) BattleTowerAction $12
+Function170aa0: ; BattleTowerAction $12
 	ld c, TRUE
-asm_170aa2: ; 170aa2 (5c:4aa2)
+asm_170aa2:
 	ld a, $5
 	call GetSRAMBank
 	ld a, c
@@ -1532,7 +1484,7 @@
 	call CloseSRAM
 	ret
 
-Function170aaf: ; 170aaf (5c:4aaf) BattleTowerAction $13
+Function170aaf: ; BattleTowerAction $13
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa8d]
@@ -1540,7 +1492,7 @@
 	call CloseSRAM
 	ret
 
-Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14
+Function170abe: ; BattleTowerAction $14
 	call BattleTower_CheckSaveFileExistsAndIsYours
 	ld a, [wScriptVar]
 	and a
@@ -1554,7 +1506,7 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wScriptVar], a
 	ret
 
-LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44
+LoadOpponentTrainerAndPokemonWithOTSprite:
 	farcall Function_LoadOpponentTrainerAndPokemons
 	ld a, [rSVBK]
 	push af
@@ -1646,15 +1598,13 @@
 	ld [hUsedSpriteTile], a
 	farcall GetUsedSprite
 	ret
-; 170b90
 
 INCLUDE "data/trainers/sprites.asm"
 
-DummySpecial_170bd2: ; 170bd2
+DummySpecial_170bd2:
 	ret
-; 170bd3
 
-CheckForBattleTowerRules: ; 170bd3
+CheckForBattleTowerRules:
 	farcall _CheckForBattleTowerRules
 	jr c, .asm_170bde
 	xor a ; FALSE
@@ -1666,4 +1616,3 @@
 .asm_170be0
 	ld [wScriptVar], a
 	ret
-; 170be4
--- a/engine/events/battle_tower/get_trainer_class.asm
+++ b/engine/events/battle_tower/get_trainer_class.asm
@@ -5,7 +5,7 @@
 	ld c, a
 	ret
 
-.GetMobileOTTrainerClass: ; 4e930
+.GetMobileOTTrainerClass:
 	ld a, [hli]
 	xor [hl]
 	ld c, a
--- 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)
@@ -91,8 +91,7 @@
 
 	ret
 
-
-Function_LoadRandomBattleTowerMon: ; 1f8081
+Function_LoadRandomBattleTowerMon:
 	ld c, BATTLETOWER_PARTY_LENGTH
 .loop
 	push bc
@@ -105,7 +104,7 @@
 	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]
@@ -207,7 +206,6 @@
 	ld [sBTMonPrevTrainer3], a
 	call CloseSRAM
 	ret
-; 1f814e
 
 INCLUDE "data/battle_tower/classes.asm"
 
--- a/engine/events/battle_tower/rules.asm
+++ b/engine/events/battle_tower/rules.asm
@@ -1,4 +1,4 @@
-CheckForMobileBattleRules: ; 8b1e1
+CheckForMobileBattleRules:
 	ld de, .PointerTables
 	call BattleTower_ExecuteJumptable
 	ret z
@@ -5,31 +5,27 @@
 	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 @@
 	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_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_OnlyThreeMonMayBeEntered: ; 0x8b247
+JumpText_OnlyThreeMonMayBeEntered:
 	; Only three #MON may be entered.
 	text_jump Text_OnlyThreeMonMayBeEntered
 	db "@"
-; 0x8b24c
 
-JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c
+JumpText_TheMonMustAllBeDifferentKinds:
 	; The @  #MON must all be different kinds.
 	text_jump Text_TheMonMustAllBeDifferentKinds
 	db "@"
-; 0x8b251
 
-JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251
+JumpText_TheMonMustNotHoldTheSameItems:
 	; The @  #MON must not hold the same items.
 	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 @@
 	ld a, b
 	and a
 	ret
-; 8b26c
 
-.DoJumptableFunction: ; 8b26c
+.DoJumptableFunction:
 	push de
 	push bc
 	call .GetFunctionPointer
@@ -137,16 +120,14 @@
 	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 @@
 	ld a, [de]
 	ld h, a
 	ret
-; 8b281
 
-.GetTextPointers: ; 8b281
+.GetTextPointers:
 	inc de
 	inc de
 	inc de
@@ -166,16 +146,14 @@
 	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,9 +164,8 @@
 	ld b, $1
 	pop de
 	ret
-; 8b29d
 
-.PrintFirstText: ; 8b29d
+.PrintFirstText:
 	push de
 	call .GetTextPointers
 	call .LoadTextPointer
@@ -195,9 +172,8 @@
 	call PrintText
 	pop de
 	ret
-; 8b2a9
 
-.PrintNthText: ; 8b2a9
+.PrintNthText:
 	push bc
 	call .GetTextPointers
 	inc hl
@@ -209,15 +185,13 @@
 	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 @@
 	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,9 +267,8 @@
 	pop hl
 	scf
 	ret
-; 8b31a
 
-.nextmon ; 8b31a
+.nextmon
 	push bc
 	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
@@ -305,9 +275,8 @@
 	inc de
 	pop bc
 	ret
-; 8b322
 
-.isegg ; 8b322
+.isegg
 	push bc
 	ld b, a
 	ld a, [de]
@@ -315,15 +284,13 @@
 	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 @@
 .found
 	scf
 	ret
-; 8b342
--- 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 @@
 	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 @@
 	dw BTGreetingM24
 	dw BTGreetingM25
 
-.PlayerLost: ; 11f36a
+.PlayerLost:
 	dw BTLossM1
 	dw BTLossM2
 	dw BTLossM3
@@ -149,7 +147,7 @@
 	dw BTLossM24
 	dw BTLossM25
 
-.PlayerWon: ; 11f39c
+.PlayerWon:
 	dw BTWinM1
 	dw BTWinM2
 	dw BTWinM3
@@ -176,13 +174,12 @@
 	dw BTWinM24
 	dw BTWinM25
 
-
 BTFemaleTrainerTexts:
 	dw .Greetings
 	dw .PlayerLost
 	dw .PlayerWon
 
-.Greetings: ; 11f3d4
+.Greetings:
 	dw BTGreetingF1
 	dw BTGreetingF2
 	dw BTGreetingF3
@@ -199,7 +196,7 @@
 	dw BTGreetingF14
 	dw BTGreetingF15
 
-.PlayerLost: ; 11f3f2
+.PlayerLost:
 	dw BTLossF1
 	dw BTLossF2
 	dw BTLossF3
@@ -216,7 +213,7 @@
 	dw BTLossF14
 	dw BTLossF15
 
-.PlayerWon: ; 11f410
+.PlayerWon:
 	dw BTWinF1
 	dw BTWinF2
 	dw BTWinF3
@@ -233,486 +230,482 @@
 	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 "@"
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -1,4 +1,4 @@
-BuenasPassword: ; 8af6b
+BuenasPassword:
 	xor a
 	ld [wWhichIndexSet], a
 	ld hl, .MenuHeader
@@ -26,25 +26,22 @@
 	ld a, b
 	ld [wScriptVar], a
 	ret
-; 8afa9
 
-.MenuHeader: ; 0x8afa9
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 7
 	dw .MenuData
 	db 1 ; default option
-; 0x8afb1
 
 	db 0
 
-.MenuData: ; 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 @@
 endr
 	db -1
 
-.PlacePasswordChoices: ; 8afbd
+.PlacePasswordChoices:
 	push de
 	ld a, [wBuenasPassword]
 	and $f0
@@ -65,9 +62,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 8afd4
 
-BuenaPrize: ; 8afd4
+BuenaPrize:
 	xor a
 	ld [wMenuScrollPosition], a
 	ld a, $1
@@ -149,56 +145,47 @@
 	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
+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
@@ -221,29 +208,24 @@
 	lb bc, 1, 2
 	call PrintNum
 	ret
-; 8b0ca
 
 .Points_string:
 	db "Points@"
-; 8b0d1
 
-BlueCardBalanceMenuHeader: ; 0x8b0d1
+BlueCardBalanceMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 11, 13
-; 8b0d6
 
-Buena_PlacePrizeMenuBox: ; 8b0d6
+Buena_PlacePrizeMenuBox:
 	ld hl, .MenuHeader
 	call LoadMenuHeader
 	ret
-; 8b0dd
 
-.MenuHeader ; 0x8b0dd
+.MenuHeader
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 17, TEXTBOX_Y - 1
-; 8b0e2
 
-Buena_PrizeMenu: ; 8b0e2
+Buena_PrizeMenu:
 	ld hl, .MenuHeader
 	call CopyMenuHeader
 	ld a, [wMenuSelection]
@@ -268,18 +250,16 @@
 .cancel
 	xor a
 	ret
-; 8b113
 
-.MenuHeader: ; 0x8b113
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 16, 9
 	dw .MenuData
 	db 1 ; default option
-; 0x8b11b
 
 	db 0
 
-.MenuData: ; 0x8b11c
+.MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 13 ; rows, columns
 	db 1 ; spacing
@@ -286,11 +266,10 @@
 	dba .indices
 	dba .prizeitem
 	dba .prizepoints
-; 8b129
 
 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 @@
 x = x + 1
 endr
 	db -1
-; 8b134
 
-.prizeitem ; 8b134
+.prizeitem
 	ld a, [wMenuSelection]
 	call Buena_getprize
 	ld a, [hl]
@@ -310,9 +288,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 8b147
 
-.prizepoints ; 8b147
+.prizepoints
 	ld a, [wMenuSelection]
 	call Buena_getprize
 	inc hl
@@ -321,9 +298,8 @@
 	add c
 	ld [de], a
 	ret
-; 8b154
 
-Buena_getprize: ; 8b154
+Buena_getprize:
 	dec a
 	ld hl, BuenaPrizeItems
 	ld b, 0
@@ -331,6 +307,5 @@
 	add hl, bc
 	add hl, bc
 	ret
-; 8b15e
 
 INCLUDE "data/items/buena_prizes.asm"
--- a/engine/events/buena_menu.asm
+++ b/engine/events/buena_menu.asm
@@ -1,4 +1,4 @@
-AskRememberPassword: ; 4ae12
+AskRememberPassword:
 	call .DoMenu
 	ld a, $0
 	jr c, .okay
@@ -8,7 +8,7 @@
 	ld [wScriptVar], a
 	ret
 
-.DoMenu: ; 4ae1f
+.DoMenu:
 	lb bc, 14, 7
 	push bc
 	ld hl, YesNoMenuHeader
@@ -42,7 +42,7 @@
 	scf
 	ret
 
-Buena_ExitMenu: ; 4ae5e
+Buena_ExitMenu:
 	ld a, [hOAMUpdate]
 	push af
 	call ExitMenu
--- 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 @@
 	call PrintText
 	ret
 
-.generatestats ; e6fd
+.generatestats
 	ld a, [wTempEnemyMonSpecies]
 	ld [wCurSpecies], a
 	ld [wCurPartySpecies], a
@@ -32,7 +32,7 @@
 	ld hl, wContestMon
 	jp GeneratePartyMonStats
 
-.caughttext ; 0xe71d
+.caughttext
 	; Caught @ !
 	text_jump UnknownText_0x1c10c0
 	db "@"
--- a/engine/events/bug_contest/contest.asm
+++ b/engine/events/bug_contest/contest.asm
@@ -1,4 +1,4 @@
-GiveParkBalls: ; 135db
+GiveParkBalls:
 	xor a
 	ld [wContestMon], a
 	ld a, 20
@@ -6,7 +6,7 @@
 	farcall StartBugContestTimer
 	ret
 
-BugCatchingContestBattleScript:: ; 0x135eb
+BugCatchingContestBattleScript::
 	writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST
 	randomwildmon
 	startbattle
@@ -15,7 +15,7 @@
 	iffalse BugCatchingContestOutOfBallsScript
 	end
 
-BugCatchingContestOverScript:: ; 0x135f8
+BugCatchingContestOverScript::
 	playsound SFX_ELEVATOR_END
 	opentext
 	writetext BugCatchingContestText_BeeepTimesUp
@@ -22,22 +22,22 @@
 	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 "@"
--- a/engine/events/bug_contest/contest_2.asm
+++ b/engine/events/bug_contest/contest_2.asm
@@ -1,4 +1,4 @@
-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,9 +54,8 @@
 	dec c
 	jr nz, .loop2
 	ret
-; 139ed
 
-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,
@@ -73,11 +72,10 @@
 	ld b, CHECK_FLAG
 	call EventFlagAction
 	ret
-; 139fe
 
 INCLUDE "data/events/bug_contest_flags.asm"
 
-ContestDropOffMons: ; 13a12
+ContestDropOffMons:
 	ld hl, wPartyMon1HP
 	ld a, [hli]
 	or [hl]
@@ -100,9 +98,8 @@
 	ld a, $1
 	ld [wScriptVar], a
 	ret
-; 13a31
 
-ContestReturnMons: ; 13a31
+ContestReturnMons:
 ; Restore the species of the second mon.
 	ld hl, wPartySpecies + 1
 	ld a, [wBugContestSecondPartySpecies]
@@ -120,4 +117,3 @@
 	ld a, b
 	ld [wPartyCount], a
 	ret
-; 13a47
--- 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
@@ -86,17 +86,17 @@
 .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 "@"
@@ -103,5 +103,5 @@
 
 DummyPredef2F:
 DummyPredef38:
-DummyPredef39: ; cc0d5
+DummyPredef39:
 	ret
--- 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld de, wBugContestWinnerName
 	ld bc, NAME_LENGTH
 	jp CopyBytes
-; 13783
 
-
 INCLUDE "data/events/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 @@
 
 .done
 	ret
-; 13819
 
-BugContest_JudgeContestants: ; 13819
+BugContest_JudgeContestants:
 	call ClearContestResults
 	call ComputeAIContestantScores
 	ld hl, wBugContestTempWinnerID
@@ -168,9 +156,8 @@
 	ld [hl], a
 	call DetermineContestWinners
 	ret
-; 13833
 
-ClearContestResults: ; 13833
+ClearContestResults:
 	ld hl, wBugContestResults
 	ld b, wBugContestWinnersEnd - wBugContestResults
 	xor a
@@ -179,9 +166,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 1383e
 
-DetermineContestWinners: ; 1383e
+DetermineContestWinners:
 	ld de, wBugContestTempScore
 	ld hl, wBugContestFirstPlaceScore
 	ld c, 2
@@ -224,9 +210,8 @@
 
 .done
 	ret
-; 138a0
 
-CopyTempContestant: ; 138a0
+CopyTempContestant:
 ; Could've just called CopyBytes.
 	ld de, wBugContestTempWinnerID
 rept BUG_CONTESTANT_SIZE + -1
@@ -238,9 +223,8 @@
 	inc de
 	ld [hl], a
 	ret
-; 138b0
 
-ComputeAIContestantScores: ; 138b0
+ComputeAIContestantScores:
 	ld e, 0
 .loop
 	push de
@@ -298,9 +282,8 @@
 	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 @@
 
 .done
 	ret
-; 1397f
 
-.AddContestStat: ; 1397f
+.AddContestStat:
 	ld hl, hMultiplicand
 	add [hl]
 	ld [hl], a
@@ -393,4 +375,3 @@
 	dec hl
 	inc [hl]
 	ret
-; 13988
--- 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 @@
 	ld a, FALSE
 	ld [wItemEffectSucceeded], a
 	ret
-; 507af
 
-.CardKeyScript: ; 0x507af
+.CardKeyScript:
 	closetext
 	farjump CardKeySlotScript
-; 0x507b4
--- 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 @@
 	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 @@
 	call CopyBytes
 	ret
 
-.LoadDudeData: ; 4e5b7 (13:65b7)
+.LoadDudeData:
 	ld hl, wDudeNumItems
 	ld [hl], 1
 	inc hl
@@ -68,14 +68,14 @@
 	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
--- a/engine/events/catch_tutorial_input.asm
+++ b/engine/events/catch_tutorial_input.asm
@@ -1,28 +1,28 @@
-_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
@@ -29,7 +29,7 @@
 	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
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -1,6 +1,6 @@
 SPECIALCELEBIEVENT_CELEBI EQU $84
 
-CelebiShrineEvent: ; 4989a
+CelebiShrineEvent:
 	call DelayFrame
 	ld a, [wVramState]
 	push af
@@ -31,7 +31,7 @@
 	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 @@
 	pop bc
 	jr .loop
 
-
 .done
 	pop af
 	ld [wVramState], a
@@ -49,9 +48,7 @@
 	call CelebiEvent_SetBattleType
 	ret
 
-; 498f9
-
-.RestorePlayerSprite_DespawnLeaves: ; 498f9
+.RestorePlayerSprite_DespawnLeaves:
 	ld hl, wVirtualOAMSprite00TileID
 	xor a
 	ld c, 4
@@ -69,9 +66,7 @@
 	call ByteFill
 	ret
 
-; 49912
-
-LoadCelebiGFX: ; 49912
+LoadCelebiGFX:
 	farcall ClearSpriteAnims
 	ld de, SpecialCelebiLeafGFX
 	ld hl, vTiles1
@@ -85,9 +80,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-; 49935
-
-CelebiEvent_CountDown: ; 49935
+CelebiEvent_CountDown:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -95,15 +88,12 @@
 	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 @@
 	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 @@
 .done
 	ret
 
-
-.FreezeCelebiPosition: ; 49b30 (12:5b30)
+.FreezeCelebiPosition:
 	pop af
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -238,14 +224,12 @@
 	call ReinitSpriteAnimFrame
 	ret
 
-
-CelebiEvent_Cosine: ; 49b3b (12:5b3b)
+CelebiEvent_Cosine:
 ; a = d * cos(a * pi/32)
 	add %010000 ; cos(x) = sin(x + pi/2)
 	calc_sine_wave
-; 49bae
 
-GetCelebiSpriteTile: ; 49bae
+GetCelebiSpriteTile:
 	push hl
 	push bc
 	push de
@@ -267,22 +251,18 @@
 	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
 
@@ -292,7 +272,6 @@
 	ld [hl], a
 	jr .done
 
-
 .restart
 	pop de
 	ld d, $ff
@@ -304,9 +283,7 @@
 	pop hl
 	ret
 
-; 49bed
-
-.AddE: ; 49bed
+.AddE:
 	push af
 	ld a, d
 	add e
@@ -314,16 +291,12 @@
 	pop af
 	ret
 
-; 49bf3
-
-CelebiEvent_SetBattleType: ; 49bf3
+CelebiEvent_SetBattleType:
 	ld a, BATTLETYPE_CELEBI
 	ld [wBattleType], a
 	ret
 
-; 49bf9
-
-CheckCaughtCelebi: ; 49bf9
+CheckCaughtCelebi:
 	ld a, [wBattleResult]
 	bit BATTLERESULT_CAUGHT_CELEBI, a
 	jr z, .false
@@ -331,7 +304,6 @@
 	ld [wScriptVar], a
 	jr .done
 
-
 .false
 	xor a ; FALSE
 	ld [wScriptVar], a
@@ -338,5 +310,3 @@
 
 .done
 	ret
-
-; 49c0c
--- 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 @@
 	pop hl
 	scf
 	ret
-; b81e2
 
-.GetFarByte: ; b81e2
+.GetFarByte:
 	ld a, [wBuffer1]
 	call GetFarByte
 	inc hl
 	ret
-; b81ea
--- a/engine/events/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]
--- a/engine/events/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 @@
 	ld c, a
 	ret
 
-.TimeOfDayTable: ; c012
+.TimeOfDayTable:
 	db MORN_F, MORN
 	db DAY_F,  DAY
 	db NITE_F, NITE
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -21,7 +21,7 @@
 	const DAYCARETEXT_OH_FINE
 	const DAYCARETEXT_COME_AGAIN
 
-DayCareMan: ; 166d6
+DayCareMan:
 	ld hl, wDayCareMan
 	bit DAYCAREMAN_HAS_MON_F, [hl]
 	jr nz, .AskWithdrawMon
@@ -58,9 +58,8 @@
 	ld a, DAYCARETEXT_COME_AGAIN
 	call PrintDayCareText
 	ret
-; 1672a
 
-DayCareLady: ; 1672a
+DayCareLady:
 	ld hl, wDayCareLady
 	bit DAYCARELADY_HAS_MON_F, [hl]
 	jr nz, .AskWithdrawMon
@@ -98,9 +97,8 @@
 	ld a, DAYCARETEXT_COME_AGAIN
 	call PrintDayCareText
 	ret
-; 16781
 
-DayCareLadyIntroText: ; 16781
+DayCareLadyIntroText:
 	bit DAYCARELADY_ACTIVE_F, [hl]
 	jr nz, .okay
 	set DAYCARELADY_ACTIVE_F, [hl]
@@ -109,16 +107,14 @@
 	call PrintDayCareText
 	call YesNoBox
 	ret
-; 1678f
 
-DayCareManIntroText: ; 1678f
+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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld l, a
 	call PrintText
 	ret
-; 168aa
 
-.TextTable: ; 168aa
+.TextTable:
 ; entries correspond to DAYCARETEXT_* constants
 	dw .DayCareManIntro ; 00
 	dw .DayCareManOddEgg ; 01
@@ -305,129 +294,108 @@
 	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
 
-DayCareManOutside: ; 16936
+DayCareManOutside:
 	ld hl, wDayCareMan
 	bit DAYCAREMAN_HAS_EGG_F, [hl]
 	jr nz, .AskGiveEgg
@@ -435,13 +403,12 @@
 	call PrintText
 	ret
 
-.NotYet: ; 0x16944
+.NotYet:
 	; Not yet…
 	text_jump UnknownText_0x1bdef6
 	db "@"
-; 0x16949
 
-.AskGiveEgg: ; 16949
+.AskGiveEgg:
 	ld hl, .IntroText
 	call PrintText
 	call YesNoBox
@@ -477,39 +444,33 @@
 	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
@@ -580,9 +541,8 @@
 .PartyFull:
 	scf
 	ret
-; 16a31
 
-DayCare_GetCurrentPartyMember: ; 16a31
+DayCare_GetCurrentPartyMember:
 	ld a, [wPartyCount]
 	dec a
 	call AddNTimes
@@ -589,9 +549,8 @@
 	ld d, h
 	ld e, l
 	ret
-; 16a3b
 
-DayCare_InitBreeding: ; 16a3b
+DayCare_InitBreeding:
 	ld a, [wDayCareLady]
 	bit DAYCARELADY_HAS_MON_F, a
 	ret z
@@ -612,9 +571,8 @@
 	jr c, .loop
 	ld [wStepsToEgg], a
 	jp .UselessJump
-; 16a66
 
-.UselessJump: ; 16a66
+.UselessJump:
 	xor a
 	ld hl, wEggMon
 	ld bc, wEggMonEnd - wEggMon
@@ -788,8 +746,6 @@
 	ld a, [wCurPartyLevel]
 	ld [wEggMonLevel], a
 	ret
-; 16be0
 
-.String_EGG: ; 16be0
+.String_EGG:
 	db "EGG@"
-; 16be4
--- a/engine/events/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 @@
 	call SetPalettes
 	call DelayFrame
 	ret
-; 1dd760
 
 .Player:
 	db "PLAYER@"
@@ -50,9 +48,8 @@
 	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 @@
 	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"
--- a/engine/events/dratini.asm
+++ b/engine/events/dratini.asm
@@ -1,4 +1,4 @@
-GiveDratini: ; 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 @@
 	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 @@
 .EmptyParty:
 	scf
 	ret
-; 8b1e1
--- 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 @@
 .quit
 	scf
 	ret
-; 1344a
 
-.LoadPointer: ; 1344a
+.LoadPointer:
 	ld a, b
 	ld [wElevatorPointerBank], a
 	ld a, e
@@ -26,9 +25,8 @@
 	ld [wElevatorPointer + 1], a
 	call .LoadFloors
 	ret
-; 1345a
 
-.LoadFloors: ; 1345a
+.LoadFloors:
 	ld de, wCurElevator
 	ld bc, 4
 	ld hl, wElevatorPointer
@@ -49,9 +47,8 @@
 	cp -1
 	jr nz, .loop
 	ret
-; 1347d
 
-.FindCurrentFloor: ; 1347d
+.FindCurrentFloor:
 	ld hl, wElevatorPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -98,9 +95,8 @@
 .fail
 	scf
 	ret
-; 134c0
 
-Elevator_GoToFloor: ; 134c0
+Elevator_GoToFloor:
 	push af
 	ld hl, wElevatorPointer
 	ld a, [hli]
@@ -116,9 +112,8 @@
 	ld bc, 3
 	call FarCopyBytes
 	ret
-; 134dd
 
-Elevator_AskWhichFloor: ; 134dd
+Elevator_AskWhichFloor:
 	call LoadStandardMenuHeader
 	ld hl, Elevator_WhichFloorText
 	call PrintText
@@ -141,16 +136,13 @@
 .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 @@
 	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 @@
 	pop de
 	call GetFloorString
 	ret
-; 13550
 
-Elevator_MenuHeader: ; 0x13550
+Elevator_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 1, 18, 9
 	dw Elevator_MenuData
 	db 1 ; default option
-; 0x13558
 
-Elevator_MenuData: ; 0x13558
+Elevator_MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 0 ; rows, columns
 	db 1 ; horizontal spacing
@@ -202,11 +189,10 @@
 	dba GetElevatorFloorStrings
 	dba NULL
 	dba NULL
-; 13568
 
-GetElevatorFloorStrings: ; 13568
+GetElevatorFloorStrings:
 	ld a, [wMenuSelection]
-GetFloorString: ; 1356b
+GetFloorString:
 	push de
 	call FloorToString
 	ld d, h
@@ -213,9 +199,8 @@
 	ld e, l
 	pop hl
 	jp PlaceString
-; 13575
 
-FloorToString: ; 13575
+FloorToString:
 	push de
 	ld e, a
 	ld d, 0
@@ -227,6 +212,5 @@
 	ld l, a
 	pop de
 	ret
-; 13583
 
 INCLUDE "data/events/elevator_floors.asm"
--- a/engine/events/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 @@
 ;
 ; 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 @@
 	and c
 	ld [de], a
 	ret
-; 80462
-
 
 INCLUDE "data/engine_flags.asm"
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -1,12 +1,15 @@
-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
+BlindingFlash:
 	farcall FadeOutPalettes
 	ld hl, wStatusFlags
 	set STATUSFLAGS_FLASH_F, [hl]
@@ -17,16 +20,15 @@
 	farcall LoadOW_BGPal7
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 
 .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 @@
 	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 @@
 	inc [hl]
 	ret
 
-Cut_SpawnAnimateLeaves: ; 8ca3c (23:4a3c)
+Cut_SpawnAnimateLeaves:
 	call Cut_GetLeafSpawnCoords
 	xor a
 	call Cut_SpawnLeaf
@@ -212,7 +203,7 @@
 	inc [hl]
 	ret
 
-Cut_StartWaiting: ; 8ca5c (23:4a5c)
+Cut_StartWaiting:
 	ld a, $1
 	ld [hBGMapMode], a
 ; Cut_WaitAnimSFX
@@ -219,7 +210,7 @@
 	ld hl, wJumptableIndex
 	inc [hl]
 
-Cut_WaitAnimSFX: ; 8ca64 (23:4a64)
+Cut_WaitAnimSFX:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -232,7 +223,7 @@
 	set 7, [hl]
 	ret
 
-Cut_SpawnLeaf: ; 8ca73 (23:4a73)
+Cut_SpawnLeaf:
 	push de
 	push af
 	ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
@@ -239,7 +230,7 @@
 	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 @@
 	pop de
 	ret
 
-Cut_GetLeafSpawnCoords: ; 8ca8e (23:4a8e)
+Cut_GetLeafSpawnCoords:
 	ld de, 0
 	ld a, [wMetatileStandingX]
 	bit 0, a
@@ -273,9 +264,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	pop af
 	ld [wVramState], a
 	ret
-; 8cb33
 
-FlyToAnim: ; 8cb33
+FlyToAnim:
 	call DelayFrame
 	ld a, [wVramState]
 	push af
@@ -366,7 +351,7 @@
 	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 @@
 	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,7 +377,7 @@
 	call .RestorePlayerSprite_DespawnLeaves
 	ret
 
-.RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
+.RestorePlayerSprite_DespawnLeaves:
 	ld hl, wVirtualOAMSprite00TileID
 	xor a
 	ld c, 4
@@ -410,10 +395,10 @@
 	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 @@
 	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 @@
 	set 7, [hl]
 	ret
 
-.SpawnLeaf: ; 8cbe6 (23:4be6)
+.SpawnLeaf:
 	ld hl, wcf65
 	ld a, [hl]
 	inc [hl]
@@ -465,5 +450,5 @@
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
-	ld [hl], $80
+	ld [hl], FIELDMOVE_GRASS
 	ret
--- 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 @@
 	call GetFishGroupIndex
 
 	ld hl, FishGroups
-rept 7
+rept FISHGROUP_DATA_LENGTH
 	add hl, de
 endr
 	call .Fish
@@ -20,10 +20,8 @@
 	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,10 +88,8 @@
 	ld d, [hl]
 	inc hl
 	ret
-; 9245b
 
-
-GetFishGroupIndex: ; 9245b
+GetFishGroupIndex:
 ; Return the index of fishgroup d in de.
 
 	push hl
@@ -127,7 +123,5 @@
 	jr nz, .done
 	ld d, FISHGROUP_REMORAID_SWARM
 	jr .done
-; 92488
-
 
 INCLUDE "data/wild/fish.asm"
--- a/engine/events/fishing_gfx.asm
+++ b/engine/events/fishing_gfx.asm
@@ -1,4 +1,4 @@
-LoadFishingGFX: ; b84b3
+LoadFishingGFX:
 	ld a, [rVBK]
 	push af
 	ld a, $1
@@ -17,15 +17,14 @@
 	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 @@
 	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
--- a/engine/events/forced_movement.asm
+++ b/engine/events/forced_movement.asm
@@ -1,4 +1,4 @@
-Script_ForcedMovement:: ; 0x1253d
+Script_ForcedMovement::
 	checkcode VAR_FACING
 	ifequal DOWN, .down
 	ifequal UP, .up
@@ -5,56 +5,47 @@
 	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
--- 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 @@
 .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 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
@@ -73,9 +68,8 @@
 	ld hl, wDailyFlags
 	set DAILYFLAGS_ALL_FRUIT_TREES_F, [hl]
 	ret
-; 44078
 
-GetFruitTreeFlag: ; 44078
+GetFruitTreeFlag:
 	push hl
 	push de
 	ld a, [wCurFruitTree]
@@ -87,9 +81,8 @@
 	pop de
 	pop hl
 	ret
-; 4408a
 
-GetFruitTreeItem: ; 4408a
+GetFruitTreeItem:
 	push hl
 	push de
 	ld e, a
@@ -100,33 +93,25 @@
 	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
--- a/engine/events/haircut.asm
+++ b/engine/events/haircut.asm
@@ -1,4 +1,4 @@
-BillsGrandfather: ; 73f7
+BillsGrandfather:
 	farcall SelectMonFromParty
 	jr c, .cancel
 	ld a, [wCurPartySpecies]
@@ -12,19 +12,19 @@
 	ld [wScriptVar], a
 	ret
 
-YoungerHaircutBrother: ; 7413
+YoungerHaircutBrother:
 	ld hl, HappinessData_YoungerHaircutBrother
 	jr HaircutOrGrooming
 
-OlderHaircutBrother: ; 7418
+OlderHaircutBrother:
 	ld hl, HappinessData_OlderHaircutBrother
 	jr HaircutOrGrooming
 
-DaisysGrooming: ; 741d
+DaisysGrooming:
 	ld hl, HappinessData_DaisysGrooming
 	; fallthrough
 
-HaircutOrGrooming: ; 7420
+HaircutOrGrooming:
 	push hl
 	farcall SelectMonFromParty
 	pop hl
@@ -72,11 +72,11 @@
 
 INCLUDE "data/events/happiness_probabilities.asm"
 
-CopyPokemonName_Buffer1_Buffer3: ; 746e
+CopyPokemonName_Buffer1_Buffer3:
 	ld hl, wStringBuffer1
 	ld de, wStringBuffer3
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
 
-DummyPredef1: ; 747a
+DummyPredef1:
 	ret
--- 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
@@ -33,9 +33,8 @@
 	ld b, a
 	farcall Credits
 	ret
-; 0x86455
 
-RedCredits:: ; 86455
+RedCredits::
 	ld a, LOW(MUSIC_NONE)
 	ld [wMusicFadeID], a
 	ld a, HIGH(MUSIC_NONE)
@@ -56,9 +55,8 @@
 	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)
@@ -72,9 +70,8 @@
 	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 @@
 	pop de
 	call PlayMusic
 	ret
-; 864c3
 
-AnimateHallOfFame: ; 864c3
+AnimateHallOfFame:
 	xor a
 	ld [wJumptableIndex], a
 	call LoadHOFTeam
@@ -120,9 +116,8 @@
 	ld c, 8
 	call DelayFrames
 	ret
-; 8650c
 
-.DisplayNewHallOfFamer: ; 8650c
+.DisplayNewHallOfFamer:
 	call DisplayHOFMon
 	ld de, .String_NewHallOfFamer
 	hlcoord 1, 2
@@ -135,14 +130,11 @@
 	call DelayFrames
 	and a
 	ret
-; 8652c
 
 .String_NewHallOfFamer:
 	db "New Hall of Famer!@"
-; 8653f
 
-
-GetHallOfFameParty: ; 8653f
+GetHallOfFameParty:
 	ld hl, wHallOfFamePokemonList
 	ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1
 	xor a
@@ -227,9 +219,8 @@
 	ld a, -1
 	ld [de], a
 	ret
-; 865b5
 
-AnimateHOFMonEntrance: ; 865b5
+AnimateHOFMonEntrance:
 	push hl
 	call ClearBGPalettes
 	farcall ResetDisplayBetweenHallOfFameMons
@@ -281,7 +272,6 @@
 	ld [hSCY], a
 	call HOF_SlideFrontpic
 	ret
-; 86635
 
 HOF_SlideBackpic:
 .backpicloop
@@ -292,7 +282,6 @@
 	ld [hSCX], a
 	call DelayFrame
 	jr .backpicloop
-; 86643
 
 HOF_SlideFrontpic:
 .frontpicloop
@@ -304,9 +293,8 @@
 	ld [hSCX], a
 	call DelayFrame
 	jr .frontpicloop
-; 86650
 
-_HallOfFamePC: ; 86650
+_HallOfFamePC:
 	call LoadFontsBattleExtra
 	xor a
 	ld [wJumptableIndex], a
@@ -415,9 +403,8 @@
 
 .TimeFamer:
 	db "    -Time Famer@"
-; 8671c
 
-LoadHOFTeam: ; 8671c
+LoadHOFTeam:
 	ld a, [wJumptableIndex]
 	cp NUM_HOF_TEAMS
 	jr nc, .invalid
@@ -442,9 +429,8 @@
 .invalid
 	scf
 	ret
-; 86748
 
-DisplayHOFMon: ; 86748
+DisplayHOFMon:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [hli]
@@ -529,9 +515,8 @@
 	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 @@
 	call WaitBGMap
 	farcall ProfOaksPCRating
 	ret
-; 868ed
 
 .PlayTime:
 	db "PLAY TIME@"
-; 868f7
-
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -1,4 +1,4 @@
-GetFirstPokemonHappiness: ; 718d
+GetFirstPokemonHappiness:
 	ld hl, wPartyMon1Happiness
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld de, wPartySpecies
@@ -17,7 +17,7 @@
 	call GetPokemonName
 	jp CopyPokemonName_Buffer1_Buffer3
 
-CheckFirstMonIsEgg: ; 71ac
+CheckFirstMonIsEgg:
 	ld a, [wPartySpecies]
 	ld [wd265], a
 	cp EGG
@@ -30,7 +30,7 @@
 	call GetPokemonName
 	jp CopyPokemonName_Buffer1_Buffer3
 
-ChangeHappiness: ; 71c2
+ChangeHappiness:
 ; Perform happiness action c on wCurPartyMon
 
 	ld a, [wCurPartyMon]
@@ -102,11 +102,9 @@
 	ld [wBattleMonHappiness], a
 	ret
 
-
 INCLUDE "data/events/happiness_changes.asm"
 
-
-StepHappiness:: ; 725a
+StepHappiness::
 ; Raise the party's happiness by 1 point every other step cycle.
 
 	ld hl, wHappinessStepCount
@@ -141,8 +139,7 @@
 	jr nz, .loop
 	ret
 
-
-DayCareStep:: ; 7282
+DayCareStep::
 ; Raise the experience of Day-Care Pokémon every step cycle.
 
 	ld a, [wDayCareMan]
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -7,7 +7,7 @@
 	const HEALMACHINESTATE_HOFPLAYSFX
 	const HEALMACHINESTATE_FINISH
 
-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 @@
 	ld a, [wBuffer2]
 	call DmgToCgbObjPal1
 	ret
-; 1233e
 
-.DoJumptableFunctions: ; 1233e
+.DoJumptableFunctions:
 	xor a
 	ld [wBuffer3], a
 .jumpable_loop
@@ -53,14 +52,12 @@
 
 .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 @@
 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,9 +81,8 @@
 	dw .PlayHealMusic
 	dw .HOF_PlaySFX
 	dw .dummy_5 ; never encountered
-; 12383
 
-.LoadGFX: ; 12383
+.LoadGFX:
 	call .LoadPalettes
 	ld de, .HealMachineGFX
 	ld hl, vTiles0 tile $7c
@@ -94,9 +89,8 @@
 	lb bc, BANK(.HealMachineGFX), 2
 	call Request2bpp
 	ret
-; 12393
 
-.PC_LoadBallsOntoMachine: ; 12393
+.PC_LoadBallsOntoMachine:
 	ld hl, wVirtualOAMSprite32
 	ld de, .PC_ElmsLab_OAM
 	call .PlaceHealingMachineTile
@@ -103,11 +97,11 @@
 	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 @@
 	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 @@
 	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,13 +142,11 @@
 	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
@@ -165,9 +153,8 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .palette_loop
 	ret
-; 12469
 
-.FlashPalettes: ; 12469
+.FlashPalettes:
 	call IsCGB
 	jr nz, .go
 	ld a, [rOBP1]
@@ -250,9 +234,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 124a3
 
-.PlaceHealingMachineTile: ; 124a3
+.PlaceHealingMachineTile:
 	push bc
 	ld a, [wBuffer1]
 	bcpixel 2, 4
@@ -277,4 +260,3 @@
 	ld [hli], a ; attributes
 	pop bc
 	ret
-; 124c1
--- 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 @@
 	ld a, $1
 	ld [wItemEffectSucceeded], a
 	ret
-; 12599
 
-.ItemfinderSound: ; 12599
+.ItemfinderSound:
 	ld c, 4
 .sfx_loop
 	push bc
@@ -26,9 +25,8 @@
 	dec c
 	jr nz, .sfx_loop
 	ret
-; 125ad
 
-.Script_FoundSomething: ; 0x125ad
+.Script_FoundSomething:
 	reloadmappart
 	special UpdateTimePals
 	callasm .ItemfinderSound
@@ -35,24 +33,20 @@
 	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
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -1,28 +1,24 @@
-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
 
-SelectApricornForKurt: ; 88018
+SelectApricornForKurt:
 	call LoadStandardMenuHeader
 	ld c, $1
 	xor a
@@ -54,9 +50,8 @@
 .done
 	call Call_ExitMenu
 	ret
-; 88055
 
-Kurt_SelectApricorn: ; 88055
+Kurt_SelectApricorn:
 	farcall FindApricornsInBag
 	jr c, .nope
 	ld hl, .MenuHeader
@@ -81,18 +76,16 @@
 .done
 	ld c, a
 	ret
-; 88086
 
-.MenuHeader: ; 0x88086
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, 13, 10
 	dw .MenuData
 	db 1 ; default option
-; 0x8808e
 
 	db 0 ; XXX
 
-.MenuData: ; 0x8808f
+.MenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 7
 	db 1
@@ -101,15 +94,14 @@
 	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 @@
 	ld [wMenuSelectionQuantity], a
 	farcall PlaceMenuItemQuantity
 	ret
-; 880c2
 
-Kurt_SelectQuantity: ; 880c2
+Kurt_SelectQuantity:
 	ld a, [wCurItem]
 	ld [wMenuSelection], a
 	call Kurt_GetQuantityOfApricorn
@@ -155,9 +146,8 @@
 .done
 	call CloseWindow
 	ret
-; 8810d
 
-.MenuHeader: ; 0x8810d
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 9, SCREEN_WIDTH - 1, 12
 	dw NULL
@@ -164,7 +154,7 @@
 	db -1 ; default option
 	db 0
 
-.PlaceApricornName: ; 88116
+.PlaceApricornName:
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
 	add hl, de
@@ -172,9 +162,8 @@
 	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 @@
 	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 @@
 	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 @@
 	pop bc
 	pop de
 	ret
-; 88201
 
-Kurt_GetAddressOfApricornQuantity: ; 88201
+Kurt_GetAddressOfApricornQuantity:
 	push hl
 	push bc
 	ld hl, wNumItems
@@ -368,9 +354,8 @@
 	pop bc
 	pop hl
 	ret
-; 88211
 
-Kurt_GetRidOfItem: ; 88211
+Kurt_GetRidOfItem:
 	push bc
 	ld hl, wNumItems
 	ld a, [wCurItemQuantity]
@@ -409,4 +394,3 @@
 	ld [wItemQuantityChangeBuffer], a
 	pop bc
 	ret
-; 88248
--- 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
--- a/engine/events/lucky_number.asm
+++ b/engine/events/lucky_number.asm
@@ -1,4 +1,4 @@
-CheckForLuckyNumberWinners: ; 4d87a
+CheckForLuckyNumberWinners:
 	xor a
 	ld [wScriptVar], a
 	ld [wFoundMatchingIDInParty], a
@@ -118,7 +118,7 @@
 .print
 	jp PrintText
 
-.CompareLuckyNumberToMonID: ; 4d939
+.CompareLuckyNumberToMonID:
 	push bc
 	push de
 	push hl
@@ -190,7 +190,7 @@
 	and a
 	ret
 
-.BoxBankAddresses: ; 4d99f
+.BoxBankAddresses:
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -206,17 +206,17 @@
 	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 "@"
 
-PrintTodaysLuckyNumber: ; 4d9d3
+PrintTodaysLuckyNumber:
 	ld hl, wStringBuffer3
 	ld de, wLuckyIDNumber
 	lb bc, PRINTNUM_LEADINGZEROS | 2, 5
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -1,4 +1,4 @@
-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 @@
 	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 @@
 	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 @@
 ; 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
@@ -283,9 +277,8 @@
 	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 @@
 	ld a, c
 	cp e
 	ret
-; fbca1
 
-.BCMinusDE: ; fbca1
+.BCMinusDE:
 ; bc -= de
 	ld a, c
 	sub e
@@ -306,13 +298,10 @@
 	sbc d
 	ld b, a
 	ret
-; fbca8
 
 INCLUDE "data/events/magikarp_lengths.asm"
 
-
-
-MagikarpHouseSign: ; fbcd2
+MagikarpHouseSign:
 	ld a, [wBestMagikarpLengthFeet]
 	ld [wMagikarpLength], a
 	ld a, [wBestMagikarpLengthInches]
@@ -321,10 +310,8 @@
 	ld hl, .CurrentRecordtext
 	call PrintText
 	ret
-; fbce8
 
-.CurrentRecordtext: ; 0xfbce8
+.CurrentRecordtext:
 	; "CURRENT RECORD"
 	text_jump UnknownText_0x1c123a
 	db "@"
-; 0xfbced
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -1,4 +1,4 @@
-MagnetTrain: ; 8cc04
+MagnetTrain:
 	ld a, [wScriptVar]
 	and a
 	jr nz, .ToGoldenrod
@@ -81,9 +81,8 @@
 	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 @@
 	dec c
 	jr nz, .loadloop
 	ret
-; 8ccc9
 
-MagntTrain_LoadGFX_PlayMusic: ; 8ccc9
+MagntTrain_LoadGFX_PlayMusic:
 	call ClearBGPalettes
 	call ClearSprites
 	call DisableLCD
@@ -155,9 +153,8 @@
 	ld de, MUSIC_MAGNET_TRAIN
 	call PlayMusic2
 	ret
-; 8cd27
 
-DrawMagnetTrain: ; 8cd27
+DrawMagnetTrain:
 	hlbgcoord 0, 0
 	xor a
 .loop
@@ -184,9 +181,8 @@
 	ld c, 20
 	call .FillLine
 	ret
-; 8cd65
 
-.FillLine: ; 8cd65
+.FillLine:
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -193,9 +189,8 @@
 	dec c
 	jr nz, .FillLine
 	ret
-; 8cd6c
 
-.FillAlt: ; 8cd6c
+.FillAlt:
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -203,9 +198,8 @@
 	dec b
 	jr nz, .FillAlt
 	ret
-; 8cd74
 
-GetMagnetTrainBGTiles: ; 8cd74
+GetMagnetTrainBGTiles:
 	push hl
 	ld e, a
 	ld d, 0
@@ -217,9 +211,8 @@
 	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 @@
 	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 @@
 	ld a, rSCX - $ff00
 	ld [hLCDCPointer], a
 	ret
-; 8cdc3
 
-SetMagnetTrainPals: ; 8cdc3
+SetMagnetTrainPals:
 	ld a, $1
 	ld [rVBK], a
 
@@ -286,9 +277,8 @@
 	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 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8ce06
 
-.Jumptable: ; 8ce06
+.Jumptable:
 	dw .InitPlayerSpriteAnim
 	dw .WaitScene
 	dw .MoveTrain1
@@ -309,15 +298,13 @@
 	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
@@ -343,9 +330,8 @@
 	ld a, $80
 	ld [wMagnetTrainWaitCounter], a
 	ret
-; 8ce47
 
-.MoveTrain1: ; 8ce47
+.MoveTrain1:
 	ld hl, wMagnetTrainHoldPosition
 	ld a, [wMagnetTrainPosition]
 	cp [hl]
@@ -367,9 +353,8 @@
 	ld a, $80
 	ld [wMagnetTrainWaitCounter], a
 	ret
-; 8ce6d
 
-.WaitScene: ; 8ce6d
+.WaitScene:
 	ld hl, wMagnetTrainWaitCounter
 	ld a, [hl]
 	and a
@@ -380,9 +365,8 @@
 .DoneWaiting:
 	call .Next
 	ret
-; 8ce7a
 
-.MoveTrain2: ; 8ce7a
+.MoveTrain2:
 	ld hl, wMagnetTrainFinalPosition
 	ld a, [wMagnetTrainPosition]
 	cp [hl]
@@ -410,17 +394,15 @@
 .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 @@
 	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 @@
 	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
--- 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 @@
 	xor a
 	ld [hLCDCPointer], a
 	ret
-; b8064
 
-.CheckMovingWithinLandmark: ; b8064
+.CheckMovingWithinLandmark:
 	ld a, [wCurrentLandmark]
 	ld c, a
 	ld a, [wPreviousLandmark]
@@ -67,9 +65,8 @@
 	ret z
 	cp SPECIAL_MAP
 	ret
-; b8070
 
-.CheckSpecialMap: ; b8070
+.CheckSpecialMap:
 ; These landmarks do not get pop-up signs.
 	cp -1
 	ret z
@@ -88,9 +85,8 @@
 	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 @@
 	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,16 +124,14 @@
 	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
@@ -146,10 +138,8 @@
 	call InitMapSignAttrMap
 	call PlaceMapNameFrame
 	ret
-; b80e1
 
-
-PlaceMapNameCenterAlign: ; b80e1 (2e:40e1)
+PlaceMapNameCenterAlign:
 	ld a, [wCurrentLandmark]
 	ld e, a
 	farcall GetLandmarkName
@@ -165,7 +155,7 @@
 	call PlaceString
 	ret
 
-.GetNameLength: ; b8101 (2e:4101)
+.GetNameLength:
 	ld c, 0
 	push hl
 	ld hl, wStringBuffer1
@@ -181,8 +171,7 @@
 	pop hl
 	ret
 
-
-InitMapSignAttrMap: ; b8115
+InitMapSignAttrMap:
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	inc b
@@ -204,9 +193,8 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; b8164
 
-.FillTopBottom: ; b8164
+.FillTopBottom:
 	ld c, 5
 	jr .enterloop
 
@@ -271,4 +257,3 @@
 	dec c
 	jr nz, .continueloop
 	ret
-; b8172
--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
@@ -1,4 +1,4 @@
-Script_AbortBugContest: ; 0x122c1
+Script_AbortBugContest:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iffalse .finish
 	setflag ENGINE_DAILY_BUG_CONTEST
@@ -6,7 +6,7 @@
 .finish
 	end
 
-FindItemInBallScript:: ; 0x122ce
+FindItemInBallScript::
 	callasm .TryReceiveItem
 	iffalse .no_room
 	disappear LAST_TALKED
@@ -17,9 +17,8 @@
 	itemnotify
 	closetext
 	end
-; 0x122e3
 
-.no_room ; 0x122e3
+.no_room
 	opentext
 	writetext .text_found
 	waitbutton
@@ -27,21 +26,18 @@
 	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 @@
 	ld a, $1
 	ld [wScriptVar], a
 	ret
-; 12324
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -1,4 +1,4 @@
-RepelWoreOffScript:: ; 0x13619
+RepelWoreOffScript::
 	opentext
 	writetext .text
 	waitbutton
@@ -5,12 +5,12 @@
 	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 @@
 	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]
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -1,4 +1,4 @@
-BankOfMom: ; 16218
+BankOfMom:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -16,9 +16,8 @@
 	pop af
 	ld [hInMenu], a
 	ret
-; 16233
 
-.RunJumptable: ; 16233
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -29,9 +28,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 16242
 
-.dw ; 16242
+.dw
 
 	dw .CheckIfBankInitialized
 	dw .InitializeBank
@@ -42,9 +40,8 @@
 	dw .StopOrStartSavingMoney
 	dw .AskDST
 	dw .JustDoWhatYouCan
-; 16254
 
-.CheckIfBankInitialized: ; 16254
+.CheckIfBankInitialized:
 	ld a, [wMomSavingMoney]
 	bit MOM_ACTIVE_F, a
 	jr nz, .savingmoneyalready
@@ -59,9 +56,8 @@
 .done_0
 	ld [wJumptableIndex], a
 	ret
-; 1626a
 
-.InitializeBank: ; 1626a
+.InitializeBank:
 	ld hl, UnknownText_0x16649
 	call PrintText
 	call YesNoBox
@@ -81,9 +77,8 @@
 	ld a, $8
 	ld [wJumptableIndex], a
 	ret
-; 16290
 
-.IsThisAboutYourMoney: ; 16290
+.IsThisAboutYourMoney:
 	ld hl, UnknownText_0x16658
 	call PrintText
 	call YesNoBox
@@ -98,9 +93,8 @@
 .done_2
 	ld [wJumptableIndex], a
 	ret
-; 162a8
 
-.AccessBankOfMom: ; 162a8
+.AccessBankOfMom:
 	ld hl, UnknownText_0x1665d
 	call PrintText
 	call LoadStandardMenuHeader
@@ -135,9 +129,8 @@
 .done_3
 	ld [wJumptableIndex], a
 	ret
-; 162e0
 
-.StoreMoney: ; 162e0
+.StoreMoney:
 	ld hl, UnknownText_0x16662
 	call PrintText
 	xor a
@@ -202,9 +195,8 @@
 .done_4
 	ld [wJumptableIndex], a
 	ret
-; 16373
 
-.TakeMoney: ; 16373
+.TakeMoney:
 	ld hl, UnknownText_0x16667
 	call PrintText
 	xor a
@@ -269,9 +261,8 @@
 .done_5
 	ld [wJumptableIndex], a
 	ret
-; 16406
 
-.StopOrStartSavingMoney: ; 16406
+.StopOrStartSavingMoney:
 	ld hl, UnknownText_0x1666c
 	call PrintText
 	call YesNoBox
@@ -290,19 +281,17 @@
 	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 @@
 	ld hl, .Text_SetClockForward
 	call PlaceHLTextAtBC
 	ret
-; 164b9
 
-.SetClockForward: ; 164b9
+.SetClockForward:
 	ld a, [wStartHour]
 	add 1
 	sub 24
@@ -379,9 +367,8 @@
 	adc 0
 	ld [wStartDay], a
 	ret
-; 164d1
 
-.SetClockBack: ; 164d1
+.SetClockBack:
 	ld a, [wStartHour]
 	sub 1
 	jr nc, .DontLoopHourBack
@@ -395,59 +382,51 @@
 .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 @@
 	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 @@
 	add hl, de
 	pop de
 	ret
-; 16613
 
-.DigitQuantities: ; 16613
+.DigitQuantities:
 	dt 100000
 	dt 10000
 	dt 1000
@@ -613,128 +589,106 @@
 	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
 
-MenuHeader_0x166b5: ; 0x166b5
+MenuHeader_0x166b5:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 10, 10
 	dw MenuData_0x166bd
 	db 1 ; default option
-; 0x166bd
 
-MenuData_0x166bd: ; 0x166bd
+MenuData_0x166bd:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "GET@"
@@ -741,4 +695,3 @@
 	db "SAVE@"
 	db "CHANGE@"
 	db "CANCEL@"
-; 0x166d6
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -5,7 +5,7 @@
 	const MOM_ITEM
 	const MOM_DOLL
 
-MomTriesToBuySomething:: ; fcfec
+MomTriesToBuySomething::
 	ld a, [wMapReentryScriptQueueFlag]
 	and a
 	ret nz
@@ -23,14 +23,12 @@
 	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 @@
 	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 @@
 	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 @@
 	farcall TakeMoney
 	ret
 
-
-Mom_GiveItemOrDoll: ; fd0c3
+Mom_GiveItemOrDoll:
 	call GetItemFromMom
 	ld de, 6 ; item type
 	add hl, de
@@ -156,10 +150,8 @@
 	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 @@
 	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 @@
 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
--- a/engine/events/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 @@
 .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 @@
 .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 @@
 	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 @@
 	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 @@
 	pop de
 	pop hl
 	ret
-; 1606f
 
-GiveCoins:: ; 1606f
+GiveCoins::
 	ld a, 2
 	ld de, wCoins
 	call AddFunds
@@ -189,14 +182,11 @@
 .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 @@
 .okay
 	and a
 	ret
-; 160a1
 
-CheckCoins:: ; 160a1
+CheckCoins::
 	ld a, 2
 	ld de, wCoins
 	jp CompareFunds
-; 160a9
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@@ -59,55 +59,47 @@
 	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
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -1,4 +1,4 @@
-MoveTutor: ; 4925b
+MoveTutor:
 	call FadeToMenu
 	call ClearBGPalettes
 	call ClearScreen
@@ -33,7 +33,7 @@
 	call CloseSubmenu
 	ret
 
-.GetMoveTutorMove: ; 492a5
+.GetMoveTutorMove:
 	ld a, [wScriptVar]
 	cp MOVETUTOR_FLAMETHROWER
 	jr z, .flamethrower
@@ -51,7 +51,7 @@
 	ld a, THUNDERBOLT
 	ret
 
-CheckCanLearnMoveTutorMove: ; 492b9
+CheckCanLearnMoveTutorMove:
 	ld hl, .MenuHeader
 	call LoadMenuHeader
 
@@ -98,6 +98,6 @@
 	scf
 	ret
 
-.MenuHeader: ; 0x4930a
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
--- 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 @@
 .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 @@
 .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 @@
 .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 @@
 .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 @@
 	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
--- a/engine/events/npc_trade.asm
+++ b/engine/events/npc_trade.asm
@@ -1,4 +1,4 @@
-NPCTrade:: ; fcba8
+NPCTrade::
 	ld a, e
 	ld [wJumptableIndex], a
 	call Trade_GetDialog
@@ -51,9 +51,8 @@
 .done
 	call PrintTradeText
 	ret
-; fcc07
 
-.TradeAnimation: ; fcc07
+.TradeAnimation:
 	call DisableSpriteUpdates
 	ld a, [wJumptableIndex]
 	push af
@@ -66,9 +65,8 @@
 	ld [wJumptableIndex], a
 	call ReturnToMapWithSpeechTextbox
 	ret
-; fcc23
 
-CheckTradeGender: ; fcc23
+CheckTradeGender:
 	xor a
 	ld [wMonType], a
 
@@ -95,9 +93,8 @@
 .not_matching
 	scf
 	ret
-; fcc4a
 
-TradeFlagAction: ; fcc4a
+TradeFlagAction:
 	ld hl, wTradeFlags
 	ld a, [wJumptableIndex]
 	ld c, a
@@ -105,17 +102,15 @@
 	ld a, c
 	and a
 	ret
-; fcc59
 
-Trade_GetDialog: ; fcc59
+Trade_GetDialog:
 	ld e, NPCTRADE_DIALOG
 	call GetTradeAttribute
 	ld a, [hl]
 	ld [wcf64], a
 	ret
-; fcc63
 
-DoNPCTrade: ; fcc63
+DoNPCTrade:
 	ld e, NPCTRADE_GIVEMON
 	call GetTradeAttribute
 	ld a, [hl]
@@ -275,10 +270,8 @@
 	pop bc
 	pop af
 	ret
-; fcdc2
 
-
-GetTradeAttribute: ; 0xfcdc2
+GetTradeAttribute:
 	ld d, 0
 	push de
 	ld a, [wJumptableIndex]
@@ -292,15 +285,13 @@
 	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
@@ -307,9 +298,8 @@
 	ld e, l
 	ld d, h
 	ret
-; fcde8
 
-GetTradeMonName: ; fcde8
+GetTradeMonName:
 	push de
 	ld [wd265], a
 	call GetBasePokemonName
@@ -316,31 +306,27 @@
 	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
@@ -347,9 +333,8 @@
 	ld a, [hl]
 	ld [de], a
 	ret
-; fce15
 
-Trade_CopyTwoBytesReverseEndian: ; fce15
+Trade_CopyTwoBytesReverseEndian:
 	ld a, [hli]
 	ld [de], a
 	dec de
@@ -356,9 +341,8 @@
 	ld a, [hl]
 	ld [de], a
 	ret
-; fce1b
 
-GetTradeMonNames: ; fce1b
+GetTradeMonNames:
 	ld e, NPCTRADE_GETMON
 	call GetTradeAttribute
 	ld a, [hl]
@@ -398,13 +382,10 @@
 	ld [hli], a
 	ld [hl], "@"
 	ret
-; fce58
 
-
 INCLUDE "data/events/npc_trades.asm"
 
-
-PrintTradeText: ; fcf38
+PrintTradeText:
 	push af
 	call GetTradeMonNames
 	pop af
@@ -420,9 +401,8 @@
 	ld l, a
 	call PrintText
 	ret
-; fcf53
 
-TradeTexts: ; fcf53
+TradeTexts:
 ; entries correspond to TRADE_DIALOG_* × TRADE_DIALOGSET_* constants
 ; TRADE_DIALOG_INTRO
 	dw TradeIntroText1
@@ -449,17 +429,13 @@
 	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 @@
 	; 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
--- 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 @@
 .done
 
 	ld hl, OddEggs
-	ld a, OddEgg2 - OddEgg1
+	ld a, OddEgg1End - OddEgg1
 	call AddNTimes
 
 	ld de, wOddEggSpecies
@@ -88,7 +88,6 @@
 	ld [wMobileMonNicknamePointerBuffer + 1], a
 	farcall AddMobileMonToParty
 	ret
-; 1fb546
 
 .Odd:
 	db "ODD@@@@@@@@@"
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1,4 +1,4 @@
-FieldMoveJumptableReset: ; c6ea
+FieldMoveJumptableReset:
 	xor a
 	ld hl, wBuffer1
 	ld bc, 7
@@ -5,7 +5,7 @@
 	call ByteFill
 	ret
 
-FieldMoveJumptable: ; c6f5
+FieldMoveJumptable:
 	ld a, [wBuffer1]
 	rst JumpTable
 	ld [wBuffer1], a
@@ -19,7 +19,7 @@
 	scf
 	ret
 
-GetPartyNick: ; c706
+GetPartyNick:
 ; write wCurPartyMon nickname to wStringBuffer1-3
 	ld hl, wPartyMonNicknames
 	ld a, BOXMON
@@ -33,7 +33,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
@@ -206,11 +206,11 @@
 	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 @@
 	closetext
 	end
 
-CutDownTreeOrGrass: ; c810
+CutDownTreeOrGrass:
 	ld hl, wBuffer3 ; OverworldMapTile
 	ld a, [hli]
 	ld h, [hl]
@@ -240,7 +240,7 @@
 	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 @@
 	xor a
 	ret
 
-
 INCLUDE "data/events/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 @@
 	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 @@
 	closetext
 	end
 
-UnknownText_0xc8f3: ; 0xc8f3
+UnknownText_0xc8f3:
 	text_jump UnknownText_0x1c0609
 	start_asm
 	call WaitSFX
@@ -334,10 +332,10 @@
 	ld hl, .BlankText
 	ret
 
-.BlankText: ; 0xc908
+.BlankText:
 	db "@"
 
-SurfFunction: ; c909
+SurfFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, .Jumptable
@@ -347,13 +345,13 @@
 	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
@@ -385,7 +383,7 @@
 	ld a, $2
 	ret
 
-.DoSurf: ; c95f (3:495f)
+.DoSurf:
 	call GetSurfType
 	ld [wBuffer2], a
 	call GetPartyNick
@@ -394,22 +392,22 @@
 	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
@@ -426,23 +424,23 @@
 	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 @@
 	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 @@
 	db FACE_LEFT
 	db FACE_RIGHT
 
-TrySurfOW:: ; c9e7
+TrySurfOW::
 ; Checking a tile in the overworld.
 ; Return carry if fail is allowed.
 
@@ -538,7 +536,7 @@
 	xor a
 	ret
 
-AskSurfScript: ; ca2c
+AskSurfScript:
 	opentext
 	writetext AskSurfText
 	yesorno
@@ -546,11 +544,11 @@
 	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 @@
  	dw .DoFly
  	dw .FailFly
 
-.TryFly: ; ca52
+.TryFly:
 ; Fly
 	ld de, ENGINE_STORMBADGE
 	call CheckBadge
@@ -606,18 +604,18 @@
 	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
@@ -632,7 +630,7 @@
 	callasm .ReturnFromFly
 	end
 
-.ReturnFromFly: ; cacb
+.ReturnFromFly:
 	farcall Function561d
 	call DelayFrame
 	call ReplaceKrisSprite
@@ -639,13 +637,13 @@
 	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 @@
 	ld a, $80
 	ret
 
-CheckMapCanWaterfall: ; cb07
+CheckMapCanWaterfall:
 	ld a, [wPlayerDirection]
 	and $c
 	cp FACE_UP
@@ -678,11 +676,11 @@
 	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 @@
 	iffalse .loop
 	end
 
-.CheckContinueWaterfall: ; cb38
+.CheckContinueWaterfall:
 	xor a
 	ld [wScriptVar], a
 	ld a, [wPlayerStandingTile]
@@ -705,16 +703,16 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $1
 	ret
 
-.DoDig: ; cbd8
+.DoDig:
 	ld hl, wDigWarpNumber
 	ld de, wNextWarp
 	ld bc, 3
@@ -826,7 +824,7 @@
 	ld a, $81
 	ret
 
-.FailDig: ; cc06
+.FailDig:
 	ld a, [wBuffer2]
 	cp $2
 	jr nz, .failescaperope
@@ -839,33 +837,33 @@
 	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
@@ -878,17 +876,17 @@
 	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 @@
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.Jumptable: ; cc72
+.Jumptable:
 	dw .TryTeleport
 	dw .DoTeleport
 	dw .FailTeleport
 
-.TryTeleport: ; cc78
+.TryTeleport:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	jr z, .CheckIfSpawnPoint
@@ -925,7 +923,7 @@
 	ld a, $2
 	ret
 
-.DoTeleport: ; cc9c
+.DoTeleport:
 	call GetPartyNick
 	ld hl, .TeleportScript
 	call QueueScript
@@ -932,23 +930,23 @@
 	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
@@ -965,21 +963,21 @@
 	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,21 +990,21 @@
 	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 BIKEFLAGS_STRENGTH_ACTIVE_F, [hl]
 	ld a, [wCurPartyMon]
@@ -1019,11 +1017,11 @@
 	call GetPartyNick
 	ret
 
-Script_StrengthFromMenu: ; 0xcd29
+Script_StrengthFromMenu:
 	reloadmappart
 	special UpdateTimePals
 
-Script_UsedStrength: ; 0xcd2d
+Script_UsedStrength:
 	callasm SetStrengthFlag
 	writetext .UsedStrength
 	copybytetovar wBuffer6
@@ -1033,11 +1031,11 @@
 	closetext
 	end
 
-.UsedStrength: ; 0xcd41
+.UsedStrength:
 	text_jump UnknownText_0x1c0774
 	db "@"
 
-.StrengthAllowedItToMoveBoulders: ; 0xcd46
+.StrengthAllowedItToMoveBoulders:
 	text_jump UnknownText_0x1c0788
 	db "@"
 
@@ -1047,13 +1045,13 @@
 	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 @@
 	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
@@ -1104,7 +1102,7 @@
 	ld [wScriptVar], a
 	ret
 
-WhirlpoolFunction: ; cd9d
+WhirlpoolFunction:
 	call FieldMoveJumptableReset
 .loop
 	ld hl, Jumptable_cdae
@@ -1114,12 +1112,12 @@
 	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 @@
 	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 @@
 	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 @@
 	closetext
 	end
 
-DisappearWhirlpool: ; ce1d
+DisappearWhirlpool:
 	ld hl, wBuffer3
 	ld a, [hli]
 	ld h, [hl]
@@ -1210,7 +1208,7 @@
 	call GetMovementPermissions
 	ret
 
-TryWhirlpoolOW:: ; ce3e
+TryWhirlpoolOW::
 	ld d, WHIRLPOOL
 	call CheckPartyMove
 	jr c, .failed
@@ -1232,14 +1230,14 @@
 	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 @@
 	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 @@
 	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 @@
 	closetext
 	end
 
-TryHeadbuttOW:: ; cec9
+TryHeadbuttOW::
 	ld d, HEADBUTT
 	call CheckPartyMove
 	jr c, .no
@@ -1322,7 +1320,7 @@
 	xor a
 	ret
 
-AskHeadbuttScript: ; 0xcedc
+AskHeadbuttScript:
 	opentext
 	writetext UnknownText_0xcee6
 	yesorno
@@ -1330,18 +1328,18 @@
 	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 @@
 	ld a, $80
 	ret
 
-GetFacingObject: ; cf0d
+GetFacingObject:
 	farcall CheckFacingObject
 	jr nc, .fail
 
@@ -1380,11 +1378,11 @@
 	scf
 	ret
 
-RockSmashFromMenuScript: ; 0xcf2e
+RockSmashFromMenuScript:
 	reloadmappart
 	special UpdateTimePals
 
-RockSmashScript: ; cf32
+RockSmashScript:
 	callasm GetPartyNick
 	writetext UnknownText_0xcf58
 	closetext
@@ -1403,15 +1401,15 @@
 .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
 	ifequal 1, .no
 
@@ -1424,17 +1422,17 @@
 .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 @@
 	ld [wScriptVar], a
 	ret
 
-FishFunction: ; cf8e
+FishFunction:
 	ld a, e
 	push af
 	call FieldMoveJumptableReset
@@ -1462,7 +1460,7 @@
 	ld [wFieldMoveSucceeded], a
 	ret
 
-.FishTable: ; cfa5
+.FishTable:
 	dw .TryFish
 	dw .FishNoBite
 	dw .FishGotSomething
@@ -1469,7 +1467,7 @@
 	dw .FailFish
 	dw .FishNoFish
 
-.TryFish: ; cfaf
+.TryFish:
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
 	jr z, .fail
@@ -1510,11 +1508,11 @@
 	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 @@
 	ld a, $81
 	ret
 
-.FishNoBite: ; d002
+.FishNoBite:
 	ld a, $2
 	ld [wBuffer6], a
 	ld hl, Script_NotEvenANibble
@@ -1530,7 +1528,7 @@
 	ld a, $81
 	ret
 
-.FishNoFish: ; d010
+.FishNoFish:
 	ld a, $0
 	ld [wBuffer6], a
 	ld hl, Script_NotEvenANibble2
@@ -1538,22 +1536,22 @@
 	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
@@ -1560,10 +1558,10 @@
 	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 @@
 	reloadmapafterbattle
 	end
 
-.Movement_NotFacingUp: ; d05c
+.Movement_NotFacingUp:
 	fish_got_bite
 	fish_got_bite
 	fish_got_bite
@@ -1582,7 +1580,7 @@
 	show_emote
 	step_end
 
-.Movement_FacingUp: ; d062
+.Movement_FacingUp:
 	fish_got_bite
 	fish_got_bite
 	fish_got_bite
@@ -1591,12 +1589,12 @@
 	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 @@
 	ld [wScriptVar], a
 	ret
 
-Script_FishCastRod: ; 0xd07c
+Script_FishCastRod:
 	reloadmappart
 	loadvar hBGMapMode, $0
 	special UpdateTimePals
@@ -1619,11 +1617,11 @@
 	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 @@
 	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 @@
 	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]
@@ -1704,7 +1702,7 @@
 	ld a, $1
 	ret
 
-.CheckIfRegistered: ; d119
+.CheckIfRegistered:
 	ld a, [wUsingItemWithSelect]
 	and a
 	ret z
@@ -1712,7 +1710,7 @@
 	ld l, e
 	ret
 
-.CheckEnvironment: ; d121
+.CheckEnvironment:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	jr z, .ok
@@ -1733,7 +1731,7 @@
 	scf
 	ret
 
-Script_GetOnBike: ; 0xd13e
+Script_GetOnBike:
 	reloadmappart
 	special UpdateTimePals
 	writecode VAR_MOVEMENT, PLAYER_BIKE
@@ -1743,7 +1741,7 @@
 	special ReplaceKrisSprite
 	end
 
-Script_GetOnBike_Register: ; 0xd14e
+Script_GetOnBike_Register:
 	writecode VAR_MOVEMENT, PLAYER_BIKE
 	closetext
 	special ReplaceKrisSprite
@@ -1753,7 +1751,7 @@
 	nop
 	ret
 
-Script_GetOffBike: ; 0xd158
+Script_GetOffBike:
 	reloadmappart
 	special UpdateTimePals
 	writecode VAR_MOVEMENT, PLAYER_NORMAL
@@ -1766,32 +1764,32 @@
 	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 @@
 	scf
 	ret
 
-AskCutScript: ; 0xd1a9
+AskCutScript:
 	opentext
 	writetext UnknownText_0xd1c8
 	yesorno
@@ -1824,7 +1822,7 @@
 	closetext
 	end
 
-.CheckMap: ; d1ba
+.CheckMap:
 	xor a
 	ld [wScriptVar], a
 	call CheckMapForSomethingToCut
@@ -1833,13 +1831,13 @@
 	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 "@"
--- a/engine/events/play_slow_cry.asm
+++ b/engine/events/play_slow_cry.asm
@@ -1,4 +1,4 @@
-PlaySlowCry: ; fb841
+PlaySlowCry:
 	ld a, [wScriptVar]
 	call LoadCry
 	jr c, .done
@@ -28,4 +28,3 @@
 
 .done
 	ret
-; fb877
--- 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 @@
 .no_faint
 	xor a
 	ret
-; 5062e
 
-.DamageMonIfPoisoned: ; 5062e
+.DamageMonIfPoisoned:
 ; check if mon is poisoned, return if not
 	ld a, MON_STATUS
 	call GetPartyParamLocation
@@ -98,9 +97,8 @@
 	ld c, %01
 	scf
 	ret
-; 50658
 
-.PlayPoisonSFX: ; 50658
+.PlayPoisonSFX:
 	ld de, SFX_POISON
 	call PlaySFX
 	ld b, $2
@@ -107,9 +105,8 @@
 	predef LoadPoisonBGPals
 	call DelayFrame
 	ret
-; 50669
 
-.Script_MonFaintedToPoison: ; 50669
+.Script_MonFaintedToPoison:
 	callasm .PlayPoisonSFX
 	opentext
 	callasm .CheckWhitedOut
@@ -116,13 +113,11 @@
 	iffalse .whiteout
 	closetext
 	end
-; 50677
 
-.whiteout ; 50677
+.whiteout
 	farjump Script_OverworldWhiteout
-; 5067b
 
-.CheckWhitedOut: ; 5067b
+.CheckWhitedOut:
 	xor a
 	ld [wCurPartyMon], a
 	ld de, wEngineBuffer2
@@ -149,14 +144,11 @@
 	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
--- a/engine/events/poisonstep_pals.asm
+++ b/engine/events/poisonstep_pals.asm
@@ -1,4 +1,4 @@
-LoadPoisonBGPals: ; cbcdd
+LoadPoisonBGPals:
 	call .LoadPals
 	ld a, [hCGB]
 	and a
@@ -5,7 +5,7 @@
 	ret nz
 	ret ; ????
 
-.LoadPals: ; cbce5
+.LoadPals:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
--- 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
 
-PokeSeer: ; 4f0bc
+PokeSeer:
 	ld a, SEER_INTRO
 	call PrintSeerText
 	call JoyWaitAorB
@@ -47,25 +47,21 @@
 	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
@@ -72,9 +68,8 @@
 	call PrintSeerText
 	call SeerAdvice
 	ret
-; 4f10e
 
-SeerAction1: ; 4f10e
+SeerAction1:
 	call GetCaughtOT
 	ld a, SEER_TRADED
 	call PrintSeerText
@@ -82,28 +77,24 @@
 	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 @@
 	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 @@
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 	ret
-; 4f18c
 
-GetCaughtLevel: ; 4f18c
+GetCaughtLevel:
 	ld a, "@"
 	ld hl, wSeerCaughtLevelString
 	ld bc, 4
@@ -185,13 +174,11 @@
 	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 @@
 	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 @@
 	ld [wSeerAction], a
 	scf
 	ret
-; 4f242
 
-GetCaughtOT: ; 4f242
+GetCaughtOT:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonOT
 	ld bc, NAME_LENGTH
@@ -286,15 +268,13 @@
 	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 @@
 	ld l, a
 	call PrintText
 	ret
-; 4f27c
 
-SeerTexts: ; 4f27c
+SeerTexts:
 	dw SeerIntroText
 	dw SeerCantTellText
 	dw SeerMetAtText
@@ -316,58 +295,48 @@
 	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 @@
 	ld l, a
 	call PrintText
 	ret
-; 4f2d6
 
-SeerAdviceTexts: ; 4f2d6
+SeerAdviceTexts:
 ; level, text
 	dbw 9,   SeerAdvice1
 	dbw 29,  SeerAdvice2
@@ -402,40 +370,33 @@
 	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 @@
 .genderless
 	ld c, CAUGHT_BY_UNKNOWN
 	ret
-; 4f31c
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -1,4 +1,4 @@
-PokemonCenterPC: ; 1559a
+PokemonCenterPC:
 	call PC_CheckPartyForPokemon
 	ret c
 	call PC_PlayBootSound
@@ -97,9 +97,8 @@
 	ret z
 	ld a, 2 ; postgame
 	ret
-; 15650
 
-PC_CheckPartyForPokemon: ; 15650
+PC_CheckPartyForPokemon:
 	ld a, [wPartyCount]
 	and a
 	ret nz
@@ -114,9 +113,8 @@
 	; 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
@@ -123,9 +121,8 @@
 	farcall _BillsPC
 	and a
 	ret
-; 15679 (5:5679)
 
-PlayersPC: ; 15679
+PlayersPC:
 	call PC_PlayChoosePCSound
 	ld hl, PokecenterPCText_AccessedOwnPC
 	call PC_DisplayText
@@ -133,9 +130,8 @@
 	call _PlayersPC
 	and a
 	ret
-; 15689
 
-OaksPC: ; 15689
+OaksPC:
 	call PC_PlayChoosePCSound
 	ld hl, PokecenterPCText_AccessedOaksPC
 	call PC_DisplayText
@@ -142,9 +138,8 @@
 	farcall ProfOaksPC
 	and a
 	ret
-; 1569a
 
-HallOfFamePC: ; 1569a
+HallOfFamePC:
 	call PC_PlayChoosePCSound
 	call FadeToMenu
 	farcall _HallOfFamePC
@@ -151,43 +146,40 @@
 	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
 
-_PlayersHousePC: ; 156d9
+_PlayersHousePC:
 	call PC_PlayBootSound
 	ld hl, UnknownText_0x156ff
 	call PC_DisplayText
@@ -206,15 +198,13 @@
 	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
@@ -222,9 +212,8 @@
 	call Function15715
 	call ExitMenu
 	ret
-; 15715
 
-Function15715: ; 15715
+Function15715:
 	xor a
 	ld [wPCItemsCursor], a
 	ld [wPCItemsScrollPosition], a
@@ -244,9 +233,8 @@
 .asm_15732
 	call ExitMenu
 	ret
-; 15736
 
-PlayersPCMenuData: ; 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)
@@ -268,7 +256,7 @@
 PLAYERSPC_TURN_OFF      EQU 5
 PLAYERSPC_LOG_OFF       EQU 6
 
-.PlayersPCMenuPointers: ; 0x15746
+.PlayersPCMenuPointers:
 ; entries correspond to PLAYERSPC_* constants
 	dw PlayerWithdrawItemMenu, .WithdrawItem
 	dw PlayerDepositItemMenu,  .DepositItem
@@ -305,7 +293,7 @@
 	db PLAYERSPC_LOG_OFF
 	db -1 ; end
 
-PC_DisplayTextWaitMenu: ; 157bb
+PC_DisplayTextWaitMenu:
 	ld a, [wOptions]
 	push af
 	set NO_TEXT_SCROLL, a
@@ -314,15 +302,13 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 157cc
 
-UnknownText_0x157cc: ; 0x157cc
+UnknownText_0x157cc:
 	; What do you want to do?
 	text_jump UnknownText_0x1c1368
 	db "@"
-; 0x157d1
 
-PlayerWithdrawItemMenu: ; 0x157d1
+PlayerWithdrawItemMenu:
 	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
@@ -386,19 +372,19 @@
 .done
 	ret
 
-.HowManyText: ; 0x15850
+.HowManyText:
 	text_jump _PlayersPCHowManyWithdrawText
 	db "@"
 
-.WithdrewText: ; 0x15855
+.WithdrewText:
 	text_jump _PlayersPCWithdrewItemsText
 	db "@"
 
-.NoRoomText: ; 0x1585a
+.NoRoomText:
 	text_jump _PlayersPCNoRoomWithdrawText
 	db "@"
 
-PlayerTossItemMenu: ; 0x1585f
+PlayerTossItemMenu:
 	call LoadStandardMenuHeader
 	farcall ClearPCItemScreen
 .loop
@@ -412,9 +398,8 @@
 	call CloseSubmenu
 	xor a
 	ret
-; 0x1587d
 
-PlayerDecorationMenu: ; 0x1587d
+PlayerDecorationMenu:
 	farcall _PlayerDecorationMenu
 	ld a, c
 	and a
@@ -421,15 +406,13 @@
 	ret z
 	scf
 	ret
-; 0x15888
 
-PlayerLogOffMenu: ; 0x15888
+PlayerLogOffMenu:
 	xor a
 	scf
 	ret
-; 0x1588b
 
-PlayerDepositItemMenu: ; 0x1588b
+PlayerDepositItemMenu:
 	call .CheckItemsInBag
 	jr c, .nope
 	call DisableSpriteUpdates
@@ -549,25 +532,24 @@
 	and a
 	ret
 
-.HowManyText: ; 0x1596e
+.HowManyText:
 	text_jump _PlayersPCHowManyDepositText
 	db "@"
 
-.DepositText: ; 0x15973
+.DepositText:
 	text_jump _PlayersPCDepositItemsText
 	db "@"
 
-.NoRoomText: ; 0x15978
+.NoRoomText:
 	text_jump _PlayersPCNoRoomDepositText
 	db "@"
 
-PlayerMailBoxMenu: ; 0x1597d
+PlayerMailBoxMenu:
 	farcall _PlayerMailBoxMenu
 	xor a
 	ret
-; 0x15985
 
-PCItemsJoypad: ; 0x15985
+PCItemsJoypad:
 	xor a
 	ld [wSwitchItem], a
 .loop
@@ -651,44 +633,37 @@
 	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
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@@ -1,4 +1,4 @@
-Pokepic:: ; 244e3
+Pokepic::
 	ld hl, PokepicMenuHeader
 	call CopyMenuHeader
 	call MenuBox
@@ -27,7 +27,7 @@
 	call WaitBGMap
 	ret
 
-ClosePokepic:: ; 24528
+ClosePokepic::
 	ld hl, PokepicMenuHeader
 	call CopyMenuHeader
 	call ClearMenuBoxInterior
@@ -41,7 +41,7 @@
 	call LoadStandardFont
 	ret
 
-PokepicMenuHeader: ; 0x24547
+PokepicMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 14, 13
 	dw NULL
--- 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]
--- 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
--- 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]
@@ -121,7 +121,7 @@
 	ld [hl], a
 	ret
 
-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
--- a/engine/events/print_photo.asm
+++ b/engine/events/print_photo.asm
@@ -1,4 +1,4 @@
-PhotoStudio: ; 16dc7
+PhotoStudio:
 	ld hl, .Text_AskWhichMon
 	call PrintText
 	farcall SelectMonFromParty
@@ -28,34 +28,28 @@
 .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
--- 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 @@
 	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 @@
 	ld [hInMenu], a
 	call ReturnToMapFromSubmenu
 	ret
-; 16ca0
 
-.LeftRight: ; 16ca0
+.LeftRight:
 	ld a, [hJoyLast]
 	and D_RIGHT
 	jr nz, .press_right
@@ -127,9 +129,8 @@
 .return
 	call .UpdateUnownFrontpic
 	ret
-; 16cc8
 
-.UpdateUnownFrontpic: ; 16cc8
+.UpdateUnownFrontpic:
 	ld a, [wJumptableIndex]
 	cp 26
 	jr z, .vacant
@@ -151,7 +152,7 @@
 	farcall RotateUnownFrontpic
 	ret
 
-.Load2bppToSRAM: ; 16cff
+.Load2bppToSRAM:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -194,7 +195,6 @@
 	ld c, 20
 	call DelayFrames
 	ret
-; 16d57
 
 AlphRuinsStampString:
 	db " ALPH RUINS STAMP@"
@@ -203,8 +203,8 @@
 	db "Do what?@"
 
 UnownDexMenuString:
-	db   "♂ PRINT"
-	next "♀ CANCEL"
+	db   UNOWNSTAMP_BOLD_A, " PRINT"
+	next UNOWNSTAMP_BOLD_B, " CANCEL"
 	next "← PREVIOUS"
 	next "→ NEXT"
 	db   "@"
@@ -211,15 +211,13 @@
 
 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 @@
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 16dc7
--- 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
@@ -43,7 +43,7 @@
 	call CloseSRAM
 	ret
 
-.Copy: ; e004e
+.Copy:
 	ld c, $10
 .loop_copy
 	ld a, [hli]
@@ -53,7 +53,7 @@
 	jr nz, .loop_copy
 	ret
 
-.Rotate: ; e0057
+.Rotate:
 	ld hl, wd012
 	ld e, %10000000
 	ld d, 8
@@ -75,7 +75,7 @@
 	jr nz, .loop_decompress
 	ret
 
-.CountSetBit: ; e0078
+.CountSetBit:
 	ld b, 0
 	ld c, 8
 .loop_count
@@ -107,5 +107,5 @@
 endr
 ENDM
 
-UnownPrinter_GBPrinterRectangle: ; e008b
+UnownPrinter_GBPrinterRectangle:
 	gbprinterrect 7, 7
--- a/engine/events/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
@@ -1,4 +1,4 @@
-ProfOaksPC: ; 0x265d3
+ProfOaksPC:
 	ld hl, OakPCText1
 	call MenuTextBox
 	call YesNoBox
@@ -11,7 +11,7 @@
 	call ExitMenu
 	ret
 
-ProfOaksPCBoot ; 0x265ee
+ProfOaksPCBoot:
 	ld hl, OakPCText2
 	call PrintText
 	call Rate
@@ -20,7 +20,7 @@
 	call WaitSFX
 	ret
 
-ProfOaksPCRating: ; 0x26601
+ProfOaksPCRating:
 	call Rate
 	push de
 	ld de, MUSIC_NONE
@@ -31,7 +31,7 @@
 	call WaitSFX
 	ret
 
-Rate: ; 0x26616
+Rate:
 ; calculate Seen/Owned
 	ld hl, wPokedexSeen
 	ld b, wEndPokedexSeen - wPokedexSeen
@@ -55,7 +55,7 @@
 	pop de
 	ret
 
-.UpdateRatingBuffers: ; 0x26647
+.UpdateRatingBuffers:
 	ld hl, wStringBuffer3
 	ld de, wd002
 	call .UpdateRatingBuffer
@@ -64,7 +64,7 @@
 	call .UpdateRatingBuffer
 	ret
 
-.UpdateRatingBuffer: ; 0x2665a
+.UpdateRatingBuffer:
 	push hl
 	ld a, "@"
 	ld bc, ITEM_NAME_LENGTH
@@ -74,7 +74,7 @@
 	call PrintNum
 	ret
 
-FindOakRating: ; 0x2666b
+FindOakRating:
 ; return sound effect in de
 ; return text pointer in hl
 	nop
@@ -100,15 +100,15 @@
 
 INCLUDE "data/events/pokedex_ratings.asm"
 
-OakPCText1: ; 0x266de
+OakPCText1:
 	text_jump _OakPCText1
 	db "@"
 
-OakPCText2: ; 0x266e3
+OakPCText2:
 	text_jump _OakPCText2
 	db "@"
 
-OakPCText3: ; 0x266e8
+OakPCText3:
 	text_jump _OakPCText3
 	db "@"
 
@@ -188,6 +188,6 @@
 	text_jump _OakRating19
 	db "@"
 
-OakPCText4: ; 0x2674c
+OakPCText4:
 	text_jump _OakPCText4
 	db "@"
--- 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 @@
 	ld a, $1
 	ld [wItemEffectSucceeded], a
 	ret
-; 507fb
 
-CheckAnyFaintedMon: ; 507fb
+CheckAnyFaintedMon:
 	ld de, PARTYMON_STRUCT_LENGTH
 	ld bc, wPartySpecies
 	ld hl, wPartyMon1HP
@@ -46,9 +45,8 @@
 	pop af
 	scf
 	ret
-; 50821
 
-SacredAshScript: ; 0x50821
+SacredAshScript:
 	special HealParty
 	reloadmappart
 	playsound SFX_WARP_TO
@@ -65,10 +63,8 @@
 	waitbutton
 	closetext
 	end
-; 0x50845
 
-UnknownText_0x50845: ; 0x50845
+UnknownText_0x50845:
 	; 's #MON were all healed!
 	text_jump UnknownText_0x1c0b65
 	db "@"
-; 0x5084a
--- a/engine/events/shuckle.asm
+++ b/engine/events/shuckle.asm
@@ -1,7 +1,6 @@
 MANIA_OT_ID EQU 00518
 
-GiveShuckle: ; 7305
-
+GiveShuckle:
 ; Adding to the party.
 	xor a
 	ld [wMonType], a
@@ -71,7 +70,7 @@
 SpecialShuckleNick:
 	db "SHUCKIE@"
 
-ReturnShuckle: ; 737e
+ReturnShuckle:
 	farcall SelectMonFromParty
 	jr c, .refused
 
--- a/engine/events/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 @@
 	ld a, b
 	rst FarCall
 	ret
-; c029
 
 INCLUDE "data/special_pointers.asm"
 
-DummySpecial_c224: ; c224
+DummySpecial_c224:
 	ret
-; c225
 
-SetPlayerPalette: ; c225
+SetPlayerPalette:
 	ld a, [wScriptVar]
 	ld d, a
 	farcall _SetPlayerPalette
 	ret
-; c230
 
-GameCornerPrizeMonCheckDex: ; c230
+GameCornerPrizeMonCheckDex:
 	ld a, [wScriptVar]
 	dec a
 	call CheckCaughtMon
@@ -41,16 +38,14 @@
 	farcall NewPokedexEntry
 	call ExitAllMenus
 	ret
-; c252
 
-UnusedSetSeenMon: ; c252
+UnusedSetSeenMon:
 	ld a, [wScriptVar]
 	dec a
 	call SetSeenMon
 	ret
-; c25a
 
-FindPartyMonAboveLevel: ; c25a
+FindPartyMonAboveLevel:
 	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonAboveLevel
@@ -57,7 +52,7 @@
 	jr z, FoundNone
 	jr FoundOne
 
-FindPartyMonAtLeastThatHappy: ; c268
+FindPartyMonAtLeastThatHappy:
 	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonAtLeastThatHappy
@@ -64,7 +59,7 @@
 	jr z, FoundNone
 	jr FoundOne
 
-FindPartyMonThatSpecies: ; c276
+FindPartyMonThatSpecies:
 	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonThatSpecies
@@ -71,7 +66,7 @@
 	jr z, FoundNone
 	jr FoundOne
 
-FindPartyMonThatSpeciesYourTrainerID: ; c284
+FindPartyMonThatSpeciesYourTrainerID:
 	ld a, [wScriptVar]
 	ld b, a
 	farcall _FindPartyMonThatSpeciesYourTrainerID
@@ -78,18 +73,17 @@
 	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
 
-NameRival: ; 0xc29d
+NameRival:
 	ld b, $2 ; rival
 	ld de, wRivalName
 	farcall _NamingScreen
@@ -101,35 +95,30 @@
 
 .default
 	db "SILVER@"
-; 0xc2b9
 
-NameRater: ; c2b9
+NameRater:
 	farcall _NameRater
 	ret
-; c2c0
 
-OverworldTownMap: ; c2c0
+OverworldTownMap:
 	call FadeToMenu
 	farcall _TownMap
 	call ExitAllMenus
 	ret
-; c2cd
 
-UnownPrinter: ; c2cd
+UnownPrinter:
 	call FadeToMenu
 	farcall _UnownPrinter
 	call ExitAllMenus
 	ret
-; c2da
 
-DisplayLinkRecord: ; c2da
+DisplayLinkRecord:
 	call FadeToMenu
 	farcall _DisplayLinkRecord
 	call ExitAllMenus
 	ret
-; c2e7
 
-PlayersHousePC: ; c2e7
+PlayersHousePC:
 	xor a
 	ld [wScriptVar], a
 	farcall _PlayersHousePC
@@ -136,9 +125,8 @@
 	ld a, c
 	ld [wScriptVar], a
 	ret
-; c2f6
 
-CheckMysteryGift: ; c2f6
+CheckMysteryGift:
 	ld a, BANK(sMysteryGiftItem)
 	call GetSRAMBank
 	ld a, [sMysteryGiftItem]
@@ -150,9 +138,8 @@
 	ld [wScriptVar], a
 	call CloseSRAM
 	ret
-; c309
 
-GetMysteryGiftItem: ; c309
+GetMysteryGiftItem:
 	ld a, BANK(sMysteryGiftItem)
 	call GetSRAMBank
 	ld a, [sMysteryGiftItem]
@@ -179,29 +166,25 @@
 	xor a
 	ld [wScriptVar], a
 	ret
-; c345
 
-.ReceiveItemText: ; 0xc345
+.ReceiveItemText:
 	; received item
 	text_jump UnknownText_0x1bd3be
 	db "@"
-; 0xc34a
 
-BugContestJudging: ; c34a
+BugContestJudging:
 	farcall _BugContestJudging
 	ld a, b
 	ld [wScriptVar], a
 	ret
-; c355
 
-MapRadio: ; c355
+MapRadio:
 	ld a, [wScriptVar]
 	ld e, a
 	farcall PlayRadio
 	ret
-; c360
 
-UnownPuzzle: ; c360
+UnownPuzzle:
 	call FadeToMenu
 	farcall _UnownPuzzle
 	ld a, [wSolvedUnownPuzzle]
@@ -208,9 +191,8 @@
 	ld [wScriptVar], a
 	call ExitAllMenus
 	ret
-; c373
 
-SlotMachine: ; c373
+SlotMachine:
 	call CheckCoinsAndCoinCase
 	ret c
 	ld a, BANK(_SlotMachine)
@@ -217,9 +199,8 @@
 	ld hl, _SlotMachine
 	call StartGameCornerGame
 	ret
-; c380
 
-CardFlip: ; c380
+CardFlip:
 	call CheckCoinsAndCoinCase
 	ret c
 	ld a, BANK(_CardFlip)
@@ -226,9 +207,8 @@
 	ld hl, _CardFlip
 	call StartGameCornerGame
 	ret
-; c38d
 
-DummyNonfunctionalGameCornerGame: ; c38d
+DummyNonfunctionalGameCornerGame:
 	call CheckCoinsAndCoinCase
 	ret c
 	ld a, BANK(_DummyGame)
@@ -235,9 +215,8 @@
 	ld hl, _DummyGame
 	call StartGameCornerGame
 	ret
-; c39a
 
-StartGameCornerGame: ; c39a
+StartGameCornerGame:
 	call FarQueueScript
 	call FadeToMenu
 	ld hl, wQueuedScriptBank
@@ -250,9 +229,8 @@
 	rst FarCall
 	call ExitAllMenus
 	ret
-; c3ae
 
-CheckCoinsAndCoinCase: ; c3ae
+CheckCoinsAndCoinCase:
 	ld hl, wCoins
 	ld a, [hli]
 	or [hl]
@@ -276,27 +254,23 @@
 	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
 
-ClearBGPalettesBufferScreen: ; c3db
+ClearBGPalettesBufferScreen:
 	call ClearBGPalettes
 	call BufferScreen
 	ret
-; c3e2
 
-ScriptReturnCarry: ; c3e2
+ScriptReturnCarry:
 	jr c, .carry
 	xor a
 	ld [wScriptVar], a
@@ -305,23 +279,19 @@
 	ld a, 1
 	ld [wScriptVar], a
 	ret
-; c3ef
 
-UnusedCheckUnusedTwoDayTimer: ; c3ef
+UnusedCheckUnusedTwoDayTimer:
 	farcall CheckUnusedTwoDayTimer
 	ld a, [wUnusedTwoDayTimer]
 	ld [wScriptVar], a
 	ret
-; c3fc
 
-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 @@
 	ld a, e
 	ld [wYanmaMapNumber], a
 	ret
-; c419
 
-
-CheckPokerus: ; c419
+CheckPokerus:
 ; Check if a monster in your party has Pokerus
 	farcall _CheckPokerus
 	jp ScriptReturnCarry
-; c422
 
-ResetLuckyNumberShowFlag: ; c422
+ResetLuckyNumberShowFlag:
 	farcall RestartLuckyNumberCountdown
 	ld hl, wLuckyNumberShowFlag
 	res LUCKYNUMBERSHOW_GAME_OVER_F, [hl]
 	farcall LoadOrRegenerateLuckyIDNumber
 	ret
-; c434
 
-CheckLuckyNumberShowFlag: ; c434
+CheckLuckyNumberShowFlag:
 	farcall _CheckLuckyNumberShowFlag
 	jp ScriptReturnCarry
-; c43d
 
-SnorlaxAwake: ; 0xc43d
+SnorlaxAwake:
 ; Check if the Poké Flute channel is playing, and if the player is standing
 ; next to Snorlax.
 
@@ -410,14 +375,11 @@
 	db 36,  9 ; right
 	db -1
 
-
-PlayCurMonCry: ; c472
+PlayCurMonCry:
 	ld a, [wCurPartySpecies]
 	jp PlayMonCry
-; c478
 
-
-GameboyCheck: ; c478
+GameboyCheck:
 	ld a, [hCGB]
 	and a
 	jr nz, .cgb
@@ -438,8 +400,7 @@
 	ld [wScriptVar], a
 	ret
 
-
-FadeOutMusic: ; c48f
+FadeOutMusic:
 	ld a, LOW(MUSIC_NONE)
 	ld [wMusicFadeID], a
 	ld a, HIGH(MUSIC_NONE)
@@ -447,23 +408,20 @@
 	ld a, $2
 	ld [wMusicFade], a
 	ret
-; c49f
 
-Diploma: ; c49f
+Diploma:
 	call FadeToMenu
 	farcall _Diploma
 	call ExitAllMenus
 	ret
-; c4ac
 
-PrintDiploma: ; c4ac
+PrintDiploma:
 	call FadeToMenu
 	farcall _PrintDiploma
 	call ExitAllMenus
 	ret
-; c4b9
 
-TrainerHouse: ; 0xc4b9
+TrainerHouse:
 	ld a, BANK(sMysteryGiftTrainerHouseFlag)
 	call GetSRAMBank
 	ld a, [sMysteryGiftTrainerHouseFlag]
--- 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 @@
 	xor a
 	ld [wScriptVar], a
 	ret
-; 50779
--- 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
@@ -25,5 +25,5 @@
 
 INCLUDE "data/events/collision_stdscripts.asm"
 
-Script_JumpStdFromRAM: ; 0x1369a
+Script_JumpStdFromRAM:
 	jump wJumpStdScriptBuffer
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -216,7 +216,7 @@
 	closetext
 	end
 
-TrashCanScript: ; 0xbc1a5
+TrashCanScript:
 	farjumptext TrashCanText
 
 PCScript:
@@ -335,9 +335,8 @@
 	farwritetext ContestResults_DidNotWinText
 	buttonsound
 	jump BugContestResults_FinishUp
-; 0xbc2b1
 
-BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1
+BugContestResults_ReturnAfterWinnersPrize:
 	farwritetext ContestResults_JoinUsNextTimeText
 	buttonsound
 
@@ -381,9 +380,8 @@
 	setflag ENGINE_DAILY_BUG_CONTEST
 	special PlayMapMusic
 	end
-; 0xbc31e
 
-BugContestResults_FirstPlace: ; 0xbc31e
+BugContestResults_FirstPlace:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	itemtotext SUN_STONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
@@ -391,9 +389,8 @@
 	verbosegiveitem SUN_STONE
 	iffalse BugContestResults_NoRoomForSunStone
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc332
 
-BugContestResults_SecondPlace: ; 0xbc332
+BugContestResults_SecondPlace:
 	itemtotext EVERSTONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
@@ -400,9 +397,8 @@
 	verbosegiveitem EVERSTONE
 	iffalse BugContestResults_NoRoomForEverstone
 	jump BugContestResults_ReturnAfterWinnersPrize
-; 0xbc343
 
-BugContestResults_ThirdPlace: ; 0xbc343
+BugContestResults_ThirdPlace:
 	itemtotext GOLD_BERRY, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
@@ -409,37 +405,32 @@
 	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
@@ -1489,7 +1480,7 @@
 	buttonsound
 	end
 
-NumberAcceptedFScript: ; 0xbcbd3
+NumberAcceptedFScript:
 	checkcode VAR_CALLERID
 	ifequal PHONE_POKEFAN_BEVERLY, .Beverly
 	ifequal PHONE_COOLTRAINERF_BETH, .Beth
@@ -1777,23 +1768,21 @@
 	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,12 +1793,11 @@
 	waitbutton
 	closetext
 	end
-; 0xbcde0
 
-CoinVendor_IntroScript: ; 0xbcde0
+CoinVendor_IntroScript:
 	farwritetext CoinVendor_IntroText
 
-.loop ; 0xbcde4
+.loop
 	special DisplayMoneyAndCoinBalance
 	loadmenu .MenuHeader
 	verticalmenu
@@ -1817,9 +1805,8 @@
 	ifequal 1, .Buy50
 	ifequal 2, .Buy500
 	jump .Cancel
-; 0xbcdf7
 
-.Buy50: ; 0xbcdf7
+.Buy50:
 	checkcoins MAX_COINS - 50
 	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 1000
@@ -1831,9 +1818,8 @@
 	farwritetext CoinVendor_Buy50CoinsText
 	waitbutton
 	jump .loop
-; 0xbce1b
 
-.Buy500: ; 0xbce1b
+.Buy500:
 	checkcoins MAX_COINS - 500
 	ifequal HAVE_MORE, .CoinCaseFull
 	checkmoney YOUR_MONEY, 10000
@@ -1845,30 +1831,25 @@
 	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
 
-
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 4, 15, TEXTBOX_Y - 1
@@ -1881,9 +1862,7 @@
 	db " 50 :  ¥1000@"
 	db "500 : ¥10000@"
 	db "CANCEL@"
-; 0xbce7f
 
-
 HappinessCheckScript:
 	faceplayer
 	opentext
@@ -1907,9 +1886,8 @@
 	closetext
 	end
 
-Movement_ContestResults_WalkAfterWarp: ; bcea1
+Movement_ContestResults_WalkAfterWarp:
 	step RIGHT
 	step DOWN
 	turn_head UP
 	step_end
-; bcea5
--- 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,20 +19,17 @@
 	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
@@ -60,16 +56,13 @@
 	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
--- 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 @@
 	encountermusic
 	jump StartBattleWithMapTrainerScript
 
-SeenByTrainerScript:: ; 0xbe675
+SeenByTrainerScript::
 	loadmemtrainer
 	encountermusic
 	showemote EMOTE_SHOCK, LAST_TALKED, 30
@@ -16,7 +16,7 @@
 	faceobject PLAYER, LAST_TALKED
 	jump StartBattleWithMapTrainerScript
 
-StartBattleWithMapTrainerScript: ; 0xbe68a
+StartBattleWithMapTrainerScript:
 	opentext
 	trainertext $0
 	waitbutton
--- 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 @@
 	xor a
 	ld [wScriptVar], a
 	ret
-; b8219
 
-RockMonEncounter: ; b8219
-
+RockMonEncounter:
 	xor a
 	ld [wTempWildMonSpecies], a
 	ld [wCurPartyLevel], a
@@ -54,11 +52,10 @@
 .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 @@
 	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 @@
 .quit
 	xor a
 	ret
-; b82e8
 
 INCLUDE "data/wild/treemons.asm"
 
-GetTreeMon: ; b83e5
+GetTreeMon:
 	push hl
 	call GetTreeScore
 	pop hl
@@ -168,9 +163,8 @@
 	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 @@
 	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 @@
 .rare
 	ld a, TREEMON_SCORE_RARE
 	ret
-; b8466
 
-.CoordScore: ; b8466
+.CoordScore:
 	call GetFacingTileCoord
 	ld hl, 0
 	ld c, e
@@ -269,9 +261,8 @@
 
 	ld a, [hQuotient + 3]
 	ret
-; b849d
 
-.OTIDScore: ; b849d
+.OTIDScore:
 	ld a, [wPlayerID]
 	ld [hDividend], a
 	ld a, [wPlayerID + 1]
@@ -282,4 +273,3 @@
 	call Divide
 	ld a, [hQuotient + 3]
 	ret
-; b84b3
--- a/engine/events/unown_walls.asm
+++ b/engine/events/unown_walls.asm
@@ -1,4 +1,4 @@
-HoOhChamber: ; 0x8addb
+HoOhChamber:
 	ld hl, wPartySpecies
 	ld a, [hl]
 	cp HO_OH ; is Ho-oh the first Pokémon in the party?
@@ -9,9 +9,8 @@
 	call EventFlagAction
 .done
 	ret
-; 0x8adef
 
-OmanyteChamber: ; 8adef
+OmanyteChamber:
 	call GetMapAttributesPointer ; pointless?
 	ld de, EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
 	ld b, CHECK_FLAG
@@ -51,9 +50,8 @@
 
 .nope
 	ret
-; 8ae30
 
-SpecialAerodactylChamber: ; 8ae30
+SpecialAerodactylChamber:
 	push de
 	push bc
 
@@ -79,9 +77,8 @@
 	pop bc
 	pop de
 	ret
-; 8ae4e
 
-SpecialKabutoChamber: ; 8ae4e
+SpecialKabutoChamber:
 	push hl
 	push de
 
@@ -101,9 +98,8 @@
 	pop de
 	pop hl
 	ret
-; 8ae68
 
-DisplayUnownWords: ; 8ae68
+DisplayUnownWords:
 	ld a, [wScriptVar]
 	ld hl, MenuHeaders_UnownWalls
 	and a
@@ -151,11 +147,10 @@
 	call PlayClickSFX
 	call CloseWindow
 	ret
-; 8aebc
 
 INCLUDE "data/events/unown_walls.asm"
 
-_DisplayUnownWords_FillAttr: ; 8aee9
+_DisplayUnownWords_FillAttr:
 	ld a, [de]
 	cp $ff
 	ret z
@@ -170,9 +165,8 @@
 	inc hl
 	inc de
 	jr _DisplayUnownWords_FillAttr
-; 8aefd
 
-.PlaceSquare: ; 8aefd
+.PlaceSquare:
 	push hl
 	ld [hli], a
 	ld [hld], a
@@ -183,9 +177,8 @@
 	ld [hl], a
 	pop hl
 	ret
-; 8af09
 
-_DisplayUnownWords_CopyWord: ; 8af09
+_DisplayUnownWords_CopyWord:
 	push hl
 	push de
 .word_loop
@@ -203,9 +196,8 @@
 	pop de
 	pop hl
 	ret
-; 8af1c
 
-.ConvertChar: ; 8af1c
+.ConvertChar:
 	push hl
 	ld a, c
 	cp $60
@@ -264,4 +256,3 @@
 	ld [hl], $2
 	pop hl
 	ret
-; 8af6b
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -1,13 +1,12 @@
-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 FadeOutPalettes
@@ -24,15 +23,13 @@
 
 .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
@@ -39,16 +36,14 @@
 	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 @@
 	rra
 	ld [hl], a
 	ret
-; 12527
 
-
-GetWhiteoutSpawn: ; 12527
+GetWhiteoutSpawn:
 	ld a, [wLastSpawnMapGroup]
 	ld d, a
 	ld a, [wLastSpawnMapNumber]
@@ -79,4 +72,3 @@
 .yes
 	ld [wDefaultSpawnpoint], a
 	ret
-; 1253d
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -1,16 +1,16 @@
-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 NO_TEXT_SCROLL, [hl]
 	call ClearBGPalettes
@@ -74,7 +74,7 @@
 	res 4, [hl]
 	ret
 
-.CardFlip: ; e0191 (38:4191)
+.CardFlip:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -85,9 +85,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e01a0 (38:41a0)
 
-.Jumptable: ; e01a0
+.Jumptable:
 	dw .AskPlayWithThree
 	dw .DeductCoins
 	dw .ChooseACard
@@ -96,15 +95,13 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld c, a
 	add hl, bc
 	ret
-; e03ac
 
-GetCoordsOfChosenCard: ; e03ac
+GetCoordsOfChosenCard:
 	ld a, [wCardFlipWhichCard]
 	and a
 	jr nz, .BottomCard
@@ -412,9 +393,8 @@
 
 .done
 	ret
-; e03c1
 
-PlaceCardFaceDown: ; e03c1
+PlaceCardFaceDown:
 	xor a
 	ld [hBGMapMode], a
 	ld de, .FaceDownCardTilemap
@@ -421,9 +401,8 @@
 	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
@@ -430,9 +409,8 @@
 	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,9 +471,8 @@
 	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
@@ -502,9 +479,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	jr nz, .row
 	ret
 
-CardFlip_CopyToBox: ; e04f7 (38:44f7)
+CardFlip_CopyToBox:
 .row
 	push bc
 	push hl
@@ -598,9 +569,8 @@
 	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 @@
 	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 @@
 	ld [hli], a
 	ld [hl], a
 	ret
-; e0534 (38:4534)
 
-CardFlip_BlankDiscardedCardSlot: ; e0534
+CardFlip_BlankDiscardedCardSlot:
 	xor a
 	ld [hBGMapMode], a
 	ld a, [wCardFlipFaceUpCard]
@@ -660,9 +628,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e0553
 
-.Jumptable: ; e0553
+.Jumptable:
 	dw .Level1
 	dw .Level2
 	dw .Level3
@@ -669,9 +636,8 @@
 	dw .Level4
 	dw .Level5
 	dw .Level6
-; e055f
 
-.Level1: ; e055f
+.Level1:
 	ld hl, wDiscardPile + 4
 	add hl, de
 	ld a, [hl]
@@ -695,9 +661,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e0643
 
-.Jumptable: ; e0643
+.Jumptable:
 	dw .Impossible
 	dw .Impossible
 	dw .PikaJiggly
@@ -894,37 +853,34 @@
 	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
@@ -931,7 +887,7 @@
 	jr z, .WinNine
 	jp .Lose
 
-.FiveSix: ; e06d8
+.FiveSix:
 	ld a, [wCardFlipFaceUpCard]
 	and $18
 	cp $10
@@ -938,19 +894,18 @@
 	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
@@ -957,7 +912,7 @@
 	jr z, .WinTwelve
 	jp .Lose
 
-.Poliwag: ; e0702
+.Poliwag:
 	ld a, [wCardFlipFaceUpCard]
 	and $3
 	cp $2
@@ -964,7 +919,7 @@
 	jr z, .WinTwelve
 	jp .Lose
 
-.Oddish: ; e070e
+.Oddish:
 	ld a, [wCardFlipFaceUpCard]
 	and $3
 	cp $3
@@ -971,19 +926,18 @@
 	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
@@ -990,7 +944,7 @@
 	jr z, .WinEighteen
 	jp .Lose
 
-.Three: ; e0738
+.Three:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $8
@@ -997,7 +951,7 @@
 	jr z, .WinEighteen
 	jp .Lose
 
-.Four: ; e0744
+.Four:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $c
@@ -1004,7 +958,7 @@
 	jr z, .WinEighteen
 	jp .Lose
 
-.Five: ; e0750
+.Five:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $10
@@ -1011,7 +965,7 @@
 	jr z, .WinEighteen
 	jp .Lose
 
-.Six: ; e075c
+.Six:
 	ld a, [wCardFlipFaceUpCard]
 	and $1c
 	cp $14
@@ -1018,109 +972,107 @@
 	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 @@
 	ld de, SFX_2ND_PLACE
 	jr .Payout
 
-.Lose: ; e07db
+.Lose:
 	ld de, SFX_WRONG
 	call PlaySFX
 	ld hl, .Text_Darn
@@ -1136,7 +1088,7 @@
 	call WaitSFX
 	ret
 
-.Payout: ; e07eb
+.Payout:
 	push bc
 	push de
 	ld hl, .Text_Yeah
@@ -1159,21 +1111,18 @@
 	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 @@
 	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 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	inc [hl]
 	jr .play_sound
 
-.d_up ; e090a
+.d_up
 	ld hl, wCardFlipCursorY
 	ld a, [wCardFlipCursorX]
 	and a
@@ -1356,7 +1299,7 @@
 	ld [wCardFlipCursorX], a
 	jr .play_sound
 
-.d_down ; e093d
+.d_down
 	ld hl, wCardFlipCursorY
 	ld a, [wCardFlipCursorX]
 	and a
@@ -1377,13 +1320,12 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/engine/games/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 @@
 	ld [wJumptableIndex], a
 	ret
 
-; e2010
-
-DummyGame_CheckMatch: ; e2010
+DummyGame_CheckMatch:
 	ld hl, wDummyGameCard1
 	ld a, [hli]
 	cp [hl]
@@ -322,21 +320,17 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-; e20e5
-
-DummyGame_SampleTilePlacement: ; e20e5
+DummyGame_SampleTilePlacement:
 	push hl
 	ld de, wDummyGameCards
 .loop
@@ -408,9 +400,7 @@
 	inc hl
 	ret
 
-; e2101
-
-DummyGame_GetDistributionOfTiles: ; e2101
+DummyGame_GetDistributionOfTiles:
 	ld a, [wMenuCursorY]
 	dec a
 	ld l, a
@@ -426,9 +416,8 @@
 	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 @@
 	call DelayFrames
 	ret
 
-; e2142
-
-DummyGame_DeleteCard: ; e2142
+DummyGame_DeleteCard:
 	ld a, $1
 	ld [hli], a
 	ld [hld], a
@@ -460,9 +447,7 @@
 	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 @@
 	db "とったもの@"
 .japstr2
 	db "あと　かい@"
-; e2183
 
-DummyGame_Card2Coord: ; e2183
+DummyGame_Card2Coord:
 	ld d, 0
 .find_row
 	sub 9
@@ -511,9 +495,7 @@
 	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 @@
 	ld [hl], a
 	ret
 
-; e2221 (38:6221)
-
-LZ_e2221: ; e2221
+LZ_e2221:
 INCBIN "gfx/dummy_game/dummy_game.2bpp.lz"
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -94,7 +94,7 @@
 	res rLCDC_SPRITE_SIZE, [hl] ; 8x8
 	ret
 
-.InitGFX: ; 926f7 (24:66f7)
+.InitGFX:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -163,7 +163,7 @@
 	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 @@
 	call DmgToCgbObjPals
 	ret
 
-SlotsLoop: ; 927af (24:67af)
+SlotsLoop:
 	ld a, [wJumptableIndex]
 	bit SLOTS_END_LOOP_F, a
 	jr nz, .stop
@@ -194,7 +194,7 @@
 	scf
 	ret
 
-.Stubbed_Function927d3: ; 927d3 (24:67d3)
+.Stubbed_Function927d3:
 ; dummied out
 	ret
 	ld a, [wReel1ReelAction]
@@ -219,9 +219,7 @@
 	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 @@
 	call PrintNum
 	ret
 
-; 92811 (24:6811)
-
-Unreferenced_Function92811: ; 92811
+Unreferenced_Function92811:
 ; debug function?
 	ld a, [wSlotBias]
 	add 0
@@ -252,9 +248,7 @@
 	ld [hl], a
 	ret
 
-; 9282c
-
-Unreferenced_Function9282c: ; 9282c
+Unreferenced_Function9282c:
 ; animate OAM tiles?
 	ld hl, wcf66
 	ld a, [hl]
@@ -274,9 +268,7 @@
 	jr nz, .loop
 	ret
 
-; 92844
-
-SlotsJumptable: ; 92844 (24:6844)
+SlotsJumptable:
 	jumptable .Jumptable, wJumptableIndex
 
 .Jumptable:
@@ -300,12 +292,12 @@
 	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 @@
 	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 @@
 	call Slots_PlaySFX
 	ret
 
-SlotsAction_WaitStart: ; 928c6 (24:68c6)
+SlotsAction_WaitStart:
 	ld hl, wSlotsDelay
 	ld a, [hl]
 	and a
@@ -354,7 +346,7 @@
 	ld [hJoypadSum], a
 	ret
 
-SlotsAction_WaitReel1: ; 928d6 (24:68d6)
+SlotsAction_WaitReel1:
 	ld hl, hJoypadSum
 	ld a, [hl]
 	and A_BUTTON
@@ -362,7 +354,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call SlotsAction_Next
 	ret
 
-SlotsAction_GiveEarnedCoins: ; 92987 (24:6987)
+SlotsAction_GiveEarnedCoins:
 	xor a
 	ld [wFirstTwoReelsMatching], a
 	ld [wFirstTwoReelsMatchingSevens], a
@@ -461,10 +453,10 @@
 	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 @@
 	call SlotsAction_Next
 	ret
 
-SlotsAction_RestartOrQuit: ; 929d9 (24:69d9)
+SlotsAction_RestartOrQuit:
 	call Slots_DeilluminateBetLights
 	call WaitPressAorB_BlinkCursor
 	call Slots_AskPlayAgain
@@ -516,12 +508,12 @@
 	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 @@
 	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 @@
 	and a
 	ret
 
-Slots_GetCurrentReelState: ; 92a12 (24:6a12)
+Slots_GetCurrentReelState:
 	ld hl, REEL_POSITION
 	add hl, bc
 	ld a, [hl]
@@ -569,12 +561,12 @@
 	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 @@
 	ld a, REEL_ACTION_STOP_REEL2
 	ret
 
-.CheckReel1ForASeven: ; 92a51 (24:6a51)
+.CheckReel1ForASeven:
 	ld a, [wReel1Stopped]
 	and a
 	ret z
@@ -614,7 +606,7 @@
 	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 @@
 	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 @@
 	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 @@
 	call Slots_UpdateReelPositionAndOAM
 	ret
 
-Slots_SpinReels: ; 92b0f (24:6b0f)
+Slots_SpinReels:
 	ld bc, wReel1
 	call .SpinReel
 	ld bc, wReel2
@@ -745,7 +737,7 @@
 	call .SpinReel
 	ret
 
-.SpinReel: ; 92b22 (24:6b22)
+.SpinReel:
 	ld hl, REEL_SPIN_DISTANCE
 	add hl, bc
 	ld a, [hl]
@@ -782,7 +774,7 @@
 	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 @@
 	ld [hl], a
 	ret
 
-.LoadOAM: ; 92b83 (24:6b83)
+.LoadOAM:
 	ld hl, REEL_OAM_ADDR
 	add hl, bc
 	ld a, [hli]
@@ -853,9 +845,7 @@
 	jr nz, .loop
 	ret
 
-; 92bbe (24:6bbe)
-
-Unreferenced_Function92bbe: ; 92bbe
+Unreferenced_Function92bbe:
 	push hl
 	srl a
 	srl a
@@ -868,13 +858,10 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call Slots_StopReel
 	ret
 
-; 92c76
-
-.CheckForBias: ; 92c76
+.CheckForBias:
 	call Slots_GetCurrentReelState
 	ld a, [wSlotBias]
 	ld e, a
@@ -1027,9 +995,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [hl], 8
 	ret
 
-; 92d13
-
-ReelAction_FastSpinReel2UntilLinedUp7s: ; 92d13
+ReelAction_FastSpinReel2UntilLinedUp7s:
 	call Slots_CheckMatchedFirstTwoReels
 	ret nc
 	ld a, [wFirstTwoReelsMatchingSevens]
@@ -1156,9 +1114,7 @@
 	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 @@
 	pop bc
 	xor a
 	ld [wSlotsDelay], a
-ReelAction_WaitGolem: ; 92d4f
+ReelAction_WaitGolem:
 	ld a, [wSlotsDelay]
 	cp 2
 	jr z, .two
@@ -1213,9 +1169,7 @@
 	ld [hl], 8
 	ret
 
-; 92d6e
-
-ReelAction_EndGolem: ; 92d6e
+ReelAction_EndGolem:
 	xor a
 	ld [wSlotsDelay], a
 	ld hl, REEL_ACTION
@@ -1226,9 +1180,7 @@
 	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 @@
 	ld [wSlotsDelay], a
 	ret
 
-; 92da4
-
-ReelAction_WaitChansey: ; 92da4
+ReelAction_WaitChansey:
 	ld a, [wSlotsDelay]
 	and a
 	ret z
@@ -1265,7 +1215,7 @@
 	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 @@
 	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 @@
 	ld [wSlotsDelay], a
 	ret
 
-; 92df7
-
-ReelAction_Unused: ; 92df7
+ReelAction_Unused:
 	call Slots_CheckMatchedAllThreeReels
 	ret c
 	ld a, SFX_STOP_SLOT
@@ -1324,7 +1272,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call WaitSFX
 	ret
 
-; 92e94
-
-Slots_CheckMatchedFirstTwoReels: ; 92e94
+Slots_CheckMatchedFirstTwoReels:
 	xor a
 	ld [wFirstTwoReelsMatching], a
 	ld [wFirstTwoReelsMatchingSevens], a
@@ -1447,32 +1391,27 @@
 	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]
@@ -1479,9 +1418,7 @@
 	call z, .StoreResult
 	ret
 
-; 92ee0
-
-.CheckUpwardsDiag: ; 92ee0
+.CheckUpwardsDiag:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped]
 	cp [hl]
@@ -1488,9 +1425,7 @@
 	call z, .StoreResult
 	ret
 
-; 92eeb
-
-.CheckMiddleRow: ; 92eeb
+.CheckMiddleRow:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped + 1]
 	cp [hl]
@@ -1497,9 +1432,7 @@
 	call z, .StoreResult
 	ret
 
-; 92ef6
-
-.CheckDownwardsDiag: ; 92ef6
+.CheckDownwardsDiag:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
@@ -1506,9 +1439,7 @@
 	call z, .StoreResult
 	ret
 
-; 92f01
-
-.CheckTopRow: ; 92f01
+.CheckTopRow:
 	ld hl, wCurrReelStopped + 2
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
@@ -1515,9 +1446,7 @@
 	call z, .StoreResult
 	ret
 
-; 92f0c
-
-.StoreResult: ; 92f0c
+.StoreResult:
 	ld [wSlotBuildingMatch], a
 	and a
 	jr nz, .matching_sevens
@@ -1529,9 +1458,7 @@
 	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 @@
 	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 @@
 	call z, .StoreResult
 	ret
 
-; 92f70
-
-.CheckUpwardsDiag: ; 92f70
+.CheckUpwardsDiag:
 	ld hl, wCurrReelStopped + 2
 	ld a, [wReel1Stopped]
 	cp [hl]
@@ -1608,9 +1528,7 @@
 	call z, .StoreResult
 	ret
 
-; 92f80
-
-.CheckMiddleRow: ; 92f80
+.CheckMiddleRow:
 	ld hl, wCurrReelStopped + 1
 	ld a, [wReel1Stopped + 1]
 	cp [hl]
@@ -1620,9 +1538,7 @@
 	call z, .StoreResult
 	ret
 
-; 92f90
-
-.CheckDownwardsDiag: ; 92f90
+.CheckDownwardsDiag:
 	ld hl, wCurrReelStopped
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
@@ -1632,9 +1548,7 @@
 	call z, .StoreResult
 	ret
 
-; 92fa0
-
-.CheckTopRow: ; 92fa0
+.CheckTopRow:
 	ld hl, wCurrReelStopped + 2
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
@@ -1644,15 +1558,11 @@
 	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 @@
 	ld [de], a
 	ret
 
-; 92fc0
-
-Slots_GetNumberOfGolems: ; 92fc0
+Slots_GetNumberOfGolems:
 	ld hl, REEL_POSITION
 	add hl, bc
 	ld a, [hl]
@@ -1679,9 +1587,7 @@
 	ld a, e
 	ret
 
-; 92fcf
-
-.Check7Bias: ; 92fcf
+.Check7Bias:
 	ld a, [wSlotBias]
 	and a
 	jr nz, .not_biased_to_seven
@@ -1718,9 +1624,7 @@
 	jr c, .loop2
 	ret
 
-; 93002
-
-Slots_InitBias: ; 93002 (24:7002)
+Slots_InitBias:
 	ld a, [wSlotBias]
 	and a
 	ret z
@@ -1744,9 +1648,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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,7 +1705,7 @@
 	ld [hl], a
 	ret
 
-Slots_AskBet: ; 9307c (24:707c)
+Slots_AskBet:
 .loop
 	ld hl, .Text_BetHowManyCoins
 	call PrintText
@@ -1847,42 +1747,35 @@
 	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
 
-.MenuHeader: ; 0x930d6
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x930de
 
-.MenuData: ; 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 @@
 	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 @@
 	ld [hl], a
 	ret
 
-Slots_PayoutText: ; 93158 (24:7158)
+Slots_PayoutText:
 	ld a, [wSlotMatched]
 	cp SLOTS_NO_MATCH
 	jr nz, .MatchedSomething
@@ -1987,9 +1878,7 @@
 	farcall StubbedTrainerRankings_AddToSlotsWinStreak
 	ret
 
-; 93195 (24:7195)
-
-.PayoutStrings: ; 93195
+.PayoutStrings:
 	dbw "300@", .LinedUpSevens
 	dbw "50@@", .LinedUpPokeballs
 	dbw "6@@@", .LinedUpMonOrCherry
@@ -1996,9 +1885,8 @@
 	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 @@
 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 @@
 	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 @@
 	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 @@
 	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 @@
 	call Slots_PlaySFX
 	ret
 
-.roll ; 93289 (24:7289)
+.roll
 	ld hl, SPRITEANIMSTRUCT_XOFFSET
 	add hl, bc
 	ld a, [hl]
@@ -2175,7 +2053,7 @@
 	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 @@
 	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 @@
 	ld a, 1
 	ld [wSlotsDelay], a
 
-.one ; 932e0 (24:72e0)
+.one
 	ld a, [wSlotsDelay]
 	cp $2
 	jr z, .retain
@@ -2231,7 +2109,7 @@
 	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,9 +2129,7 @@
 	pop bc
 	ret
 
-; 93316 (24:7316)
-
-Slots_WaitSFX: ; 93316
+Slots_WaitSFX:
 	push bc
 	ld c, 16
 	call DelayFrames
@@ -2260,9 +2136,7 @@
 	pop bc
 	ret
 
-; 9331e
-
-Slots_PlaySFX: ; 9331e (24:731e)
+Slots_PlaySFX:
 	push de
 	ld e, a
 	ld d, 0
@@ -2270,11 +2144,9 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/engine/games/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
@@ -3,7 +3,7 @@
 
 puzcoord EQUS "* 6 +"
 
-_UnownPuzzle: ; e1190
+_UnownPuzzle:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -19,11 +19,11 @@
 	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 @@
 	ld a, LCDC_DEFAULT
 	ld [rLCDC], a
 	ret
-; e124e
 
-InitUnownPuzzlePiecePositions: ; e124e
+InitUnownPuzzlePiecePositions:
 	ld c,  1
 	ld b, 16
 .load_loop
@@ -111,9 +110,8 @@
 	dec b
 	jr nz, .load_loop
 	ret
-; e126d
 
-.PuzzlePieceInitialPositions: ; e126d
+.PuzzlePieceInitialPositions:
 initpuzcoord: MACRO
 rept _NARG / 2
 	db \1 puzcoord \2
@@ -128,9 +126,8 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; e128d
 
-PlaceStartCancelBoxBorder: ; e128d
+PlaceStartCancelBoxBorder:
 	hlcoord 4, 15
 	ld a, $f0
 	ld [hli], a
@@ -172,9 +168,8 @@
 	ld a, $f5
 	ld [hl], a
 	ret
-; e12ca
 
-UnownPuzzleJumptable: ; e12ca
+UnownPuzzleJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -185,13 +180,11 @@
 	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 @@
 .play_sfx
 	call PlaySFX
 	ret
-; e1376
 
-UnownPuzzle_A: ; e1376
+UnownPuzzle_A:
 	ld a, [wHoldingUnownPuzzlePiece]
 	and a
 	jr nz, .TryPlacePiece
@@ -348,19 +340,18 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; e141f
 
-PlaceUnownPuzzlePieceGFX: ; e141f
+PlaceUnownPuzzlePieceGFX:
 	ld a, $2 ; tilemap coords
 	call GetUnownPuzzleCoordData
 	ld a, [hli]
@@ -427,9 +416,8 @@
 	dec b
 	jr nz, .row
 	ret
-; e1441
 
-FillUnoccupiedPuzzleSpace: ; e1441
+FillUnoccupiedPuzzleSpace:
 	ld a, 2 ; tilemap coords
 	call GetUnownPuzzleCoordData
 	ld a, [hli]
@@ -454,9 +442,8 @@
 	dec b
 	jr nz, .row
 	ret
-; e1463
 
-GetUnownPuzzleCoordData: ; e1463
+GetUnownPuzzleCoordData:
 	ld e, a
 	ld d, 0
 	ld hl, UnownPuzzleCoordData
@@ -467,9 +454,8 @@
 	add hl, de
 endr
 	ret
-; e1475
 
-UnownPuzzle_CheckCurrentTileOccupancy: ; e1475
+UnownPuzzle_CheckCurrentTileOccupancy:
 	ld hl, wPuzzlePieces
 	ld a, [wUnownPuzzleCursorPosition]
 	ld e, a
@@ -477,9 +463,8 @@
 	add hl, de
 	ld a, [hl]
 	ret
-; e1481
 
-GetCurrentPuzzlePieceVTileCorner: ; e1481
+GetCurrentPuzzlePieceVTileCorner:
 	ld a, [wUnownPuzzleHeldPiece]
 	ld hl, .Corners
 	add l
@@ -489,9 +474,8 @@
 	ld h, a
 	ld a, [hl]
 	ret
-; e148f
 
-.Corners: ; e148f
+.Corners:
 ; 00, 01, 02
 ; 0c, 0d, 0e
 ; 18, 19, 1a
@@ -500,9 +484,8 @@
 	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,9 +503,8 @@
 .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
@@ -529,9 +511,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	jr nz, .loop
 	call UnownPuzzle_AddPuzzlePieceBorders
 	ret
-; e1654
 
-.EnlargePuzzlePieceTiles: ; e1654
+.EnlargePuzzlePieceTiles:
 ; double size
 	ld c, 6
 .loop1
@@ -738,9 +717,8 @@
 	dec c
 	jr nz, .loop1
 	ret
-; e16aa
 
-.GetEnlargedTile: ; e16aa
+.GetEnlargedTile:
 	push hl
 	ld hl, .EnlargedTiles
 	add l
@@ -751,18 +729,15 @@
 	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 @@
 	dec a
 	jr nz, .loop
 	ret
-; e16e2
 
-.LoadGFX: ; e16e2
+.LoadGFX:
 	lb bc, 4, 4
 .loop1
 	push bc
@@ -817,9 +791,8 @@
 	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 @@
 	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 @@
 	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"
--- a/engine/gfx/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 @@
 	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
@@ -64,9 +61,8 @@
 	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 @@
 	call CopyPalettes
 	jr _CGB_FinishBattleScreenLayout
 
-_CGB_BattleColors: ; 8ddb
+_CGB_BattleColors:
 	ld de, wBGPals1
 	call GetBattlemonBackpicPalettePointer
 	push hl
@@ -115,7 +111,7 @@
 	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 @@
 	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 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	ret
-; 8e9f
 
-InitPartyMenuBGPal0: ; 8e9f
+InitPartyMenuBGPal0:
 	farcall Function100dc0
 	ld hl, PartyMenuBGPalette
 	jr nc, .not_mobile
@@ -180,9 +173,8 @@
 	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	ret
-; 8eb9
 
-_CGB_PokegearPals: ; 8eb9
+_CGB_PokegearPals:
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
 	jr z, .male
@@ -200,9 +192,8 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9009
 
-.Function9009: ; 9009
+.Function9009:
 	ld hl, .BillsPCOrangePalette
 	call LoadHLPaletteIntoDE
 	jr .asm_901a
@@ -358,13 +342,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
 	ret
-; 9180
 
-.StartersCharizardScene: ; 9180
+.StartersCharizardScene:
 	ld hl, PalPacket_Pack + 1
 	call CopyFourPalettes
 	ld de, wOBPals1
@@ -529,9 +503,8 @@
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
 	ret
-; 9195
 
-_CGB11: ; 9195
+_CGB11:
 	ld hl, BetaPokerPals
 	ld de, wBGPals1
 	ld bc, 5 palettes
@@ -541,9 +514,8 @@
 	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 @@
 	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 @@
 	call InitPartyMenuOBPals
 	call ApplyAttrMap
 	ret
-; 91e4
 
-_CGB_Evolution: ; 91e4
+_CGB_Evolution:
 	ld de, wBGPals1
 	ld a, c
 	and a
@@ -607,9 +576,8 @@
 	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 @@
 	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 @@
 	call WipeAttrMap
 	call ApplyAttrMap
 	ret
-; 9289
 
-_CGB_TrainerCard: ; 9289
+_CGB_TrainerCard:
 	ld de, wBGPals1
 	xor a ; CHRIS
 	call GetTrainerPalettePointer
@@ -763,9 +728,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 9373
 
-_CGB_MoveList: ; 9373
+_CGB_MoveList:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_GOLDENROD
 	call GetPredefPal
@@ -788,9 +752,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 93a6
 
-_CGB_BetaPikachuMinigame: ; 93a6
+_CGB_BetaPikachuMinigame:
 	ld hl, PalPacket_BetaPikachuMinigame + 1
 	call CopyFourPalettes
 	call WipeAttrMap
@@ -799,9 +762,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 93ba
 
-_CGB_PokedexSearchOption: ; 93ba
+_CGB_PokedexSearchOption:
 	ld de, wBGPals1
 	ld a, PREDEFPAL_POKEDEX
 	call GetPredefPal
@@ -812,9 +774,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 93d3
 
-_CGB_PackPals: ; 93d3
+_CGB_PackPals:
 ; pack pals
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
@@ -861,17 +822,14 @@
 	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 @@
 	call FillBoxCGB
 	call ApplyAttrMap
 	ret
-; 94d0
 
-_CGB13: ; 94d0
+_CGB13:
 	ld hl, PalPacket_SCGB_13 + 1
 	call CopyFourPalettes
 	call WipeAttrMap
@@ -923,9 +880,8 @@
 	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 @@
 	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 @@
 	call ApplyAttrMap
 	call ApplyPals
 	ret
-; 9542
 
-_CGB1e: ; 9542
+_CGB1e:
 	ld de, wBGPals1
 	ld a, [wCurPartySpecies]
 	call GetMonPalettePointer_
@@ -966,9 +919,8 @@
 	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 @@
 	call LoadHLPaletteIntoDE
 	call WipeAttrMap
 	ret
-; 9578
 
-_CGB_TrainerOrMonFrontpicPals: ; 9578
+_CGB_TrainerOrMonFrontpicPals:
 	ld de, wBGPals1
 	ld a, [wCurPartySpecies]
 	ld bc, wTempMonDVs
@@ -994,9 +945,8 @@
 	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 @@
 	call FillBoxCGB
 	call ApplyAttrMap
 	ret
-; 95e0
 
-.Palettes: ; 95e0
+.Palettes:
 INCLUDE "gfx/mystery_gift/mystery_gift.pal"
-; 95f0
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -107,7 +107,7 @@
 	ret
 
 ; SGB layout for SCGB_PARTY_MENU_HP_PALS
-SGB_ApplyPartyMenuHPPals: ; 8ade
+SGB_ApplyPartyMenuHPPals:
 	ld hl, wHPPals
 	ld a, [wSGBPals]
 	ld e, a
@@ -648,7 +648,7 @@
 	ret
 
 ; CGB layout for SCGB_PARTY_MENU_HP_PALS
-CGB_ApplyPartyMenuHPPals: ; 96f3
+CGB_ApplyPartyMenuHPPals:
 	ld hl, wHPPals
 	ld a, [wSGBPals]
 	ld e, a
@@ -1128,7 +1128,7 @@
 	ld [rBGP], a
 	ret
 
-CopyData: ; 0x9a52
+CopyData:
 ; copy bc bytes of data from hl to de
 .loop
 	ld a, [hli]
@@ -1139,9 +1139,8 @@
 	or b
 	jr nz, .loop
 	ret
-; 0x9a5b
 
-ClearBytes: ; 0x9a5b
+ClearBytes:
 ; clear bc bytes of data starting from de
 .loop
 	xor a
@@ -1152,9 +1151,8 @@
 	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
@@ -1172,7 +1170,6 @@
 	dec c
 	jr nz, .line
 	ret
-; 0x9a7a
 
 SGBDelayCycles:
 	ld de, 7000
--- a/engine/gfx/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 @@
 	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,9 +41,8 @@
 	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
@@ -52,7 +49,7 @@
 	call ByteFill
 	ret
 
-MG_Mobile_Layout_LoadPals: ; 49351 (12:5351)
+MG_Mobile_Layout_LoadPals:
 	ld de, wBGPals1
 	ld hl, Palette_MysteryGiftMobile
 	ld bc, 5 palettes
@@ -65,7 +62,7 @@
 	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 @@
 	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,13 +106,11 @@
 	ld a, $7
 	call ByteFill
 	ret
-; 493e1 (12:53e1)
 
-Palette_MysteryGiftMobile: ; 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
@@ -122,13 +117,11 @@
 	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
@@ -135,9 +128,8 @@
 	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 @@
 	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 @@
 	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 @@
 	hlcoord 19, 1, wAttrMap
 	ld [hl], a
 	ret
-; 494ac
 
 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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"
--- a/engine/gfx/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 @@
 	ld hl, wScratchAttrMap
 	call HDMATransferToWRAMBank3
 	ret
-; 10402d
 
-HDMATransferTileMapToWRAMBank3:: ; 10402d
+HDMATransferTileMapToWRAMBank3::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -33,9 +32,8 @@
 	ld hl, wScratchTileMap
 	call HDMATransferToWRAMBank3
 	ret
-; 104047
 
-HDMATransferAttrMapToWRAMBank3: ; 104047
+HDMATransferAttrMapToWRAMBank3:
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -48,9 +46,8 @@
 	ld hl, wScratchAttrMap
 	call HDMATransferToWRAMBank3
 	ret
-; 104061
 
-ReloadMapPart:: ; 104061
+ReloadMapPart::
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -80,7 +77,7 @@
 
 	ret
 
-Mobile_ReloadMapPart: ; 104099
+Mobile_ReloadMapPart:
 	ld hl, ReloadMapPart ; useless
 	ld hl, .Function
 	jp CallInSafeGFXMode
@@ -110,7 +107,6 @@
 	ei
 
 	ret
-; 1040d4
 
 ; unused
 	ld hl, .unreferenced_1040da
@@ -134,7 +130,6 @@
 	ld [hDMATransfer], a
 	call WaitDMATransfer
 	ret
-; 1040fb
 
 ; unused
 	ld hl, .unreferenced_104101
@@ -148,9 +143,8 @@
 	ld hl, w3_d800
 	call HDMATransferToWRAMBank3
 	ret
-; 104110
 
-OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 104110
+OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
 ; OpenText
 	ld hl, .Function
 	jp CallInSafeGFXMode
@@ -182,9 +176,8 @@
 	ld [rVBK], a
 	ei
 	ret
-; 104148
 
-Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: ; 104148 (41:4148)
+Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:
 	ld hl, .Function
 	jp CallInSafeGFXMode
 
@@ -209,9 +202,8 @@
 	ld hl, wScratchTileMap
 	call HDMATransfer_Wait127Scanlines_toBGMap
 	ret
-; 104177
 
-CallInSafeGFXMode: ; 104177
+CallInSafeGFXMode:
 	ld a, [hBGMapMode]
 	push af
 	ld a, [hMapAnims]
@@ -237,19 +229,16 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ei
 
 	ret
-; 10424e
 
-
-_LoadHDMAParameters: ; 10424e (41:424e)
+_LoadHDMAParameters:
 	ld a, h
 	ld [rHDMA1], a
 	ld a, l
@@ -422,14 +406,14 @@
 	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 @@
 	ld [hMapObjectIndexBuffer], a
 	ret
 
-
-_Get2bpp:: ; 104284
+_Get2bpp::
 	; 2bpp when [rLCDC] & $80
 	; switch to WRAM bank 6
 	ld a, [rSVBK]
@@ -510,9 +493,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 1042b2
 
-_Get1bpp:: ; 1042b2
+_Get1bpp::
 	; 1bpp when [rLCDC] & $80
 .loop
 	ld a, c
@@ -537,9 +519,8 @@
 	sub $10
 	ld c, a
 	jr .loop
-; 1042d6
 
-.bankswitch ; 1042d6
+.bankswitch
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wScratchTileMap)
@@ -576,12 +557,10 @@
 	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 @@
 	call HDMATransfer_Wait127Scanlines
 	ret
 
-.Copy: ; 10433a (41:433a)
+.Copy:
 	ld b, 4
 .outer_loop
 	ld c, SCREEN_WIDTH
@@ -623,4 +602,3 @@
 	dec b
 	jr nz, .outer_loop
 	ret
-; 104350
--- a/engine/gfx/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -5,22 +5,20 @@
 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 @@
 	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,9 +58,8 @@
 	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)
@@ -70,17 +66,15 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/engine/gfx/load_overworld_font.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 @@
 	lb bc, BANK(.OverworldFontSpaceGFX), 1
 	call Get2bpp
 	ret
-; 1065ad
 
 .OverworldFontGFX:
 INCBIN "gfx/font/overworld.2bpp"
--- a/engine/gfx/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 @@
 	ld [wUnownLetter], a
 	ret
 
-GetMonFrontpic: ; 51077
+GetMonFrontpic:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call IsAPokemon
@@ -60,7 +60,7 @@
 	ld [rSVBK], a
 	ret
 
-GetAnimatedFrontpic: ; 5108b
+GetAnimatedFrontpic:
 	ld a, [wCurPartySpecies]
 	ld [wCurSpecies], a
 	call IsAPokemon
@@ -75,7 +75,7 @@
 	ld [rSVBK], a
 	ret
 
-_GetFrontpic: ; 510a5
+_GetFrontpic:
 	push de
 	call GetBaseData
 	ld a, [wBasePicSize]
@@ -102,7 +102,7 @@
 	pop hl
 	ret
 
-GetFrontpicPointer: ; 510d7
+GetFrontpicPointer:
 	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unown
@@ -129,7 +129,7 @@
 	pop bc
 	ret
 
-GetAnimatedEnemyFrontpic: ; 51103
+GetAnimatedEnemyFrontpic:
 	ld a, BANK(vTiles3)
 	ld [rVBK], a
 	push hl
@@ -158,7 +158,6 @@
 	ld de, wDecompressEnemyFrontpic + 7 * 7 tiles
 	ld c, 7 * 7
 .got_dims
-
 	push hl
 	push bc
 	call LoadFrontpicTiles
@@ -172,7 +171,7 @@
 	ld [rVBK], a
 	ret
 
-LoadFrontpicTiles: ; 5114f
+LoadFrontpicTiles:
 	ld hl, wDecompressScratch
 	swap c
 	ld a, c
@@ -193,7 +192,7 @@
 	jr nz, .loop
 	ret
 
-GetMonBackpic: ; 5116c
+GetMonBackpic:
 	ld a, [wCurPartySpecies]
 	call IsAPokemon
 	ret c
@@ -244,7 +243,7 @@
 	ld [rSVBK], a
 	ret
 
-FixPicBank: ; 511c5
+FixPicBank:
 ; This is a thing for some reason.
 
 PICS_FIX EQU $36
@@ -262,7 +261,7 @@
 	pop hl
 	ret
 
-.PicsBanks: ; 511d4
+.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
@@ -288,7 +287,7 @@
 	db BANK("Pics 23") ; BANK("Pics 1") + 22
 	db BANK("Pics 24") ; BANK("Pics 1") + 23
 
-Function511ec: ; 511ec
+Function511ec:
 	ld a, c
 	push de
 	ld hl, PokemonPicPointers
@@ -307,7 +306,7 @@
 	call FarDecompress
 	ret
 
-GetTrainerPic: ; 5120d
+GetTrainerPic:
 	ld a, [wTrainerClass]
 	and a
 	ret z
@@ -349,7 +348,7 @@
 	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]
@@ -373,7 +372,7 @@
 	ld [rSVBK], a
 	ret
 
-FixBackpicAlignment: ; 5127c
+FixBackpicAlignment:
 	push de
 	push bc
 	ld a, [wBoxAlignment]
@@ -409,7 +408,7 @@
 	pop de
 	ret
 
-PadFrontpic: ; 512ab
+PadFrontpic:
 ; pads frontpic to fill 7x7 box
 	ld a, b
 	cp 6
@@ -418,7 +417,7 @@
 	jr z, .five
 
 .seven_loop
-	ld c, $70
+	ld c, 7 << 4
 	call LoadOrientedFrontpic
 	dec b
 	jr nz, .seven_loop
@@ -425,14 +424,14 @@
 	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
@@ -439,18 +438,18 @@
 	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
@@ -461,7 +460,7 @@
 	jr nz, .Fill
 	ret
 
-LoadOrientedFrontpic: ; 512f2
+LoadOrientedFrontpic:
 	ld a, [wBoxAlignment]
 	and a
 	jr nz, .x_flip
--- a/engine/gfx/load_push_oam.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 @@
 	jr nz, .loop
 	ret
 
-.PushOAM: ; 403f
+.PushOAM:
 	ld a, HIGH(wVirtualOAM)
 	ld [rDMA], a
 	ld a, NUM_SPRITE_OAM_STRUCTS
--- a/engine/gfx/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 @@
 	ld b, BANK(Icons)
 	ld c, 8
 	ret
-; 8e83f
 
-LoadMenuMonIcon: ; 8e83f
+LoadMenuMonIcon:
 	push hl
 	push de
 	push bc
@@ -23,9 +22,8 @@
 	pop de
 	pop hl
 	ret
-; 8e849
 
-.LoadIcon: ; 8e849
+.LoadIcon:
 	ld d, 0
 	ld hl, .Jumptable
 	add hl, de
@@ -34,10 +32,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [hl], a
 	ret
 
-InitPartyMenuIcon: ; 8e908 (23:6908)
+InitPartyMenuIcon:
 	ld a, [wCurIconTile]
 	push af
 	ld a, [hObjectStructIndexBuffer]
@@ -185,7 +181,7 @@
 	ld [hl], a
 	ret
 
-SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
+SetPartyMonIconAnimSpeed:
 	push bc
 	ld a, [hObjectStructIndexBuffer]
 	ld b, a
@@ -202,7 +198,7 @@
 	ld [hl], a
 	ret
 
-.getspeed ; 8e94c (23:694c)
+.getspeed
 	farcall PlacePartymonHPBar
 	call GetHPPal
 	ld e, d
@@ -211,15 +207,13 @@
 	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 @@
 	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 @@
 	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 @@
 	call GetMemIconGFX
 	ret
 
-GetSpeciesIcon: ; 8e9ac
+GetSpeciesIcon:
 ; Load species icon into VRAM at tile a
 	push de
 	ld a, [wd265]
@@ -267,10 +261,8 @@
 	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 @@
 	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 @@
 	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 @@
 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 @@
 
 	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 @@
 	dec e
 	jr nz, .loop
 	ret
-; 8ea71
 
-UnfreezeMonIcons: ; 8ea71
+UnfreezeMonIcons:
 	ld hl, wSpriteAnimationStructs
 	ld e, PARTY_LENGTH
 .loop
@@ -415,9 +401,8 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-ReadMonMenuIcon: ; 8eab3
+ReadMonMenuIcon:
 	cp EGG
 	jr z, .egg
 	dec a
@@ -461,8 +446,6 @@
 .egg
 	ld a, ICON_EGG
 	ret
-; 8eac4
-
 
 INCLUDE "data/pokemon/menu_icons.asm"
 
--- a/engine/gfx/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,42 +15,36 @@
 	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
@@ -64,7 +58,7 @@
 	db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2
 ENDM
 
-PokeAnims: ; d0042
+PokeAnims:
 	dw .Slow
 	dw .Normal
 	dw .Menu
@@ -85,8 +79,7 @@
 .Egg1:   pokeanim Setup, Play
 .Egg2:   pokeanim Idle, Play
 
-
-AnimateFrontpic: ; d008e
+AnimateFrontpic:
 	call AnimateMon_CheckIfPokemon
 	ret c
 	call LoadMonAnimation
@@ -97,9 +90,8 @@
 	pop af
 	jr nc, .loop
 	ret
-; d00a3
 
-LoadMonAnimation: ; d00a3
+LoadMonAnimation:
 	push hl
 	ld c, e
 	ld b, 0
@@ -112,9 +104,8 @@
 	pop hl
 	call PokeAnim_InitPicAttributes
 	ret
-; d00b4
 
-SetUpPokeAnim: ; d00b4
+SetUpPokeAnim:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimSceneIndex)
@@ -139,9 +130,8 @@
 	ret z
 	scf
 	ret
-; d00da
 
-PokeAnim_SetupCommands: ; d00da
+PokeAnim_SetupCommands:
 setup_command: MACRO
 \1_: dw \1
 ENDM
@@ -157,9 +147,8 @@
 	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]
@@ -166,7 +155,7 @@
 	inc a
 	ld [wPokeAnimSceneIndex], a
 
-PokeAnim_Wait: ; d00fe
+PokeAnim_Wait:
 	ld hl, wPokeAnimWaitCounter
 	dec [hl]
 	ret nz
@@ -174,9 +163,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0155
 
-PokeAnim_Play2: ; d0155
+PokeAnim_Play2:
 	call PokeAnim_DoAnimScript
 	ld a, [wPokeAnimJumptableIndex]
 	bit 7, a
@@ -230,24 +214,21 @@
 	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]
@@ -254,9 +235,8 @@
 	inc a
 	ld [wPokeAnimSceneIndex], a
 	ret
-; d0188
 
-PokeAnim_CryNoWait: ; d0188
+PokeAnim_CryNoWait:
 	ld a, [wPokeAnimSpecies]
 	call PlayMonCry2
 	ld a, [wPokeAnimSceneIndex]
@@ -263,9 +243,8 @@
 	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 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; d01c6
 
-AnimateMon_CheckIfPokemon: ; d01c6
+AnimateMon_CheckIfPokemon:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .fail
@@ -302,9 +279,8 @@
 .fail
 	scf
 	ret
-; d01d6
 
-PokeAnim_InitPicAttributes: ; d01d6
+PokeAnim_InitPicAttributes:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wPokeAnimSceneIndex)
@@ -355,9 +331,8 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; d0250
 
-PokeAnim_DoAnimScript: ; d0250
+PokeAnim_DoAnimScript:
 	xor a
 	ld [hBGMapMode], a
 .loop
@@ -389,14 +363,12 @@
 	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 endanim_command
@@ -410,7 +382,7 @@
 	call PokeAnim_GetDuration
 	ld [wPokeAnimWaitCounter], a
 	call PokeAnim_StartWaitAnim
-.WaitAnim: ; d0282
+.WaitAnim:
 	ld a, [wPokeAnimWaitCounter]
 	dec a
 	ld [wPokeAnimWaitCounter], a
@@ -417,15 +389,13 @@
 	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 @@
 	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 @@
 	or h
 	add c
 	ret
-; d02c8
 
-PokeAnim_GetFrame: ; d02c8
+PokeAnim_GetFrame:
 	call PokeAnim_PlaceGraphic
 	ld a, [wPokeAnimCommand]
 	and a
@@ -473,35 +440,30 @@
 	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 @@
 	inc [hl]
 	pop hl
 	ret
-; d031b
 
-PokeAnim_GetBitmaskIndex: ; d031b
+PokeAnim_GetBitmaskIndex:
 	ld a, [wPokeAnimCommand]
 	dec a
 	ld c, a
@@ -542,9 +503,8 @@
 	ld [wPokeAnimCurBitmask], a
 	inc hl
 	ret
-; d033b
 
-PokeAnim_CopyBitmaskToBuffer: ; d033b
+PokeAnim_CopyBitmaskToBuffer:
 	call .GetSize
 	push bc
 	ld hl, wPokeAnimBitmaskAddr
@@ -558,9 +518,8 @@
 	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,7 +531,6 @@
 	ld b, 0
 	pop hl
 	ret
-; d0368
 
 .Sizes: db 4, 5, 7
 
@@ -588,7 +546,7 @@
 endr
 ENDM
 
-PokeAnim_ConvertAndApplyBitmask: ; d036b
+PokeAnim_ConvertAndApplyBitmask:
 	xor a
 	ld [wPokeAnimBitmaskCurBit], a
 	ld [wPokeAnimBitmaskCurRow], a
@@ -614,9 +572,8 @@
 	pop hl
 	jr nc, .loop
 	ret
-; d0392
 
-.IsCurBitSet: ; d0392
+.IsCurBitSet:
 ; which byte
 	ld a, [wPokeAnimBitmaskCurBit]
 	and $f8
@@ -652,9 +609,8 @@
 	ld hl, wPokeAnimBitmaskCurBit
 	inc [hl]
 	ret
-; d03bd
 
-.ApplyFrame: ; d03bd
+.ApplyFrame:
 	push af
 	call .GetCoord
 	pop af
@@ -665,9 +621,8 @@
 	pop hl
 	ld [hl], a
 	ret
-; d03cd
 
-.GetCoord: ; d03cd
+.GetCoord:
 	call .GetStartCoord
 	ld a, [wPokeAnimBitmaskCurRow]
 	ld bc, SCREEN_WIDTH
@@ -693,12 +648,11 @@
 
 .skip2
 	ret
-; d03f4
 
 ; unused
 	db 6, 5, 4
 
-.GetTilemap: ; d03f7
+.GetTilemap:
 	push af
 	ld a, [wPokeAnimFrontpicHeight]
 	cp 5
@@ -745,7 +699,6 @@
 .add_13
 	add 13
 	ret
-; d042f
 
 ._5by5:
 	poke_anim_box 5
@@ -764,8 +717,7 @@
 	; 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 @@
 .add_bc
 	add hl, bc
 	ret
-; d0499
 
-.NextBit: ; d0499
+.NextBit:
 	ld a, [wPokeAnimBitmaskCurRow]
 	inc a
 	ld [wPokeAnimBitmaskCurRow], a
@@ -818,9 +769,8 @@
 .no_carry
 	xor a
 	ret
-; d04bd
 
-PokeAnim_PlaceGraphic: ; d04bd
+PokeAnim_PlaceGraphic:
 	call .ClearBox
 	ld a, [wBoxAlignment]
 	and a
@@ -860,9 +810,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; d04f6
 
-.ClearBox: ; d04f6
+.ClearBox:
 	ld hl, wPokeAnimCoord
 	ld a, [hli]
 	ld h, [hl]
@@ -871,9 +820,8 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; d051b
 
-.SetFlag: ; d051b
+.SetFlag:
 	call PokeAnim_GetAttrMapCoord
 	ld b, 7
 	ld c, 7
@@ -908,9 +855,8 @@
 	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 @@
 	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 @@
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	ret
-; d055c
 
-GetMonAnimPointer: ; d055c
+GetMonAnimPointer:
 	call PokeAnim_IsEgg
 	jr z, .egg
 
@@ -996,9 +940,8 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; d05ce
 
-GetMonFramesPointer: ; d05ce
+GetMonFramesPointer:
 	call PokeAnim_IsEgg
 	jr z, .egg
 
@@ -1058,9 +1000,8 @@
 	ld a, h
 	ld [wPokeAnimFramesAddr + 1], a
 	ret
-; d061b
 
-GetMonBitmaskPointer: ; d061b
+GetMonBitmaskPointer:
 	call PokeAnim_IsEgg
 	jr z, .egg
 
@@ -1097,9 +1038,8 @@
 	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 @@
 .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 @@
 	inc a
 	ld [wCurPartySpecies], a
 	ret
-; d0695
--- a/engine/gfx/place_graphic.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.
 
--- a/engine/gfx/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
@@ -1,4 +1,4 @@
-Unreferenced_Function88248: ; 88248
+Unreferenced_Function88248:
 	ld c, CAL
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
@@ -10,17 +10,17 @@
 	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,7 +55,7 @@
 	pop hl
 	jr .loop
 
-ShowPlayerNamingChoices: ; 88297
+ShowPlayerNamingChoices:
 	ld hl, ChrisNameMenuHeader
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
@@ -72,7 +72,7 @@
 
 INCLUDE "data/player_names.asm"
 
-GetPlayerNameArray: ; 88318 This Function is never called
+Unreferenced_GetPlayerNameArray:
 	ld hl, wPlayerName
 	ld de, MalePlayerNameArray
 	ld a, [wPlayerGender]
@@ -84,7 +84,7 @@
 	call InitName
 	ret
 
-GetPlayerIcon: ; 8832c
+GetPlayerIcon:
 ; Get the player icon corresponding to gender
 
 ; Male
@@ -102,7 +102,7 @@
 .done
 	ret
 
-GetCardPic: ; 8833e
+GetCardPic:
 	ld hl, ChrisCardPic
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
@@ -120,16 +120,16 @@
 	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 PLAYERGENDER_FEMALE_F, a
 	jr z, GetChrisBackpic
@@ -136,7 +136,7 @@
 	call GetKrisBackpic
 	ret
 
-GetChrisBackpic: ; 88830
+GetChrisBackpic:
 	ld hl, ChrisBackpic
 	ld b, BANK(ChrisBackpic)
 	ld de, vTiles2 tile $31
@@ -144,7 +144,7 @@
 	predef DecompressGet2bpp
 	ret
 
-HOF_LoadTrainerFrontpic: ; 88840
+HOF_LoadTrainerFrontpic:
 	call WaitBGMap
 	xor a
 	ld [hBGMapMode], a
@@ -173,7 +173,7 @@
 	ld [hBGMapMode], a
 	ret
 
-DrawIntroPlayerPic: ; 88874
+DrawIntroPlayerPic:
 ; Draw the player pic at (6,4).
 
 ; Get class
@@ -206,13 +206,13 @@
 	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 @@
 	call Get2bpp
 	ret
 
-KrisBackpic: ; 88ed6
+KrisBackpic:
 INCBIN "gfx/player/kris_back.2bpp"
--- a/engine/gfx/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 @@
 	ld de, _LoadSGBLayout_ReturnFromJumpTable
 	push de
 	jp hl
-; 866f
 
-.Jumptable: ; 866f
+.Jumptable:
 	dw .SGB_BattleGrayscale
 	dw .SGB_BattleColors
 	dw .SGB_PokegearPals
@@ -54,15 +53,13 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,35 +308,30 @@
 	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
 
-.SGB_BetaPikachuMinigame: ; 8897
+.SGB_BetaPikachuMinigame:
 	ld hl, PalPacket_BetaPikachuMinigame
 	ld de, BlkPacket_9a86
 	ret
-; 889e
 
-.SGB_BetaPoker: ; 889e
+.SGB_BetaPoker:
 	ld hl, BlkPacket_9a86
 	ld de, wPlayerLightScreenCount ; ???
 	ld bc, PALPACKET_LENGTH
@@ -360,9 +339,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .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
--- a/engine/gfx/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 @@
 	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 @@
 	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 @@
 	ld [hl], $0
 	ret
 
-.PartyMonSwitch ; 8d2b9 (23:52b9)
+.PartyMonSwitch
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld [hl], 8 * 3
@@ -112,7 +111,7 @@
 	ld [hl], a
 	ret
 
-.PartyMonSelected ; 8d2ea (23:52ea)
+.PartyMonSelected
 	ld a, [wMenuCursorY]
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
@@ -131,17 +130,15 @@
 	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 @@
 	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 @@
 .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 @@
 	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 @@
 	call DeinitializeSprite
 	ret
 
-.GSIntroSparkle ; 8d3c3 (23:53c3)
+.GSIntroSparkle
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hli]
@@ -355,11 +351,11 @@
 	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 @@
 	call _ReinitSpriteAnimFrame
 	ret
 
-.SlotsChanseyEgg: ; 8d43e (23:543e)
+.SlotsChanseyEgg:
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -403,22 +399,21 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [hl], a
 	ret
 
-.FlyFrom: ; 8d5b0 (23:55b0)
+.FlyFrom:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -687,7 +677,7 @@
 	ld [hl], a
 	ret
 
-.FlyLeaf: ; 8d5e2 (23:55e2)
+.FlyLeaf:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -716,7 +706,7 @@
 	call DeinitializeSprite
 	ret
 
-.FlyTo: ; 8d607 (23:5607)
+.FlyTo:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -748,15 +738,15 @@
 	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 @@
 	call _ReinitSpriteAnimFrame
 	ret
 
-.IntroPichuWooper ; 8d666 (23:5666)
+.IntroPichuWooper
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -802,7 +792,7 @@
 .asm_8d67f
 	ret
 
-.IntroUnown ; 8d680 (23:5680)
+.IntroUnown
 	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld d, [hl]
@@ -829,7 +819,7 @@
 	ld [hl], a
 	ret
 
-.IntroUnownF ; 8d6a2 (23:56a2)
+.IntroUnownF
 	ld a, [wcf64]
 	cp $40
 	ret nz
@@ -837,7 +827,7 @@
 	call _ReinitSpriteAnimFrame
 	ret
 
-.IntroSuicuneAway ; 8d6ae (23:56ae)
+.IntroSuicuneAway
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -845,15 +835,15 @@
 	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 @@
 	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)
--- a/engine/gfx/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 @@
 	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 @@
 	pop de
 	pop hl
 	ret
-; 8cf7a
 
-DoNextFrameForAllSprites: ; 8cf7a
+DoNextFrameForAllSprites:
 	ld hl, wSpriteAnimationStructs
 	ld e, NUM_SPRITE_ANIM_STRUCTS
 
@@ -72,9 +69,8 @@
 
 .done
 	ret
-; 8cfa8
 
-DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8)
+DoNextFrameForFirst16Sprites:
 	ld hl, wSpriteAnimationStructs
 	ld e, NUM_SPRITE_ANIM_STRUCTS
 
@@ -113,7 +109,7 @@
 .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 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-
-UpdateAnimFrame: ; 8d04c
+UpdateAnimFrame:
 	call InitSpriteAnimBuffer ; init WRAM
 	call GetSpriteAnimFrame ; read from a memory array
 	cp -3
@@ -319,9 +311,8 @@
 	pop bc
 	scf
 	ret
-; 8d0be
 
-AddOrSubtractY: ; 8d0be
+AddOrSubtractY:
 	push hl
 	ld a, [hl]
 	ld hl, wCurrSpriteAddSubFlags
@@ -335,9 +326,8 @@
 .ok
 	pop hl
 	ret
-; 8d0ce
 
-AddOrSubtractX: ; 8d0ce
+AddOrSubtractX:
 	push hl
 	ld a, [hl]
 	ld hl, wCurrSpriteAddSubFlags
@@ -351,9 +341,8 @@
 .ok
 	pop hl
 	ret
-; 8d0de
 
-GetSpriteOAMAttr: ; 8d0de
+GetSpriteOAMAttr:
 	ld a, [wCurrSpriteAddSubFlags]
 	ld b, a
 	ld a, [hl]
@@ -364,9 +353,8 @@
 	and $1f
 	or b
 	ret
-; 8d0ec
 
-InitSpriteAnimBuffer: ; 8d0ec
+InitSpriteAnimBuffer:
 	xor a
 	ld [wCurrSpriteAddSubFlags], a
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
@@ -382,9 +370,8 @@
 	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 @@
 	pop bc
 	pop hl
 	ret
-; 8d120
 
-_ReinitSpriteAnimFrame:: ; 8d120
+_ReinitSpriteAnimFrame::
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld [hl], a
@@ -422,10 +408,8 @@
 	add hl, bc
 	ld [hl], -1
 	ret
-; 8d132
 
-
-GetSpriteAnimFrame: ; 8d132
+GetSpriteAnimFrame:
 .loop
 	ld hl, SPRITEANIMSTRUCT_DURATION
 	add hl, bc
@@ -491,9 +475,8 @@
 	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 @@
 	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 @@
 	add hl, de
 	add hl, de
 	ret
-; 8d1ac
 
-Unreferenced_BrokenGetStdGraphics: ; 8d1ac
+Unreferenced_BrokenGetStdGraphics:
 	push hl
 	ld l, a
 	ld h, 0
@@ -547,9 +528,7 @@
 	call Request2bpp
 	pop bc
 	ret
-; 8d1c4
 
-
 INCLUDE "data/sprite_anims/sequences.asm"
 
 INCLUDE "engine/gfx/sprite_anims.asm"
@@ -558,7 +537,6 @@
 
 INCLUDE "data/sprite_anims/oam.asm"
 
-
 BrokenStdGFXPointers:
 	; tile count, bank, pointer
 	; (all pointers were dummied out to .deleted)
@@ -573,19 +551,16 @@
 	dbbw 16, $21, .deleted
 
 .deleted
-; 8e72a (23:672a)
 
-
-Sprites_Cosine: ; 8e72a
+Sprites_Cosine:
 ; a = d * cos(a * pi/32)
 	add %010000 ; cos(x) = sin(x + pi/2)
 	; fallthrough
-Sprites_Sine: ; 8e72c
+Sprites_Sine:
 ; a = d * sin(a * pi/32)
 	calc_sine_wave
 
-
-AnimateEndOfExpBar: ; 8e79d
+AnimateEndOfExpBar:
 	ld a, [hSGB]
 	ld de, EndOfExpBarGFX
 	and a
@@ -609,9 +584,8 @@
 	jr nz, .loop
 	call ClearSprites
 	ret
-; 8e7c6
 
-.AnimateFrame: ; 8e7c6
+.AnimateFrame:
 	ld hl, wVirtualOAMSprite00
 	ld c, 8 ; number of animated circles
 .anim_loop
@@ -648,14 +622,13 @@
 	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
@@ -674,4 +647,3 @@
 	pop de
 	pop hl
 	ret
-; 8e82b
--- a/engine/gfx/trademon_frontpic.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 @@
 	predef GetAnimatedFrontpic
 	ret
 
-AnimateTrademonFrontpic: ; 4d81e
+AnimateTrademonFrontpic:
 	ld a, [wOTTrademonSpecies]
 	call IsAPokemon
 	ret c
--- a/engine/items/buy_sell_toss.asm
+++ b/engine/items/buy_sell_toss.asm
@@ -1,13 +1,12 @@
-SelectQuantityToToss: ; 24fbf
+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
@@ -16,9 +15,8 @@
 	call LoadMenuHeader
 	call Toss_Sell_Loop
 	ret
-; 24fe1
 
-SelectQuantityToSell: ; 24fe1
+SelectQuantityToSell:
 	farcall GetItemPrice
 	ld a, d
 	ld [wBuffer1], a
@@ -28,9 +26,8 @@
 	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 @@
 .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 @@
 	ld [wItemQuantityChangeBuffer], a
 	and a
 	ret
-; 25072
 
-BuySellToss_UpdateQuantityDisplay: ; 25072
+BuySellToss_UpdateQuantityDisplay:
 	call MenuBox
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
@@ -145,26 +140,22 @@
 	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 @@
 	call Multiply
 	pop hl
 	ret
-; 250c1
 
-Sell_HalvePrice: ; 250c1
+Sell_HalvePrice:
 	push hl
 	ld hl, hProduct + 1
 	ld a, [hl]
@@ -193,9 +183,8 @@
 	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 @@
 	call PrintNum
 	call WaitBGMap
 	ret
-; 250ed
 
-TossItem_MenuHeader: ; 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_MenuHeader: ; 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_MenuHeader: ; 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
--- a/engine/items/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,10 +10,8 @@
 	ld hl, ItemEffects
 	rst JumpTable
 	ret
-; e73c
 
-
-ItemEffects: ; e73c
+ItemEffects:
 ; entries correspond to item ids
 	dw PokeBallEffect      ; MASTER_BALL
 	dw PokeBallEffect      ; ULTRA_BALL
@@ -194,10 +192,8 @@
 	dw PokeBallEffect      ; PARK_BALL
 	dw NoEffect            ; RAINBOW_WING
 	dw NoEffect            ; ITEM_B3
-; e8a2
 
-
-PokeBallEffect: ; e8a2
+PokeBallEffect:
 	ld a, [wBattleMode]
 	dec a
 	jp nz, UseBallInTrainerBattle
@@ -488,8 +484,8 @@
 	ld de, wEnemyMonPP
 	ld bc, NUM_MOVES
 	call CopyBytes
-.Transformed:
 
+.Transformed:
 	ld a, [wEnemyMonSpecies]
 	ld [wWildMon], a
 	ld [wCurPartySpecies], a
@@ -564,8 +560,8 @@
 
 	ld a, FRIEND_BALL_HAPPINESS
 	ld [hl], a
-.SkipPartyMonFriendBall:
 
+.SkipPartyMonFriendBall:
 	ld hl, Text_AskNicknameNewlyCaughtMon
 	call PrintText
 
@@ -713,9 +709,7 @@
 	ld hl, wParkBallsRemaining
 	dec [hl]
 	ret
-; ec0a
 
-
 BallMultiplierFunctionTable:
 ; table of routines that increase or decrease the catch rate based on
 ; which ball is used in a certain situation.
@@ -767,10 +761,10 @@
 	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
@@ -907,7 +901,7 @@
 	pop bc
 
 	push bc
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	call GetFarByte
 	cp EVOLVE_ITEM
 	pop bc
@@ -921,7 +915,7 @@
 ; 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
@@ -1067,43 +1061,37 @@
 ; 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
@@ -1117,49 +1105,40 @@
 	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
 
-TownMapEffect: ; ee01
+TownMapEffect:
 	farcall PokegearMap
 	ret
-; ee08
 
-
-BicycleEffect: ; ee08
+BicycleEffect:
 	farcall BikeFunction
 	ret
-; ee0f
 
-
-EvoStoneEffect: ; ee0f
+EvoStoneEffect:
 	ld b, PARTYMENUACTION_EVO_STONE
 	call UseItem_SelectMon
 
@@ -1189,10 +1168,8 @@
 	xor a
 	ld [wItemEffectSucceeded], a
 	ret
-; ee3d
 
-
-VitaminEffect: ; ee3d
+VitaminEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1235,15 +1212,12 @@
 
 	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
@@ -1252,23 +1226,18 @@
 	call GetPartyParamLocation
 	ld b, TRUE
 	predef_jump CalcMonStats
-; ee9f
 
-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
@@ -1280,10 +1249,8 @@
 .defense db "DEFENSE@"
 .speed   db "SPEED@"
 .special db "SPECIAL@"
-; eed9
 
-
-GetStatExpRelativePointer: ; eed9
+GetStatExpRelativePointer:
 	ld a, [wCurItem]
 	ld hl, Table_eeeb
 .next
@@ -1298,18 +1265,15 @@
 	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
@@ -1322,10 +1286,8 @@
 	ld hl, wPartyMonNicknames
 	call GetNick
 	ret
-; 0xef14
 
-
-RareCandyEffect: ; ef14
+RareCandyEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1414,10 +1376,8 @@
 	farcall EvolvePokemon
 
 	jp UseDisposableItem
-; efad
 
-
-HealPowderEffect: ; efad
+HealPowderEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 
@@ -1436,21 +1396,17 @@
 
 .asm_efc9
 	jp StatusHealer_Jumptable
-; efcc
 
-
-StatusHealingEffect: ; 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
@@ -1476,7 +1432,7 @@
 	ld a, $0
 	ret
 
-IsItemUsedOnConfusedMon: ; f009 (3:7009)
+IsItemUsedOnConfusedMon:
 	call IsItemUsedOnBattleMon
 	jr nc, .nope
 	ld a, [wPlayerSubStatus3]
@@ -1492,7 +1448,7 @@
 	and a
 	ret
 
-BattlemonRestoreHealth: ; f01e (3:701e)
+BattlemonRestoreHealth:
 	call IsItemUsedOnBattleMon
 	ret nc
 	ld a, MON_HP
@@ -1503,7 +1459,7 @@
 	ld [wBattleMonHP + 1], a
 	ret
 
-HealStatus: ; f030 (3:7030)
+HealStatus:
 	call IsItemUsedOnBattleMon
 	ret nc
 	xor a
@@ -1524,7 +1480,7 @@
 	pop bc
 	ret
 
-GetItemHealingAction: ; f058 (3:7058)
+GetItemHealingAction:
 	push hl
 	ld a, [wCurItem]
 	ld hl, StatusHealingActions
@@ -1544,22 +1500,20 @@
 	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
 
-
-RevivalHerbEffect: ; f0a9
+RevivalHerbEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1575,10 +1529,8 @@
 
 .asm_f0c5
 	jp StatusHealer_Jumptable
-; f0c8
 
-
-ReviveEffect: ; f0c8
+ReviveEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1585,10 +1537,8 @@
 
 	call RevivePokemon
 	jp StatusHealer_Jumptable
-; f0d6
 
-
-RevivePokemon: ; f0d6
+RevivePokemon:
 	call IsMonFainted
 	ld a, 1
 	ret nz
@@ -1633,10 +1583,8 @@
 	call UseDisposableItem
 	ld a, 0
 	ret
-; f128
 
-
-FullRestoreEffect: ; f128
+FullRestoreEffect:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	jp c, StatusHealer_ExitMenu
@@ -1652,10 +1600,8 @@
 .NotAtFullHealth:
 	call .FullRestore
 	jp StatusHealer_Jumptable
-; f144
 
-
-.FullRestore: ; f144
+.FullRestore:
 	xor a
 	ld [wLowHealthAlarm], a
 	call ReviveFullHP
@@ -1673,10 +1619,8 @@
 	call UseDisposableItem
 	ld a, 0
 	ret
-; f16a
 
-
-BitterBerryEffect: ; f16a
+BitterBerryEffect:
 	ld hl, wPlayerSubStatus3
 	bit SUBSTATUS_CONFUSED, [hl]
 	ld a, 1
@@ -1694,25 +1638,19 @@
 
 .done
 	jp StatusHealer_Jumptable
-; f186
 
-
-RestoreHPEffect: ; f186
+RestoreHPEffect:
 	call ItemRestoreHP
 	jp StatusHealer_Jumptable
-; f18c
 
-
-EnergypowderEffect: ; f18c
+EnergypowderEffect:
 	ld c, HAPPINESS_BITTERPOWDER
 	jr EnergypowderEnergyRootCommon
-; f190
 
-EnergyRootEffect: ; f190
+EnergyRootEffect:
 	ld c, HAPPINESS_ENERGYROOT
-; f192
 
-EnergypowderEnergyRootCommon: ; f192
+EnergypowderEnergyRootCommon:
 	push bc
 	call ItemRestoreHP
 	pop bc
@@ -1725,10 +1663,8 @@
 
 .skip_happiness
 	jp StatusHealer_Jumptable
-; f1a9
 
-
-ItemRestoreHP: ; f1a9 (3:71a9)
+ItemRestoreHP:
 	ld b, PARTYMENUACTION_HEALING_ITEM
 	call UseItem_SelectMon
 	ld a, 2
@@ -1755,7 +1691,7 @@
 	ld a, 0
 	ret
 
-HealHP_SFX_GFX: ; f1db (3:71db)
+HealHP_SFX_GFX:
 	push de
 	ld de, SFX_POTION
 	call WaitPlaySFX
@@ -1768,7 +1704,7 @@
 	ld [wWhichHPBar], a
 	predef_jump AnimateHPBar
 
-UseItem_SelectMon: ; f1f9 (3:71f9)
+UseItem_SelectMon:
 	call .SelectMon
 	ret c
 
@@ -1784,7 +1720,7 @@
 	and a
 	ret
 
-.SelectMon: ; f20b (3:720b)
+.SelectMon:
 	ld a, b
 	ld [wPartyMenuActionText], a
 	push hl
@@ -1797,7 +1733,7 @@
 	pop hl
 	ret
 
-ChooseMonToUseItemOn: ; f21c (3:721c)
+ChooseMonToUseItemOn:
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuGFX
@@ -1809,7 +1745,7 @@
 	farcall PartyMenuSelect
 	ret
 
-ItemActionText: ; f24a (3:724a)
+ItemActionText:
 	ld [wPartyMenuActionText], a
 	ld a, [wCurPartySpecies]
 	push af
@@ -1832,7 +1768,7 @@
 	ld [wCurPartySpecies], a
 	ret
 
-ItemActionTextWaitButton: ; f279 (3:7279)
+ItemActionTextWaitButton:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -1847,18 +1783,18 @@
 	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
@@ -1875,15 +1811,15 @@
 	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
@@ -1891,7 +1827,7 @@
 	ld [hl], e
 	jp LoadCurHPIntoBuffer5
 
-RestoreHealth: ; f2d1 (3:72d1)
+RestoreHealth:
 	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hl]
@@ -1920,7 +1856,7 @@
 .finish
 	ret
 
-RemoveHP: ; f2f9 (3:72f9)
+RemoveHP:
 	ld a, MON_HP + 1
 	call GetPartyParamLocation
 	ld a, [hl]
@@ -1937,7 +1873,7 @@
 	call LoadCurHPIntoBuffer5
 	ret
 
-IsMonFainted: ; f30d (3:730d)
+IsMonFainted:
 	push de
 	call LoadMaxHPToBuffer1
 	call LoadCurHPToBuffer3
@@ -1947,7 +1883,7 @@
 	pop de
 	ret
 
-IsMonAtFullHealth: ; f31b (3:731b)
+IsMonAtFullHealth:
 	call LoadHPFromBuffer3
 	ld h, d
 	ld l, e
@@ -1958,7 +1894,7 @@
 	sbc d
 	ret
 
-LoadCurHPIntoBuffer5: ; f328 (3:7328)
+LoadCurHPIntoBuffer5:
 	ld a, MON_HP
 	call GetPartyParamLocation
 	ld a, [hli]
@@ -1966,25 +1902,22 @@
 	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]
@@ -1993,7 +1926,7 @@
 	ld [wBuffer3], a
 	ret
 
-LoadHPFromBuffer3: ; f356 (3:7356)
+LoadHPFromBuffer3:
 	ld a, [wBuffer4]
 	ld d, a
 	ld a, [wBuffer3]
@@ -2000,7 +1933,7 @@
 	ld e, a
 	ret
 
-LoadMaxHPToBuffer1: ; f35f (3:735f)
+LoadMaxHPToBuffer1:
 	push hl
 	ld a, MON_MAXHP
 	call GetPartyParamLocation
@@ -2011,7 +1944,7 @@
 	pop hl
 	ret
 
-LoadHPFromBuffer1: ; f36f (3:736f)
+LoadHPFromBuffer1:
 	ld a, [wBuffer2]
 	ld d, a
 	ld a, [wBuffer1]
@@ -2018,7 +1951,7 @@
 	ld e, a
 	ret
 
-GetOneFifthMaxHP: ; f378 (3:7378)
+GetOneFifthMaxHP:
 	push bc
 	ld a, MON_MAXHP
 	call GetPartyParamLocation
@@ -2037,7 +1970,7 @@
 	pop bc
 	ret
 
-GetHealingItemAmount: ; f395 (3:7395)
+GetHealingItemAmount:
 	push hl
 	ld a, [wCurItem]
 	ld hl, HealingHPAmounts
@@ -2060,11 +1993,10 @@
 	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
@@ -2094,7 +2026,7 @@
 	ld [wPartyMenuCursor], a
 	ret
 
-.SelectMilkDrinkRecipient: ; f419 (3:7419)
+.SelectMilkDrinkRecipient:
 .loop
 	push bc
 	ld a, PARTYMENUACTION_HEALING_ITEM
@@ -2127,16 +2059,13 @@
 	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
 
-
-EscapeRopeEffect: ; f44f
+EscapeRopeEffect:
 	xor a
 	ld [wItemEffectSucceeded], a
 	farcall EscapeRopeFunction
@@ -2145,24 +2074,19 @@
 	cp 1
 	call z, UseDisposableItem
 	ret
-; f462
 
-
-SuperRepelEffect: ; f462
+SuperRepelEffect:
 	ld b, 200
 	jr UseRepel
-; f466
 
-MaxRepelEffect: ; f466
+MaxRepelEffect:
 	ld b, 250
 	jr UseRepel
-; f466
 
-RepelEffect: ; f46a
+RepelEffect:
 	ld b, 100
-; f46c
 
-UseRepel: ; f46c
+UseRepel:
 	ld a, [wRepelEffect]
 	and a
 	ld hl, TextJump_RepelUsedEarlierIsStillInEffect
@@ -2172,24 +2096,19 @@
 	ld [wRepelEffect], a
 	jp UseItemText
 
-
-TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
+TextJump_RepelUsedEarlierIsStillInEffect:
 	; The REPEL used earlier is still in effect.
 	text_jump Text_RepelUsedEarlierIsStillInEffect
 	db "@"
-; 0xf482
 
-
-XAccuracyEffect: ; f482
+XAccuracyEffect:
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_X_ACCURACY, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
 	set SUBSTATUS_X_ACCURACY, [hl]
 	jp UseItemText
-; f48f
 
-
-PokeDollEffect: ; f48f
+PokeDollEffect:
 	ld a, [wBattleMode]
 	dec a
 	jr nz, .asm_f4a6
@@ -2205,28 +2124,22 @@
 	xor a
 	ld [wItemEffectSucceeded], a
 	ret
-; f4ab
 
-
-GuardSpecEffect: ; f4ab
+GuardSpecEffect:
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_MIST, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
 	set SUBSTATUS_MIST, [hl]
 	jp UseItemText
-; f4b8
 
-
-DireHitEffect: ; f4b8
+DireHitEffect:
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_FOCUS_ENERGY, [hl]
 	jp nz, WontHaveAnyEffect_NotUsedMessage
 	set SUBSTATUS_FOCUS_ENERGY, [hl]
 	jp UseItemText
-; f4c5
 
-
-XItemEffect: ; f4c5
+XItemEffect:
 	call UseItemText
 
 	ld a, [wCurItem]
@@ -2257,12 +2170,10 @@
 	ld c, HAPPINESS_USEDXITEM
 	farcall ChangeHappiness
 	ret
-; f504
 
 INCLUDE "data/items/x_stats.asm"
 
-
-PokeFluteEffect: ; f50c
+PokeFluteEffect:
 	ld a, [wBattleMode]
 	and a
 	jr nz, .dummy
@@ -2306,7 +2217,6 @@
 	ld hl, .AllSleepingMonWokeUp
 	jp PrintText
 
-
 .CureSleep:
 	ld de, PARTYMON_STRUCT_LENGTH
 	ld c, PARTY_LENGTH
@@ -2326,22 +2236,18 @@
 	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
@@ -2357,10 +2263,8 @@
 
 .battle
 	jp PokeFluteTerminatorCharacter
-; f58f
 
-
-BlueCardEffect: ; f58f
+BlueCardEffect:
 	ld hl, .bluecardtext
 	jp MenuTextBoxWaitButton
 
@@ -2367,10 +2271,8 @@
 .bluecardtext
 	text_jump UnknownText_0x1c5c5e
 	db "@"
-; f59a
 
-
-CoinCaseEffect: ; f59a
+CoinCaseEffect:
 	ld hl, .coincasetext
 	jp MenuTextBoxWaitButton
 
@@ -2377,37 +2279,28 @@
 .coincasetext
 	text_jump UnknownText_0x1c5c7b
 	db "@"
-; f5a5
 
-
-OldRodEffect: ; f5a5
+OldRodEffect:
 	ld e, $0
 	jr UseRod
-; f5a9
 
-GoodRodEffect: ; f5a9
+GoodRodEffect:
 	ld e, $1
 	jr UseRod
-; f5ad
 
-SuperRodEffect: ; f5ad
+SuperRodEffect:
 	ld e, $2
 	jr UseRod
-; f5b1
 
-UseRod: ; f5b1
+UseRod:
 	farcall FishFunction
 	ret
-; f5b8
 
-
-ItemfinderEffect: ; f5b8
+ItemfinderEffect:
 	farcall ItemFinder
 	ret
-; f5bf
 
-
-RestorePPEffect: ; f5bf
+RestorePPEffect:
 	ld a, [wCurItem]
 	ld [wd002], a
 
@@ -2488,12 +2381,11 @@
 	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
@@ -2548,15 +2440,13 @@
 
 .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
@@ -2586,17 +2476,16 @@
 	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
@@ -2640,58 +2529,45 @@
 .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
 
-
-SquirtbottleEffect: ; f73e
+SquirtbottleEffect:
 	farcall _Squirtbottle
 	ret
-; f745
 
-
-CardKeyEffect: ; f745
+CardKeyEffect:
 	farcall _CardKey
 	ret
-; f74c
 
-
-BasementKeyEffect: ; f74c
+BasementKeyEffect:
 	farcall _BasementKey
 	ret
-; f753
 
-
-SacredAshEffect: ; f753
+SacredAshEffect:
 	farcall _SacredAsh
 	ld a, [wItemEffectSucceeded]
 	cp $1
@@ -2698,17 +2574,14 @@
 	ret nz
 	call UseDisposableItem
 	ret
-; f763
 
-
-NormalBoxEffect: ; f763
+NormalBoxEffect:
 	ld c, DECOFLAG_SILVER_TROPHY_DOLL
 	jr OpenBox
-; f767
 
-GorgeousBoxEffect: ; f767
+GorgeousBoxEffect:
 	ld c, DECOFLAG_GOLD_TROPHY_DOLL
-OpenBox: ; f769
+OpenBox:
 	farcall SetSpecificDecorationFlag
 
 	ld hl, .text
@@ -2715,40 +2588,34 @@
 	call PrintText
 
 	jp UseDisposableItem
-; f778
 
-.text ; 0xf778
+.text
 	; There was a trophy inside!
 	text_jump UnknownText_0x1c5d03
 	db "@"
-; 0xf77d
 
-NoEffect: ; f77d
+NoEffect:
 	jp IsntTheTimeMessage
-; f780
 
-
-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
@@ -2765,9 +2632,8 @@
 	ld hl, DontBeAThiefText
 	call PrintText
 	jr UseDisposableItem
-; f7ca
 
-WontHaveAnyEffect_NotUsedMessage: ; f7ca
+WontHaveAnyEffect_NotUsedMessage:
 	ld hl, WontHaveAnyEffectText
 	call PrintText
 
@@ -2775,14 +2641,12 @@
 	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
 
@@ -2790,118 +2654,102 @@
 	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
@@ -2935,11 +2783,8 @@
 	inc hl
 	inc de
 	jr .loop
-; f881
 
-
-
-ComputeMaxPP: ; f881
+ComputeMaxPP:
 	push bc
 	; Divide the base PP by 5.
 	ld a, [de]
@@ -2987,9 +2832,8 @@
 	ld [hl], b
 	pop bc
 	ret
-; f8b9
 
-RestoreAllPP: ; f8b9
+RestoreAllPP:
 	ld a, MON_PP
 	call GetPartyParamLocation
 	push hl
@@ -3023,10 +2867,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; f8ec
 
-
-GetMaxPPOfMove: ; f8ec
+GetMaxPPOfMove:
 	ld a, [wStringBuffer1 + 0]
 	push af
 	ld a, [wStringBuffer1 + 1]
@@ -3103,16 +2945,14 @@
 	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
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1,4 +1,4 @@
-_ReceiveItem:: ; d1d5
+_ReceiveItem::
 	call DoesHLEqualNumItems
 	jp nz, PutItemInPocket
 	push hl
@@ -10,7 +10,7 @@
 	rst JumpTable
 	ret
 
-.Pockets: ; d1e9
+.Pockets:
 ; entries correspond to item types
 	dw .Item
 	dw .KeyItem
@@ -17,21 +17,21 @@
 	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]
@@ -39,7 +39,7 @@
 	call GetTMHMNumber
 	jp ReceiveTMHM
 
-_TossItem:: ; d20d
+_TossItem::
 	call DoesHLEqualNumItems
 	jr nz, .remove
 	push hl
@@ -58,11 +58,11 @@
 	dw .Ball
 	dw .TMHM
 
-.Ball: ; d228
+.Ball:
 	ld hl, wNumBalls
 	jp RemoveItemFromPocket
 
-.TMHM: ; d22e
+.TMHM:
 	ld h, d
 	ld l, e
 	ld a, [wCurItem]
@@ -70,12 +70,12 @@
 	call GetTMHMNumber
 	jp TossTMHM
 
-.KeyItem: ; d23a
+.KeyItem:
 	ld h, d
 	ld l, e
 	jp TossKeyItem
 
-.Item: ; d23f
+.Item:
 	ld h, d
 	ld l, e
 
@@ -82,7 +82,7 @@
 .remove
 	jp RemoveItemFromPocket
 
-_CheckItem:: ; d244
+_CheckItem::
 	call DoesHLEqualNumItems
 	jr nz, .nope
 	push hl
@@ -101,11 +101,11 @@
 	dw .Ball
 	dw .TMHM
 
-.Ball: ; d25f
+.Ball:
 	ld hl, wNumBalls
 	jp CheckTheItem
 
-.TMHM: ; d265
+.TMHM:
 	ld h, d
 	ld l, e
 	ld a, [wCurItem]
@@ -113,12 +113,12 @@
 	call GetTMHMNumber
 	jp CheckTMHM
 
-.KeyItem: ; d271
+.KeyItem:
 	ld h, d
 	ld l, e
 	jp CheckKeyItems
 
-.Item: ; d276
+.Item:
 	ld h, d
 	ld l, e
 
@@ -125,7 +125,7 @@
 .nope
 	jp CheckTheItem
 
-DoesHLEqualNumItems: ; d27b
+DoesHLEqualNumItems:
 	ld a, l
 	cp LOW(wNumItems)
 	ret nz
@@ -133,7 +133,7 @@
 	cp HIGH(wNumItems)
 	ret
 
-GetPocketCapacity: ; d283
+GetPocketCapacity:
 	ld c, MAX_ITEMS
 	ld a, e
 	cp LOW(wNumItems)
@@ -155,7 +155,7 @@
 	ld c, MAX_BALLS
 	ret
 
-PutItemInPocket: ; d29c
+PutItemInPocket:
 	ld d, h
 	ld e, l
 	inc hl
@@ -231,7 +231,7 @@
 	scf
 	ret
 
-RemoveItemFromPocket: ; d2ff
+RemoveItemFromPocket:
 	ld d, h
 	ld e, l
 	ld a, [hli]
@@ -296,7 +296,7 @@
 	and a
 	ret
 
-CheckTheItem: ; d349
+CheckTheItem:
 	ld a, [wCurItem]
 	ld c, a
 .loop
@@ -313,7 +313,7 @@
 	and a
 	ret
 
-ReceiveKeyItem: ; d35a
+ReceiveKeyItem:
 	ld hl, wNumKeyItems
 	ld a, [hli]
 	cp MAX_KEY_ITEMS
@@ -333,7 +333,7 @@
 	and a
 	ret
 
-TossKeyItem: ; d374
+TossKeyItem:
 	ld a, [wCurItemQuantity]
 	ld e, a
 	ld d, 0
@@ -363,7 +363,7 @@
 	scf
 	ret
 
-.Toss: ; d396
+.Toss:
 	ld hl, wNumKeyItems
 	ld a, [wCurItem]
 	ld c, a
@@ -384,7 +384,7 @@
 	scf
 	ret
 
-CheckKeyItems: ; d3b1
+CheckKeyItems:
 	ld a, [wCurItem]
 	ld c, a
 	ld hl, wKeyItems
@@ -401,7 +401,7 @@
 	scf
 	ret
 
-ReceiveTMHM: ; d3c4
+ReceiveTMHM:
 	dec c
 	ld b, 0
 	ld hl, wTMsHMs
@@ -418,7 +418,7 @@
 	and a
 	ret
 
-TossTMHM: ; d3d8
+TossTMHM:
 	dec c
 	ld b, 0
 	ld hl, wTMsHMs
@@ -445,7 +445,7 @@
 	and a
 	ret
 
-CheckTMHM: ; d3fb
+CheckTMHM:
 	dec c
 	ld b, $0
 	ld hl, wTMsHMs
@@ -456,7 +456,7 @@
 	scf
 	ret
 
-GetTMHMNumber:: ; d407
+GetTMHMNumber::
 ; Return the number of a TM/HM by item id c.
 	ld a, c
 ; Skip any dummy items.
@@ -473,7 +473,7 @@
 	ld c, a
 	ret
 
-GetNumberedTMHM: ; d417
+GetNumberedTMHM:
 ; Return the item id of a TM/HM by number c.
 	ld a, c
 ; Skip any gaps.
@@ -491,7 +491,7 @@
 	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
@@ -500,7 +500,7 @@
 	and a
 	ret
 
-CheckSelectableItem: ; d432
+CheckSelectableItem:
 ; Return 1 in wItemAttributeParamBuffer and carry if wCurItem can't be selected.
 	ld a, ITEMATTR_PERMISSIONS
 	call GetItemAttr
@@ -509,7 +509,7 @@
 	and a
 	ret
 
-CheckItemPocket:: ; d43d
+CheckItemPocket::
 ; Return the pocket for wCurItem in wItemAttributeParamBuffer.
 	ld a, ITEMATTR_POCKET
 	call GetItemAttr
@@ -517,7 +517,7 @@
 	ld [wItemAttributeParamBuffer], a
 	ret
 
-CheckItemContext: ; d448
+CheckItemContext:
 ; Return the context for wCurItem in wItemAttributeParamBuffer.
 	ld a, ITEMATTR_HELP
 	call GetItemAttr
@@ -525,7 +525,7 @@
 	ld [wItemAttributeParamBuffer], a
 	ret
 
-CheckItemMenu: ; d453
+CheckItemMenu:
 ; Return the menu for wCurItem in wItemAttributeParamBuffer.
 	ld a, ITEMATTR_HELP
 	call GetItemAttr
@@ -534,7 +534,7 @@
 	ld [wItemAttributeParamBuffer], a
 	ret
 
-GetItemAttr: ; d460
+GetItemAttr:
 ; Get attribute a of wCurItem.
 
 	push hl
@@ -560,13 +560,13 @@
 	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
--- a/engine/items/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 @@
 	ld hl, .dialogs
 	rst JumpTable
 	ret
-; 15a57
 
 .dialogs
 	dw MartDialog
@@ -23,18 +22,16 @@
 	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 LoadStandardMenuHeader
 	ld hl, Text_HerbShop_Intro
@@ -43,9 +40,8 @@
 	ld hl, Text_HerbShop_ComeAgain
 	call MartTextBox
 	ret
-; 15a84
 
-BargainShop: ; 15a84
+BargainShop:
 	ld b, BANK(BargainShopData)
 	ld de, BargainShopData
 	call LoadMartPointer
@@ -65,9 +61,8 @@
 	ld hl, Text_BargainShop_ComeAgain
 	call MartTextBox
 	ret
-; 15aae
 
-Pharmacist: ; 15aae
+Pharmacist:
 	call FarReadMart
 	call LoadStandardMenuHeader
 	ld hl, Text_Pharmacist_Intro
@@ -76,9 +71,8 @@
 	ld hl, Text_Pharmacist_ComeAgain
 	call MartTextBox
 	ret
-; 15ac4
 
-RooftopSale: ; 15ac4
+RooftopSale:
 	ld b, BANK(RooftopSaleMart1)
 	ld de, RooftopSaleMart1
 	ld hl, wStatusFlags
@@ -97,11 +91,10 @@
 	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,7 +103,7 @@
 	ld [wMartPointer + 1], a
 	ld hl, wCurMart
 	xor a
-	ld bc, 16
+	ld bc, wCurMartEnd - wCurMart
 	call ByteFill
 	xor a
 	ld [wEngineBuffer5], a
@@ -117,9 +110,8 @@
 	ld [wBargainShopFlags], a
 	ld [wFacingDirection], a
 	ret
-; 15b31
 
-GetMart: ; 15b31
+GetMart:
 	ld a, e
 	cp (Marts.End - Marts) / 2
 	jr c, .IsAMart
@@ -136,19 +128,28 @@
 	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
@@ -155,17 +156,15 @@
 	dw .Sell
 	dw .Quit
 	dw .AnythingElse
-; 15b62
 
-.HowMayIHelpYou: ; 15b62
+.HowMayIHelpYou:
 	call LoadStandardMenuHeader
 	ld hl, Text_Mart_HowMayIHelpYou
 	call PrintText
-	ld a, $1 ; top menu
+	ld a, STANDARDMART_TOPMENU
 	ret
-; 15b6e
 
-.TopMenu: ; 15b6e
+.TopMenu:
 	ld hl, MenuHeader_BuySell
 	call CopyMenuHeader
 	call VerticalMenu
@@ -176,49 +175,44 @@
 	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
+.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,9 +240,8 @@
 
 .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
@@ -255,7 +248,7 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; 15c1a
 
-.CharToNybble: ; 15c1a
+.CharToNybble:
 	ld a, [de]
 	inc de
 	cp " "
@@ -292,9 +284,8 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	cp 1
 	jp z, BargainShopAskPurchaseQuantity
 	jp RooftopSaleAskPurchaseQuantity
-; 15ca3
 
-GetMartDialogGroup: ; 15ca3
+GetMartDialogGroup:
 	ld a, [wEngineBuffer1]
 	ld e, a
 	ld d, 0
@@ -398,17 +384,15 @@
 	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 @@
 	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 @@
 	dw Text_HerbShop_HereYouGo
 	dw BuyMenuLoop
 
-.BargainShopPointers: ; 15cd7
+.BargainShopPointers:
 	dw BuyMenuLoop
 	dw Text_BargainShop_CostsThisMuch
 	dw Text_BargainShop_InsufficientFunds
@@ -432,7 +416,7 @@
 	dw Text_BargainShop_HereYouGo
 	dw Text_BargainShop_SoldOut
 
-.PharmacyPointers: ; 15ce3
+.PharmacyPointers:
 	dw Text_Pharmacy_HowMany
 	dw Text_Pharmacy_CostsThisMuch
 	dw Text_Pharmacy_InsufficientFunds
@@ -439,10 +423,8 @@
 	dw Text_Pharmacy_BagFull
 	dw Text_Pharmacy_HereYouGo
 	dw BuyMenuLoop
-; 15cef
 
-
-BuyMenuLoop: ; 15cef
+BuyMenuLoop:
 	farcall PlaceMoneyTopRight
 	call UpdateSprites
 	ld hl, MenuHeader_Buy
@@ -470,7 +452,7 @@
 	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 @@
 	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 @@
 	call JoyWaitAorB
 	and a
 	ret
-; 15d83
 
 StandardMartAskPurchaseQuantity:
 	ld a, 99
@@ -522,15 +503,13 @@
 	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
@@ -537,7 +516,7 @@
 	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 @@
 	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 @@
 	call JoyWaitAorB
 	scf
 	ret
-; 15de2
 
 RooftopSaleAskPurchaseQuantity:
 	ld a, MARTTEXT_HOW_MANY
@@ -582,9 +560,8 @@
 	farcall RooftopSale_SelectQuantityToBuy
 	call ExitMenu
 	ret
-; 15df9
 
-.GetSalePrice: ; 15df9
+.GetSalePrice:
 	ld a, [wMartItemID]
 	ld e, a
 	ld d, 0
@@ -601,29 +578,24 @@
 	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
 
-MenuHeader_Buy: ; 0x15e18
+MenuHeader_Buy:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x15e20
 
-.MenuData ; 0x15e20
+.MenuData
 	db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
 	db 4, 8 ; rows, columns
 	db 1 ; horizontal spacing
@@ -631,9 +603,8 @@
 	dba PlaceMenuItemName
 	dba .PrintBCDPrices
 	dba UpdateItemDescription
-; 15e30
 
-.PrintBCDPrices: ; 15e30
+.PrintBCDPrices:
 	ld a, [wScrollingMenuCursorPosition]
 	ld c, a
 	ld b, 0
@@ -650,136 +621,113 @@
 	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,7 +742,6 @@
 	call ReturnToMapWithSpeechTextbox
 	and a
 	ret
-; 15ed3
 
 .Unreferenced_NothingToSell:
 	ld hl, .NothingToSellText
@@ -801,24 +748,20 @@
 	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 @@
 	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 @@
 	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
 
-MenuHeader_BuySell: ; 0x15f88
+MenuHeader_BuySell:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 7, 8
 	dw .MenuData
 	db 1 ; default option
-; 0x15f90
 
-.MenuData ; 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
--- a/engine/items/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 @@
 	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 @@
 	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 @@
 	call Pack_InitColors
 	ret
 
-.InitItemsPocket: ; 10056 (4:4056)
+.InitItemsPocket:
 	xor a ; ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -73,7 +70,7 @@
 	call Pack_JumptableNext
 	ret
 
-.ItemsPocketMenu: ; 10067 (4:4067)
+.ItemsPocketMenu:
 	ld hl, ItemsPocketMenuHeader
 	call CopyMenuHeader
 	ld a, [wItemsPocketCursor]
@@ -92,7 +89,7 @@
 	call .ItemBallsKey_LoadSubmenu
 	ret
 
-.InitKeyItemsPocket: ; 10094 (4:4094)
+.InitKeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -101,7 +98,7 @@
 	call Pack_JumptableNext
 	ret
 
-.KeyItemsPocketMenu: ; 100a6 (4:40a6)
+.KeyItemsPocketMenu:
 	ld hl, KeyItemsPocketMenuHeader
 	call CopyMenuHeader
 	ld a, [wKeyItemsPocketCursor]
@@ -120,7 +117,7 @@
 	call .ItemBallsKey_LoadSubmenu
 	ret
 
-.InitTMHMPocket: ; 100d3 (4:40d3)
+.InitTMHMPocket:
 	ld a, TM_HM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -131,7 +128,7 @@
 	call Pack_JumptableNext
 	ret
 
-.TMHMPocketMenu: ; 100e8 (4:40e8)
+.TMHMPocketMenu:
 	farcall TMHMPocket
 	ld b, PACKSTATE_INITKEYITEMSPOCKET ; left
 	ld c, PACKSTATE_INITITEMSPOCKET ; right
@@ -160,49 +157,41 @@
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10124 (4:4124)
-.MenuHeader1: ; 0x10124
+.MenuHeader1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData_1
 	db 1 ; default option
-; 0x1012c
 
-.MenuData_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
-
-.MenuHeader2: ; 0x1013b
+.MenuHeader2:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData_2
 	db 1 ; default option
-; 0x10143
 
-.MenuData_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 @@
 	call Pack_InitColors
 	ret
 
-.InitBallsPocket: ; 10186 (4:4186)
+.InitBallsPocket:
 	ld a, BALL_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -231,7 +220,7 @@
 	call Pack_JumptableNext
 	ret
 
-.BallsPocketMenu: ; 10198 (4:4198)
+.BallsPocketMenu:
 	ld hl, BallsPocketMenuHeader
 	call CopyMenuHeader
 	ld a, [wBallsPocketCursor]
@@ -250,7 +239,7 @@
 	call .ItemBallsKey_LoadSubmenu
 	ret
 
-.ItemBallsKey_LoadSubmenu: ; 101c5 (4:41c5)
+.ItemBallsKey_LoadSubmenu:
 	farcall _CheckTossableItem
 	ld a, [wItemAttributeParamBuffer]
 	and a
@@ -319,15 +308,13 @@
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10249 (4:4249)
-MenuHeader_UsableKeyItem: ; 0x10249
+MenuHeader_UsableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10251
 
-.MenuData: ; 0x10251
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 5 ; items
 	db "USE@"
@@ -335,24 +322,21 @@
 	db "TOSS@"
 	db "SEL@"
 	db "QUIT@"
-; 0x1026a
 
-Jumptable_UseGiveTossRegisterQuit: ; 1026a
+Jumptable_UseGiveTossRegisterQuit:
 	dw UseItem
 	dw GiveItem
 	dw TossMenu
 	dw RegisterItem
 	dw QuitItemSubmenu
-; 10274
 
-MenuHeader_UsableItem: ; 0x10274
+MenuHeader_UsableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x1027c
 
-.MenuData: ; 0x1027c
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 4 ; items
 	db "USE@"
@@ -359,63 +343,54 @@
 	db "GIVE@"
 	db "TOSS@"
 	db "QUIT@"
-; 0x10291
 
-Jumptable_UseGiveTossQuit: ; 10291
+Jumptable_UseGiveTossQuit:
 	dw UseItem
 	dw GiveItem
 	dw TossMenu
 	dw QuitItemSubmenu
-; 10299
 
-MenuHeader_UnusableItem: ; 0x10299
+MenuHeader_UnusableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102a1
 
-.MenuData: ; 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
 
-MenuHeader_UnusableKeyItem: ; 0x102b0
+MenuHeader_UnusableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102b8
 
-.MenuData: ; 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
 
-MenuHeader_HoldableKeyItem: ; 0x102cd
+MenuHeader_HoldableKeyItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102d5
 
-.MenuData: ; 0x102d5
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 4 ; items
 	db "GIVE@"
@@ -422,46 +397,39 @@
 	db "TOSS@"
 	db "SEL@"
 	db "QUIT@"
-; 0x102ea
 
-Jumptable_GiveTossRegisterQuit: ; 102ea
+Jumptable_GiveTossRegisterQuit:
 	dw GiveItem
 	dw TossMenu
 	dw RegisterItem
 	dw QuitItemSubmenu
-; 102f2
 
-MenuHeader_HoldableItem: ; 0x102f2
+MenuHeader_HoldableItem:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x102fa
 
-.MenuData: ; 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 @@
 	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
@@ -498,7 +465,7 @@
 	call Pack_PrintTextNoScroll
 	ret
 
-.Field: ; 10355 (4:4355)
+.Field:
 	call DoItemEffect
 	ld a, [wItemEffectSucceeded]
 	and a
@@ -506,9 +473,8 @@
 	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 @@
 	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 @@
 	ld [wKeyItemsPocketCursor], a
 	ld [wKeyItemsPocketScrollPosition], a
 	ret
-; 103c2
 
-RegisterItem: ; 103c2
+RegisterItem:
 	farcall CheckSelectableItem
 	ld a, [wItemAttributeParamBuffer]
 	and a
@@ -591,9 +555,8 @@
 	ld hl, Text_CantRegister
 	call Pack_PrintTextNoScroll
 	ret
-; 103fd
 
-GiveItem: ; 103fd
+GiveItem:
 	ld a, [wPartyCount]
 	and a
 	jp z, .NoPokemon
@@ -647,22 +610,19 @@
 	call Pack_InitColors
 	ret
 
-.NoPokemon: ; 10486 (4:4486)
+.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 @@
 	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 @@
 	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 @@
 	call Pack_InitColors
 	ret
 
-.InitItemsPocket: ; 104e9 (4:44e9)
+.InitItemsPocket:
 	xor a ; ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -723,7 +680,7 @@
 	call Pack_JumptableNext
 	ret
 
-.ItemsPocketMenu: ; 104fa (4:44fa)
+.ItemsPocketMenu:
 	ld hl, ItemsPocketMenuHeader
 	call CopyMenuHeader
 	ld a, [wItemsPocketCursor]
@@ -742,7 +699,7 @@
 	call ItemSubmenu
 	ret
 
-.InitKeyItemsPocket: ; 10527 (4:4527)
+.InitKeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -751,7 +708,7 @@
 	call Pack_JumptableNext
 	ret
 
-.KeyItemsPocketMenu: ; 10539 (4:4539)
+.KeyItemsPocketMenu:
 	ld hl, KeyItemsPocketMenuHeader
 	call CopyMenuHeader
 	ld a, [wKeyItemsPocketCursor]
@@ -770,7 +727,7 @@
 	call ItemSubmenu
 	ret
 
-.InitTMHMPocket: ; 10566 (4:4566)
+.InitTMHMPocket:
 	ld a, TM_HM_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -783,7 +740,7 @@
 	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 @@
 	call TMHMSubmenu
 	ret
 
-.InitBallsPocket: ; 10594 (4:4594)
+.InitBallsPocket:
 	ld a, BALL_POCKET
 	ld [wCurrPocket], a
 	call ClearPocketList
@@ -802,7 +759,7 @@
 	call Pack_JumptableNext
 	ret
 
-.BallsPocketMenu: ; 105a6 (4:45a6)
+.BallsPocketMenu:
 	ld hl, BallsPocketMenuHeader
 	call CopyMenuHeader
 	ld a, [wBallsPocketCursor]
@@ -821,10 +778,10 @@
 	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, .UsableMenuHeader
@@ -846,44 +803,37 @@
 	call Pack_GetJumptablePointer
 	jp hl
 
-; 10601 (4:4601)
-.UsableMenuHeader: ; 0x10601
+.UsableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .UsableMenuData
 	db 1 ; default option
-; 0x10609
 
-.UsableMenuData: ; 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
 
-.UnusableMenuHeader: ; 0x10618
+.UnusableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .UnusableMenuData
 	db 1 ; default option
-; 0x10620
 
-.UnusableMenuData: ; 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
@@ -890,7 +840,7 @@
 	rst JumpTable
 	ret
 
-.ItemFunctionJumptable: ; 10637 (4:4637)
+.ItemFunctionJumptable:
 ; entries correspond to ITEMMENU_* constants
 	dw .Oak         ; ITEMMENU_NOUSE
 	dw .Oak
@@ -900,12 +850,12 @@
 	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
@@ -912,7 +862,7 @@
 	jr nz, .ReturnToBattle
 	ret
 
-.BattleField: ; 10656 (4:4656)
+.BattleField:
 	call DoItemEffect
 	ld a, [wItemEffectSucceeded]
 	and a
@@ -924,11 +874,11 @@
 	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
@@ -935,21 +885,19 @@
 	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 @@
 	xor a
 	ld [wSwitchItem], a
 	ret
-; 106a5
 
-DepositSellInitPackBuffers: ; 106a5
+DepositSellInitPackBuffers:
 	xor a
 	ld [hBGMapMode], a
 	ld [wJumptableIndex], a ; PACKSTATE_INITGFX
@@ -978,25 +925,21 @@
 	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
@@ -1003,7 +946,7 @@
 	dw .KeyItemsPocket
 	dw .TMHMPocket
 
-.ItemsPocket: ; 106d9 (4:46d9)
+.ItemsPocket:
 	xor a ; ITEM_POCKET
 	call InitPocket
 	ld hl, PC_Mart_ItemsPocketMenuHeader
@@ -1019,7 +962,7 @@
 	ld [wItemsPocketCursor], a
 	ret
 
-.KeyItemsPocket: ; 106ff (4:46ff)
+.KeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
 	call InitPocket
 	ld hl, PC_Mart_KeyItemsPocketMenuHeader
@@ -1035,7 +978,7 @@
 	ld [wKeyItemsPocketCursor], a
 	ret
 
-.TMHMPocket: ; 10726 (4:4726)
+.TMHMPocket:
 	ld a, TM_HM_POCKET
 	call InitPocket
 	call WaitBGMap_DrawPackGFX
@@ -1044,7 +987,7 @@
 	ld [wCurItem], a
 	ret
 
-.BallsPocket: ; 1073b (4:473b)
+.BallsPocket:
 	ld a, BALL_POCKET
 	call InitPocket
 	ld hl, PC_Mart_BallsPocketMenuHeader
@@ -1060,7 +1003,7 @@
 	ld [wBallsPocketCursor], a
 	ret
 
-InitPocket: ; 10762 (4:4762)
+InitPocket:
 	ld [wCurrPocket], a
 	call ClearPocketList
 	call DrawPocketName
@@ -1067,7 +1010,7 @@
 	call WaitBGMap_DrawPackGFX
 	ret
 
-DepositSellTutorial_InterpretJoypad: ; 1076f
+DepositSellTutorial_InterpretJoypad:
 	ld hl, wMenuJoypad
 	ld a, [hl]
 	and A_BUTTON
@@ -1119,9 +1062,8 @@
 	pop de
 	scf
 	ret
-; 107bb
 
-TutorialPack: ; 107bb
+TutorialPack:
 	call DepositSellInitPackBuffers
 	ld a, [wInputType]
 	or a
@@ -1134,17 +1076,14 @@
 	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
@@ -1151,20 +1090,18 @@
 	dw .KeyItems
 	dw .TMHM
 
-.Items: ; 107e9 (4:47e9)
+.Items:
 	xor a ; ITEM_POCKET
 	ld hl, .ItemsMenuHeader
 	jr .DisplayPocket
 
-; 107ef (4:47ef)
-.ItemsMenuHeader: ; 0x107ef
+.ItemsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .ItemsMenuData
 	db 1 ; default option
-; 0x107f7
 
-.ItemsMenuData: ; 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 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10807
 
-.KeyItems: ; 10807 (4:4807)
+.KeyItems:
 	ld a, KEY_ITEM_POCKET
 	ld hl, .KeyItemsMenuHeader
 	jr .DisplayPocket
 
-; 1080e (4:480e)
-.KeyItemsMenuHeader: ; 0x1080e
+.KeyItemsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .KeyItemsMenuData
 	db 1 ; default option
-; 0x10816
 
-.KeyItemsMenuData: ; 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 @@
 	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 @@
 	ld [wCurItem], a
 	ret
 
-.Balls: ; 1083b (4:483b)
+.Balls:
 	ld a, BALL_POCKET
 	ld hl, .BallsMenuHeader
 	jr .DisplayPocket
 
-; 10842 (4:4842)
-.BallsMenuHeader: ; 0x10842
+.BallsMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .BallsMenuData
 	db 1 ; default option
-; 0x1084a
 
-.BallsMenuData: ; 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,9 +1158,8 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 1085a
 
-.DisplayPocket: ; 1085a (4:485a)
+.DisplayPocket:
 	push hl
 	call InitPocket
 	pop hl
@@ -1237,12 +1167,12 @@
 	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,9 +1181,8 @@
 	ld h, [hl]
 	ld l, a
 	ret
-; 10874
 
-Pack_QuitNoScript: ; 10874 (4:4874)
+Pack_QuitNoScript:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	xor a ; FALSE
@@ -1260,7 +1189,7 @@
 	ld [wPackUsedItem], a
 	ret
 
-Pack_QuitRunScript: ; 1087e (4:487e)
+Pack_QuitRunScript:
 	ld hl, wJumptableIndex
 	set 7, [hl]
 	ld a, TRUE
@@ -1267,7 +1196,7 @@
 	ld [wPackUsedItem], a
 	ret
 
-Pack_PrintTextNoScroll: ; 10889 (4:4889)
+Pack_PrintTextNoScroll:
 	ld a, [wOptions]
 	push af
 	set NO_TEXT_SCROLL, a
@@ -1277,9 +1206,9 @@
 	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
@@ -1305,16 +1234,14 @@
 .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 @@
 	scf
 	ret
 
-Pack_InitGFX: ; 10955
+Pack_InitGFX:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -1435,9 +1362,8 @@
 	call EnableLCD
 	call DrawPackGFX
 	ret
-; 109a5
 
-PlacePackGFX: ; 109a5
+PlacePackGFX:
 	hlcoord 0, 3
 	ld a, $50
 	ld de, SCREEN_WIDTH - 5
@@ -1453,9 +1379,8 @@
 	dec b
 	jr nz, .row
 	ret
-; 109bb
 
-DrawPocketName: ; 109bb
+DrawPocketName:
 	ld a, [wCurrPocket]
 	; * 15
 	ld d, a
@@ -1484,9 +1409,8 @@
 	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,31 +1427,28 @@
 	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
@@ -1534,16 +1455,14 @@
 	call SetPalettes
 	call DelayFrame
 	ret
-; 10a4f
 
-ItemsPocketMenuHeader: ; 0x10a4f
+ItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a57
 
-.MenuData: ; 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 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10a67
 
-PC_Mart_ItemsPocketMenuHeader: ; 0x10a67
+PC_Mart_ItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a6f
 
-.MenuData: ; 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 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10a7f
 
-KeyItemsPocketMenuHeader: ; 0x10a7f
+KeyItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a87
 
-.MenuData: ; 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 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10a97
 
-PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97
+PC_Mart_KeyItemsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10a9f
 
-.MenuData: ; 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 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10aaf
 
-BallsPocketMenuHeader: ; 0x10aaf
+BallsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10ab7
 
-.MenuData: ; 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 @@
 	dba PlaceMenuItemName
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
-; 10ac7
 
-PC_Mart_BallsPocketMenuHeader: ; 0x10ac7
+PC_Mart_BallsPocketMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x10acf
 
-.MenuData: ; 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 @@
 	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_YouDontHaveAMon: ; 0x10af8
+TextJump_YouDontHaveAMon:
 	; You don't have a #MON!
 	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"
--- a/engine/items/pack_kris.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 @@
 	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"
--- a/engine/items/print_item_description.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 @@
 	ld d, [hl]
 	pop hl
 	jp PlaceString
-; 0x1c8987
+
+INCLUDE "data/items/descriptions.asm"
--- a/engine/items/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 @@
 	ld [wSwitchItem], a
 	ret
 
-Function249a7: ; 249a7 (9:49a7)
+Function249a7:
 	ld a, [wSwitchItem]
 	call ItemSwitch_GetNthItem
 	ld d, h
@@ -110,7 +110,7 @@
 	scf
 	ret
 
-Function249d1: ; 249d1 (9:49d1)
+Function249d1:
 	ld a, [wSwitchItem]
 	call ItemSwitch_GetNthItem
 	inc hl
@@ -180,7 +180,7 @@
 	ld [wSwitchItem], a
 	ret
 
-Function24a40: ; 24a40 (9:4a40)
+Function24a40:
 	call ItemSwitch_GetNthItem
 	ld de, wd002
 	call ItemSwitch_ConvertSpacingToDW
@@ -187,7 +187,7 @@
 	call CopyBytes
 	ret
 
-Function24a4d: ; 24a4d (9:4a4d)
+Function24a4d:
 	call ItemSwitch_GetNthItem
 	ld d, h
 	ld e, l
@@ -196,7 +196,7 @@
 	call CopyBytes
 	ret
 
-ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
+ItemSwitch_GetNthItem:
 	push af
 	call ItemSwitch_ConvertSpacingToDW
 	ld hl, wMenuData_ItemsPointerAddr
@@ -208,7 +208,7 @@
 	call AddNTimes
 	ret
 
-Function24a6c: ; 24a6c (9:4a6c)
+Function24a6c:
 	push hl
 	call ItemSwitch_ConvertSpacingToDW
 	ld a, d
@@ -224,7 +224,7 @@
 	pop hl
 	ret
 
-ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
+ItemSwitch_ConvertSpacingToDW:
 ; This function is absolutely idiotic.
 	push hl
 	ld a, [wMenuData_ScrollingMenuSpacing]
@@ -239,13 +239,10 @@
 	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 @@
 	ld a, $1
 	ret
 
-Function24aab: ; 24aab (9:4aab)
+Function24aab:
 .loop
 	ld a, [hld]
 	ld [de], a
--- a/engine/items/tmhm.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 @@
 	scf
 	ret
 
-.ConvertItemToTMHMNumber: ; 2c798 (b:4798)
+.ConvertItemToTMHMNumber:
 	ld a, [wCurItem]
 	ld c, a
 	callfar GetNumberedTMHM
@@ -28,7 +28,7 @@
 	ld [wCurItem], a
 	ret
 
-ConvertCurItemIntoCurTMHM: ; 2c7a7 (b:47a7)
+ConvertCurItemIntoCurTMHM:
 	ld a, [wCurItem]
 	ld c, a
 	callfar GetTMHMNumber
@@ -36,12 +36,12 @@
 	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 @@
 	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 @@
 	pop de
 	pop hl
 	jr .loopback
-; 2c867
 
-TeachTMHM: ; 2c867
+TeachTMHM:
 	predef CanLearnTMHMMove
 
 	push bc
@@ -166,33 +165,28 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .done
 	ret
 
-TMHMPocket_GetCurrentLineCoord: ; 2ca86 (b:4a86)
+TMHMPocket_GetCurrentLineCoord:
 	hlcoord 5, 0
 	ld bc, 2 * SCREEN_WIDTH
 	ld a, 6
@@ -445,9 +439,8 @@
 	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 @@
 	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 @@
 	dec c
 	ret
 
-Tutorial_TMHMPocket: ; 2caca (b:4aca)
+Tutorial_TMHMPocket:
 	hlcoord 9, 3
 	push de
 	ld de, TMHM_String_Cancel
@@ -490,15 +481,14 @@
 	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 @@
 	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 @@
 	ret nc
 	ld [hl], a
 	ret
-; 2cb0c
 
-ConsumeTM: ; 2cb0c (b:4b0c)
+ConsumeTM:
 	call ConvertCurItemIntoCurTMHM
 	ld a, [wd265]
 	dec a
@@ -556,7 +542,7 @@
 	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 @@
 	ld [wd265], a
 	ret
 
-PrintMoveDesc: ; 2cb3e
+PrintMoveDesc:
 	push hl
 	ld hl, MoveDescriptions
 	ld a, [wCurSpecies]
@@ -586,4 +572,3 @@
 	ld d, [hl]
 	pop hl
 	jp PlaceString
-; 2cb52
--- a/engine/items/tmhm2.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 @@
 	pop hl
 	ld c, 0
 	ret
-; 1166a
 
-GetTMHMMove: ; 1166a
+GetTMHMMove:
 	ld a, [wd265]
 	dec a
 	ld hl, TMHMMoves
@@ -43,7 +42,5 @@
 	ld a, [hl]
 	ld [wd265], a
 	ret
-; 1167a
-
 
 INCLUDE "data/moves/tmhm_moves.asm"
--- a/engine/items/update_item_description.asm
+++ b/engine/items/update_item_description.asm
@@ -1,4 +1,4 @@
-UpdateItemDescription: ; 0x244c3
+UpdateItemDescription:
 	ld a, [wMenuSelection]
 	ld [wCurSpecies], a
 	hlcoord 0, 12
--- a/engine/link/init_list.asm
+++ b/engine/link/init_list.asm
@@ -1,4 +1,4 @@
-InitList: ; 50db9
+InitList:
 	ld a, [wInitListType]
 
 	cp INIT_ENEMYOT_LIST
--- a/engine/link/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 @@
 	cp LINK_TIMECAPSULE
 	jp nz, Gen2ToGen2LinkComms
 
-Gen2ToGen1LinkComms: ; 2805d
+Gen2ToGen1LinkComms:
 	call ClearLinkData
 	call Link_PrepPartyData_Gen1
 	call FixDataForLinkTransfer
@@ -177,9 +177,8 @@
 	ld de, MUSIC_ROUTE_30
 	call PlayMusic
 	jp InitTradeMenuDisplay
-; 28177
 
-Gen2ToGen2LinkComms: ; 28177
+Gen2ToGen2LinkComms:
 	call ClearLinkData
 	call Link_PrepPartyData_Gen2
 	call FixDataForLinkTransfer
@@ -474,9 +473,8 @@
 	ld de, MUSIC_ROUTE_30
 	call PlayMusic
 	jp InitTradeMenuDisplay
-; 283b2
 
-LinkTimeout: ; 283b2
+LinkTimeout:
 	ld de, .TooMuchTimeHasElapsed
 	ld b, 10
 .loop
@@ -506,15 +504,13 @@
 	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 @@
 	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 @@
 	or c
 	jr nz, .loop
 	ret
-; 28434
 
-FixDataForLinkTransfer: ; 28434
+FixDataForLinkTransfer:
 	ld hl, wd1f3
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld b, wLinkBattleRNs - wd1f3
@@ -636,9 +629,8 @@
 	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 @@
 .copy_ot_nicks
 	ld bc, PARTY_LENGTH * NAME_LENGTH
 	jp CopyBytes
-; 284f6
 
-.ConvertPartyStruct2to1: ; 284f6
+.ConvertPartyStruct2to1:
 	ld b, h
 	ld c, l
 	push de
@@ -804,9 +795,8 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; 2868a
 
-Function2868a: ; 2868a
+Function2868a:
 	push hl
 	ld d, h
 	ld e, l
@@ -980,9 +968,8 @@
 	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]
@@ -1102,9 +1089,8 @@
 	inc de
 	inc de
 	ret
-; 28771
 
-TimeCapsule_ReplaceTeruSama: ; 28771
+TimeCapsule_ReplaceTeruSama:
 	ld a, b
 	and a
 	ret z
@@ -1126,11 +1112,9 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; 287ca
 
-Link_FindFirstNonControlCharacter_SkipZero: ; 287ca
+Link_FindFirstNonControlCharacter_SkipZero:
 .loop
 	ld a, [hli]
 	and a
@@ -1176,9 +1158,8 @@
 	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 @@
 	jr z, .loop
 	dec hl
 	ret
-; 287e3
 
-InitTradeMenuDisplay: ; 287e3
+InitTradeMenuDisplay:
 	call ClearScreen
 	call LoadTradeScreenBorder
 	farcall InitTradeSpeciesList
@@ -1204,9 +1184,8 @@
 	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 @@
 	xor a
 	ld [w2DMenuFlags2], a
 
-LinkTradeOTPartymonMenuLoop: ; 28835
+LinkTradeOTPartymonMenuLoop:
 	farcall LinkTradeMenu
 	ld a, d
 	and a
@@ -1268,9 +1247,8 @@
 	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 @@
 	ld [w2DMenuFlags2], a
 	call WaitBGMap2
 
-LinkTradePartymonMenuLoop: ; 288c5
+LinkTradePartymonMenuLoop:
 	farcall LinkTradeMenu
 	ld a, d
 	and a
@@ -1343,16 +1321,14 @@
 	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 @@
 	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 @@
 	ld [hl], " "
 	pop bc
 	pop hl
-Function28ade: ; 28ade
+Function28ade:
 .loop1
 	ld a, "▶"
 	ldcoord_a 9, 17
@@ -1576,7 +1547,7 @@
 	ld a, [wOtherPlayerLinkMode]
 	cp $f
 	jr nz, .loop1
-Function28b22: ; 28b22
+Function28b22:
 	call RotateThreePalettesRight
 	call ClearScreen
 	ld b, SCGB_DIPLOMA
@@ -1592,9 +1563,8 @@
 	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,13 +1576,11 @@
 	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
@@ -1619,9 +1587,8 @@
 	call AddNTimes
 	ld [hl], "▷"
 	ret
-; 28b77
 
-LinkEngine_FillBox: ; 28b77
+LinkEngine_FillBox:
 .row
 	push bc
 	push hl
@@ -1636,9 +1603,8 @@
 	dec b
 	jr nz, .row
 	ret
-; 28b87
 
-LinkTrade: ; 28b87
+LinkTrade:
 	xor a
 	ld [wcf57], a
 	ld [wOtherPlayerLinkAction], a
@@ -1972,51 +1938,44 @@
 	cp LINK_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,11 +1986,10 @@
 	call LinkTextboxAtHL
 	farcall PlaceTradePartnerNamesAndParty
 	ret
-; 28f24
 
 INCLUDE "engine/movie/trade_animation.asm"
 
-CheckTimeCapsuleCompatibility: ; 29bfb
+CheckTimeCapsuleCompatibility:
 ; Checks to see if your party is compatible with the Gen 1 games.
 ; Returns the following in wScriptVar:
 ; 0: Party is okay
@@ -2081,7 +2039,7 @@
 	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
@@ -2111,9 +2069,8 @@
 .done
 	ld [wScriptVar], a
 	ret
-; 29c67
 
-Function29c67: ; 29c67
+Function29c67:
 	ld a, [wPartyCount]
 	sub b
 	ld c, a
@@ -2125,9 +2082,8 @@
 	ld [wd265], a
 	call GetPokemonName
 	ret
-; 29c7b
 
-EnterTimeCapsule: ; 29c7b
+EnterTimeCapsule:
 	ld c, 10
 	call DelayFrames
 	ld a, $4
@@ -2139,9 +2095,8 @@
 	inc a
 	ld [wLinkMode], a
 	ret
-; 29c92
 
-WaitForOtherPlayerToExit: ; 29c92
+WaitForOtherPlayerToExit:
 	ld c, 3
 	call DelayFrames
 	ld a, CONNECTION_NOT_ESTABLISHED
@@ -2187,23 +2142,20 @@
 	ld [hVBlank], a
 	ld [wLinkMode], a
 	ret
-; 29ce8
 
-SetBitsForLinkTradeRequest: ; 29ce8
+SetBitsForLinkTradeRequest:
 	ld a, LINK_TRADECENTER - 1
 	ld [wPlayerLinkAction], a
 	ld [wd265], a
 	ret
-; 29cf1
 
-SetBitsForBattleRequest: ; 29cf1
+SetBitsForBattleRequest:
 	ld a, LINK_COLOSSEUM - 1
 	ld [wPlayerLinkAction], a
 	ld [wd265], a
 	ret
-; 29cfa
 
-SetBitsForTimeCapsuleRequest: ; 29cfa
+SetBitsForTimeCapsuleRequest:
 	ld a, $2
 	ld [rSB], a
 	xor a
@@ -2216,9 +2168,8 @@
 	ld [wPlayerLinkAction], a
 	ld [wd265], a
 	ret
-; 29d11
 
-WaitForLinkedFriend: ; 29d11
+WaitForLinkedFriend:
 	ld a, [wPlayerLinkAction]
 	and a
 	jr z, .no_link_action
@@ -2288,9 +2239,8 @@
 	xor a
 	ld [wScriptVar], a
 	ret
-; 29d92
 
-CheckLinkTimeout: ; 29d92
+CheckLinkTimeout:
 	ld a, $1
 	ld [wPlayerLinkAction], a
 	ld hl, wLinkTimeoutFrames
@@ -2310,9 +2260,8 @@
 	and a
 	ret nz
 	jp Link_ResetSerialRegistersAfterLinkClosure
-; 29dba
 
-Function29dba: ; 29dba
+Function29dba:
 	ld a, $5
 	ld [wPlayerLinkAction], a
 	ld hl, wLinkTimeoutFrames
@@ -2358,9 +2307,8 @@
 	xor a
 	ld [hVBlank], a
 	ret
-; 29e0c
 
-Link_CheckCommunicationError: ; 29e0c
+Link_CheckCommunicationError:
 	xor a
 	ld [hSerialReceivedNewData], a
 	ld a, [wLinkTimeoutFrames]
@@ -2389,9 +2337,8 @@
 	ld [hli], a
 	ld [hl], a
 	ret
-; 29e3b
 
-.CheckConnected: ; 29e3b
+.CheckConnected:
 	call WaitLinkTransfer
 	ld hl, wLinkTimeoutFrames
 	ld a, [hli]
@@ -2400,9 +2347,8 @@
 	ld a, [hl]
 	inc a
 	ret
-; 29e47
 
-.AcknowledgeSerial: ; 29e47
+.AcknowledgeSerial:
 	ld b, 10
 .loop
 	call DelayFrame
@@ -2410,9 +2356,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 29e53
 
-.ConvertDW: ; 29e53
+.ConvertDW:
 	; [wLinkTimeoutFrames] = ((hl - $100) / 4) + $100
 	;                      = (hl / 4) + $c0
 	dec h
@@ -2426,9 +2371,8 @@
 	ld a, l
 	ld [wLinkTimeoutFrames + 1], a
 	ret
-; 29e66
 
-TryQuickSave: ; 29e66
+TryQuickSave:
 	ld a, [wd265]
 	push af
 	farcall Link_SaveGame
@@ -2442,9 +2386,8 @@
 	pop af
 	ld [wd265], a
 	ret
-; 29e82
 
-CheckBothSelectedSameRoom: ; 29e82
+CheckBothSelectedSameRoom:
 	ld a, [wd265]
 	call Link_EnsureSync
 	push af
@@ -2469,9 +2412,8 @@
 	xor a ; FALSE
 	ld [wScriptVar], a
 	ret
-; 29eaf
 
-TimeCapsule: ; 29eaf
+TimeCapsule:
 	ld a, LINK_TIMECAPSULE
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2480,9 +2422,8 @@
 	xor a
 	ld [hVBlank], a
 	ret
-; 29ec4
 
-TradeCenter: ; 29ec4
+TradeCenter:
 	ld a, LINK_TRADECENTER
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2491,9 +2432,8 @@
 	xor a
 	ld [hVBlank], a
 	ret
-; 29ed9
 
-Colosseum: ; 29ed9
+Colosseum:
 	ld a, LINK_COLOSSEUM
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2502,24 +2442,21 @@
 	xor a
 	ld [hVBlank], a
 	ret
-; 29eee
 
-CloseLink: ; 29eee
+CloseLink:
 	xor a
 	ld [wLinkMode], a
 	ld c, 3
 	call DelayFrames
 	jp Link_ResetSerialRegistersAfterLinkClosure
-; 29efa
 
-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
@@ -2530,9 +2467,8 @@
 	ld [hSerialReceive], a
 	ld [rSC], a
 	ret
-; 29f17
 
-Link_EnsureSync: ; 29f17
+Link_EnsureSync:
 	add $d0
 	ld [wPlayerLinkAction], a
 	ld [wcf57], a
@@ -2559,9 +2495,8 @@
 	ld a, b
 	and $f
 	ret
-; 29f47
 
-CableClubCheckWhichChris: ; 29f47
+CableClubCheckWhichChris:
 	ld a, [hSerialConnectionStatus]
 	cp USING_EXTERNAL_CLOCK
 	ld a, TRUE
@@ -2571,11 +2506,9 @@
 .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)
--- a/engine/link/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 @@
 	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 @@
 	dec b
 	jr nz, .row
 	ret
-; 4d37e
 
-.PlaceBorder: ; 4d37e
+.PlaceBorder:
 	push hl
 	ld a, $76
 	ld [hli], a
@@ -67,11 +66,11 @@
 	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
@@ -78,15 +77,14 @@
 	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
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -1,24 +1,21 @@
 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
+Function16d42e:
 	ld hl, Tilemap_MobileTradeBorderFullscreen
 	decoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ret
-; 16d43b
 
-Function16d43b: ; 16d43b
+Function16d43b:
 	call LoadStandardMenuHeader
 	call ClearBGPalettes
 	call ClearTileMap
@@ -32,7 +29,6 @@
 	call JoyWaitAorB
 	call Call_ExitMenu
 	ret
-; 16d465
 
 Tilemap_MobileTradeBorderFullscreen:
 INCBIN "gfx/trade/border_mobile_fullscreen.tilemap"
@@ -43,7 +39,7 @@
 Tilemap_CableTradeBorderBottom:
 INCBIN "gfx/trade/border_cable_bottom.tilemap"
 
-_LinkTextbox: ; 16d61d
+_LinkTextbox:
 	ld h, d
 	ld l, e
 	push bc
@@ -73,9 +69,8 @@
 	dec b
 	jr nz, .row
 	ret
-; 16d640
 
-.PlaceBorder ; 16d640
+.PlaceBorder
 	push hl
 	ld a, $30
 	ld [hli], a
@@ -105,9 +100,8 @@
 	call .PlaceRow
 	ld [hl], $37
 	ret
-; 16d66d
 
-.PlaceRow ; 16d66d
+.PlaceRow
 	ld d, c
 .row_loop
 	ld [hli], a
@@ -114,9 +108,8 @@
 	dec d
 	jr nz, .row_loop
 	ret
-; 16d673
 
-InitTradeSpeciesList: ; 16d673
+InitTradeSpeciesList:
 	call _LoadTradeScreenBorder
 	call Function16d6ae
 	farcall InitMG_Mobile_LinkTradePalMap
@@ -125,32 +118,26 @@
 	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_CableTradeBorderTop
 	decoord 0, 0
@@ -161,14 +148,12 @@
 	ld bc, 2 * SCREEN_WIDTH
 	call CopyBytes
 	ret
-; 16d6ca
 
-LinkTextbox: ; 16d6ca
+LinkTextbox:
 	call _LinkTextbox
 	ret
-; 16d6ce
 
-Function16d6ce: ; 16d6ce
+Function16d6ce:
 	call LoadStandardMenuHeader
 	call Function16d6e1
 	farcall WaitLinkTransfer
@@ -175,9 +160,8 @@
 	call Call_ExitMenu
 	call WaitBGMap2
 	ret
-; 16d6e1
 
-Function16d6e1: ; 16d6e1
+Function16d6e1:
 	hlcoord 4, 10
 	ld b, 1
 	ld c, 10
@@ -189,19 +173,16 @@
 	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 @@
 	pop bc
 	ld d, a
 	ret
-; 16d725
 
-.MenuAction: ; 16d725
+.MenuAction:
 	ld hl, w2DMenuFlags2
 	res 7, [hl]
 	ld a, [hBGMapMode]
@@ -246,9 +226,8 @@
 
 .done
 	ret
-; 16d759
 
-.UpdateBGMapAndOAM: ; 16d759
+.UpdateBGMapAndOAM:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -269,9 +248,8 @@
 	jr z, .loop2
 	and a
 	ret
-; 16d77a
 
-.UpdateCursor: ; 16d77a
+.UpdateCursor:
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
@@ -346,9 +324,8 @@
 	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 @@
 	ret z
 	scf
 	ret
-; 16d7fe
--- a/engine/link/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 @@
 	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 @@
 .No:
 	jp CloseSRAM
 
-.AddMysteryGiftPartnerID: ; 104a56 (41:4a56)
+.AddMysteryGiftPartnerID:
 	call GetMysteryGiftBank
 	ld hl, sNumDailyMysteryGiftPartnerIDs
 	ld a, [hl]
@@ -219,7 +209,7 @@
 	ld [hl], a
 	jp CloseSRAM
 
-.SaveMysteryGiftTrainerName: ; 104a71 (41:4a71)
+.SaveMysteryGiftTrainerName:
 	call GetMysteryGiftBank
 	ld a, $1
 	ld [sMysteryGiftTrainerHouseFlag], a
@@ -235,7 +225,7 @@
 	call CopyBytes
 	jp CloseSRAM
 
-Function104a95: ; 104a95 (41:4a95)
+Function104a95:
 	di
 	farcall ClearChannels
 	call Function104d5e
@@ -305,10 +295,10 @@
 	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 @@
 	call Function105033
 	jp Function104bd0
 
-Function104b22: ; 104b22 (41:4b22)
+Function104b22:
 	call Function104b88
 	jp nz, Function104bd0
 	call Function104d43
@@ -330,13 +320,13 @@
 	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 @@
 	cp $6c
 	ret
 
-Function104b88: ; 104b88 (41:4b88)
+Function104b88:
 	ld a, $96
 	ld [hPrintNum1], a
 	ld hl, hPrintNum1
@@ -404,7 +394,7 @@
 	cp $6c
 	ret
 
-Function104bd0: ; 104bd0 (41:4bd0)
+Function104bd0:
 	nop
 	ld a, [hMGStatusFlags]
 	cp $10
@@ -451,7 +441,7 @@
 	pop af
 	ret
 
-Function104c2d: ; 104c2d (41:4c2d)
+Function104c2d:
 	di
 	farcall ClearChannels
 	call Function104d5e
@@ -488,7 +478,7 @@
 	call Function10502e
 	jp Function104d1c
 
-Function104c8a: ; 104c8a (41:4c8a)
+Function104c8a:
 	ld hl, hPrintNum1
 	ld b, $1
 	call Function104d56
@@ -524,7 +514,7 @@
 	cp $6c
 	ret
 
-Function104cd2: ; 104cd2 (41:4cd2)
+Function104cd2:
 	ld a, $3c
 	ld [hPrintNum1], a
 	ld hl, hPrintNum1
@@ -561,7 +551,7 @@
 	cp $6c
 	ret
 
-Function104d1c: ; 104d1c (41:4d1c)
+Function104d1c:
 	nop
 	ld a, [hMGStatusFlags]
 	push af
@@ -576,13 +566,13 @@
 	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]
@@ -589,7 +579,7 @@
 	cp $6c
 	ret
 
-Function104d43: ; 104d43 (41:4d43)
+Function104d43:
 	call Function104d96
 	call Function104dfe
 	ld a, [hMGStatusFlags]
@@ -596,19 +586,19 @@
 	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 @@
 	jr nz, .asm_104d6d
 	ret
 
-Function104d74: ; 104d74 (41:4d74)
+Function104d74:
 	xor a
 	ld [rTAC], a
 	ld a, $fe
@@ -636,7 +626,7 @@
 	ld [rTAC], a
 	ret
 
-Function104d86: ; 104d86 (41:4d86)
+Function104d86:
 	xor a
 	ld [rTAC], a
 	ld [rTMA], a
@@ -647,7 +637,7 @@
 	ld [rTAC], a
 	ret
 
-Function104d96: ; 104d96 (41:4d96)
+Function104d96:
 	ld a, $c0
 	call Function104e8c
 	ld a, $1
@@ -654,7 +644,7 @@
 	ld [hPrintNum9], a
 	ret
 
-Function104da0: ; 104da0 (41:4da0)
+Function104da0:
 	xor a
 	call Function104e8c
 	ld a, $2
@@ -661,7 +651,7 @@
 	ld [rTAC], a
 	ret
 
-Function104da9: ; 104da9 (41:4da9)
+Function104da9:
 	inc d
 	ret z
 	xor a
@@ -673,7 +663,7 @@
 	or a
 	ret
 
-Function104db7: ; 104db7 (41:4db7)
+Function104db7:
 	inc d
 	ret z
 	xor a
@@ -685,7 +675,7 @@
 	or a
 	ret
 
-Function104dc5: ; 104dc5 (41:4dc5)
+Function104dc5:
 	ld a, $c1
 	ld [$ff00+c], a
 .wait
@@ -696,7 +686,7 @@
 	halt
 	jr .wait
 
-Function104dd1: ; 104dd1 (41:4dd1)
+Function104dd1:
 	ld a, $c0
 	ld [$ff00+c], a
 .wait
@@ -707,7 +697,7 @@
 	halt
 	jr .wait
 
-Function104ddd: ; 104ddd (41:4ddd)
+Function104ddd:
 	ld d, $0
 	ld e, d
 	ld a, $1
@@ -730,7 +720,7 @@
 	and b
 	jr nz, .loop
 
-Function104dfe: ; 104dfe (41:4dfe)
+Function104dfe:
 	ld c, LOW(rRP)
 	ld d, $0
 	ld e, d
@@ -757,7 +747,7 @@
 	call Function104dd1
 	ret
 
-Function104e3a: ; 104e3a (41:4e3a)
+Function104e3a:
 	; Wait a random amount of time
 	call Random
 	ld e, a
@@ -768,7 +758,7 @@
 	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 @@
 	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 @@
 	pop hl
 	ret
 
-Function104ed6: ; 104ed6 (41:4ed6)
+Function104ed6:
 	ld c, LOW(rRP)
 	ld d, $5
 	call Function104dd1
@@ -910,25 +900,25 @@
 	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 @@
 	ld [hPrintNum6], a
 	ret
 
-Function104faf: ; 104faf (41:4faf)
+Function104faf:
 	ld c, LOW(rRP)
 	ld d, $0
 	call Function104db7
@@ -1059,15 +1049,15 @@
 	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 @@
 	ld [rJOYP], a
 	ret
 
-MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
+MysteryGift_CheckAndSetDecorationAlreadyReceived:
 	call GetMysteryGiftBank
 	ld d, $0
 	ld b, CHECK_FLAG
@@ -1134,7 +1124,7 @@
 	xor a
 	ret
 
-MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
+MysteryGift_CopyReceivedDecosToPC:
 	call GetMysteryGiftBank
 	ld c, $0
 .loop
@@ -1157,7 +1147,7 @@
 	jr c, .loop
 	jp CloseSRAM
 
-UnlockMysteryGift: ; 1050b9
+UnlockMysteryGift:
 	call GetMysteryGiftBank
 	ld hl, sMysteryGiftUnlocked
 	ld a, [hl]
@@ -1167,9 +1157,8 @@
 	ld [hl], a
 .ok
 	jp CloseSRAM
-; 1050c8
 
-Function1050c8: ; 1050c8
+Function1050c8:
 	call GetMysteryGiftBank
 	ld a, [sNumDailyMysteryGiftPartnerIDs]
 	cp $ff
@@ -1178,10 +1167,8 @@
 	ld [sNumDailyMysteryGiftPartnerIDs], a
 .okay
 	jp CloseSRAM
-; 1050d9
 
-
-BackupMysteryGift: ; 1050d9
+BackupMysteryGift:
 	call GetMysteryGiftBank
 	ld hl, sMysteryGiftItem
 	ld de, sBackupMysteryGiftItem
@@ -1191,10 +1178,8 @@
 	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 @@
 	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 @@
 	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,7 +1255,7 @@
 	ld [wca00], a
 	jp CloseSRAM
 
-InitMysteryGiftLayout: ; 105153 (41:5153)
+InitMysteryGiftLayout:
 	call ClearBGPalettes
 	call DisableLCD
 	ld hl, MysteryGiftGFX
@@ -1364,19 +1346,18 @@
 	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
@@ -1383,18 +1364,18 @@
 	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 @@
 	jr nz, .col_loop
 	ret
 
-.Load16Row: ; 105251 (41:5251)
+.Load16Row:
 	ld b, 16
 .row_loop
 	ld [hli], a
@@ -1410,11 +1391,11 @@
 	jr nz, .row_loop
 	ret
 
-MysteryGiftGFX: ; 105258
+MysteryGiftGFX:
 INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
 .End
 
-Function105688: ; 105688 (41:5688)
+Function105688:
 	call ClearTileMap
 	call ClearSprites
 	call WaitBGMap
@@ -1455,7 +1436,7 @@
 	ld hl, Text_ListedCardAsNumber
 	jr PrintTextAndExit_JP
 
-Function1056eb: ; 1056eb (41:56eb)
+Function1056eb:
 	ld c, 16
 .loop
 	ld hl, wVirtualOAMSprite00YCoord
@@ -1484,25 +1465,24 @@
 	pop bc
 	jr .loop
 
-Function105712: ; 105712 (41:5712)
+Function105712:
 	call Function105777
 	ld hl, Text_MGLinkCanceled
 	jr PrintTextAndExit_JP
 
-Function10571a: ; 10571a (41:571a)
+Function10571a:
 	call Function105777
 	ld hl, Text_MGCommError
 	call PrintText
 	jp Function105688
 
-PrintTextAndExit_JP: ; 105726 (41:5726)
+PrintTextAndExit_JP:
 	call PrintText
 	ld a, LCDC_DEFAULT
 	ld [rLCDC], a
 	ret
-; 10572e (41:572e)
 
-String_PressAToLink_BToCancel_JP: ; 10572e
+String_PressAToLink_BToCancel_JP:
 	db   "エーボタン<WO>おすと"
 	next "つうしん<PKMN>おこなわれるよ！"
 	next "ビーボタン<WO>おすと"
@@ -1509,30 +1489,27 @@
 	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,7 +1519,7 @@
 	call SetPalettes
 	ret
 
-Function10578c: ; 10578c (41:578c)
+Function10578c:
 	ld de, wLinkData
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
@@ -1572,7 +1549,7 @@
 	call CloseSRAM
 	ret
 
-Function1057d7: ; 1057d7 (41:57d7)
+Function1057d7:
 	call ClearBGPalettes
 	call DisableLCD
 	ld hl, MysteryGiftJP_GFX
@@ -1666,18 +1643,18 @@
 	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
@@ -1684,18 +1661,18 @@
 	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,7 +1680,7 @@
 	jr nz, .column_loop
 	ret
 
-.Load16Row: ; 1058e9 (41:58e9)
+.Load16Row:
 	ld b, 16
 .row_loop_no_inc
 	ld [hli], a
@@ -1710,9 +1687,8 @@
 	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 @@
 	dsprite  1, 1, 14, 4, $07, 0
 
 ; japanese mystery gift gfx
-MysteryGiftJP_GFX: ; 105930
+MysteryGiftJP_GFX:
 INCBIN "gfx/mystery_gift/mystery_gift_jp.2bpp"
--- a/engine/link/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 @@
 	ld bc, wMysteryGiftPlayerDataEnd - wMysteryGiftPlayerData
 	jp CopyBytes
 
-.RandomSample: ; 2c6ac (b:46ac)
+.RandomSample:
 	push de
 	call Random
 	cp 10 percent
@@ -121,7 +121,7 @@
 	pop de
 	ret
 
-MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708)
+MysteryGiftGetItemHeldEffect:
 	ld a, c
 	cp MysteryGiftItems.End - MysteryGiftItems
 	jr nc, MysteryGiftFallbackItem
@@ -131,7 +131,7 @@
 	ld c, [hl]
 	ret
 
-MysteryGiftGetDecoration: ; 2c715 (b:4715)
+MysteryGiftGetDecoration:
 	ld a, c
 	cp MysteryGiftDecos.End - MysteryGiftDecos
 	jr nc, MysteryGiftFallbackItem
@@ -141,11 +141,9 @@
 	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"
 
--- a/engine/link/place_waiting_text.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 @@
 	ld c, 50
 	jp DelayFrames
 
-.Waiting: ; 4025
+.Waiting:
 	db "Waiting...!@"
--- a/engine/link/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 @@
 .abnormal
 	scf
 	ret
-; fb5dd
 
-Functionfb5dd: ; fb5dd
+Functionfb5dd:
 	ld a, [wd002]
 	ld d, a
 	ld a, [wPartyCount]
@@ -100,9 +99,8 @@
 .done
 	and a
 	ret
-; fb60d
 
-PlaceTradePartnerNamesAndParty: ; fb60d
+PlaceTradePartnerNamesAndParty:
 	hlcoord 4, 0
 	ld de, wPlayerName
 	call PlaceString
@@ -118,7 +116,7 @@
 	call .PlaceSpeciesNames
 	hlcoord 7, 9
 	ld de, wOTPartySpecies
-.PlaceSpeciesNames: ; fb634
+.PlaceSpeciesNames:
 	ld c, $0
 .loop
 	ld a, [de]
@@ -142,6 +140,5 @@
 	pop bc
 	inc c
 	jr .loop
-; fb656
 
 INCLUDE "data/pokemon/gen1_base_special.asm"
--- a/engine/link/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 @@
 	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 @@
 	pop hl
 	pop bc
 	ret
-; fb91c
-
 
 INCLUDE "data/pokemon/gen1_order.asm"
--- a/engine/math/get_square_root.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 @@
 	jr c, .loop
 	ret
 
-.Squares: ; 13b98
+.Squares:
 x = 1
 rept NUM_SQUARE_ROOTS
 	dw x * x
--- a/engine/math/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 @@
 	ld [hMathBuffer + 3], a
 	ld [hMathBuffer + 4], a
 
-
 .loop
 	ld a, [hMultiplier]
 	srl a
@@ -46,7 +44,6 @@
 	dec b
 	jr z, .done
 
-
 ; hMultiplicand <<= 1
 
 	ld a, [hMultiplicand + 2]
@@ -67,7 +64,6 @@
 
 	jr .loop
 
-
 .done
 	ld a, [hMathBuffer + 4]
 	ld [hProduct + 3], a
@@ -82,10 +78,8 @@
 	ld [hProduct + 0], a
 
 	ret
-; 673e
 
-
-_Divide:: ; 673e
+_Divide::
 	xor a
 	ld [hMathBuffer + 0], a
 	ld [hMathBuffer + 1], a
@@ -193,4 +187,3 @@
 	ld [hDividend + 0], a
 
 	ret
-; 67c1
--- a/engine/math/print_num.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 @@
 	pop bc
 	ret
 
-.PrintYen: ; c5ba
+.PrintYen:
 	push af
 	ld a, [hPrintNum1]
 	and a
@@ -193,7 +193,7 @@
 	pop af
 	ret
 
-.PrintDigit: ; c5cb (3:45cb)
+.PrintDigit:
 	dec e
 	jr nz, .ok
 	ld a, "0"
@@ -278,7 +278,7 @@
 	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
@@ -285,7 +285,7 @@
 	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?
--- a/engine/math/sine.asm
+++ b/engine/math/sine.asm
@@ -1,4 +1,4 @@
-_Sine:: ; 84d9
+_Sine::
 ; a = d * sin(e * pi/32)
 	ld a, e
 	calc_sine_wave
--- a/engine/menus/debug.asm
+++ b/engine/menus/debug.asm
@@ -22,7 +22,7 @@
 	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,15 +62,14 @@
 	pop af
 	ld [hInMenu], a
 	ret
-; 818f4
 
-Function818f4: ; 818f4
+Function818f4:
 	ld a, [wd002]
 	and a
 	jr nz, Function81911
 	ld hl, PokemonPalettes
 
-Function818fd: ; 818fd
+Function818fd:
 	ld de, wOverworldMapBlocks
 	ld c, NUM_POKEMON + 1
 .asm_81902
@@ -85,7 +84,7 @@
 	jr nz, .asm_81902
 	ret
 
-Function81911: ; 81911
+Function81911:
 	ld hl, TrainerPalettes
 	ld de, wOverworldMapBlocks
 	ld c, NUM_TRAINER_CLASSES
@@ -100,9 +99,8 @@
 	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 @@
 	ld [de], a
 	inc de
 	ret
-; 81948
 
-Function81948: ; 81948
+Function81948:
 	ld a, $1
 	ld [rVBK], a
 	ld hl, vTiles0
@@ -148,9 +145,8 @@
 	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 @@
 	or b
 	jr nz, .asm_8199d
 	ret
-; 819a7
 
-Function819a7: ; 819a7
+Function819a7:
 	ld a, [hCGB]
 	and a
 	ret z
@@ -214,16 +209,14 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 819f4
 
-Palette_DebugBG: ; 819f4
+Palette_DebugBG:
 INCLUDE "gfx/debug/bg.pal"
 
-Palette_DebugOB: ; 81a34
+Palette_DebugOB:
 INCLUDE "gfx/debug/ob.pal"
-; 81a74
 
-Function81a74: ; 81a74
+Function81a74:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	cp $4
@@ -273,9 +266,8 @@
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; 81ac3
 
-Function81ac3: ; 81ac3
+Function81ac3:
 ; Looping back around the pic set.
 	ld a, [wd002]
 	and a
@@ -286,9 +278,8 @@
 .asm_81acc
 	ld a, NUM_TRAINER_CLASSES - 1 ; MYSTICALMAN
 	ret
-; 81acf
 
-Jumptable_81acf: ; 81acf
+Jumptable_81acf:
 	dw Function81adb
 	dw Function81c18
 	dw Function81c33
@@ -295,9 +286,8 @@
 	dw Function81cc2
 	dw Function81d8e
 	dw Function81daf
-; 81adb
 
-Function81adb: ; 81adb
+Function81adb:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -382,14 +372,12 @@
 	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 @@
 	hlcoord 2, 15
 	ld a, $3
 
-Function81bde: ; 81bde
+Function81bde:
 	push af
 	ld a, DEBUGTEST_UP_ARROW
 	ld [hli], a
@@ -415,9 +403,8 @@
 	ld bc, $28
 	call ByteFill
 	ret
-; 81bf4
 
-Function81bf4: ; 81bf4
+Function81bf4:
 	ld a, [wcf66]
 	inc a
 	ld l, a
@@ -435,9 +422,8 @@
 	ld de, wc608
 	call Function81ea5
 	ret
-; 81c18
 
-Function81c18: ; 81c18
+Function81c18:
 	ld a, [hCGB]
 	and a
 	jr z, .asm_81c2a
@@ -452,9 +438,8 @@
 	ld a, $2
 	ld [wJumptableIndex], a
 	ret
-; 81c33
 
-Function81c33: ; 81c33
+Function81c33:
 	ld a, [hCGB]
 	and a
 	jr z, .asm_81c69
@@ -511,9 +496,8 @@
 	ld a, $3
 	ld [wJumptableIndex], a
 	ret
-; 81ca7
 
-Function81ca7: ; 81ca7
+Function81ca7:
 	inc hl
 	inc hl
 	inc hl
@@ -528,14 +512,13 @@
 	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 @@
 	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 @@
 	call Function81ea5
 	ret
 
-Function81d34: ; 81d34
+Function81d34:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -621,7 +602,7 @@
 	ld hl, wc608 + 10
 	jr Function81d63
 
-Function81d46: ; 81d46
+Function81d46:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -632,7 +613,7 @@
 	ld hl, wc608 + 11
 	jr Function81d63
 
-Function81d58: ; 81d58
+Function81d58:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -639,7 +620,7 @@
 	jr nz, Function81d84
 	ld hl, wc608 + 12
 
-Function81d63: ; 81d63
+Function81d63:
 	ld a, [hJoyLast]
 	and D_RIGHT
 	jr nz, Function81d70
@@ -648,7 +629,7 @@
 	jr nz, Function81d77
 	ret
 
-Function81d70: ; 81d70
+Function81d70:
 	ld a, [hl]
 	cp $1f
 	ret nc
@@ -655,30 +636,29 @@
 	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 @@
 	ld a, $5
 	ld [wJumptableIndex], a
 	ret
-; 81daf
 
-Function81daf: ; 81daf
+Function81daf:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -706,15 +685,13 @@
 	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 @@
 	ld [wd004], a
 	call Function81df4
 	ret
-; 81df4
 
-Function81df4: ; 81df4
+Function81df4:
 	hlcoord 10, 11
 	call Function81e5e
 	hlcoord 10, 12
@@ -783,13 +759,11 @@
 	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 @@
 .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 @@
 	ld a, d
 	ld [wc608 + 1], a
 	ret
-; 81ea5
 
-Function81ea5: ; 81ea5
+Function81ea5:
 	ld a, [de]
 	and $1f
 	ld [wc608 + 10], a
@@ -867,9 +838,8 @@
 	srl a
 	ld [wc608 + 12], a
 	ret
-; 81eca
 
-Function81eca: ; 81eca
+Function81eca:
 	ld a, [wcf66]
 	inc a
 	ld l, a
@@ -884,9 +854,8 @@
 	ld bc, 4
 	call CopyBytes
 	ret
-; 81ee3
 
-Function81ee3: ; 81ee3
+Function81ee3:
 .asm_81ee3
 	ld a, LOW(PALRGB_WHITE)
 	ld [hli], a
@@ -910,9 +879,8 @@
 	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 @@
 	dec b
 	jr nz, .row
 	ret
-; 81f0c
 
-Function81f0c: ; 81f0c
+Function81f0c:
 	ld a, [wcfbe]
 	push af
 	set 7, a
@@ -939,9 +906,8 @@
 	pop af
 	ld [wcfbe], a
 	ret
-; 81f1d
 
-Function81f1d: ; 81f1d
+Function81f1d:
 	ld a, [hl]
 	and $7
 	ret z
@@ -989,9 +955,8 @@
 	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 @@
 .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 @@
 	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,9 +1109,8 @@
 	ld [hli], a
 endr
 	ret
-; 821f4
 
-Function821f4: ; 821f4
+Function821f4:
 	hlcoord 2, 4
 	call Function82203
 	hlcoord 2, 6
@@ -1157,7 +1117,7 @@
 	call Function82203
 	hlcoord 2, 8
 
-Function82203: ; 82203
+Function82203:
 	ld a, DEBUGTEST_UP_ARROW
 	ld [hli], a
 	ld bc, $10 - 1
@@ -1164,9 +1124,8 @@
 	ld a, DEBUGTEST_TICKS
 	call ByteFill
 	ret
-; 8220f
 
-Function8220f: ; 8220f
+Function8220f:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -1187,10 +1146,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 82236
 
-
-Function82236: ; 82236
+Function82236:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and SELECT
@@ -1247,9 +1204,8 @@
 	xor $d0
 	ld [hWY], a
 	ret
-; 822a3
 
-Function822a3: ; 822a3
+Function822a3:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals2)
@@ -1281,9 +1237,8 @@
 	ld [hCGBPalUpdate], a
 	call DelayFrame
 	ret
-; 822f0
 
-Function822f0: ; 822f0
+Function822f0:
 	ld a, [wcf65]
 	and 3
 	ld e, a
@@ -1295,16 +1250,14 @@
 	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 @@
 	call Function81ea5
 	ret
 
-Function82339: ; 82338
+Function82339:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1350,7 +1303,7 @@
 	ld hl, wc608 + 10
 	jr Function82368
 
-Function8234b: ; 8234b
+Function8234b:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1361,7 +1314,7 @@
 	ld hl, wc608 + 11
 	jr Function82368
 
-Function8235d: ; 8235d
+Function8235d:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -1368,7 +1321,7 @@
 	jr nz, Function82387
 	ld hl, wc608 + 12
 
-Function82368: ; 82368
+Function82368:
 	ld a, [hJoyLast]
 	and D_RIGHT
 	jr nz, .asm_82375
@@ -1395,18 +1348,17 @@
 	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 @@
 	ld [hli], a
 	ld [hl], d
 	ret
-; 823c6
 
-Function823c6: ; 823c6
+Function823c6:
 	ret
 
-Function823c7: ; 823c7
+Function823c7:
 	ret
-; 823c8
--- a/engine/menus/delete_save.asm
+++ b/engine/menus/delete_save.asm
@@ -1,4 +1,4 @@
-_DeleteSaveData: ; 4d54c
+_DeleteSaveData:
 	farcall BlankScreen
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
@@ -18,18 +18,18 @@
 	farcall EmptyAllSRAMBanks
 	ret
 
-.Text_ClearAllSaveData: ; 0x4d580
+.Text_ClearAllSaveData:
 	; Clear all save data?
 	text_jump UnknownText_0x1c564a
 	db "@"
 
-.NoYesMenuHeader: ; 0x4d585
+.NoYesMenuHeader:
 	db 0 ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData: ; 0x4d58d
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2 ; items
 	db "NO@"
--- a/engine/menus/empty_sram.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 @@
 	call .EmptyBank
 	ret
 
-.EmptyBank: ; 4cf34
+.EmptyBank:
 	call GetSRAMBank
 	ld hl, SRAM_Begin
 	ld bc, SRAM_End - SRAM_Begin
--- a/engine/menus/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 @@
 	res 1, a
 	ld [wd479], a
 	ret
-; 4802f
 
 INCLUDE "mobile/mobile_12.asm"
 
-InitGender: ; 48dcb (12:4dcb)
+InitGender:
 	call InitGenderScreen
 	call LoadGenderScreenPal
 	call LoadGenderScreenLightBlueTile
@@ -41,29 +40,25 @@
 	ld c, 10
 	call DelayFrames
 	ret
-; 48dfc (12:4dfc)
 
-.MenuHeader: ; 0x48dfc
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 6, 4, 12, 9
 	dw .MenuData
 	db 1 ; default option
-; 0x48e04
 
-.MenuData: ; 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 @@
 	call ByteFill
 	ret
 
-LoadGenderScreenPal: ; 48e47 (12:4e47)
+LoadGenderScreenPal:
 	ld hl, .Palette
 	ld de, wBGPals1
 	ld bc, 1 palettes
@@ -93,19 +88,16 @@
 	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"
--- a/engine/menus/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 @@
 	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 @@
 	ld de, .Day
 	call PlaceString
 	ret
-; 5b1c
 
-.Days: ; 5b1c
+.Days:
 	db "SUN@"
 	db "MON@"
 	db "TUES@"
@@ -38,13 +35,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +216,8 @@
 
 	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
@@ -237,9 +224,8 @@
 	dec a
 	ld [hl], a
 	ret
-; 5ca6
 
-SetDefaultBoxNames: ; 5ca6
+SetDefaultBoxNames:
 	ld hl, wBoxNames
 	ld c, 0
 .loop
@@ -270,9 +256,8 @@
 
 .Box:
 	db "BOX@"
-; 5cd3
 
-InitializeMagikarpHouse: ; 5cd3
+InitializeMagikarpHouse:
 	ld hl, wBestMagikarpLengthFeet
 	ld a, $3
 	ld [hli], a
@@ -281,13 +266,11 @@
 	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 @@
 .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,9 +327,8 @@
 	ld [wLuckyIDNumber + 1], a
 	ld [sLuckyIDNumber + 1], a
 	jp CloseSRAM
-; 5d65
 
-Continue: ; 5d65
+Continue:
 	farcall TryLoadSaveFile
 	jr c, .FailToLoad
 	farcall _LoadData
@@ -400,22 +380,19 @@
 	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 @@
 	ld c, 35
 	call DelayFrames
 	ret
-; 5e34
 
-ConfirmContinue: ; 5e34
+ConfirmContinue:
 .loop
 	call DelayFrame
 	call GetJoypad
@@ -460,9 +436,8 @@
 
 .PressA:
 	ret
-; 5e48
 
-Continue_CheckRTC_RestartClock: ; 5e48
+Continue_CheckRTC_RestartClock:
 	call CheckRTCStatus
 	and %10000000 ; Day count exceeded 16383
 	jr z, .pass
@@ -476,9 +451,8 @@
 .pass
 	xor a
 	ret
-; 5e5d
 
-FinishContinueFunction: ; 5e5d
+FinishContinueFunction:
 .loop
 	xor a
 	ld [wDontPlayMapMusicOnReload], a
@@ -497,9 +471,8 @@
 .AfterRed:
 	call SpawnAfterRed
 	jr .loop
-; 5e85
 
-DisplaySaveInfoOnContinue: ; 5e85
+DisplaySaveInfoOnContinue:
 	call CheckRTCStatus
 	and %10000000
 	jr z, .clock_ok
@@ -511,14 +484,12 @@
 	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
@@ -525,9 +496,8 @@
 	call LoadFontsExtra
 	call UpdateSprites
 	ret
-; 5eaf
 
-DisplayContinueDataWithRTCError: ; 5eaf
+DisplayContinueDataWithRTCError:
 	call Continue_LoadMenuHeader
 	call Continue_DisplayBadgesDexPlayerName
 	call Continue_UnknownGameTime
@@ -534,9 +504,8 @@
 	call LoadFontsExtra
 	call UpdateSprites
 	ret
-; 5ebf
 
-Continue_LoadMenuHeader: ; 5ebf
+Continue_LoadMenuHeader:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, .MenuHeader_Dex
@@ -550,16 +519,14 @@
 	call MenuBox
 	call PlaceVerticalMenuItems
 	ret
-; 5ed9
 
-.MenuHeader_Dex: ; 5ed9
+.MenuHeader_Dex:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 9
 	dw .MenuData_Dex
 	db 1 ; default option
-; 5ee1
 
-.MenuData_Dex: ; 5ee1
+.MenuData_Dex:
 	db 0 ; flags
 	db 4 ; items
 	db "PLAYER@"
@@ -566,16 +533,14 @@
 	db "BADGES@"
 	db "#DEX@"
 	db "TIME@"
-; 5efb
 
-.MenuHeader_NoDex: ; 5efb
+.MenuHeader_NoDex:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 15, 9
 	dw .MenuData_NoDex
 	db 1 ; default option
-; 5f03
 
-.MenuData_NoDex: ; 5f03
+.MenuData_NoDex:
 	db 0 ; flags
 	db 4 ; items
 	db "PLAYER <PLAYER>@"
@@ -582,10 +547,8 @@
 	db "BADGES@"
 	db " @"
 	db "TIME@"
-; 5f1c
 
-
-Continue_DisplayBadgesDexPlayerName: ; 5f1c
+Continue_DisplayBadgesDexPlayerName:
 	call MenuBoxCoord2Tile
 	push hl
 	decoord 13, 4, 0
@@ -607,16 +570,14 @@
 
 .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 @@
 
 .three_question_marks
 	db " ???@"
-; 5f58
 
-Continue_DisplayBadgeCount: ; 5f58
+Continue_DisplayBadgeCount:
 	push hl
 	ld hl, wJohtoBadges
 	ld b, 2
@@ -636,9 +596,8 @@
 	ld de, wd265
 	lb bc, 1, 2
 	jp PrintNum
-; 5f6b
 
-Continue_DisplayPokedexNumCaught: ; 5f6b
+Continue_DisplayPokedexNumCaught:
 	ld a, [wStatusFlags]
 	bit STATUSFLAGS_POKEDEX_F, a
 	ret z
@@ -654,9 +613,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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]
@@ -823,7 +779,6 @@
 	db "CHRIS@@@@@@"
 .Kris:
 	db "KRIS@@@@@@@"
-; 60e9
 
 Unreferenced_Function60e9:
 	call LoadMenuHeader
@@ -833,9 +788,8 @@
 	call CopyNameFromMenu
 	call CloseWindow
 	ret
-; 60fa
 
-StorePlayerName: ; 60fa
+StorePlayerName:
 	ld a, "@"
 	ld bc, NAME_LENGTH
 	ld hl, wPlayerName
@@ -844,10 +798,8 @@
 	ld de, wStringBuffer2
 	call CopyName2
 	ret
-; 610f
 
-ShrinkPlayer: ; 610f
-
+ShrinkPlayer:
 	ld a, [hROMBank]
 	push af
 
@@ -898,9 +850,8 @@
 	call RotateThreePalettesRight
 	call ClearTileMap
 	ret
-; 616a
 
-Intro_RotatePalettesLeftFrontpic: ; 616a
+Intro_RotatePalettesLeftFrontpic:
 	ld hl, IntroFadePalettes
 	ld b, IntroFadePalettes.End - IntroFadePalettes
 .loop
@@ -911,9 +862,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 617c
 
-IntroFadePalettes: ; 0x617c
+IntroFadePalettes:
 	db %01010100
 	db %10101000
 	db %11111100
@@ -921,9 +871,8 @@
 	db %11110100
 	db %11100100
 .End
-; 6182
 
-Intro_WipeInFrontpic: ; 6182
+Intro_WipeInFrontpic:
 	ld a, $77
 	ld [hWX], a
 	call DelayFrame
@@ -937,9 +886,8 @@
 	ret z
 	ld [hWX], a
 	jr .loop
-; 619c
 
-Intro_PrepTrainerPic: ; 619c
+Intro_PrepTrainerPic:
 	ld de, vTiles2
 	farcall GetTrainerPic
 	xor a
@@ -948,9 +896,8 @@
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 61b4
 
-ShrinkFrame: ; 61b4
+ShrinkFrame:
 	ld de, vTiles2
 	ld c, 7 * 7
 	predef DecompressGet2bpp
@@ -960,10 +907,8 @@
 	lb bc, 7, 7
 	predef PlaceGraphic
 	ret
-; 61cd
 
-Intro_PlacePlayerSprite: ; 61cd
-
+Intro_PlacePlayerSprite:
 	farcall GetPlayerIcon
 	ld c, $c
 	ld hl, vTiles0
@@ -998,9 +943,8 @@
 	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
@@ -1007,15 +951,13 @@
 	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 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 626a
 
 .dw
 	dw _MainMenu
@@ -1070,15 +1011,12 @@
 	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 @@
 .done_title
 	scf
 	ret
-; 6292
 
-Unreferenced_Function6292: ; 6292
+Unreferenced_Function6292:
 	ld a, [hVBlankCounter]
 	and $7
 	ret nz
@@ -1103,9 +1040,8 @@
 	ld bc, 2 * SCREEN_WIDTH
 	call ByteFill
 	ret
-; 62a3
 
-TitleScreenScene: ; 62a3
+TitleScreenScene:
 	ld e, a
 	ld d, 0
 	ld hl, .scenes
@@ -1115,7 +1051,6 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 62af
 
 .scenes
 	dw TitleScreenEntrance
@@ -1122,17 +1057,13 @@
 	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 @@
 	ld a, $88
 	ld [hWY], a
 	ret
-; 62f6
 
-
-TitleScreenTimer: ; 62f6
-
+TitleScreenTimer:
 ; Next scene
 	ld hl, wJumptableIndex
 	inc [hl]
@@ -1194,10 +1122,8 @@
 	inc hl
 	ld [hl], d
 	ret
-; 6304
 
-TitleScreenMain: ; 6304
-
+TitleScreenMain:
 ; Run the timer down.
 	ld hl, wTitleScreenTimer
 	ld e, [hl]
@@ -1296,10 +1222,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [hWY], a
 	call WaitBGMap
 	jp CrystalIntroSequence
-; 6454
--- a/engine/menus/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
@@ -27,24 +26,21 @@
 
 .quit
 	ret
-; 49d14
 
-.MenuHeader: ; 49d14
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 16, 7
 	dw .MenuData
 	db 1 ; default option
-; 49d1c
 
-.MenuData: ; 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,7 +48,7 @@
 	db "MOBILE@"
 	db "MOBILE STUDIUM@"
 
-.Jumptable: ; 0x49d60
+.Jumptable:
 	dw MainMenu_Continue
 	dw MainMenu_NewGame
 	dw MainMenu_Options
@@ -59,7 +55,6 @@
 	dw MainMenu_MysteryGift
 	dw MainMenu_Mobile
 	dw MainMenu_MobileStudium
-; 0x49d6c
 
 CONTINUE       EQU 0
 NEW_GAME       EQU 1
@@ -70,13 +65,13 @@
 
 MainMenuItems:
 
-NewGameMenu: ; 0x49d6c
+NewGameMenu:
 	db 2
 	db NEW_GAME
 	db OPTION
 	db -1
 
-ContinueMenu: ; 0x49d70
+ContinueMenu:
 	db 3
 	db CONTINUE
 	db NEW_GAME
@@ -83,7 +78,7 @@
 	db OPTION
 	db -1
 
-MobileMysteryMenu: ; 0x49d75
+MobileMysteryMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -92,7 +87,7 @@
 	db MOBILE
 	db -1
 
-MobileMenu: ; 0x49d7c
+MobileMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -100,7 +95,7 @@
 	db MOBILE
 	db -1
 
-MobileStudiumMenu: ; 0x49d82
+MobileStudiumMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -109,7 +104,7 @@
 	db MOBILE_STUDIUM
 	db -1
 
-MysteryMobileStudiumMenu: ; 0x49d89
+MysteryMobileStudiumMenu:
 	db 6
 	db CONTINUE
 	db NEW_GAME
@@ -119,7 +114,7 @@
 	db MOBILE_STUDIUM
 	db -1
 
-MysteryMenu: ; 0x49d91
+MysteryMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -127,7 +122,7 @@
 	db MYSTERY_GIFT
 	db -1
 
-MysteryStudiumMenu: ; 0x49d97
+MysteryStudiumMenu:
 	db 5
 	db CONTINUE
 	db NEW_GAME
@@ -136,7 +131,7 @@
 	db MOBILE_STUDIUM
 	db -1
 
-StudiumMenu: ; 0x49d9e
+StudiumMenu:
 	db 4
 	db CONTINUE
 	db NEW_GAME
@@ -144,8 +139,7 @@
 	db MOBILE_STUDIUM
 	db -1
 
-
-MainMenu_GetWhichMenu: ; 49da4
+MainMenu_GetWhichMenu:
 	nop
 	nop
 	nop
@@ -193,9 +187,8 @@
 .ok4
 	ld a, $6 ; Mystery Gift
 	ret
-; 49de4
 
-MainMenuJoypadLoop: ; 49de4
+MainMenuJoypadLoop:
 	call SetUpMenu
 .loop
 	call MainMenu_PrintCurrentTimeAndDay
@@ -218,9 +211,8 @@
 .b_button
 	scf
 	ret
-; 49e09
 
-MainMenu_PrintCurrentTimeAndDay: ; 49e09
+MainMenu_PrintCurrentTimeAndDay:
 	ld a, [wSaveFileExists]
 	and a
 	ret z
@@ -237,10 +229,8 @@
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 49e27
 
-
-.PlaceBox: ; 49e27
+.PlaceBox:
 	call CheckRTCStatus
 	and $80
 	jr nz, .TimeFail
@@ -253,10 +243,8 @@
 .TimeFail:
 	call SpeechTextBox
 	ret
-; 49e3d
 
-
-.PlaceTime: ; 49e3d
+.PlaceTime:
 	ld a, [wSaveFileExists]
 	and a
 	ret z
@@ -282,26 +270,22 @@
 .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
@@ -315,7 +299,6 @@
 	ld de, .Day
 	call PlaceString
 	ret
-; 49ea8
 
 .Days:
 	db "SUN@"
@@ -327,9 +310,8 @@
 	db "SATUR@"
 .Day:
 	db "DAY@"
-; 49ed0
 
-Function49ed0: ; 49ed0
+Function49ed0:
 	xor a
 	ld [hMapAnims], a
 	call ClearTileMap
@@ -337,25 +319,19 @@
 	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
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -1,4 +1,4 @@
-_2DMenu_:: ; 2400e
+_2DMenu_::
 	ld hl, CopyMenuData
 	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
@@ -8,9 +8,8 @@
 	call ApplyTilemap
 	call Get2DMenuSelection
 	ret
-; 24022
 
-_InterpretBattleMenu:: ; 24022
+_InterpretBattleMenu::
 	ld hl, CopyMenuData
 	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
@@ -21,9 +20,8 @@
 	call ApplyTilemap
 	call Get2DMenuSelection
 	ret
-; 2403c
 
-_InterpretMobileMenu:: ; 2403c
+_InterpretMobileMenu::
 	ld hl, CopyMenuData
 	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
@@ -56,23 +54,19 @@
 	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
+Mobile_GetMenuSelection:
 	ld a, [wMenuDataFlags]
 	bit 1, a
 	jr z, .skip
@@ -108,22 +102,19 @@
 .quit2
 	scf
 	ret
-; 240cd
 
-Get2DMenuNumberOfColumns: ; 240cd
+Get2DMenuNumberOfColumns:
 	ld a, [wMenuData_2DMenuDimensions]
 	and $f
 	ret
-; 240d3
 
-Get2DMenuNumberOfRows: ; 240d3
+Get2DMenuNumberOfRows:
 	ld a, [wMenuData_2DMenuDimensions]
 	swap a
 	and $f
 	ret
-; 240db
 
-Place2DMenuItemStrings: ; 240db
+Place2DMenuItemStrings:
 	ld hl, wMenuData_2DMenuItemStringsAddr
 	ld e, [hl]
 	inc hl
@@ -164,10 +155,8 @@
 	ld a, [wMenuData_2DMenuFunctionBank]
 	rst FarCall
 	ret
-; 2411a
 
-
-Init2DMenuCursorPosition: ; 2411a (9:411a)
+Init2DMenuCursorPosition:
 	call GetMenuTextStartCoord
 	ld a, b
 	ld [w2DMenuCursorInitY], a
@@ -222,9 +211,8 @@
 	ld [wCursorCurrentTile], a
 	ld [wCursorCurrentTile + 1], a
 	ret
-; 24179
 
-.InitFlags_a: ; 24179
+.InitFlags_a:
 	xor a
 	ld hl, w2DMenuFlags1
 	ld [hli], a
@@ -235,16 +223,14 @@
 	set 5, [hl]
 	set 4, [hl]
 	ret
-; 2418a
 
-.InitFlags_b: ; 2418a
+.InitFlags_b:
 	ld a, [wMenuData_2DMenuSpacing]
 	or $20
 	ld [w2DMenuCursorOffsets], a
 	ret
-; 24193
 
-.InitFlags_c: ; 24193
+.InitFlags_c:
 	ld hl, wMenuDataFlags
 	ld a, A_BUTTON
 	bit 0, [hl]
@@ -257,12 +243,10 @@
 .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 @@
 	pop af
 	ld [hBGMapMode], a
 	ret
-; 241ba
 
-MobileMenuJoypad: ; 241ba
+MobileMenuJoypad:
 	ld hl, w2DMenuFlags2
 	res 7, [hl]
 	ld a, [hBGMapMode]
@@ -288,10 +271,8 @@
 	call GetMenuJoypad
 	ld c, a
 	ret
-; 241d5
 
-
-Unreferenced_Function241d5: ; 241d5
+Unreferenced_Function241d5:
 	call Place2DMenuCursor
 .loop
 	call Move2DMenuCursor
@@ -328,10 +309,8 @@
 	jr z, .loop2
 	and a
 	ret
-; 24216
 
-
-MenuJoypadLoop: ; 24216
+MenuJoypadLoop:
 .loop
 	call Move2DMenuCursor
 	call .BGMap_OAM
@@ -350,9 +329,8 @@
 
 .done
 	ret
-; 24238
 
-.BGMap_OAM: ; 24238
+.BGMap_OAM:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -363,9 +341,8 @@
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 24249
 
-Do2DMenuRTCJoypad: ; 24249
+Do2DMenuRTCJoypad:
 .loopRTC
 	call RTC
 	call Menu_WasButtonPressed
@@ -375,9 +352,8 @@
 	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 @@
 	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 @@
 	and a
 	ret
 
-.set_bit_7 ; 24299
+.set_bit_7
 	ld hl, w2DMenuFlags2
 	set 7, [hl]
 	scf
@@ -512,14 +487,12 @@
 	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 @@
 	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 @@
 	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 @@
 	ld hl, wWindowStackSize
 	inc [hl]
 	ret
-; 243cd
 
-.copy ; 243cd
+.copy
 	call GetMenuBoxDims
 	inc b
 	inc c
@@ -678,13 +649,11 @@
 	jr nz, .row
 
 	ret
-; 243e7
 
-.ret ; 243e7
+.ret
 	ret
-; 243e8
 
-_ExitMenu:: ; 243e8
+_ExitMenu::
 	xor a
 	ld [hBGMapMode], a
 
@@ -722,9 +691,8 @@
 	ld hl, wWindowStackSize
 	dec [hl]
 	ret
-; 24423
 
-Unreferenced_Function24423: ; 24423
+Unreferenced_Function24423:
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -755,22 +723,19 @@
 	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
+_InitVerticalMenuCursor::
 	ld a, [wMenuDataFlags]
 	ld b, a
 	ld hl, w2DMenuCursorInitY
@@ -838,4 +803,3 @@
 	ld [hli], a
 	ld [hli], a
 	ret
-; 244c3
--- a/engine/menus/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 @@
 	call PlaceString
 	ret
 
-PlaceMenuItemQuantity: ; 0x24ac3
+PlaceMenuItemQuantity:
 	push de
 	ld a, [wMenuSelection]
 	ld [wCurItem], a
@@ -27,22 +27,22 @@
 .done
 	ret
 
-PlaceMoneyTopRight: ; 24ae8
+PlaceMoneyTopRight:
 	ld hl, MenuHeader_0x24b15
 	call CopyMenuHeader
 	jr PlaceMoneyTextBox
 
-PlaceMoneyBottomLeft: ; 24af0
+PlaceMoneyBottomLeft:
 	ld hl, MenuHeader_0x24b1d
 	call CopyMenuHeader
 	jr PlaceMoneyTextBox
 
-PlaceMoneyAtTopLeftOfTextbox: ; 24af8
+PlaceMoneyAtTopLeftOfTextbox:
 	ld hl, MenuHeader_0x24b15
 	lb de, 0, 11
 	call OffsetMenuHeader
 
-PlaceMoneyTextBox: ; 24b01
+PlaceMoneyTextBox:
 	call MenuBox
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH + 1
@@ -52,19 +52,19 @@
 	call PrintNum
 	ret
 
-MenuHeader_0x24b15: ; 0x24b15
+MenuHeader_0x24b15:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, 2
 	dw NULL
 	db 1 ; default option
 
-MenuHeader_0x24b1d: ; 0x24b1d
+MenuHeader_0x24b1d:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 11, 8, 13
 	dw NULL
 	db 1 ; default option
 
-DisplayCoinCaseBalance: ; 24b25
+DisplayCoinCaseBalance:
 	; Place a text box of size 1x7 at 11, 0.
 	hlcoord 11, 0
 	ld b, 1
@@ -82,7 +82,7 @@
 	call PrintNum
 	ret
 
-DisplayMoneyAndCoinBalance: ; 24b4e
+DisplayMoneyAndCoinBalance:
 	hlcoord 5, 0
 	ld b, 3
 	ld c, 13
@@ -103,14 +103,14 @@
 	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,12 +138,12 @@
 	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
@@ -150,7 +150,7 @@
 	call TextBox
 	ret
 
-StartMenu_PrintBugContestStatus: ; 24be7
+StartMenu_PrintBugContestStatus:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -194,18 +194,18 @@
 	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 @@
 	scf
 	ret
 
-.addtobuffer ; 24c94
+.addtobuffer
 	push hl
 	ld hl, wBuffer1
 	inc [hl]
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -4,15 +4,13 @@
 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 @@
 	call ClearJoypad
 	ret
 
-; 116f8
-
-.SetUpNamingScreen: ; 116f8
+.SetUpNamingScreen:
 	call ClearBGPalettes
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
@@ -63,9 +59,7 @@
 	call NamingScreen_InitNameEntry
 	ret
 
-; 1171d
-
-.GetNamingScreenSetup: ; 1171d
+.GetNamingScreenSetup:
 	ld a, [wNamingScreenType]
 	and 7
 	ld e, a
@@ -78,9 +72,7 @@
 	ld l, a
 	jp hl
 
-; 1172e
-
-.Jumptable: ; 1172e (4:572e)
+.Jumptable:
 	dw .Pokemon
 	dw .Player
 	dw .Rival
@@ -90,7 +82,7 @@
 	dw .Pokemon
 	dw .Pokemon
 
-.Pokemon: ; 1173e (4:573e)
+.Pokemon:
 	ld a, [wCurPartySpecies]
 	ld [wd265], a
 	ld hl, LoadMenuMonIcon
@@ -121,15 +113,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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,14 +176,10 @@
 	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
@@ -214,14 +186,10 @@
 	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 @@
 	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 @@
 	ld [wNamingScreenStringEntryCoord + 1], a
 	ret
 
-NamingScreen_IsTargetBox: ; 1189c
+NamingScreen_IsTargetBox:
 	push bc
 	push af
 	ld a, [wNamingScreenType]
@@ -287,9 +255,7 @@
 	pop bc
 	ret
 
-; 118a8
-
-NamingScreen_InitText: ; 118a8
+NamingScreen_InitText:
 	call WaitTop
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -304,7 +270,7 @@
 .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 @@
 	jr nz, .row
 	ret
 
-; 11915
-
-NamingScreenJoypadLoop: ; 11915
+NamingScreenJoypadLoop:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
@@ -373,9 +337,7 @@
 	scf
 	ret
 
-; 11940
-
-.UpdateStringEntry: ; 11940
+.UpdateStringEntry:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 1, 5
@@ -399,9 +361,7 @@
 	ld [hBGMapMode], a
 	ret
 
-; 11968
-
-.RunJumptable: ; 11968
+.RunJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, $0
@@ -413,13 +373,11 @@
 	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 @@
 	inc [hl]
 	ret
 
-.ReadButtons: ; 119a1 (4:59a1)
+.ReadButtons:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and A_BUTTON
@@ -510,13 +468,13 @@
 	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 @@
 	xor a
 	ret
 
-NamingScreen_AnimateCursor: ; 11a3b (4:5a3b)
+NamingScreen_AnimateCursor:
 	call .GetDPad
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
@@ -590,17 +548,13 @@
 	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 @@
 	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 @@
 
 	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 @@
 	scf
 	ret
 
-; 11b39 (4:5b39)
-
 ; unused
 	ld a, [wNamingScreenCurrNameLength]
 	and a
@@ -769,13 +721,9 @@
 	ld a, [hl]
 	jr NamingScreen_LoadNextCharacter
 
-; 11b56
-
 INCLUDE "data/text/unused_dakutens.asm"
 
-; 11bbc
-
-NamingScreen_DeleteCharacter: ; 11bbc (4:5bbc)
+NamingScreen_DeleteCharacter:
 	ld hl, wNamingScreenCurrNameLength
 	ld a, [hl]
 	and a
@@ -790,7 +738,7 @@
 	ld [hl], NAMINGSCREEN_MIDDLELINE
 	ret
 
-NamingScreen_GetTextCursorPosition: ; 11bd0 (4:5bd0)
+NamingScreen_GetTextCursorPosition:
 	push af
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
@@ -803,9 +751,7 @@
 	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 @@
 	ld [hl], "@"
 	ret
 
-; 11bf7
-
-NamingScreen_StoreEntry: ; 11bf7 (4:5bf7)
+NamingScreen_StoreEntry:
 	ld hl, wNamingScreenDestinationPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -847,7 +791,7 @@
 	jr nz, .loop
 	ret
 
-NamingScreen_GetLastCharacter: ; 11c11 (4:5c11)
+NamingScreen_GetLastCharacter:
 	ld hl, wNamingScreenCursorObjectPointer
 	ld c, [hl]
 	inc hl
@@ -890,7 +834,7 @@
 	ld [wNamingScreenLastCharacter], a
 	ret
 
-LoadNamingScreenGFX: ; 11c51
+LoadNamingScreenGFX:
 	call ClearSprites
 	callfar ClearSpriteAnims
 	call LoadStandardFont
@@ -935,32 +879,24 @@
 	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/text/name_input_chars.asm"
-; 11e5d
 
 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 @@
 	ld [hMapAnims], a
 	ret
 
-.InitBlankMail: ; 11e9a (4:5e9a)
+.InitBlankMail:
 	call ClearBGPalettes
 	call DisableLCD
 	call LoadNamingScreenGFX
@@ -1030,25 +966,18 @@
 	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 @@
 	call ClearBox
 	ld de, MailEntry_Uppercase
 
-.PlaceMailCharset: ; 11fa9 (4:5fa9)
+.PlaceMailCharset:
 	hlcoord 1, 7
 	ld b, 6
 .next
@@ -1082,7 +1011,7 @@
 	jr nz, .next
 	ret
 
-.DoMailEntry: ; 11fc0 (4:5fc0)
+.DoMailEntry:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
@@ -1103,7 +1032,7 @@
 	scf
 	ret
 
-.Update: ; 11feb (4:5feb)
+.Update:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 1, 1
@@ -1119,7 +1048,7 @@
 	ld [hBGMapMode], a
 	ret
 
-.DoJumptable: ; 12008 (4:6008)
+.DoJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -1131,11 +1060,11 @@
 	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 @@
 	inc [hl]
 	ret
 
-.process_joypad ; 1203a (4:603a)
+.process_joypad
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and A_BUTTON
@@ -1240,7 +1169,7 @@
 
 ; 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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, [hl]
 	jp NamingScreen_LoadNextCharacter
 
-; 121dd
-
 INCLUDE "data/text/mail_input_chars.asm"
-
-; 122c1
--- a/engine/menus/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 @@
 	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>"
+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@"
-; e42d6
 
-
-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 @@
 	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 @@
 	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
@@ -156,7 +150,6 @@
 	call PlaceString
 	and a
 	ret
-; e4331
 
 .Strings:
 ; entries correspond to OPT_TEXT_SPEED_* constants
@@ -167,14 +160,12 @@
 .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 @@
 	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 @@
 	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 @@
 	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,13 +303,10 @@
 	call PlaceString
 	and a
 	ret
-; e4416
 
 .Mono:   db "MONO  @"
 .Stereo: db "STEREO@"
-; e4424
 
-
 	const_def
 	const OPT_PRINT_LIGHTEST ; 0
 	const OPT_PRINT_LIGHTER  ; 1
@@ -334,7 +314,7 @@
 	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 @@
 	call PlaceString
 	and a
 	ret
-; e445a
 
 .Strings:
 ; entries correspond to OPT_PRINT_* constants
@@ -392,10 +371,8 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	call LoadFontsExtra
 	and a
 	ret
-; e4520
 
-Options_Cancel: ; e4520
+Options_Cancel:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr nz, .Exit
@@ -516,9 +488,8 @@
 .Exit:
 	scf
 	ret
-; e452a
 
-OptionsControl: ; e452a
+OptionsControl:
 	ld hl, wJumptableIndex
 	ld a, [hJoyLast]
 	cp D_DOWN
@@ -563,9 +534,8 @@
 	dec [hl]
 	scf
 	ret
-; e455c
 
-Options_UpdateCursorPosition: ; e455c
+Options_UpdateCursorPosition:
 	hlcoord 1, 1
 	ld de, SCREEN_WIDTH
 	ld c, $10
@@ -580,4 +550,3 @@
 	call AddNTimes
 	ld [hl], "▶"
 	ret
-; e4579
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -1,4 +1,4 @@
-SaveMenu: ; 14a1a
+SaveMenu:
 	call LoadStandardMenuHeader
 	farcall DisplaySaveInfoOnSave
 	call SpeechTextBox
@@ -23,7 +23,7 @@
 	scf
 	ret
 
-SaveAfterLinkTrade: ; 14a58
+SaveAfterLinkTrade:
 	call PauseGameLogic
 	farcall StageRTCTimeForSave
 	farcall BackupMysteryGift
@@ -35,10 +35,8 @@
 	farcall SaveRTC
 	call ResumeGameLogic
 	ret
-; 14a83
 
-
-ChangeBoxSaveGame: ; 14a83 (5:4a83)
+ChangeBoxSaveGame:
 	push de
 	ld hl, Text_SaveOnBoxSwitch
 	call MenuTextBox
@@ -62,7 +60,7 @@
 	pop de
 	ret
 
-Link_SaveGame: ; 14ab2
+Link_SaveGame:
 	call AskOverwriteSaveFile
 	jr c, .refused
 	call PauseGameLogic
@@ -72,9 +70,8 @@
 
 .refused
 	ret
-; 14ac2
 
-MoveMonWOMail_SaveGame: ; 14ac2
+MoveMonWOMail_SaveGame:
 	call PauseGameLogic
 	push de
 	call SaveBox
@@ -84,9 +81,8 @@
 	call LoadBox
 	call ResumeGameLogic
 	ret
-; 14ad5
 
-MoveMonWOMail_InsertMon_SaveGame: ; 14ad5
+MoveMonWOMail_InsertMon_SaveGame:
 	call PauseGameLogic
 	push de
 	call SaveBox
@@ -93,7 +89,7 @@
 	pop de
 	ld a, e
 	ld [wCurBox], a
-	ld a, $1
+	ld a, TRUE
 	ld [wSaveFileExists], a
 	farcall StageRTCTimeForSave
 	farcall BackupMysteryGift
@@ -117,9 +113,8 @@
 	ld c, 24
 	call DelayFrames
 	ret
-; 14b34
 
-StartMoveMonWOMail_SaveGame: ; 14b34
+StartMoveMonWOMail_SaveGame:
 	ld hl, Text_SaveOnMoveMonWOMail
 	call MenuTextBox
 	call YesNoBox
@@ -136,22 +131,18 @@
 .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
@@ -171,14 +162,12 @@
 	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 @@
 .refused
 	scf
 	ret
-; 14baf
 
-SaveTheGame_yesorno: ; 14baf
+SaveTheGame_yesorno:
 	ld b, BANK(Text_WouldYouLikeToSaveTheGame)
 	call MapTextbox
 	call LoadMenuTextBox
@@ -221,9 +209,8 @@
 	pop af
 	and a
 	ret
-; 14bcb
 
-CompareLoadedAndSavedPlayerID: ; 14bcb
+CompareLoadedAndSavedPlayerID:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, sPlayerData + (wPlayerID - wPlayerData)
@@ -237,11 +224,10 @@
 	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 @@
 	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 @@
 .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 @@
 .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 @@
 	ret nz
 	inc hl
 	jr .loop
-; 14c99
 
-SavingDontTurnOffThePower: ; 14c99
+SavingDontTurnOffThePower:
 	; Prevent joypad interrupts
 	xor a
 	ld [hJoypadReleased], a
@@ -364,10 +345,8 @@
 	ld c, $10
 	call DelayFrames
 	ret
-; 14cbb
 
-
-ErasePreviousSave: ; 14cbb
+ErasePreviousSave:
 	call EraseBoxes
 	call EraseHallOfFame
 	call EraseLinkBattleStats
@@ -383,9 +362,8 @@
 	ld a, $1
 	ld [wSavedAtLeastOnce], a
 	ret
-; 14ce2
 
-EraseLinkBattleStats: ; 14ce2
+EraseLinkBattleStats:
 	ld a, BANK(sLinkBattleStats)
 	call GetSRAMBank
 	ld hl, sLinkBattleStats
@@ -393,9 +371,8 @@
 	xor a
 	call ByteFill
 	jp CloseSRAM
-; 14cf4
 
-EraseMysteryGift: ; 14cf4
+EraseMysteryGift:
 	ld a, BANK(sBackupMysteryGiftItem)
 	call GetSRAMBank
 	ld hl, sBackupMysteryGiftItem
@@ -403,9 +380,8 @@
 	xor a
 	call ByteFill
 	jp CloseSRAM
-; 14d06
 
-EraseHallOfFame: ; 14d06
+EraseHallOfFame:
 	ld a, BANK(sHallOfFame)
 	call GetSRAMBank
 	ld hl, sHallOfFame
@@ -413,9 +389,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +445,8 @@
 	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
@@ -484,18 +453,15 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [sBackupCheckValue2], a
 	call CloseSRAM
 	ret
-; 14e40
 
-SaveBackupOptions: ; 14e40
+SaveBackupOptions:
 	ld a, BANK(sBackupOptions)
 	call GetSRAMBank
 	ld hl, wOptions
@@ -583,9 +542,8 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e55
 
-SaveBackupPlayerData: ; 14e55
+SaveBackupPlayerData:
 	ld a, BANK(sBackupPlayerData)
 	call GetSRAMBank
 	ld hl, wPlayerData
@@ -598,9 +556,8 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e76
 
-SaveBackupPokemonData: ; 14e76
+SaveBackupPokemonData:
 	ld a, BANK(sBackupPokemonData)
 	call GetSRAMBank
 	ld hl, wPokemonData
@@ -609,9 +566,8 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 14e8b
 
-SaveBackupChecksum: ; 14e8b
+SaveBackupChecksum:
 	ld hl, sBackupGameData
 	ld bc, sBackupGameDataEnd - sBackupGameData
 	ld a, BANK(sBackupGameData)
@@ -623,10 +579,8 @@
 	ld [sBackupChecksum + 1], a
 	call CloseSRAM
 	ret
-; 14ea5
 
-
-TryLoadSaveFile: ; 14ea5 (5:4ea5)
+TryLoadSaveFile:
 	call VerifyChecksum
 	jr nz, .backup
 	call LoadPlayerData
@@ -672,9 +626,8 @@
 	scf
 	ret
 
-
-TryLoadSaveData: ; 14f1c
-	xor a
+TryLoadSaveData:
+	xor a ; FALSE
 	ld [wSaveFileExists], a
 	call CheckPrimarySaveFile
 	ld a, [wSaveFileExists]
@@ -720,13 +673,10 @@
 	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 @@
 	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 @@
 .nope
 	call CloseSRAM
 	ret
-; 14fd7
 
-
-LoadPlayerData: ; 14fd7 (5:4fd7)
+LoadPlayerData:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, sPlayerData
@@ -793,7 +740,7 @@
 	call CloseSRAM
 	ret
 
-LoadPokemonData: ; 1500c
+LoadPokemonData:
 	ld a, BANK(sPokemonData)
 	call GetSRAMBank
 	ld hl, sPokemonData
@@ -802,14 +749,13 @@
 	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 @@
 	pop af
 	ret
 
-LoadBackupPlayerData: ; 15046 (5:5046)
+LoadBackupPlayerData:
 	ld a, BANK(sBackupPlayerData)
 	call GetSRAMBank
 	ld hl, sBackupPlayerData
@@ -840,7 +786,7 @@
 	call CloseSRAM
 	ret
 
-LoadBackupPokemonData: ; 15067 (5:5067)
+LoadBackupPokemonData:
 	ld a, BANK(sBackupPokemonData)
 	call GetSRAMBank
 	ld hl, sBackupPokemonData
@@ -850,7 +796,7 @@
 	call CloseSRAM
 	ret
 
-VerifyBackupChecksum: ; 1507c (5:507c)
+VerifyBackupChecksum:
 	ld hl, sBackupGameData
 	ld bc, sBackupGameDataEnd - sBackupGameData
 	ld a, BANK(sBackupGameData)
@@ -867,8 +813,7 @@
 	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 @@
 
 	jp CloseSRAM
 
-
-_LoadData: ; 150b9
+_LoadData:
 	ld a, BANK(sCrystalData)
 	call GetSRAMBank
 	ld hl, sCrystalData
@@ -914,8 +858,7 @@
 
 	jp CloseSRAM
 
-
-GetBoxAddress: ; 150d8
+GetBoxAddress:
 	ld a, [wCurBox]
 	cp NUM_BOXES
 	jr c, .ok
@@ -940,9 +883,8 @@
 	ld l, a
 	pop af
 	ret
-; 150f9
 
-SaveBoxAddress: ; 150f9
+SaveBoxAddress:
 ; Save box via wBoxPartialData.
 ; We do this in three steps because the size of wBoxPartialData is less than
 ; the size of sBox.
@@ -1016,10 +958,8 @@
 
 	pop hl
 	ret
-; 1517d
 
-
-LoadBoxAddress: ; 1517d (5:517d)
+LoadBoxAddress:
 ; Load box via wBoxPartialData.
 ; We do this in three steps because the size of wBoxPartialData is less than
 ; the size of sBox.
@@ -1082,8 +1022,7 @@
 	pop hl
 	ret
 
-
-EraseBoxes: ; 151fb
+EraseBoxes:
 	ld hl, BoxAddresses
 	ld c, NUM_BOXES
 .next
@@ -1123,9 +1062,8 @@
 	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 @@
 	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 @@
 	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_SaveOnMoveMonWOMail: ; 0x152a6
+Text_SaveOnMoveMonWOMail:
 	; Each time you move a #MON, data will be saved. OK?
 	text_jump UnknownText_0x1c465f
 	db "@"
-; 0x152ab
--- a/engine/menus/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 @@
 	ld [hBGMapMode], a
 	ret
 
-.CopyTilemapAtOnce: ; 4cf80 (13:4f80)
+.CopyTilemapAtOnce:
 	ld [hSPBuffer], sp ; $ffd9
 	ld sp, hl
 	ld a, [hBGMapAddress + 1]
--- a/engine/menus/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 @@
 	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 @@
 	xor a
 	ld [hBGMapMode], a
 	ret
-; 245f1
 
-ScrollingMenu_InitDisplay: ; 245f1
+ScrollingMenu_InitDisplay:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, wOptions
@@ -54,9 +50,8 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 24609
 
-ScrollingMenuJoyAction: ; 24609
+ScrollingMenuJoyAction:
 .loop
 	call ScrollingMenuJoypad
 	ld a, [hJoyLast]
@@ -82,15 +77,13 @@
 	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,15 +102,13 @@
 	ld a, A_BUTTON
 	scf
 	ret
-; 2466f
 
-.b_button ; 2466f
+.b_button
 	ld a, B_BUTTON
 	scf
 	ret
-; 24673
 
-.select ; 24673
+.select
 	ld a, [wMenuDataFlags]
 	bit 7, a
 	jp z, xor_a_dec_a
@@ -133,9 +124,8 @@
 	ld a, SELECT
 	scf
 	ret
-; 24695
 
-.start ; 24695
+.start
 	ld a, [wMenuDataFlags]
 	bit 6, a
 	jp z, xor_a_dec_a
@@ -142,9 +132,8 @@
 	ld a, START
 	scf
 	ret
-; 246a1
 
-.d_left ; 246a1
+.d_left
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a_dec_a
@@ -154,9 +143,8 @@
 	ld a, D_LEFT
 	scf
 	ret
-; 246b5
 
-.d_right ; 246b5
+.d_right
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a_dec_a
@@ -166,9 +154,8 @@
 	ld a, D_RIGHT
 	scf
 	ret
-; 246c9
 
-.d_up ; 246c9
+.d_up
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a
@@ -181,9 +168,8 @@
 
 .xor_dec_up
 	jp xor_a_dec_a
-; 246df
 
-.d_down ; 246df
+.d_down
 	ld hl, w2DMenuFlags2
 	bit 7, [hl]
 	jp z, xor_a
@@ -199,9 +185,8 @@
 
 .xor_dec_down
 	jp xor_a_dec_a
-; 246fc
 
-ScrollingMenu_GetCursorPosition: ; 246fc
+ScrollingMenu_GetCursorPosition:
 	ld a, [wMenuScrollPosition]
 	ld c, a
 	ld a, [wMenuCursorY]
@@ -208,9 +193,8 @@
 	add c
 	ld c, a
 	ret
-; 24706
 
-ScrollingMenu_ClearLeftColumn: ; 24706 (9:4706)
+ScrollingMenu_ClearLeftColumn:
 	call MenuBoxCoord2Tile
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -223,7 +207,7 @@
 	jr nz, .loop
 	ret
 
-InitScrollingMenuCursor: ; 2471a
+InitScrollingMenuCursor:
 	ld hl, wMenuData_ItemsPointerAddr
 	ld a, [hli]
 	ld h, [hl]
@@ -271,9 +255,8 @@
 
 .asm_24763
 	ret
-; 24764
 
-ScrollingMenu_InitFlags: ; 24764
+ScrollingMenu_InitFlags:
 	ld a, [wMenuDataFlags]
 	ld c, a
 	ld a, [wScrollingMenuListSize]
@@ -343,9 +326,8 @@
 	ld [wCursorCurrentTile + 1], a
 	ld [wCursorOffCharacter], a
 	ret
-; 247dd
 
-ScrollingMenu_ValidateSwitchItem: ; 247dd
+ScrollingMenu_ValidateSwitchItem:
 	ld a, [wScrollingMenuListSize]
 	ld c, a
 	ld a, [wSwitchItem]
@@ -359,9 +341,8 @@
 
 .done
 	ret
-; 247f0
 
-ScrollingMenu_UpdateDisplay: ; 247f0
+ScrollingMenu_UpdateDisplay:
 	call ClearWholeMenuBox
 	ld a, [wMenuDataFlags]
 	bit 4, a ; place arrows
@@ -432,9 +413,8 @@
 	ld e, l
 	ld hl, wMenuData_ScrollingMenuFunction1
 	jp CallPointerAt
-; 2486e
 
-ScrollingMenu_CallFunctions1and2: ; 2486e
+ScrollingMenu_CallFunctions1and2:
 	push hl
 	ld d, h
 	ld e, l
@@ -454,9 +434,8 @@
 
 .done
 	ret
-; 2488b
 
-ScrollingMenu_PlaceCursor: ; 2488b
+ScrollingMenu_PlaceCursor:
 	ld a, [wSwitchItem]
 	and a
 	jr z, .done
@@ -486,9 +465,8 @@
 
 .done
 	ret
-; 248b8
 
-ScrollingMenu_CheckCallFunction3: ; 248b8
+ScrollingMenu_CheckCallFunction3:
 	ld a, [wMenuDataFlags]
 	bit 5, a ; call function 3
 	ret z
@@ -505,9 +483,8 @@
 	ld hl, wMenuData_ScrollingMenuFunction3
 	call CallPointerAt
 	ret
-; 248d5
 
-ScrollingMenu_GetListItemCoordAndFunctionArgs: ; 248d5
+ScrollingMenu_GetListItemCoordAndFunctionArgs:
 	push de
 	push hl
 	ld e, a
@@ -540,4 +517,3 @@
 	pop hl
 	pop de
 	ret
-; 2490c
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -10,9 +10,7 @@
 	const STARTMENUITEM_POKEGEAR ; 7
 	const STARTMENUITEM_QUIT     ; 8
 
-
-StartMenu:: ; 125cd
-
+StartMenu::
 	call ClearWindowData
 
 	ld de, SFX_MENU
@@ -25,8 +23,8 @@
 	ld hl, .MenuHeader
 	jr z, .GotMenuData
 	ld hl, .ContestMenuHeader
-.GotMenuData:
 
+.GotMenuData:
 	call LoadMenuHeader
 	call .SetUpMenuItems
 	ld a, [wBattleMenuCursorBuffer]
@@ -118,23 +116,20 @@
 .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]
@@ -143,14 +138,12 @@
 	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
@@ -161,9 +154,7 @@
 	call ret_d90
 	call FinishExitMenu
 	ret
-; 126d3
 
-
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
@@ -241,8 +232,7 @@
 	db   "Quit and"
 	next "be judged.@"
 
-
-.OpenMenu: ; 127e5
+.OpenMenu:
 	ld a, [wMenuSelection]
 	call .GetMenuAccountTextPointer
 	ld a, [hli]
@@ -249,9 +239,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 127ef
 
-.MenuString: ; 127ef
+.MenuString:
 	push de
 	ld a, [wMenuSelection]
 	call .GetMenuAccountTextPointer
@@ -263,9 +252,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 12800
 
-.MenuDesc: ; 12800
+.MenuDesc:
 	push de
 	ld a, [wMenuSelection]
 	cp $ff
@@ -283,10 +271,8 @@
 .none
 	pop de
 	ret
-; 12819
 
-
-.GetMenuAccountTextPointer: ; 12819
+.GetMenuAccountTextPointer:
 	ld e, a
 	ld d, 0
 	ld hl, wMenuDataPointerTableAddr
@@ -297,10 +283,8 @@
 	add hl, de
 endr
 	ret
-; 12829
 
-
-.SetUpMenuItems: ; 12829
+.SetUpMenuItems:
 	xor a
 	ld [wWhichIndexSet], a
 	call .FillMenuList
@@ -358,10 +342,8 @@
 	ld a, c
 	ld [wMenuItemsList], a
 	ret
-; 1288d
 
-
-.FillMenuList: ; 1288d
+.FillMenuList:
 	xor a
 	ld hl, wMenuItemsList
 	ld [hli], a
@@ -371,28 +353,24 @@
 	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
@@ -402,23 +380,20 @@
 	ld b, 3
 	ld c, 8
 	jp TextBoxPalette
-; 128cb
 
-.IsMenuAccountOn: ; 128cb
+.IsMenuAccountOn:
 	ld a, [wOptions2]
 	and 1 << MENU_ACCOUNT
 	ret
-; 128d1
 
-.DrawBugContestStatusBox: ; 128d1
+.DrawBugContestStatusBox:
 	ld hl, wStatusFlags2
 	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	ret z
 	farcall StartMenu_DrawBugContestStatusBox
 	ret
-; 128de
 
-.DrawBugContestStatus: ; 128de
+.DrawBugContestStatus:
 	ld hl, wStatusFlags2
 	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
 	jr nz, .contest
@@ -426,18 +401,14 @@
 .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
@@ -456,10 +427,8 @@
 .EndTheContestText:
 	text_jump UnknownText_0x1c1a6c
 	db "@"
-; 1290b
 
-
-StartMenu_Save: ; 1290b
+StartMenu_Save:
 ; Save the game.
 
 	call BufferScreen
@@ -470,10 +439,8 @@
 .asm_12919
 	ld a, 1
 	ret
-; 1291c
 
-
-StartMenu_Option: ; 1291c
+StartMenu_Option:
 ; Game options.
 
 	call FadeToMenu
@@ -480,10 +447,8 @@
 	farcall OptionsMenu
 	ld a, 6
 	ret
-; 12928
 
-
-StartMenu_Status: ; 12928
+StartMenu_Status:
 ; Player status.
 
 	call FadeToMenu
@@ -491,11 +456,8 @@
 	call CloseSubmenu
 	ld a, 0
 	ret
-; 12937
 
-
-StartMenu_Pokedex: ; 12937
-
+StartMenu_Pokedex:
 	ld a, [wPartyCount]
 	and a
 	jr z, .asm_12949
@@ -507,21 +469,15 @@
 .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]
@@ -535,11 +491,8 @@
 	call ExitAllMenus
 	ld a, 4
 	ret
-; 12976
 
-
-StartMenu_Pokemon: ; 12976
-
+StartMenu_Pokemon:
 	ld a, [wPartyCount]
 	and a
 	jr z, .return
@@ -586,9 +539,8 @@
 	call ExitAllMenus
 	pop af
 	ret
-; 129d5
 
-HasNoItems: ; 129d5
+HasNoItems:
 	ld a, [wNumItems]
 	and a
 	ret nz
@@ -612,7 +564,7 @@
 	and a
 	ret
 
-TossItemFromPC: ; 129f4
+TossItemFromPC:
 	push de
 	call PartyMonItemName
 	farcall _CheckTossableItem
@@ -675,38 +627,30 @@
 	; 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
@@ -749,11 +693,8 @@
 	dbw MONMENUITEM_CANCEL,     CancelPokemonAction
 	dbw MONMENUITEM_MOVE,       ManagePokemonMoves
 	dbw MONMENUITEM_MAIL,       MonMailAction
-; 12aec
 
-
-SwitchPartyMons: ; 12aec
-
+SwitchPartyMons:
 ; Don't try if there's nothing to switch!
 	ld a, [wPartyCount]
 	cp 2
@@ -802,11 +743,8 @@
 	ld [wPartyMenuActionText], a
 	call CancelPokemonAction
 	ret
-; 12b60
 
-
-GiveTakePartyMonItem: ; 12b60
-
+GiveTakePartyMonItem:
 ; Eggs can't hold items!
 	ld a, [wCurPartySpecies]
 	cp EGG
@@ -844,11 +782,8 @@
 .cancel
 	ld a, 3
 	ret
-; 12ba9
 
-
 .GiveItem:
-
 	farcall DepositSellInitPackBuffers
 
 .loop
@@ -877,11 +812,8 @@
 
 .quit
 	ret
-; 12bd9
 
-
-TryGiveItemToPartymon: ; 12bd9
-
+TryGiveItemToPartymon:
 	call SpeechTextBox
 	call PartyMonItemName
 	call GetPartyItemLocation
@@ -942,11 +874,8 @@
 
 .abort
 	ret
-; 12c4c
 
-
-GivePartyItem: ; 12c4c
-
+GivePartyItem:
 	call GetPartyItemLocation
 	ld a, [wCurItem]
 	ld [hl], a
@@ -957,11 +886,8 @@
 
 .done
 	ret
-; 12c60
 
-
-TakePartyItem: ; 12c60
-
+TakePartyItem:
 	call SpeechTextBox
 	call GetPartyItemLocation
 	ld a, [hl]
@@ -993,10 +919,8 @@
 
 .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
@@ -1007,81 +931,64 @@
 	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
+ReceiveItemFromPokemon:
 	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	ld hl, wNumItems
 	jp ReceiveItem
-; 12cea
 
-
-GiveItemToPokemon: ; 12cea (4:6cea)
+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
@@ -1110,7 +1017,7 @@
 	call CloseSRAM
 	ret
 
-MonMailAction: ; 12d45
+MonMailAction:
 ; If in the time capsule or trade center,
 ; selecting the mail only allows you to
 ; read the mail.
@@ -1181,15 +1088,12 @@
 .done
 	ld a, $3
 	ret
-; 12dc9
 
-
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x12dd1
 
 .MenuData:
 	db STATICMENU_CURSOR ; flags
@@ -1197,47 +1101,38 @@
 	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
+OpenPartyStats:
 	call LoadStandardMenuHeader
 	call ClearSprites
 ; PartyMon
@@ -1249,10 +1144,8 @@
 	call Call_ExitMenu
 	ld a, 0
 	ret
-; 12e1b
 
-
-MonMenu_Cut: ; 12e1b
+MonMenu_Cut:
 	farcall CutFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1264,10 +1157,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12e30
 
-
-MonMenu_Fly: ; 12e30
+MonMenu_Fly:
 	farcall FlyFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $2
@@ -1290,9 +1181,8 @@
 .Unreferenced:
 	ld a, $1
 	ret
-; 12e55
 
-MonMenu_Flash: ; 12e55
+MonMenu_Flash:
 	farcall OWFlash
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1304,9 +1194,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12e6a
 
-MonMenu_Strength: ; 12e6a
+MonMenu_Strength:
 	farcall StrengthFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1318,9 +1207,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12e7f
 
-MonMenu_Whirlpool: ; 12e7f
+MonMenu_Whirlpool:
 	farcall WhirlpoolFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1332,9 +1220,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12e94
 
-MonMenu_Waterfall: ; 12e94
+MonMenu_Waterfall:
 	farcall WaterfallFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1346,9 +1233,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12ea9
 
-MonMenu_Teleport: ; 12ea9
+MonMenu_Teleport:
 	farcall TeleportFunction
 	ld a, [wFieldMoveSucceeded]
 	and a
@@ -1360,9 +1246,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12ebd
 
-MonMenu_Surf: ; 12ebd
+MonMenu_Surf:
 	farcall SurfFunction
 	ld a, [wFieldMoveSucceeded]
 	and a
@@ -1374,9 +1259,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12ed1
 
-MonMenu_Dig: ; 12ed1
+MonMenu_Dig:
 	farcall DigFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1388,9 +1272,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12ee6
 
-MonMenu_Softboiled_MilkDrink: ; 12ee6
+MonMenu_Softboiled_MilkDrink:
 	call .CheckMonHasEnoughHP
 	jr nc, .NotEnoughHP
 	farcall Softboiled_MilkDrinkFunction
@@ -1405,13 +1288,11 @@
 	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.
@@ -1433,9 +1314,8 @@
 	ld a, [hQuotient + 1]
 	sbc [hl]
 	ret
-; 12f26
 
-MonMenu_Headbutt: ; 12f26
+MonMenu_Headbutt:
 	farcall HeadbuttFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1447,9 +1327,8 @@
 .Fail:
 	ld a, $3
 	ret
-; 12f3b
 
-MonMenu_RockSmash: ; 12f3b
+MonMenu_RockSmash:
 	farcall RockSmashFunction
 	ld a, [wFieldMoveSucceeded]
 	cp $1
@@ -1461,16 +1340,14 @@
 .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
@@ -1484,7 +1361,6 @@
 	call ClearBGPalettes
 	pop af
 	ret
-; 12f73
 
 .ChooseMoveToDelete
 	call SetUpMoveScreenBG
@@ -1506,7 +1382,6 @@
 	call PrepareToPlaceMoveData
 	call PlaceMoveData
 	jp .loop
-; 12f9c
 
 .a_button
 	and a
@@ -1525,17 +1400,15 @@
 	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
@@ -1551,9 +1424,8 @@
 .egg
 	ld a, $0
 	ret
-; 12fd5
 
-MoveScreenLoop: ; 12fd5
+MoveScreenLoop:
 	ld a, [wCurPartyMon]
 	inc a
 	ld [wPartyMenuCursor], a
@@ -1613,7 +1485,6 @@
 	lb bc, 8, SCREEN_WIDTH - 2
 	call ClearBox
 	jp .loop
-; 1305b
 
 .d_right
 	ld a, [wMoveSwapBuffer]
@@ -1678,7 +1549,6 @@
 	and a
 	jr z, .cycle_right
 	jr .cycle_left_loop
-; 130c6
 
 .a_button
 	call PlayClickSFX
@@ -1729,7 +1599,6 @@
 	lb bc, 1, 9
 	call ClearBox
 	jp .loop
-; 1313a
 
 .copy_move
 	push hl
@@ -1752,7 +1621,6 @@
 	ld a, b
 	ld [de], a
 	ret
-; 13154
 
 .exit
 	xor a
@@ -1761,21 +1629,18 @@
 	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_MoveWhere: ; 1316b
+String_MoveWhere:
 	db "Where?@"
-; 13172
 
-SetUpMoveScreenBG: ; 13172
+SetUpMoveScreenBG:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -1821,9 +1686,8 @@
 	hlcoord 16, 0
 	lb bc, 1, 3
 	jp ClearBox
-; 131ef
 
-SetUpMoveList: ; 131ef
+SetUpMoveList:
 	xor a
 	ld [hBGMapMode], a
 	ld [wMoveSwapBuffer], a
@@ -1848,9 +1712,8 @@
 	ld b, 5
 	ld c, 18
 	jp TextBox
-; 13235
 
-PrepareToPlaceMoveData: ; 13235
+PrepareToPlaceMoveData:
 	ld hl, wPartyMon1Moves
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wCurPartyMon]
@@ -1865,9 +1728,8 @@
 	hlcoord 1, 12
 	lb bc, 5, 18
 	jp ClearBox
-; 13256
 
-PlaceMoveData: ; 13256
+PlaceMoveData:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 10
@@ -1909,28 +1771,22 @@
 	ld a, $1
 	ld [hBGMapMode], a
 	ret
-; 132ba
 
-String_MoveType_Top: ; 132ba
+String_MoveType_Top:
 	db "┌─────┐@"
-; 132c2
-String_MoveType_Bottom: ; 132c2
+String_MoveType_Bottom:
 	db "│TYPE/└@"
-; 132ca
-String_MoveAtk: ; 132ca
+String_MoveAtk:
 	db "ATK/@"
-; 132cf
-String_MoveNoPower: ; 132cf
+String_MoveNoPower:
 	db "---@"
-; 132d3
 
-Function132d3: ; 132d3
+Function132d3:
 	call Function132da
 	call Function132fe
 	ret
-; 132da
 
-Function132da: ; 132da
+Function132da:
 	ld a, [wCurPartyMon]
 	and a
 	ret z
@@ -1958,9 +1814,8 @@
 	hlcoord 16, 0
 	ld [hl], "◀"
 	ret
-; 132fe
 
-Function132fe: ; 132fe
+Function132fe:
 	ld a, [wCurPartyMon]
 	inc a
 	ld c, a
@@ -1990,4 +1845,3 @@
 	hlcoord 18, 0
 	ld [hl], "▶"
 	ret
-; 13327
--- a/engine/menus/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 @@
 	ld [wVramState], a
 	ret
 
-.InitRAM: ; 2513b (9:513b)
+.InitRAM:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -78,10 +78,10 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wJumptableIndex], a
 	ret
 
-TrainerCard_PrintTopHalfOfCard: ; 25299 (9:5299)
+TrainerCard_PrintTopHalfOfCard:
 	hlcoord 0, 0
 	ld d, 5
 	call TrainerCard_InitBorder
@@ -257,21 +255,18 @@
 	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
@@ -304,11 +299,10 @@
 .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 @@
 	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 @@
 	inc de
 	jr .loop
 
-TrainerCard_InitBorder: ; 253b0 (9:53b0)
+TrainerCard_InitBorder:
 	ld e, SCREEN_WIDTH
 .loop1
 	ld a, $23
@@ -411,7 +402,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-.PrepOAM: ; 2547b (9:547b)
+.PrepOAM:
 	ld a, [wTrainerCardBadgeTileID]
 	and 1 << 7
 	jr nz, .xflip
@@ -546,9 +537,7 @@
 	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
@@ -555,7 +544,7 @@
 	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
@@ -562,7 +551,7 @@
 	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 @@
 	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"
 
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -3,7 +3,7 @@
 
 SECTION "Credits", ROMX
 
-Credits:: ; 109847
+Credits::
 	bit 6, b ; Hall Of Fame
 	ld a, $0
 	jr z, .okay
@@ -104,9 +104,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 1098fd
 
-Credits_HandleAButton: ; 1098fd
+Credits_HandleAButton:
 	ld a, [hJoypadDown]
 	and A_BUTTON
 	ret z
@@ -113,9 +112,8 @@
 	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 @@
 	ret z
 	dec [hl]
 	ret
-; 109926
 
-Credits_Jumptable: ; 109926
+Credits_Jumptable:
 	ld a, [wJumptableIndex]
 	and $f
 	ld e, a
@@ -150,9 +147,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 109937
 
-.Jumptable: ; 109937 (42:5937)
+.Jumptable:
 	dw ParseCredits
 	dw Credits_Next
 	dw Credits_Next
@@ -167,12 +163,12 @@
 	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
@@ -179,12 +175,12 @@
 	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,7 +192,7 @@
 	ld [wRequested2bppDest + 1], a
 	jr Credits_RequestGFX
 
-Credits_RequestGFX: ; 10997b (42:597b)
+Credits_RequestGFX:
 	xor a
 	ld [hBGMapMode], a
 	ld a, $8
@@ -203,7 +199,7 @@
 	ld [wRequested2bpp], a
 	jp Credits_Next
 
-Credits_LYOverride: ; 109986 (42:5986)
+Credits_LYOverride:
 	ld a, [rLY]
 	cp $30
 	jr c, Credits_LYOverride
@@ -217,7 +213,7 @@
 	call .Fill
 	jp Credits_Next
 
-.Fill: ; 1099a3 (42:59a3)
+.Fill:
 	ld c, $8
 .loop
 	ld [hli], a
@@ -224,10 +220,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 1099aa
 
-
-ParseCredits: ; 1099aa
+ParseCredits:
 	ld hl, wJumptableIndex
 	bit 7, [hl]
 	jp nz, .done
@@ -397,10 +391,8 @@
 	pop de
 	pop hl
 	ret
-; 109a95
 
-
-ConstructCreditsTilemap: ; 109a95 (42:5a95)
+ConstructCreditsTilemap:
 	xor a
 	ld [hBGMapMode], a
 	ld a, $c
@@ -453,7 +445,7 @@
 	call WaitBGMap2
 	ret
 
-.InitTopPortion: ; 109aff (42:5aff)
+.InitTopPortion:
 	ld b, 5
 .outer_loop
 	push hl
@@ -478,7 +470,7 @@
 	jr nz, .outer_loop
 	ret
 
-DrawCreditsBorder: ; 109b1d (42:5b1d)
+DrawCreditsBorder:
 	ld c, SCREEN_WIDTH / 4
 .loop
 	push af
@@ -492,7 +484,7 @@
 	jr nz, .loop
 	ret
 
-GetCreditsPalette: ; 109b2c
+GetCreditsPalette:
 	call .GetPalAddress
 
 	push hl
@@ -541,9 +533,8 @@
 
 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 @@
 .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 @@
 	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 @@
 	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"
--- a/engine/movie/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 @@
 	call .StopGamefreakAnim
 	and a
 	ret
-; e45e8
 
-.GetGFLogoGFX: ; e45e8
+.GetGFLogoGFX:
 	ld de, GameFreakLogo
 	ld hl, vTiles2
 	lb bc, BANK(GameFreakLogo), 28
@@ -104,9 +103,8 @@
 	lb de, %11100100, %11100100
 	call DmgToCgbObjPals
 	ret
-; e465e
 
-.StopGamefreakAnim: ; e465e
+.StopGamefreakAnim:
 	farcall ClearSpriteAnims
 	call ClearTileMap
 	call ClearSprites
@@ -113,9 +111,8 @@
 	ld c, 16
 	call DelayFrames
 	ret
-; e4670
 
-PlaceGameFreakPresents: ; e4670
+PlaceGameFreakPresents:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -126,26 +123,22 @@
 	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,7 +156,6 @@
 	ld de, SFX_GAME_FREAK_PRESENTS
 	call PlaySFX
 	ret
-; e46af
 
 .GAME_FREAK:
 	;  G  A  M  E   _  F  R  E  A  K
@@ -170,9 +162,8 @@
 	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 @@
 	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 @@
 	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,7 +211,7 @@
 	ld l, a
 	jp hl
 
-GameFreakLogoScenes: ; e46fd (39:46fd)
+GameFreakLogoScenes:
 	dw GameFreakLogoScene1
 	dw GameFreakLogoScene2
 	dw GameFreakLogoScene3
@@ -231,13 +218,13 @@
 	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 @@
 	call PlaySFX
 	ret
 
-GameFreakLogoScene3: ; e4759 (39:4759)
+GameFreakLogoScene3:
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -303,7 +290,7 @@
 	call PlaySFX
 	ret
 
-GameFreakLogoScene4: ; e4776 (39:4776)
+GameFreakLogoScene4:
 	ld hl, SPRITEANIMSTRUCT_0D
 	add hl, bc
 	ld a, [hl]
@@ -336,20 +323,17 @@
 	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 @@
 	ld a, [hVBlank]
 	push af
 	call .InitRAMAddrs
-.loop ; e48bc
+.loop
 	call JoyTextDelay
 	ld a, [hJoyLast]
 	and BUTTONS
@@ -394,9 +378,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; e4901
 
-.InitRAMAddrs: ; e4901
+.InitRAMAddrs:
 	xor a
 	ld [hVBlank], a
 	ld a, $1
@@ -405,9 +388,8 @@
 	ld [hMapAnims], a
 	ld [wJumptableIndex], a
 	ret
-; e490f
 
-IntroSceneJumper: ; e490f
+IntroSceneJumper:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -418,9 +400,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; e491e
 
-IntroScenes: ; e491e (39:491e)
+IntroScenes:
 	dw IntroScene1
 	dw IntroScene2
 	dw IntroScene3
@@ -450,12 +431,12 @@
 	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
@@ -507,7 +488,7 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene3: ; e49fd (39:49fd)
+IntroScene3:
 ; More setup. Transition to the outdoor scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -579,7 +560,7 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene5: ; e4a7a (39:4a7a)
+IntroScene5:
 ; Go back to the Unown.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -646,7 +627,7 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene7: ; e4b3f (39:4b3f)
+IntroScene7:
 ; Back to the outdoor scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -762,7 +743,7 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene9: ; e4c04 (39:4c04)
+IntroScene9:
 ; Set up the next scene (same bg).
 	xor a
 	ld [hLCDCPointer], a
@@ -828,7 +809,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene10: ; e4c4f (39:4c4f)
+IntroScene10:
 ; Wooper and Pichu enter.
 	call Intro_RustleGrass
 	ld hl, wIntroSceneFrameCounter
@@ -861,7 +842,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene11: ; e4c86 (39:4c86)
+IntroScene11:
 ; Back to Unown again.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -911,7 +892,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene12: ; e4cfa (39:4cfa)
+IntroScene12:
 ; Even more Unown.
 	call .PlayUnownSound
 	ld hl, wIntroSceneFrameCounter
@@ -951,7 +932,7 @@
 	call NextIntroScene
 	ret
 
-.PlayUnownSound: ; e4d36 (39:4d36)
+.PlayUnownSound:
 	ld a, [wIntroSceneFrameCounter]
 	ld c, a
 	ld hl, .UnownSounds
@@ -973,9 +954,8 @@
 	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 @@
 	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
@@ -1045,7 +1025,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene14: ; e4dfa (39:4dfa)
+IntroScene14:
 ; Suicune runs then jumps.
 	ld a, [hSCX]
 	sub 10
@@ -1090,7 +1070,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene15: ; e4e40 (39:4e40)
+IntroScene15:
 ; Transition to a new scene.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1154,7 +1134,7 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene17: ; e4ef5 (39:4ef5)
+IntroScene17:
 ; ...
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1221,7 +1201,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene18: ; e4f67 (39:4f67)
+IntroScene18:
 ; Suicune close up.
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
@@ -1238,7 +1218,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene19: ; e4f7e (39:4f7e)
+IntroScene19:
 ; More setup.
 	call Intro_ClearBGPals
 	call ClearSprites
@@ -1303,7 +1283,7 @@
 	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 @@
 	xor a
 	call Intro_Scene20_AppearUnown
 	ret
-; e5049 (39:5049)
 ; unused
 	ld a, c
 	and $1c
@@ -1350,7 +1329,7 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene22: ; e5072 (39:5072)
+IntroScene22:
 	ld hl, wIntroSceneFrameCounter
 	ld a, [hl]
 	inc [hl]
@@ -1374,13 +1353,13 @@
 	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 @@
 	call NextIntroScene
 	ret
 
-IntroScene25: ; e50ad (39:50ad)
+IntroScene25:
 ; Wait around a bit.
 	ld a, [wIntroSceneFrameCounter]
 	dec a
@@ -1416,7 +1395,7 @@
 	call NextIntroScene
 	ret
 
-IntroScene26: ; e50bb (39:50bb)
+IntroScene26:
 ; Load the final scene.
 	call ClearBGPalettes
 	call ClearSprites
@@ -1465,7 +1444,7 @@
 	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 @@
 	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 @@
 	cp $8
 	ret nz
 
-	ld de, SFX_UNKNOWN_CB
+	ld de, SFX_INTRO_WHOOSH
 	call PlaySFX
 	ret
 
@@ -1515,7 +1494,7 @@
 	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 @@
 	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 @@
 	call ReinitSpriteAnimFrame
 	ret
 
-CrystalIntro_UnownFade: ; e5223 (39:5223)
+CrystalIntro_UnownFade:
 	add a
 	add a
 	add a
@@ -1673,9 +1650,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; e5288 (39:5288)
 
-.BWFade: ; e5288
+.BWFade:
 ; Fade between black and white.
 hue = 0
 rept 32
@@ -1682,9 +1658,8 @@
 	RGB hue, hue, hue
 hue = hue + 1
 endr
-; e52c8
 
-.BlackLBlueFade: ; e52c8
+.BlackLBlueFade:
 ; Fade between black and light blue.
 hue = 0
 rept 32
@@ -1691,9 +1666,8 @@
 	RGB 0, hue / 2, hue
 hue = hue + 1
 endr
-; e5308
 
-.BlackBlueFade: ; e5308
+.BlackBlueFade:
 ; Fade between black and blue.
 hue = 0
 rept 32
@@ -1700,9 +1674,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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)
@@ -1873,7 +1838,7 @@
 	ld [rSVBK], a
 	ret
 
-Intro_Scene16_AnimateSuicune: ; e5441 (39:5441)
+Intro_Scene16_AnimateSuicune:
 	ld a, [wIntroSceneFrameCounter]
 	and $3
 	jr z, Intro_ColoredSuicuneFrameSwap
@@ -1886,7 +1851,7 @@
 	ld [hBGMapMode], a
 	ret
 
-Intro_ColoredSuicuneFrameSwap: ; e5451 (39:5451)
+Intro_ColoredSuicuneFrameSwap:
 	hlcoord 0, 0
 	ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
 .loop
@@ -1907,7 +1872,7 @@
 	ld [hBGMapMode], a
 	ret
 
-Intro_RustleGrass: ; e546d (39:546d)
+Intro_RustleGrass:
 	ld a, [wIntroSceneFrameCounter]
 	cp 36
 	ret nc
@@ -1928,21 +1893,19 @@
 	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)
@@ -1961,7 +1924,7 @@
 	call DelayFrame
 	ret
 
-Intro_DecompressRequest2bpp_128Tiles: ; e54c2 (39:54c2)
+Intro_DecompressRequest2bpp_128Tiles:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -1980,7 +1943,7 @@
 	ld [rSVBK], a
 	ret
 
-Intro_DecompressRequest2bpp_255Tiles: ; e54de (39:54de)
+Intro_DecompressRequest2bpp_255Tiles:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -1999,7 +1962,7 @@
 	ld [rSVBK], a
 	ret
 
-Intro_DecompressRequest2bpp_64Tiles: ; e54fa (39:54fa)
+Intro_DecompressRequest2bpp_64Tiles:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -2018,7 +1981,7 @@
 	ld [rSVBK], a
 	ret
 
-Intro_ResetLYOverrides: ; e5516 (39:5516)
+Intro_ResetLYOverrides:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -2035,7 +1998,7 @@
 	ld [hLCDCPointer], a
 	ret
 
-Intro_PerspectiveScrollBG: ; e552f (39:552f)
+Intro_PerspectiveScrollBG:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wLYOverrides)
@@ -2066,134 +2029,104 @@
 	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
 
-IntroPalette1: ; 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
 
-IntroPalette2: ; 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
 
-IntroPalette3: ; 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
 
-IntroPalette4: ; 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
 
-IntroPalette5: ; 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"
--- a/engine/movie/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 @@
 
 	scf
 	ret
-; 4e607
 
-.EvolutionAnimation: ; 4e607
+.EvolutionAnimation:
 	ld a, %11100100
 	ld [rOBP0], a
 
@@ -150,20 +149,17 @@
 	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 @@
 	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 @@
 .exit_sequence
 	scf
 	ret
-; 4e741
 
-.Flash: ; 4e741
+.Flash:
 	ld a, -7 * 7 ; new stage
 	ld [wEvolutionPicOffset], a
 	call .ReplaceFrontpic
@@ -207,9 +201,8 @@
 	dec b
 	jr nz, .Flash
 	ret
-; 4e755
 
-.ReplaceFrontpic: ; 4e755
+.ReplaceFrontpic:
 	push bc
 	xor a
 	ld [hBGMapMode], a
@@ -233,9 +226,8 @@
 	call WaitBGMap
 	pop bc
 	ret
-; 4e779
 
-.WaitFrames_CheckPressedB: ; 4e779
+.WaitFrames_CheckPressedB:
 	call DelayFrame
 	push bc
 	call JoyTextDelay
@@ -255,9 +247,8 @@
 	jr nz, .loop3
 	scf
 	ret
-; 4e794
 
-.check_statused ; 4e794
+.check_statused
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1Species
 	call GetPartyLocation
@@ -265,9 +256,8 @@
 	ld c, l
 	farcall CheckFaintedFrzSlp
 	ret
-; 4e7a6
 
-.PlayEvolvedSFX: ; 4e7a6
+.PlayEvolvedSFX:
 	ld a, [wEvolutionCanceled]
 	and a
 	ret nz
@@ -292,9 +282,8 @@
 	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 @@
 .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 @@
 	add hl, bc
 	ld [hl], $10
 	ret
-; 4e80c
 
-.AnimateBallsOfLight: ; 4e80c
+.AnimateBallsOfLight:
 	push bc
 	callfar PlaySpriteAnimations
 	; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES
@@ -360,8 +347,6 @@
 	pop bc
 	call DelayFrame
 	ret
-; 4e831
-
 
 .GFX:
 INCBIN "gfx/evo/bubble_large.2bpp"
--- a/engine/movie/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 @@
 .loop
 	call DelayFrame
 	jr .loop
-; 4eac5
 
-
-DrawGBCOnlyScreen: ; 4eac5
-
+DrawGBCOnlyScreen:
 	call DrawGBCOnlyBorder
 
 	; Pokemon
@@ -63,11 +59,8 @@
 	call PlaceString
 
 	ret
-; 4eaea
 
-
-DrawGBCOnlyBorder: ; 4eaea
-
+DrawGBCOnlyBorder:
 	hlcoord 0, 0
 	ld [hl], 0 ; top-left
 
@@ -94,9 +87,8 @@
 
 	ld [hl], 7 ; bottom-right
 	ret
-; 4eb15
 
-.FillRow: ; 4eb15
+.FillRow:
 	ld c, SCREEN_WIDTH - 2
 .next_column
 	ld [hli], a
@@ -103,9 +95,8 @@
 	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 @@
 	dec c
 	jr nz, .next_row
 	ret
-; 4eb27
 
-
-DrawGBCOnlyGraphic: ; 4eb27
+DrawGBCOnlyGraphic:
 	ld de, SCREEN_WIDTH
 .y
 	push bc
@@ -133,17 +122,12 @@
 	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
--- a/engine/movie/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 @@
 	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 @@
 	call SetPalettes
 	ret
 
-ResetDisplayBetweenHallOfFameMons: ; 4e906
+ResetDisplayBetweenHallOfFameMons:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -1,5 +1,4 @@
-_TitleScreen: ; 10ed67
-
+_TitleScreen:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -18,18 +17,15 @@
 ; 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
@@ -36,7 +32,6 @@
 	xor a
 	call ByteFill
 
-
 ; Fill tile palettes:
 
 ; BG Map 1:
@@ -47,7 +42,6 @@
 	ld a, 7 ; palette
 	call ByteFill
 
-
 ; BG Map 0:
 
 ; Apply logo gradient:
@@ -78,7 +72,6 @@
 	ld a, 6
 	call ByteFill
 
-
 ; 'CRYSTAL VERSION'
 	hlbgcoord 5, 9
 	ld bc, NAME_LENGTH ; length of version text
@@ -91,12 +84,10 @@
 	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 @@
 	ld de, vTiles0
 	call Decompress
 
-
 ; Clear screen tiles
 	hlbgcoord 0, 0
 	ld bc, 64 * BG_MAP_WIDTH
@@ -157,7 +147,6 @@
 	pop af
 	ld [rSVBK], a
 
-
 ; LY/SCX trickery starts here
 
 	ld a, [rSVBK]
@@ -194,7 +183,6 @@
 	pop af
 	ld [rSVBK], a
 
-
 ; Reset audio
 	call ChannelsOff
 	call EnableLCD
@@ -228,9 +216,8 @@
 	call PlaySFX
 
 	ret
-; 10eea7
 
-SuicuneFrameIterator: ; 10eea7
+SuicuneFrameIterator:
 	ld hl, wd002
 	ld a, [hl]
 	ld c, a
@@ -257,17 +244,14 @@
 	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 @@
 	dec b
 	jr nz, .bgrows
 	ret
-; 10eeef
 
-DrawTitleGraphic: ; 10eeef
+DrawTitleGraphic:
 ; input:
 ;   hl: draw location
 ;   b: height
@@ -320,9 +303,8 @@
 	dec b
 	jr nz, .bgrows
 	ret
-; 10ef06
 
-InitializeBackground: ; 10ef06
+InitializeBackground:
 	ld hl, wVirtualOAMSprite00
 	ld d, -$22
 	ld e, $0
@@ -337,9 +319,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 10ef1c
 
-.InitColumn: ; 10ef1c
+.InitColumn:
 	ld c, $6
 	ld b, $40
 .loop2
@@ -358,10 +339,8 @@
 	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
@@ -384,19 +363,15 @@
 	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"
--- a/engine/movie/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 @@
 	const TRADEANIMSTATE_3 ; 3
 TRADEANIMJUMPTABLE_LENGTH EQU const_value
 
-TradeAnimation: ; 28f24
+TradeAnimation:
 	xor a
 	ld [wcf66], a
 	ld hl, wPlayerTrademonSenderName
@@ -60,7 +60,7 @@
 	tradeanim_scroll_out_right
 	tradeanim_end
 
-TradeAnimationPlayer2: ; 28f63
+TradeAnimationPlayer2:
 	xor a
 	ld [wcf66], a
 	ld hl, wOTTrademonSenderName
@@ -110,7 +110,7 @@
 	tradeanim_scroll_out_right
 	tradeanim_end
 
-RunTradeAnimScript: ; 28fa1
+RunTradeAnimScript:
 	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
@@ -144,9 +144,7 @@
 	ld [hMapAnims], a
 	ret
 
-; 28fdb
-
-.TradeAnimLayout: ; 28fdb
+.TradeAnimLayout:
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -212,9 +210,7 @@
 	call TradeAnim_NormalPals
 	ret
 
-; 29082
-
-DoTradeAnimation: ; 29082
+DoTradeAnimation:
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .finished
@@ -231,9 +227,7 @@
 	scf
 	ret
 
-; 290a0
-
-.DoTradeAnimCommand: ; 290a0
+.DoTradeAnimCommand:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -244,9 +238,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wFrameCounter], a
 	ret
 
-; 291af
-
-TradeAnim_TubeToOT2: ; 291af
+TradeAnim_TubeToOT2:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	add $2
@@ -416,9 +400,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291c4
-
-TradeAnim_TubeToOT3: ; 291c4
+TradeAnim_TubeToOT3:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	add $2
@@ -430,9 +412,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291d9
-
-TradeAnim_TubeToOT4: ; 291d9
+TradeAnim_TubeToOT4:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	add $2
@@ -442,9 +422,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291e8
-
-TradeAnim_TubeToPlayer3: ; 291e8
+TradeAnim_TubeToPlayer3:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	sub $2
@@ -456,9 +434,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 291fd
-
-TradeAnim_TubeToPlayer4: ; 291fd
+TradeAnim_TubeToPlayer4:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	sub $2
@@ -470,9 +446,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 29211
-
-TradeAnim_TubeToPlayer5: ; 29211
+TradeAnim_TubeToPlayer5:
 	call TradeAnim_FlashBGPals
 	ld a, [hSCX]
 	sub $2
@@ -482,19 +456,15 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call TradeAnim_CopyTradeGameBoyTilemap
 	ret
 
-; 292af
-
-.One: ; 292af
+.One:
 	call TradeAnim_BlankTileMap
 	hlcoord 0, 3
 	ld bc, SCREEN_WIDTH
@@ -595,9 +553,7 @@
 	call ByteFill
 	ret
 
-; 292be
-
-.Two: ; 292be
+.Two:
 	call TradeAnim_BlankTileMap
 	hlcoord 0, 3
 	ld bc, $11
@@ -625,17 +581,13 @@
 	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 @@
 	call ClearTileMap
 	ret
 
-; 29348
-
-TradeAnim_EnterLinkTube1: ; 29348
+TradeAnim_EnterLinkTube1:
 	call ClearTileMap
 	call WaitTop
 	ld a, $a0
@@ -698,9 +648,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 2937e
-
-TradeAnim_EnterLinkTube2: ; 2937e
+TradeAnim_EnterLinkTube2:
 	ld a, [hSCX]
 	and a
 	jr z, .done
@@ -714,9 +662,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29391
-
-TradeAnim_ExitLinkTube: ; 29391
+TradeAnim_ExitLinkTube:
 	ld a, [hSCX]
 	cp $a0
 	jr z, .done
@@ -731,9 +677,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293a6
-
-TradeAnim_SetupGivemonScroll: ; 293a6
+TradeAnim_SetupGivemonScroll:
 	ld a, $8f
 	ld [hWX], a
 	ld a, $88
@@ -743,9 +687,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293b6
-
-TradeAnim_DoGivemonScroll: ; 293b6
+TradeAnim_DoGivemonScroll:
 	ld a, [hWX]
 	cp $7
 	jr z, .done
@@ -764,9 +706,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293d2
-
-TradeAnim_FrontpicScrollStart: ; 293d2
+TradeAnim_FrontpicScrollStart:
 	ld a, $7
 	ld [hWX], a
 	ld a, $50
@@ -774,9 +714,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293de
-
-TradeAnim_TextboxScrollStart: ; 293de
+TradeAnim_TextboxScrollStart:
 	ld a, $7
 	ld [hWX], a
 	ld a, $90
@@ -784,9 +722,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 293ea
-
-TradeAnim_ScrollOutRight: ; 293ea
+TradeAnim_ScrollOutRight:
 	call WaitTop
 	ld a, HIGH(vBGMap1)
 	ld [hBGMapAddress + 1], a
@@ -803,9 +739,7 @@
 	call TradeAnim_IncrementJumptableIndex
 	ret
 
-; 2940c
-
-TradeAnim_ScrollOutRight2: ; 2940c
+TradeAnim_ScrollOutRight2:
 	ld a, [hWX]
 	cp $a1
 	jr nc, .done
@@ -826,9 +760,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 2942e
-
-TradeAnim_ShowGivemonData: ; 2942e
+TradeAnim_ShowGivemonData:
 	call ShowPlayerTrademonStats
 	ld a, [wPlayerTrademonSpecies]
 	ld [wCurPartySpecies], a
@@ -853,9 +785,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29461
-
-TradeAnim_ShowGetmonData: ; 29461
+TradeAnim_ShowGetmonData:
 	call ShowOTTrademonStats
 	ld a, [wOTTrademonSpecies]
 	ld [wCurPartySpecies], a
@@ -871,16 +801,12 @@
 	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 @@
 	predef GetMonFrontpic
 	ret
 
-; 294a9
-
-TradeAnim_GetNickname: ; 294a9
+TradeAnim_GetNickname:
 	push de
 	ld [wd265], a
 	call GetPokemonName
@@ -904,15 +828,13 @@
 	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,33 +849,25 @@
 	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
@@ -960,9 +874,7 @@
 	call DelayFrames
 	ret
 
-; 2950c
-
-TraideAnim_Wait180IfOTEgg: ; 2950c
+TraideAnim_Wait180IfOTEgg:
 	call IsOTTrademonEgg
 	ret nz
 	ld c, 180
@@ -969,16 +881,13 @@
 	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 @@
 	call TrademonStats_WaitBGMap
 	ret
 
-; 29549
-
-ShowOTTrademonStats: ; 29549
+ShowOTTrademonStats:
 	ld de, wOTTrademonSpecies
 	ld a, [de]
 	cp EGG
@@ -1016,9 +923,7 @@
 	call TrademonStats_WaitBGMap
 	ret
 
-; 29573
-
-TrademonStats_MonTemplate: ; 29573
+TrademonStats_MonTemplate:
 	call WaitTop
 	call TradeAnim_BlankTileMap
 	ld a, HIGH(vBGMap1)
@@ -1032,16 +937,13 @@
 	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,15 +958,12 @@
 	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)
@@ -1071,9 +970,7 @@
 	ld [hBGMapAddress + 1], a
 	ret
 
-; 295e3
-
-TrademonStats_PrintSpeciesNumber: ; 295e3
+TrademonStats_PrintSpeciesNumber:
 	hlcoord 10, 0
 	lb bc, PRINTNUM_LEADINGZEROS | 1, 3
 	call PrintNum
@@ -1080,16 +977,12 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 29686
 
-.Jumptable: ; 29686 (a:5686)
+.Jumptable:
 	dw .InitTimer
 	dw .WaitTimer1
 	dw .MoveRight
@@ -1197,15 +1076,14 @@
 	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
@@ -1212,7 +1090,7 @@
 	ld [hl], $80
 	ret
 
-.WaitTimer1: ; 296a4 (a:56a4)
+.WaitTimer1:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -1221,7 +1099,7 @@
 	ret nz
 	call .JumptableNext
 
-.MoveRight: ; 296af (a:56af)
+.MoveRight:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1233,7 +1111,7 @@
 .done_move_right
 	call .JumptableNext
 
-.MoveDown: ; 296bd (a:56bd)
+.MoveDown:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1248,7 +1126,7 @@
 	ld [hl], $0
 	ret
 
-.MoveUp: ; 296cf (a:56cf)
+.MoveUp:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1260,7 +1138,7 @@
 .done_move_up
 	call .JumptableNext
 
-.MoveLeft: ; 296dd (a:56dd)
+.MoveLeft:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1276,7 +1154,7 @@
 	ld [hl], $80
 	ret
 
-.WaitTimer2: ; 296f2 (a:56f2)
+.WaitTimer2:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -1288,9 +1166,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,28 +1271,22 @@
 	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, " "
@@ -1438,9 +1293,7 @@
 	call ByteFill
 	ret
 
-; 297db
-
-TradeAnim_CopyBoxFromDEtoHL: ; 297db
+TradeAnim_CopyBoxFromDEtoHL:
 .row
 	push bc
 	push hl
@@ -1458,9 +1311,7 @@
 	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 @@
 	call DmgToCgbBGPals
 	ret
 
-; 297ff
-
-LinkTradeAnim_LoadTradePlayerNames: ; 297ff
+LinkTradeAnim_LoadTradePlayerNames:
 	push de
 	ld de, wLinkPlayer1Name
 	ld bc, NAME_LENGTH
@@ -1486,9 +1335,7 @@
 	call CopyBytes
 	ret
 
-; 29814
-
-LinkTradeAnim_LoadTradeMonSpecies: ; 29814
+LinkTradeAnim_LoadTradeMonSpecies:
 	ld a, [hl]
 	ld [wLinkTradeSendmonSpecies], a
 	ld a, [de]
@@ -1495,9 +1342,7 @@
 	ld [wLinkTradeGetmonSpecies], a
 	ret
 
-; 2981d
-
-TradeAnim_FlashBGPals: ; 2981d
+TradeAnim_FlashBGPals:
 	ld a, [wcf65]
 	and $7
 	ret nz
@@ -1506,9 +1351,7 @@
 	call DmgToCgbBGPals
 	ret
 
-; 2982b
-
-LoadTradeBallAndCableGFX: ; 2982b
+LoadTradeBallAndCableGFX:
 	call DelayFrame
 	ld de, TradeBallGFX
 	ld hl, vTiles0 tile $62
@@ -1528,9 +1371,7 @@
 	ld [hl], $62
 	ret
 
-; 2985a
-
-LoadTradeBubbleGFX: ; 2985a
+LoadTradeBubbleGFX:
 	call DelayFrame
 	ld e, $3
 	callfar LoadMenuMonIcon
@@ -1544,9 +1385,7 @@
 	ld [hl], $62
 	ret
 
-; 29879
-
-TradeAnim_WaitAnim: ; 29879
+TradeAnim_WaitAnim:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -1558,9 +1397,7 @@
 	call TradeAnim_AdvanceScriptPointer
 	ret
 
-; 29886
-
-TradeAnim_WaitAnim2: ; 29886
+TradeAnim_WaitAnim2:
 	ld hl, wFrameCounter
 	ld a, [hl]
 	and a
@@ -1572,10 +1409,7 @@
 	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,8 +1439,6 @@
 	jr nz, .loop2
 	ret
 
-; 298b5
-
 debugtrade: MACRO
 ; species, ot name, ot id (?)
 	db \1, \2
@@ -1613,13 +1445,11 @@
 	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 @@
 	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"
--- a/engine/movie/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 @@
 	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 @@
 	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 @@
 	jr .loop
 .done
 	ret
-; 10ed67
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -1,4 +1,4 @@
-InitDecorations: ; 26751 (9:6751)
+InitDecorations:
 	ld a, DECO_FEATHERY_BED
 	ld [wDecoBed], a
 	ld a, DECO_TOWN_MAP
@@ -5,7 +5,7 @@
 	ld [wDecoPoster], a
 	ret
 
-_PlayerDecorationMenu: ; 0x2675c
+_PlayerDecorationMenu:
 	ld a, [wWhichIndexSet]
 	push af
 	ld hl, .MenuHeader
@@ -34,24 +34,21 @@
 	ld a, [wBuffer5]
 	ld c, a
 	ret
-; 0x2679a
 
-.MenuHeader: ; 0x2679a
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
-; 0x267a2
 
-.MenuData: ; 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 @@
 .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 @@
 	call CopyBytes
 	ret
 
-.ClearStringBuffer2: ; 26822 (9:6822)
+.ClearStringBuffer2:
 	ld hl, wStringBuffer2
 	xor a
 	ld [hli], a
@@ -93,7 +89,7 @@
 	call ByteFill
 	ret
 
-.AppendToStringBuffer2: ; 26830 (9:6830)
+.AppendToStringBuffer2:
 	ld hl, wStringBuffer2
 	inc [hl]
 	ld e, [hl]
@@ -102,7 +98,7 @@
 	ld [hl], a
 	ret
 
-.FindOwndDecos: ; 2683a (9:683a)
+.FindOwndDecos:
 	ld hl, .dw
 .loop
 	ld a, [hli]
@@ -124,9 +120,8 @@
 	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 @@
 	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 @@
 	ld bc, $10
 	call ByteFill
 	ret
-; 2687a
 
-CheckAllDecorationFlags: ; 2687a
+CheckAllDecorationFlags:
 .loop
 	ld a, [hli]
 	cp -1
@@ -166,9 +159,8 @@
 
 .done
 	ret
-; 26891
 
-AppendDecoIndex: ; 26891
+AppendDecoIndex:
 	ld hl, wd002
 	inc [hl]
 	ld e, [hl]
@@ -176,9 +168,8 @@
 	add hl, de
 	ld [hl], a
 	ret
-; 2689b
 
-FindOwnedDecosInCategory: ; 2689b
+FindOwnedDecosInCategory:
 	push bc
 	push hl
 	call Deco_FillTempWithMinusOne
@@ -195,126 +186,108 @@
 	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 @@
 	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
@@ -413,37 +381,32 @@
 	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
 
-.NonscrollingMenuHeader: ; 0x269b5
+.NonscrollingMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .NonscrollingMenuData
 	db 1 ; default option
-; 0x269bd
 
-.NonscrollingMenuData: ; 0x269bd
+.NonscrollingMenuData:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 0 ; items
 	dw wd002
 	dw DecorationMenuFunction
 	dw DecorationAttributes
-; 0x269c5
 
-.ScrollingMenuHeader: ; 0x269c5
+.ScrollingMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
 	dw .ScrollingMenuData
 	db 1 ; default option
-; 0x269cd
 
-.ScrollingMenuData: ; 0x269cd
+.ScrollingMenuData:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 8, 0 ; rows, columns
 	db 1 ; horizontal spacing
@@ -451,17 +414,14 @@
 	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
@@ -468,9 +428,8 @@
 	pop hl
 	call CopyName2
 	ret
-; 269f3
 
-DecorationMenuFunction: ; 269f3
+DecorationMenuFunction:
 	ld a, [wMenuSelection]
 	push de
 	call GetDecorationData
@@ -478,9 +437,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 26a02
 
-DoDecorationAction2: ; 26a02
+DoDecorationAction2:
 	ld a, [wMenuSelection]
 	call GetDecorationData
 	ld de, 2 ; function 2
@@ -489,9 +447,8 @@
 	ld hl, .DecoActions
 	rst JumpTable
 	ret
-; 26a12
 
-.DecoActions: ; 26a12
+.DecoActions:
 	dw DecoAction_nothing
 	dw DecoAction_setupbed
 	dw DecoAction_putawaybed
@@ -507,10 +464,8 @@
 	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 @@
 	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 @@
 	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 @@
 	rst JumpTable
 	pop de
 	ret
-; 26c7e
 
-.NameFunctions: ; 26c7e
+.NameFunctions:
 	dw .invalid
 	dw .plant
 	dw .bed
@@ -561,40 +512,37 @@
 	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,7 +550,7 @@
 	ld a, e
 	jr .getpokename
 
-.unused ; 26cb8
+.unused
 	push de
 	call .getdeconame
 	pop de
@@ -609,7 +557,7 @@
 	ld a, e
 	jr .getdeconame
 
-.getpokename ; 26cc0
+.getpokename
 	push bc
 	ld [wd265], a
 	call GetPokemonName
@@ -616,11 +564,11 @@
 	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 @@
 	pop bc
 	ret
 
-.copy ; 26cda
+.copy
 	ld h, b
 	ld l, c
 	call CopyName2
@@ -637,74 +585,60 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	xor a
 	ret
 
-DecoAction_putawayornament: ; 26dc9
+DecoAction_putawayornament:
 	ld hl, DecoText_WhichSide
 	call DecoAction_AskWhichSide
 	jr nc, .incave
@@ -814,7 +745,7 @@
 .incave
 	call DecoAction_PutItAway_Ornament
 
-DecoAction_FinishUp_Ornament: ; 26dd6
+DecoAction_FinishUp_Ornament:
 	call QueryWhichSide
 	ld a, [wSelectedDecoration]
 	ld [hl], a
@@ -822,9 +753,8 @@
 	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 @@
 	call MenuTextBoxBackup
 	scf
 	ret
-; 26e33
 
-.getwhichside ; 26e33
+.getwhichside
 	ld a, [wMenuSelection]
 	ld b, a
 	ld a, [wOtherDecoration]
@@ -874,15 +803,13 @@
 	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,15 +829,13 @@
 	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, MenuHeader_0x26eab
 	call GetMenu2
@@ -932,9 +857,8 @@
 .nope
 	scf
 	ret
-; 26e9a
 
-QueryWhichSide: ; 26e9a
+QueryWhichSide:
 	ld hl, wDecoRightOrnament
 	ld de, wDecoLeftOrnament
 	ld a, [wBuffer2]
@@ -945,68 +869,57 @@
 	ld l, e
 	pop de
 	ret
-; 26eab
 
-MenuHeader_0x26eab: ; 0x26eab
+MenuHeader_0x26eab:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 13, 7
 	dw MenuData_0x26eb3
 	db 1 ; default option
-; 0x26eb3
 
-MenuData_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 @@
 	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 @@
 	pop de
 	pop hl
 	ret
-; 26f19
 
-SetAllDecorationFlags: ; 26f19
+SetAllDecorationFlags:
 	ld hl, DecorationIDs
 .loop
 	ld a, [hli]
@@ -1051,18 +961,16 @@
 
 .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
@@ -1069,9 +977,8 @@
 	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,17 +995,15 @@
 	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
@@ -1105,61 +1010,52 @@
 	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
@@ -1166,46 +1062,41 @@
 	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
 
-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 @@
 	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
@@ -1235,9 +1125,8 @@
 .ok
 	ld de, EVENT_PLAYERS_ROOM_POSTER
 	jp EventFlagAction
-; 27037
 
-SetDecorationTile: ; 27037
+SetDecorationTile:
 	push af
 	call PadCoords_de
 	pop af
@@ -1246,9 +1135,8 @@
 	call _GetDecorationSprite
 	ld [hl], a
 	ret
-; 27043
 
-ToggleDecorationsVisibility: ; 27043
+ToggleDecorationsVisibility:
 	ld de, EVENT_PLAYERS_HOUSE_2F_CONSOLE
 	ld hl, wVariableSprites + SPRITE_CONSOLE - SPRITE_VARS
 	ld a, [wDecoConsole]
@@ -1266,9 +1154,8 @@
 	ld a, [wDecoBigDoll]
 	call ToggleDecorationVisibility
 	ret
-; 27074
 
-ToggleDecorationVisibility: ; 27074
+ToggleDecorationVisibility:
 	and a
 	jr z, .hide
 	call _GetDecorationSprite
@@ -1279,9 +1166,8 @@
 .hide
 	ld b, SET_FLAG
 	jp EventFlagAction
-; 27085
 
-_GetDecorationSprite: ; 27085
+_GetDecorationSprite:
 	ld c, a
 	push de
 	push hl
@@ -1290,9 +1176,9 @@
 	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
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -3,7 +3,7 @@
 
 SECTION "Events", ROMX
 
-OverworldLoop:: ; 966b0
+OverworldLoop::
 	xor a
 	ld [wMapStatus], a
 .loop
@@ -21,99 +21,83 @@
 	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 @@
 	call ByteFill
 	farcall InitCallReceiveDelay
 	call ClearJoypad
-EnterMap: ; 9673e
+EnterMap:
 	xor a
 	ld [wXYComparePointer], a
 	ld [wXYComparePointer + 1], a
@@ -149,15 +133,13 @@
 	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 @@
 	call HandleMapBackground
 	call CheckPlayerState
 	ret
-; 96795
 
-MapEvents: ; 96795
+MapEvents:
 	ld a, [wMapEventStatus]
 	ld hl, .jumps
 	rst JumpTable
@@ -184,30 +165,25 @@
 .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
@@ -214,9 +190,8 @@
 	ld c, a
 	call DelayFrames
 	ret
-; 967c1
 
-HandleMapTimeAndJoypad: ; 967c1
+HandleMapTimeAndJoypad:
 	ld a, [wMapEventStatus]
 	cp 1 ; no events
 	ret z
@@ -225,23 +200,20 @@
 	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 @@
 	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 @@
 .ok2
 	scf
 	ret
-; 96867
 
-CheckTrainerBattle3: ; 96867
+CheckTrainerBattle3:
 	nop
 	nop
 	call CheckTrainerBattle2
@@ -333,9 +302,8 @@
 .nope
 	xor a
 	ret
-; 96874
 
-CheckTileEvent: ; 96874
+CheckTileEvent:
 ; Check for warps, coord events, or wild battles.
 
 	call CheckWarpConnxnScriptFlag
@@ -399,9 +367,8 @@
 	call GetMapScriptsBank
 	call CallScript
 	ret
-; 968c7
 
-CheckWildEncounterCooldown:: ; 968c7
+CheckWildEncounterCooldown::
 	ld hl, wWildEncounterCooldown
 	ld a, [hl]
 	and a
@@ -410,19 +377,16 @@
 	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
@@ -429,16 +393,14 @@
 	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,9 +447,8 @@
 .nope
 	xor a
 	ret
-; 9693a
 
-CheckTimeEvents: ; 9693a
+CheckTimeEvents:
 	ld a, [wLinkMode]
 	and a
 	jr nz, .nothing
@@ -517,16 +478,13 @@
 	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 @@
 	pop af
 	scf
 	ret
-; 96999
 
-CheckAPressOW: ; 96999
+CheckAPressOW:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	ret z
@@ -566,17 +523,15 @@
 	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 @@
 	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 @@
 	call GetMapScriptsBank
 	call CallScript
 	ret
-; 96a12
 
-.itemball ; 96a12
+.itemball
 	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, bc
 	ld a, [hli]
@@ -653,36 +606,30 @@
 	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 @@
 	dw .ifnotset
 	dw .itemifset
 	dw .copy
-; 96a59
 
 .up
 	ld b, OW_UP
@@ -784,9 +730,8 @@
 .dontread
 	xor a
 	ret
-; 96ad8
 
-CheckBGEventFlag: ; 96ad8
+CheckBGEventFlag:
 	ld hl, wEngineBuffer4
 	ld a, [hli]
 	ld h, [hl]
@@ -802,9 +747,8 @@
 	and a
 	pop hl
 	ret
-; 96af0
 
-PlayerMovement: ; 96af0
+PlayerMovement:
 	farcall DoPlayerMovement
 	ld a, c
 	ld hl, .pointers
@@ -811,7 +755,6 @@
 	rst JumpTable
 	ld a, c
 	ret
-; 96afd
 
 .pointers
 	dw .zero
@@ -824,34 +767,30 @@
 	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 @@
 	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 @@
 	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
 	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 @@
 	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 @@
 	call CallScript
 	scf
 	ret
-; 96beb
 
-DoPlayerEvent: ; 96beb
+DoPlayerEvent:
 	ld a, [wScriptRunning]
 	and a
 	ret z
@@ -1042,9 +970,8 @@
 	ld a, [hl]
 	ld [wScriptPos + 1], a
 	ret
-; 96c0c
 
-PlayerEventScriptPointers: ; 96c0c
+PlayerEventScriptPointers:
 	dba Invalid_0x96c2d          ; 0
 	dba SeenByTrainerScript      ; 1
 	dba TalkToTrainerScript      ; 2
@@ -1056,28 +983,23 @@
 	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
@@ -1084,28 +1006,633 @@
 	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/overworld/scripting.asm"
 
-INCLUDE "engine/overworld/events_2.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
+
+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
--- a/engine/overworld/events_2.asm
+++ /dev/null
@@ -1,650 +1,0 @@
-; More overworld event handling.
-
-
-WarpToSpawnPoint:: ; 97c28
-	ld hl, wStatusFlags2
-	res STATUSFLAGS2_SAFARI_GAME_F, [hl]
-	res STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
-	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 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
-; 97cf9
-
-WildBattleScript: ; 97cf9
-	randomwildmon
-	startbattle
-	reloadmapafterbattle
-	end
-; 97cfd
-
-CanUseSweetScent:: ; 97cfd
-	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
-; 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 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
-; 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
--- a/engine/overworld/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 @@
 	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 @@
 	call LoadStandardFont
 	ret
 
-HDMATransfer_FillBGMap0WithBlack: ; 64db
+HDMATransfer_FillBGMap0WithBlack:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
--- a/engine/overworld/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 @@
 	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 @@
 	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.
--- a/engine/overworld/load_map_part.asm
+++ b/engine/overworld/load_map_part.asm
@@ -1,4 +1,4 @@
-_LoadMapPart:: ; 4d15b
+_LoadMapPart::
 	ld hl, wSurroundingTiles
 	ld a, [wMetatileStandingY]
 	and a
--- a/engine/overworld/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,16 +17,14 @@
 	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
@@ -33,9 +31,8 @@
 	add hl, bc
 	ld [hl], a
 	ret
-; 44b5
 
-SetFacingStandAction: ; 44b5
+SetFacingStandAction:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld a, [hl]
@@ -42,9 +39,8 @@
 	and 1
 	jr nz, SetFacingStepAction
 	jp SetFacingCurrent
-; 44c1
 
-SetFacingStepAction: ; 44c1
+SetFacingStepAction:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	bit SLIDING_F, [hl]
@@ -69,9 +65,8 @@
 	add hl, bc
 	ld [hl], a
 	ret
-; 44e4
 
-SetFacingSkyfall: ; 44e4
+SetFacingSkyfall:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	bit SLIDING_F, [hl]
@@ -96,9 +91,8 @@
 	add hl, bc
 	ld [hl], a
 	ret
-; 4508
 
-SetFacingBumpAction: ; 4508
+SetFacingBumpAction:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	bit SLIDING_F, [hl]
@@ -122,9 +116,8 @@
 	add hl, bc
 	ld [hl], a
 	ret
-; 4529
 
-SetFacingCounterclockwiseSpin: ; 4529
+SetFacingCounterclockwiseSpin:
 	call CounterclockwiseSpinAction
 	ld hl, OBJECT_FACING
 	add hl, bc
@@ -134,14 +127,12 @@
 	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 @@
 	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 @@
 	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,16 +215,14 @@
 	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]
@@ -253,16 +236,14 @@
 	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 @@
 	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 @@
 .ok
 	ld [hl], a
 	ret
-; 45ed
 
-SetFacingGrassShake: ; 45ed
+SetFacingGrassShake:
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	inc [hl]
@@ -310,4 +289,3 @@
 .ok
 	ld [hl], a
 	ret
-; 4600
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2,9 +2,7 @@
 
 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 @@
 .ok
 	pop bc
 	ret
-; 437b
 
-Function437b: ; 437b
+Function437b:
 	call .CheckObjectStillVisible
 	ret c
 	call .HandleStepType
@@ -156,9 +153,8 @@
 	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_F, [hl]
@@ -166,7 +162,6 @@
 asm_4448:
 	ld de, ObjectActionPairPointers + 2 ; use second column
 	jr _HandleObjectAction
-; 444d
 
 _HandleObjectAction:
 ; call [4 * wObjectStructs[ObjInd, OBJECT_ACTION] + de]
@@ -183,11 +178,10 @@
 	ld l, a
 	call _hl_
 	ret
-; 445f
 
 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 @@
 	ld a, [hl]
 	call UselessAndA
 	ret
-; 462a
 
-Function462a: ; 462a
+Function462a:
 	ld hl, OBJECT_MAP_X
 	add hl, bc
 	ld a, [hl]
@@ -228,9 +221,8 @@
 	add hl, bc
 	ld [hl], a
 	ret
-; 463f
 
-UpdateTallGrassFlags: ; 463f
+UpdateTallGrassFlags:
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
 	bit OVERHEAD_F, [hl]
@@ -250,9 +242,8 @@
 	ld a, [hl]
 	call UselessAndA
 	ret
-; 4661
 
-SetTallGrassFlags: ; 4661
+SetTallGrassFlags:
 	call CheckSuperTallGrassTile
 	jr z, .set
 	call CheckGrassTile
@@ -268,14 +259,12 @@
 	add hl, bc
 	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,9 +279,8 @@
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 4690
 
-InitStep: ; 4690
+InitStep:
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
 	ld [hl], a
@@ -306,7 +294,7 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, [hli]
 	ld h, [hl]
 	ret
-; 4700
 
-StepVectors: ; 4700
+StepVectors:
 ; x,  y, duration, speed
 	; slow
 	db  0,  1, 16, 1
@@ -391,9 +376,8 @@
 	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
@@ -400,9 +384,8 @@
 	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 @@
 	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 @@
 	ld a, [hl]
 	pop bc
 	ret
-; 4769
 
-RestoreDefaultMovement: ; 4769
+RestoreDefaultMovement:
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -451,30 +432,26 @@
 .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]
@@ -481,23 +458,20 @@
 	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]
@@ -504,23 +478,20 @@
 	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 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 47dd
 
-MapObjectMovementPattern: ; 47dd
+MapObjectMovementPattern:
 	call ClearObjectStructField1c
 	call GetSpriteMovementFunction
 	ld a, [hl]
@@ -549,7 +519,7 @@
 	rst JumpTable
 	ret
 
-.Pointers: ; 47e9
+.Pointers:
 ; entries correspond to SPRITEMOVEFN_* constants
 	dw .Null_00 ; 00
 	dw .RandomWalkY ; 01
@@ -848,7 +818,7 @@
 	call .MovementSpinNextFacing
 	jr .MovementSpinCounterclockwise
 
-.DirectionData_Counterclockwise: ; 49c0
+.DirectionData_Counterclockwise:
 	db OW_RIGHT, OW_LEFT, OW_DOWN, OW_UP
 
 .MovementSpinTurnRight:
@@ -856,7 +826,7 @@
 	call .MovementSpinNextFacing
 	jr .MovementSpinClockwise
 
-.DirectionData_Clockwise: ; 49cc
+.DirectionData_Clockwise:
 	db OW_LEFT, OW_RIGHT, OW_UP, OW_DOWN
 
 .MovementSpinNextFacing:
@@ -969,7 +939,7 @@
 	ld [hl], STEP_TYPE_TRACKING_OBJECT
 	ret
 
-.data_4a81  ; 4a81
+.data_4a81
 	;   x,  y
 	db  0, -4
 	db  0,  8
@@ -1073,18 +1043,17 @@
 .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,9 +1067,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_03
 	ret
-; 4b45
 
-StepTypesJumptable: ; 4b45
+StepTypesJumptable:
 ; entries correspond to STEP_TYPE_* constants
 	dw ObjectMovementReset ; 00
 	dw MapObjectMovementPattern ; 01
@@ -1128,9 +1096,8 @@
 	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 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4b86
 
-NPCJump: ; 4b86
+NPCJump:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Jump
@@ -1174,9 +1140,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4bbf
 
-PlayerJump: ; 4bbf
+PlayerJump:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .initjump
@@ -1224,9 +1189,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4c18
 
-TeleportFrom: ; 4c18
+TeleportFrom:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .InitSpin
@@ -1233,7 +1197,6 @@
 	dw .DoSpin
 	dw .InitSpinRise
 	dw .DoSpinRise
-; 4c23
 
 .InitSpin:
 	ld hl, OBJECT_STEP_FRAME
@@ -1294,9 +1257,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4c89
 
-TeleportTo: ; 4c89
+TeleportTo:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .InitWait
@@ -1306,7 +1268,6 @@
 	dw .InitFinalSpin
 	dw .DoFinalSpin
 	dw .FinishStep
-; 4c9a
 
 .InitWait:
 	ld hl, OBJECT_ACTION
@@ -1317,7 +1278,6 @@
 	ld [hl], 16
 	call IncrementObjectStructField1c
 	ret
-; 4caa
 
 .DoWait:
 	ld hl, OBJECT_STEP_DURATION
@@ -1337,7 +1297,6 @@
 	ld [hl], 16
 	call IncrementObjectStructField1c
 	ret
-; 4cc9
 
 .DoDescent:
 	ld hl, OBJECT_ACTION
@@ -1365,7 +1324,6 @@
 	ld [hl], 16
 	call IncrementObjectStructField1c
 	ret
-; 4cf5
 
 .DoFinalSpin:
 	ld hl, OBJECT_ACTION
@@ -1386,9 +1344,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4d14
 
-Skyfall: ; 4d14
+Skyfall:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
@@ -1395,7 +1352,6 @@
 	dw .Step
 	dw .Fall
 	dw .Finish
-; 4d1f
 
 .Init:
 	ld hl, OBJECT_ACTION
@@ -1451,14 +1407,12 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	dec [hl]
 	ret nz
 	jp DeleteMapObject
-; 4dff
 
-StepTypeBump: ; 4dff
+StepTypeBump:
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	dec [hl]
@@ -1556,9 +1504,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4e0c
 
-StepType05: ; 4e0c
+StepType05:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Reset
@@ -1571,15 +1518,14 @@
 	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 @@
 	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 @@
 	ret nz
 	call CopyNextCoordsTileToStandingCoordsTile
 	jp RandomStepDuration_Slow
-; 4e56
 
-PlayerStep: ; 4e56
+PlayerStep:
 ; AnimateStep?
 	call Field1cAnonymousJumptable
 ; anonymous dw
@@ -1633,9 +1577,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4e83
 
-PlayerOrNPCTurnStep: ; 4e83
+PlayerOrNPCTurnStep:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .init1
@@ -1681,9 +1624,8 @@
 	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 @@
 	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 @@
 	ret nz
 .nope
 	jp DeleteMapObject
-; 4f33
 
-StepType14: ; 4f33
-StepType15: ; 4f33
+StepType14:
+StepType15:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
@@ -1797,12 +1737,10 @@
 	cpl
 	inc a
 	ret
-; 4f77
 
-StepType16: ; 4f77
+StepType16:
 	call Field1cAnonymousJumptable ; ????
-; 4f7a
-StepType17: ; 4f7a
+StepType17:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .null
@@ -1809,9 +1747,8 @@
 	dw .null
 	dw .null
 .null
-; 4f83
 
-SkyfallTop: ; 4f83
+SkyfallTop:
 	call Field1cAnonymousJumptable
 ; anonymous dw
 	dw .Init
@@ -1841,7 +1778,6 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
 	ret
-; 4fb2
 
 Stubbed_Function4fb2:
 	ret
@@ -1862,10 +1798,9 @@
 	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 @@
 	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 @@
 ; 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 @@
 	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 @@
 	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,23 +1893,20 @@
 	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
@@ -1988,12 +1913,10 @@
 	ld hl, MovementPointers
 	rst JumpTable
 	ret
-; 5075
 
 INCLUDE "engine/overworld/movement.asm"
-; 54b8
 
-ApplyMovementToFollower: ; 54b8
+ApplyMovementToFollower:
 	ld e, a
 	ld a, [wObjectFollow_Follower]
 	cp -1
@@ -2024,9 +1947,8 @@
 	pop af
 	ld [hl], a
 	ret
-; 54e6
 
-GetFollowerNextMovementByte: ; 54e6
+GetFollowerNextMovementByte:
 	ld hl, wFollowerMovementQueueLength
 	ld a, [hl]
 	and a
@@ -2075,9 +1997,8 @@
 	ld a, movement_step_end
 	scf
 	ret
-; 5529
 
-SpawnShadow: ; 5529
+SpawnShadow:
 	push bc
 	ld de, .ShadowObject
 	call CopyTempObjectData
@@ -2088,9 +2009,8 @@
 .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 @@
 
 .BoulderDustObject:
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST
-; 5547
 
-SpawnEmote: ; 5547
+SpawnEmote:
 	push bc
 	ld de, .EmoteObject
 	call CopyTempObjectData
@@ -2112,9 +2031,8 @@
 
 .EmoteObject:
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE
-; 5556
 
-ShakeGrass: ; 5556
+ShakeGrass:
 	push bc
 	ld de, .GrassObject
 	call CopyTempObjectData
@@ -2124,9 +2042,8 @@
 
 .GrassObject
 	db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS
-; 5565
 
-ShakeScreen: ; 5565
+ShakeScreen:
 	push bc
 	push af
 	ld de, .ScreenShakeObject
@@ -2139,9 +2056,8 @@
 
 .ScreenShakeObject:
 	db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
-; 5579
 
-DespawnEmote: ; 5579
+DespawnEmote:
 	push bc
 	ld a, [hMapObjectIndexBuffer]
 	ld c, a
@@ -2177,9 +2093,8 @@
 	dec a
 	jr nz, .loop
 	ret
-; 55ac
 
-InitTempObject: ; 55ac
+InitTempObject:
 	call FindFirstEmptyObjectStruct
 	ret nc
 	ld d, h
@@ -2186,9 +2101,8 @@
 	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.
@@ -2221,9 +2135,8 @@
 	inc hl
 	ld [hl], -1
 	ret
-; 55e0
 
-Function55e0:: ; 55e0
+Function55e0::
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -2244,9 +2157,9 @@
 	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
@@ -2260,17 +2173,15 @@
 .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
@@ -2286,9 +2197,8 @@
 	ret z
 	call Function5673
 	ret
-; 5645
 
-Function5645: ; 5645
+Function5645:
 	xor a
 	ld bc, wObjectStructs
 .loop
@@ -2303,9 +2213,8 @@
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 565c
 
-Function565c: ; 565c
+Function565c:
 	push bc
 	call Function56cd
 	pop bc
@@ -2316,25 +2225,22 @@
 	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
@@ -2349,9 +2255,8 @@
 	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]
@@ -2382,9 +2287,8 @@
 .nope
 	scf
 	ret
-; 56cd
 
-Function56cd: ; 56cd
+Function56cd:
 	ld a, [wPlayerBGMapOffsetX]
 	ld d, a
 	ld hl, OBJECT_SPRITE_X_OFFSET
@@ -2492,9 +2396,8 @@
 .nope
 	scf
 	ret
-; 576a
 
-HandleNPCStep:: ; 576a
+HandleNPCStep::
 	call .ResetStepVector
 	call .DoStepsForAllObjects
 	ret
@@ -2526,9 +2429,8 @@
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 579d
 
-RefreshPlayerSprite: ; 579d
+RefreshPlayerSprite:
 	ld a, movement_step_sleep
 	ld [wPlayerNextMovement], a
 	ld [wPlayerMovement], a
@@ -2540,9 +2442,8 @@
 	call c, SpawnInFacingDown
 	call .SpawnInCustomFacing
 	ret
-; 57bc
 
-.TryResetPlayerAction: ; 57bc
+.TryResetPlayerAction:
 	ld hl, wPlayerSpriteSetupFlags
 	bit PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
 	jr nz, .ok
@@ -2552,9 +2453,8 @@
 	ld a, OBJECT_ACTION_00
 	ld [wPlayerAction], a
 	ret
-; 57ca
 
-.SpawnInCustomFacing: ; 57ca
+.SpawnInCustomFacing:
 	ld hl, wPlayerSpriteSetupFlags
 	bit PLAYERSPRITESETUP_CUSTOM_FACING_F, [hl]
 	ret z
@@ -2563,17 +2463,15 @@
 	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 1 << 7
 	ret z
@@ -2595,9 +2493,8 @@
 	or d
 	ld [hl], a
 	ret
-; 5803
 
-StartFollow:: ; 5803
+StartFollow::
 	push bc
 	ld a, b
 	call SetLeaderIfVisible
@@ -2607,29 +2504,25 @@
 	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
@@ -2644,9 +2537,8 @@
 	ld a, [hObjectStructIndexBuffer]
 	ld [wObjectFollow_Follower], a
 	ret
-; 5847
 
-ResetFollower: ; 5847
+ResetFollower:
 	ld a, [wObjectFollow_Follower]
 	cp -1
 	ret z
@@ -2655,9 +2547,8 @@
 	ld a, -1
 	ld [wObjectFollow_Follower], a
 	ret
-; 585c
 
-SetFlagsForMovement_1:: ; 585c
+SetFlagsForMovement_1::
 	ld a, c
 	call CheckObjectVisibility
 	ret c
@@ -2669,9 +2560,8 @@
 	res 5, [hl]
 	xor a
 	ret
-; 586e
 
-Function586e: ; 586e
+Function586e:
 	call CheckObjectVisibility
 	ret c
 	ld hl, OBJECT_FLAGS2
@@ -2679,9 +2569,8 @@
 	set 5, [hl]
 	xor a
 	ret
-; 587a
 
-Function587a: ; 587a
+Function587a:
 	ld bc, wObjectStructs
 	xor a
 .loop
@@ -2701,9 +2590,8 @@
 	cp NUM_OBJECT_STRUCTS
 	jr nz, .loop
 	ret
-; 5897
 
-_SetFlagsForMovement_2:: ; 5897
+_SetFlagsForMovement_2::
 	ld a, [wObjectFollow_Leader]
 	cp -1
 	ret z
@@ -2723,9 +2611,8 @@
 	add hl, bc
 	res 5, [hl]
 	ret
-; 58b9
 
-Function58b9:: ; 58b9
+Function58b9::
 	push bc
 	ld bc, wObjectStructs
 	xor a
@@ -2747,9 +2634,8 @@
 	jr nz, .loop
 	pop bc
 	ret
-; 58d8
 
-Function58d8: ; 58d8
+Function58d8:
 	call CheckObjectVisibility
 	ret c
 	ld hl, OBJECT_FLAGS2
@@ -2756,9 +2642,8 @@
 	add hl, bc
 	res 5, [hl]
 	ret
-; 58e3
 
-Function58e3: ; 58e3
+Function58e3:
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
 	ld a, [hl]
@@ -2777,9 +2662,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_00
 	ret
-; 5903
 
-Function5903: ; 5903
+Function5903:
 	call GetSpriteDirection
 	rrca
 	rrca
@@ -2801,9 +2685,8 @@
 	db SPRITEMOVEDATA_STANDING_UP
 	db SPRITEMOVEDATA_STANDING_LEFT
 	db SPRITEMOVEDATA_STANDING_RIGHT
-; 5920
 
-_UpdateSprites:: ; 5920
+_UpdateSprites::
 	ld a, [wVramState]
 	bit 0, a
 	ret z
@@ -2840,9 +2723,8 @@
 	cp l
 	jr nz, .loop
 	ret
-; 5958
 
-ApplyBGMapAnchorToObjects: ; 5958
+ApplyBGMapAnchorToObjects:
 	push hl
 	push de
 	push bc
@@ -2881,14 +2763,12 @@
 	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
@@ -3107,7 +2987,7 @@
 	ld b, [hl]
 	ret
 
-.Addresses: ; 5ace
+.Addresses:
 	dw wPlayerStruct
 	dw wObject1Struct
 	dw wObject2Struct
@@ -3121,4 +3001,3 @@
 	dw wObject10Struct
 	dw wObject11Struct
 	dw wObject12Struct
-; 5ae8
--- a/engine/overworld/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 @@
 	jr nz, .loop
 	ret
 
-CheckObjectFlag: ; 2457d (9:457d)
+CheckObjectFlag:
 	ld hl, MAPOBJECT_SPRITE
 	add hl, bc
 	ld a, [hl]
@@ -62,7 +62,7 @@
 	scf
 	ret
 
-GetObjectTimeMask: ; 245a7 (9:45a7)
+GetObjectTimeMask:
 	call CheckObjectTime
 	ld a, -1
 	ret c
--- a/engine/overworld/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 @@
 	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 @@
 
 	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
@@ -108,51 +106,43 @@
 	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 PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
 	ret
-; 154f1
 
-DelayLoadingNewSprites: ; 154f1
+DelayLoadingNewSprites:
 	ld hl, wPlayerSpriteSetupFlags
 	set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	ret
 
-CheckReplaceKrisSprite: ; 154f7
+CheckReplaceKrisSprite:
 	nop
 	call .CheckBiking
 	jr c, .ok
@@ -166,7 +156,7 @@
 	call ReplaceKrisSprite
 	ret
 
-.CheckBiking: ; 1550c (5:550c)
+.CheckBiking:
 	and a
 	ld hl, wBikeFlags
 	bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
@@ -176,7 +166,7 @@
 	scf
 	ret
 
-.CheckSurfing2: ; 1551a (5:551a)
+.CheckSurfing2:
 	ld a, [wPlayerState]
 	cp PLAYER_NORMAL
 	jr z, .nope
@@ -208,7 +198,7 @@
 	and a
 	ret
 
-.CheckSurfing: ; 1554e (5:554e)
+.CheckSurfing:
 	call CheckOnWater
 	jr nz, .ret_nc
 	ld a, [wPlayerState]
@@ -224,19 +214,17 @@
 .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 @@
 	ld [wMusicFade], a
 	call RotateThreePalettesRight
 	ret
-; 15587
 
-ForceMapMusic: ; 15587
+ForceMapMusic:
 	ld a, [wPlayerState]
 	cp PLAYER_BIKE
 	jr nz, .notbiking
@@ -257,4 +244,3 @@
 .notbiking
 	call TryRestartMapMusic
 	ret
-; 1559a
--- a/engine/overworld/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 @@
 	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 @@
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 516a
 
-Movement_return_dig: ; 516a
+Movement_return_dig:
 	call GetSpriteDirection
 	rlca
 	rlca
@@ -162,9 +155,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,41 +259,40 @@
 	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)
 
@@ -315,7 +299,7 @@
 	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 @@
 	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 @@
 	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,61 +354,52 @@
 	add hl, bc
 	ld [hl], STANDING
 	ret
-; 5293
 
-Movement_remove_sliding: ; 5293
+Movement_remove_sliding:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	res SLIDING_F, [hl]
 	jp ContinueReadingMovement
-; 529c
 
-Movement_set_sliding: ; 529c
+Movement_set_sliding:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	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_F, [hl]
 	jp ContinueReadingMovement
-; 52ae
 
-Movement_fix_facing: ; 52ae
+Movement_fix_facing:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	set FIXED_FACING_F, [hl]
 	jp ContinueReadingMovement
-; 52b7
 
-Movement_show_object: ; 52b7
+Movement_show_object:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	res INVISIBLE_F, [hl]
 	jp ContinueReadingMovement
-; 52c0
 
-Movement_hide_object: ; 52c0
+Movement_hide_object:
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	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)
 
@@ -433,25 +406,24 @@
 	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 @@
 	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 @@
 	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 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_WALK
 	ret
-; 5446
 
-TurningStep: ; 5446
+TurningStep:
 	call InitStep
 	call UpdateTallGrassFlags
 
@@ -801,10 +718,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_WALK
 	ret
-; 5468
 
-
-SlideStep: ; 5468
+SlideStep:
 	call InitStep
 	call UpdateTallGrassFlags
 
@@ -827,10 +742,8 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_WALK
 	ret
-; 548a
 
-
-JumpStep: ; 548a
+JumpStep:
 	call InitStep
 	ld hl, OBJECT_1F
 	add hl, bc
@@ -861,4 +774,3 @@
 	add hl, bc
 	ld [hl], STEP_TYPE_PLAYER_JUMP
 	ret
-; 54b8
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -1,5 +1,4 @@
-CanObjectMoveInDirection: ; 6ec1
-
+CanObjectMoveInDirection:
 	ld hl, OBJECT_PALETTE
 	add hl, bc
 	bit SWIMMING_F, [hl]
@@ -57,10 +56,8 @@
 .move_anywhere
 	and a
 	ret
-; 6f07
 
-
-WillObjectBumpIntoWater: ; 6f07
+WillObjectBumpIntoWater:
 	call Function6f5f
 	ret c
 	ld hl, OBJECT_NEXT_MAP_X
@@ -82,9 +79,8 @@
 	jr z, WillObjectBumpIntoTile
 	scf
 	ret
-; 6f2c
 
-WillObjectBumpIntoLand: ; 6f2c
+WillObjectBumpIntoLand:
 	call Function6f5f
 	ret c
 	ld hl, OBJECT_NEXT_TILE
@@ -95,9 +91,8 @@
 	jr z, WillObjectBumpIntoTile
 	scf
 	ret
-; 6f3e
 
-WillObjectBumpIntoTile: ; 6f3e
+WillObjectBumpIntoTile:
 	ld hl, OBJECT_NEXT_TILE
 	add hl, bc
 	ld a, [hl]
@@ -117,13 +112,11 @@
 	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]
@@ -142,18 +135,16 @@
 	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
@@ -168,14 +159,12 @@
 	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]
@@ -224,12 +213,8 @@
 .not_land
 	scf
 	ret
-; 6fd9
 
-
-
-CheckFacingObject:: ; 6fd9
-
+CheckFacingObject::
 	call GetFacingTileCoord
 
 ; Double the distance for counter tiles.
@@ -267,10 +252,8 @@
 .standing
 	scf
 	ret
-; 7009
 
-
-WillObjectBumpIntoSomeoneElse: ; 7009
+WillObjectBumpIntoSomeoneElse:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -278,7 +261,6 @@
 	add hl, bc
 	ld e, [hl]
 	jr IsNPCAtCoord
-; 7015
 
 Unreferenced_Function7015:
 	ld a, [hMapObjectIndexBuffer]
@@ -287,7 +269,7 @@
 	call IsNPCAtCoord
 	ret
 
-.CheckWillBeFacingNPC: ; 7021
+.CheckWillBeFacingNPC:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -315,9 +297,8 @@
 .left
 	dec d
 	ret
-; 7041
 
-IsNPCAtCoord: ; 7041
+IsNPCAtCoord:
 	ld bc, wObjectStructs
 	xor a
 .loop
@@ -390,9 +371,8 @@
 .setcarry
 	scf
 	ret
-; 70a4
 
-HasObjectReachedMovementLimit: ; 70a4
+HasObjectReachedMovementLimit:
 	ld hl, OBJECT_RADIUS
 	add hl, bc
 	ld a, [hl]
@@ -450,9 +430,8 @@
 .yes
 	scf
 	ret
-; 70ed
 
-IsObjectMovingOffEdgeOfScreen: ; 70ed
+IsObjectMovingOffEdgeOfScreen:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, [wXCoord]
@@ -481,7 +460,6 @@
 .yes
 	scf
 	ret
-; 7113
 
 Unreferenced_Function7113:
 	ld a, [wPlayerStandingMapX]
@@ -547,10 +525,8 @@
 .yes
 	scf
 	ret
-; 7171
 
-
-Function7171: ; 7171
+Function7171:
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, d
@@ -571,4 +547,3 @@
 .nope
 	and a
 	ret
-; 718d
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -1,4 +1,4 @@
-GetEmote2bpp: ; 1412a
+GetEmote2bpp:
 	ld a, $1
 	ld [rVBK], a
 	call Get2bpp
@@ -5,9 +5,8 @@
 	xor a
 	ld [rVBK], a
 	ret
-; 14135
 
-_ReplaceKrisSprite:: ; 14135
+_ReplaceKrisSprite::
 	call GetPlayerSprite
 	ld a, [wUsedSprites]
 	ld [hUsedSpriteIndex], a
@@ -15,7 +14,6 @@
 	ld [hUsedSpriteTile], a
 	call GetUsedSprite
 	ret
-; 14146
 
 Function14146: ; mobile
 	ld hl, wSpriteFlags
@@ -27,7 +25,6 @@
 	pop af
 	ld [wSpriteFlags], a
 	ret
-; 14157
 
 Function14157: ; mobile
 	ld hl, wSpriteFlags
@@ -39,15 +36,13 @@
 	pop af
 	ld [wSpriteFlags], a
 	ret
-; 14168
 
-RefreshSprites:: ; 14168
+RefreshSprites::
 	call .Refresh
 	call LoadUsedSpritesGFX
 	ret
-; 1416f
 
-.Refresh: ; 1416f
+.Refresh:
 	xor a
 	ld bc, wUsedSpritesEnd - wUsedSprites
 	ld hl, wUsedSprites
@@ -56,9 +51,8 @@
 	call AddMapSprites
 	call LoadAndSortSprites
 	ret
-; 14183
 
-GetPlayerSprite: ; 14183
+GetPlayerSprite:
 ; Get Chris or Kris's sprite.
 	ld hl, ChrisStateSprites
 	ld a, [wPlayerSpriteSetupFlags]
@@ -97,8 +91,7 @@
 
 INCLUDE "data/sprites/player_sprites.asm"
 
-
-AddMapSprites: ; 141c9
+AddMapSprites:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	jr z, .outdoor
@@ -108,10 +101,8 @@
 .outdoor
 	call AddOutdoorSprites
 	ret
-; 141d9
 
-
-AddIndoorSprites: ; 141d9
+AddIndoorSprites:
 	ld hl, wMap1ObjectSprite
 	ld a, 1
 .loop
@@ -125,10 +116,8 @@
 	cp NUM_OBJECTS
 	jr nz, .loop
 	ret
-; 141ee
 
-
-AddOutdoorSprites: ; 141ee
+AddOutdoorSprites:
 	ld a, [wMapGroup]
 	dec a
 	ld c, a
@@ -148,18 +137,15 @@
 	dec c
 	jr nz, .loop
 	ret
-; 14209
 
-
-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
@@ -174,18 +160,14 @@
 .outdoor
 	farcall LoadEmote
 	ret
-; 14236
 
-
-
-SafeGetSprite: ; 14236
+SafeGetSprite:
 	push hl
 	call GetSprite
 	pop hl
 	ret
-; 1423c
 
-GetSprite: ; 1423c
+GetSprite:
 	call GetMonSprite
 	ret c
 
@@ -211,10 +193,8 @@
 	ld l, [hl]
 	ld h, a
 	ret
-; 14259
 
-
-GetMonSprite: ; 14259
+GetMonSprite:
 ; Return carry if a monster sprite was loaded.
 
 	cp SPRITE_POKEMON
@@ -275,10 +255,8 @@
 	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
@@ -303,10 +281,8 @@
 .only_down
 	and a
 	ret
-; 142c4
 
-
-_GetSpritePalette:: ; 142c4
+_GetSpritePalette::
 	ld a, c
 	call GetMonSprite
 	jr c, .is_pokemon
@@ -324,18 +300,14 @@
 	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.
 
@@ -372,10 +344,8 @@
 	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.
 
@@ -401,10 +371,8 @@
 	; pop bc
 	ld a, l
 	ret
-; 1431e
 
-
-SortUsedSprites: ; 1431e
+SortUsedSprites:
 ; Bubble-sort sprites by type.
 
 ; Run backwards through wUsedSprites to find the last one.
@@ -473,10 +441,8 @@
 
 .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.
 
@@ -533,10 +499,8 @@
 
 .quit
 	ret
-; 14386
 
-
-GetSpriteLength: ; 14386
+GetSpriteLength:
 ; Return the length of sprite type a in tiles.
 
 	cp WALKING_SPRITE
@@ -556,10 +520,8 @@
 .OneDirection:
 	ld a, 4
 	ret
-; 1439b
 
-
-GetUsedSprites: ; 1439b
+GetUsedSprites:
 	ld hl, wUsedSprites
 	ld c, SPRITE_GFX_LIST_CAPACITY
 
@@ -594,9 +556,8 @@
 
 .done
 	ret
-; 143c8
 
-GetUsedSprite: ; 143c8
+GetUsedSprite:
 	ld a, [hUsedSpriteIndex]
 	call SafeGetSprite
 	ld a, [hUsedSpriteTile]
@@ -639,9 +600,8 @@
 
 .done
 	ret
-; 14406
 
-.GetTileAddr: ; 14406
+.GetTileAddr:
 ; Return the address of tile (a) in (hl).
 	and $7f
 	ld l, a
@@ -656,9 +616,8 @@
 	adc HIGH(vTiles0)
 	ld h, a
 	ret
-; 14418
 
-.CopyToVram: ; 14418
+.CopyToVram:
 	ld a, [rVBK]
 	push af
 	ld a, [wSpriteFlags]
@@ -673,9 +632,8 @@
 	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)
@@ -703,8 +661,6 @@
 	ret z
 	call GetEmote2bpp
 	ret
-; 1444d
-
 
 INCLUDE "data/sprites/emotes.asm"
 
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -1,4 +1,4 @@
-DoPlayerMovement:: ; 80000
+DoPlayerMovement::
 
 	call .GetDPad
 	ld a, movement_step_sleep
@@ -30,7 +30,6 @@
 	or D_DOWN
 	ld [wCurInput], a
 	ret
-; 8002d
 
 .TranslateIntoMovement:
 	ld a, [wPlayerState]
@@ -112,9 +111,8 @@
 	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 @@
 	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 @@
 .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
@@ -323,10 +318,8 @@
 .bump
 	xor a
 	ret
-; 801c0
 
-.TrySurf: ; 801c0
-
+.TrySurf:
 	call .CheckSurfPerms
 	ld [wd040], a
 	jr c, .surf_bump
@@ -359,9 +352,8 @@
 .surf_bump
 	xor a
 	ret
-; 801f3
 
-.TryJump: ; 801f3
+.TryJump:
 	ld a, [wPlayerStandingTile]
 	ld e, a
 	and $f0
@@ -399,10 +391,8 @@
 	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 @@
 	db COLL_WARP_CARPET_UP
 	db COLL_WARP_CARPET_LEFT
 	db COLL_WARP_CARPET_RIGHT
-; 8025f
 
 .DoStep:
 	ld e, a
@@ -529,9 +518,8 @@
 	db $80 + UP
 	db $80 + LEFT
 	db $80 + RIGHT
-; 802b3
 
-.StandInPlace: ; 802b3
+.StandInPlace:
 	ld a, 0
 	ld [wPlayerTurningDirection], a
 	ld a, movement_step_sleep
@@ -538,9 +526,8 @@
 	ld [wMovementAnimation], a
 	xor a
 	ret
-; 802bf
 
-._WalkInPlace: ; 802bf
+._WalkInPlace:
 	ld a, 0
 	ld [wPlayerTurningDirection], a
 	ld a, movement_step_bump
@@ -547,9 +534,8 @@
 	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 @@
 
 .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 @@
 	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
+player_action: MACRO
+; walk direction, facing, x movement, y movement, tile collision pointer
+	db \1, \2, \3, \4
+	dw \5
+ENDM
 
-.CheckNPC: ; 80341
+.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,10 +647,8 @@
 .no_bump
 	ld a, 2
 	ret
-; 8036f
 
-.CheckStrengthBoulder: ; 8036f
-
+.CheckStrengthBoulder:
 	ld hl, wBikeFlags
 	bit BIKEFLAGS_STRENGTH_ACTIVE_F, [hl]
 	jr z, .not_boulder
@@ -706,9 +683,8 @@
 .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 @@
 .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 @@
 .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 @@
 	ret z
 	scf
 	ret
-; 803da
 
-.CheckSurfable: ; 803da
+.CheckSurfable:
 ; Return 0 if tile a is water, or 1 if land.
 ; Otherwise, return carry.
 
@@ -796,18 +768,15 @@
 .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
@@ -814,9 +783,8 @@
 	call ReplaceKrisSprite ; UpdateSprites
 	pop bc
 	ret
-; 80404
 
-CheckStandingOnIce:: ; 80404
+CheckStandingOnIce::
 	ld a, [wPlayerTurningDirection]
 	cp 0
 	jr z, .not_ice
@@ -836,9 +804,8 @@
 .not_ice
 	and a
 	ret
-; 80422
 
-StopPlayerForEvent:: ; 80422
+StopPlayerForEvent::
 	ld hl, wPlayerNextMovement
 	ld a, movement_step_sleep
 	cp [hl]
@@ -848,4 +815,3 @@
 	ld a, 0
 	ld [wPlayerTurningDirection], a
 	ret
-; 80430
--- a/engine/overworld/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 @@
 	call SetPalettes
 	ret
 
-SpawnPlayer: ; 8029
+SpawnPlayer:
 	ld a, -1
 	ld [wObjectFollow_Leader], a
 	ld [wObjectFollow_Follower], a
@@ -51,13 +51,13 @@
 	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 @@
 	ld [hl], e
 	ret
 
-PlayerSpawn_ConvertCoords: ; 808f
+PlayerSpawn_ConvertCoords:
 	push bc
 	ld a, [wXCoord]
 	add 4
@@ -82,7 +82,7 @@
 	call CopyDECoordsToMapObject
 	ret
 
-WriteObjectXY:: ; 80a1
+WriteObjectXY::
 	ld a, b
 	call CheckObjectVisibility
 	ret c
@@ -99,7 +99,7 @@
 	and a
 	ret
 
-RefreshPlayerCoords: ; 80b8
+RefreshPlayerCoords:
 	ld a, [wXCoord]
 	add 4
 	ld d, a
@@ -127,7 +127,7 @@
 	ret nz ; wtf
 	ret
 
-CopyObjectStruct:: ; 80e7
+CopyObjectStruct::
 	call CheckObjectMask
 	and a
 	ret nz ; masked
@@ -161,12 +161,12 @@
 	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 @@
 	ld [wTempObjectCopyRadius], a
 	ret
 
-InitializeVisibleSprites: ; 8177
+InitializeVisibleSprites:
 	ld bc, wMapObjects + OBJECT_LENGTH
 	ld a, 1
 .loop
@@ -281,10 +281,10 @@
 	jr nz, .loop
 	ret
 
-.ret ; 81c9
+.ret
 	ret
 
-CheckObjectEnteringVisibleRange:: ; 81ca
+CheckObjectEnteringVisibleRange::
 	nop
 	ld a, [wPlayerStepDirection]
 	cp STANDING
@@ -293,21 +293,21 @@
 	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 @@
 	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 @@
 	jr nz, .loop_h
 	ret
 
-CopyTempObjectToObjectStruct: ; 8286
+CopyTempObjectToObjectStruct:
 	ld a, [wTempObjectCopyMapObjectIndex]
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, de
@@ -461,7 +461,7 @@
 	and a
 	ret
 
-.InitYCoord: ; 82d5
+.InitYCoord:
 	ld hl, OBJECT_INIT_Y
 	add hl, de
 	ld [hl], a
@@ -481,7 +481,7 @@
 	ld [hl], a
 	ret
 
-.InitXCoord: ; 82f1
+.InitXCoord:
 	ld hl, OBJECT_INIT_X
 	add hl, de
 	ld [hl], a
@@ -499,7 +499,7 @@
 	ld [hl], a
 	ret
 
-.InitRadius: ; 830d
+.InitRadius:
 	ld h, a
 	inc a
 	and $f
@@ -513,7 +513,7 @@
 	ld [hl], a
 	ret
 
-TrainerWalkToPlayer: ; 831e
+TrainerWalkToPlayer:
 	ld a, [hLastTalked]
 	call InitMovementBuffer
 	ld a, movement_step_sleep
@@ -533,7 +533,7 @@
 	call AppendToMovementBuffer
 	ret
 
-.GetPathToPlayer: ; 8341
+.GetPathToPlayer:
 	push de
 	push bc
 ; get player object struct, load to de
@@ -577,7 +577,7 @@
 	call ComputePathToWalkToPlayer
 	ret
 
-SurfStartStep: ; 8379
+SurfStartStep:
 	call InitMovementBuffer
 	call .GetMovementData
 	call AppendToMovementBuffer
@@ -585,7 +585,7 @@
 	call AppendToMovementBuffer
 	ret
 
-.GetMovementData: ; 8388
+.GetMovementData:
 	ld a, [wPlayerDirection]
 	srl a
 	srl a
@@ -603,7 +603,7 @@
 	slow_step LEFT
 	slow_step RIGHT
 
-FollowNotExact:: ; 839e
+FollowNotExact::
 	push bc
 	ld a, c
 	call CheckObjectVisibility
@@ -690,7 +690,7 @@
 	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 @@
 	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 @@
 	scf
 	ret
 
-QueueFollowerFirstStep: ; 848a
+QueueFollowerFirstStep:
 	call .QueueFirstStep
 	jr c, .same
 	ld [wFollowMovementQueue], a
--- a/engine/overworld/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 @@
 	ld [wPlayerBGMapOffsetY], a
 	ret
 
-ScrollScreen:: ; d4d2 (3:54d2)
+ScrollScreen::
 	ld a, [wPlayerStepVectorX]
 	ld d, a
 	ld a, [wPlayerStepVectorY]
@@ -47,7 +47,7 @@
 	ld [hSCY], a
 	ret
 
-HandlePlayerStep: ; d4e5 (3:54e5)
+HandlePlayerStep:
 	ld hl, wHandlePlayerStep
 	ld a, [hl]
 	and a
@@ -58,7 +58,7 @@
 	rst JumpTable
 	ret
 
-.Jumptable: ; d4f2 (3:54f2)
+.Jumptable:
 	dw GetMovementPermissions
 	dw BufferScreen
 	dw .mobile
@@ -72,17 +72,17 @@
 	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 @@
 	inc [hl]
 	ret
 
-UpdateOverworldMap: ; d536 (3:5536)
+UpdateOverworldMap:
 	ld a, [wPlayerStepDirection]
 	and a
 	jr z, .step_down
@@ -147,7 +147,7 @@
 	call ScrollMapLeft
 	ret
 
-.ScrollOverworldMapDown: ; d571 (3:5571)
+.ScrollOverworldMapDown:
 	ld a, [wBGMapAnchor]
 	add 2 * BG_MAP_WIDTH
 	ld [wBGMapAnchor], a
@@ -168,7 +168,7 @@
 .done_down
 	ret
 
-.Add6ToOverworldMapAnchor: ; d595 (3:5595)
+.Add6ToOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [wMapWidth]
 	add 6
@@ -178,7 +178,7 @@
 	inc [hl]
 	ret
 
-.ScrollOverworldMapUp: ; d5a2 (3:55a2)
+.ScrollOverworldMapUp:
 	ld a, [wBGMapAnchor]
 	sub 2 * BG_MAP_WIDTH
 	ld [wBGMapAnchor], a
@@ -199,7 +199,7 @@
 .done_up
 	ret
 
-.Sub6FromOverworldMapAnchor: ; d5c6 (3:55c6)
+.Sub6FromOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [wMapWidth]
 	add 6
@@ -211,7 +211,7 @@
 	dec [hl]
 	ret
 
-.ScrollOverworldMapLeft: ; d5d5 (3:55d5)
+.ScrollOverworldMapLeft:
 	ld a, [wBGMapAnchor]
 	ld e, a
 	and $e0
@@ -231,7 +231,7 @@
 .done_left
 	ret
 
-.DecrementwOverworldMapAnchor: ; d5f4 (3:55f4)
+.DecrementwOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [hl]
 	sub 1
@@ -240,7 +240,7 @@
 	dec [hl]
 	ret
 
-.ScrollOverworldMapRight: ; d5fe (3:55fe)
+.ScrollOverworldMapRight:
 	ld a, [wBGMapAnchor]
 	ld e, a
 	and $e0
@@ -260,7 +260,7 @@
 .done_right
 	ret
 
-.IncrementwOverworldMapAnchor: ; d61d (3:561d)
+.IncrementwOverworldMapAnchor:
 	ld hl, wOverworldMapAnchor
 	ld a, [hl]
 	add 1
--- a/engine/overworld/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 @@
 	rst JumpTable
 	ret
 
-
 ScriptCommandTable:
 ; entries correspond to macros/scripts/events.asm enumeration
 	dw Script_scall                      ; 00
@@ -332,7 +330,6 @@
 	closetext
 	end
 
-
 if _CRYSTAL
 
 Script_farjumptext:
@@ -351,7 +348,6 @@
 
 endc
 
-
 Script_writetext:
 ; script command 0x4c
 ; parameters: text_pointer
@@ -521,7 +517,6 @@
 	ld de, GiveItemScript
 	jp ScriptCall
 
-
 ret_96f76:
 	ret
 
@@ -544,7 +539,6 @@
 	text_jump UnknownText_0x1c4719
 	db "@"
 
-
 Script_verbosegiveitem2:
 ; script command 0x9f
 ; parameters: item, var
@@ -608,7 +602,6 @@
 	call WaitSFX
 	ret
 
-
 GetPocketName:
 	farcall CheckItemPocket
 	ld a, [wItemAttributeParamBuffer]
@@ -634,7 +627,6 @@
 	call GetItemName
 	ret
 
-
 PutItemInPocketText:
 	text_jump UnknownText_0x1c472c
 	db "@"
@@ -643,7 +635,6 @@
 	text_jump UnknownText_0x1c474b
 	db "@"
 
-
 Script_pokemart:
 ; script command 0x94
 ; parameters: dialog_id, mart_id
@@ -1274,7 +1265,6 @@
 	step_sleep 1
 	step_end
 
-
 Script_earthquake:
 ; script command 0x78
 ; parameters: param
@@ -1301,7 +1291,6 @@
 	step_end
 .End
 
-
 Script_loadpikachudata:
 ; script command 0x5a
 
@@ -2664,7 +2653,6 @@
 	call CloseText
 	ret
 
-
 Script_passtoengine:
 ; script command 0x89
 ; parameters: data_pointer
@@ -2833,7 +2821,6 @@
 	ld a, c
 	ld [wScriptVar], a
 	ret
-
 
 ; unused
 	ld a, [.byte]
--- a/engine/overworld/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 @@
 	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
@@ -86,10 +80,8 @@
 	ld [wRegisteredItem], a
 	scf
 	ret
-; 133a6
 
-
-.CheckRegisteredNo: ; 133a6
+.CheckRegisteredNo:
 	ld a, [wWhichRegisteredItem]
 	and REGISTERED_NUMBER
 	dec a
@@ -102,10 +94,8 @@
 .NotEnoughItems:
 	scf
 	ret
-; 133b6
 
-
-.IsSameItem: ; 133b6
+.IsSameItem:
 	ld a, [wRegisteredItem]
 	cp [hl]
 	jr nz, .NotSameItem
@@ -116,11 +106,8 @@
 .NotSameItem:
 	scf
 	ret
-; 133c3
 
-
-UseRegisteredItem: ; 133c3
-
+UseRegisteredItem:
 	farcall CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .SwitchTo
@@ -136,25 +123,22 @@
 	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
@@ -162,9 +146,8 @@
 	call CloseText
 	and a
 	ret
-; 13406
 
-.Overworld: ; 13406
+.Overworld:
 	call RefreshScreen
 	ld a, 1
 	ld [wUsingItemWithSelect], a
@@ -178,9 +161,8 @@
 	ld a, HMENURETURN_SCRIPT
 	ld [hMenuReturn], a
 	ret
-; 13422
 
-.CantUse: ; 13422
+.CantUse:
 	call RefreshScreen
 
 ._cantuse
@@ -188,4 +170,3 @@
 	call CloseText
 	and a
 	ret
-; 1342d
--- a/engine/overworld/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 @@
 	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 @@
 .yes
 	scf
 	ret
-; 15363
--- a/engine/overworld/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 @@
 .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 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	ret z
 	ld de, SFX_EXIT_BUILDING
 	ret
-; 14a1a
--- a/engine/overworld/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 @@
 	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 @@
 	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 @@
 	inc hl
 	call CopyDayToHL
 	ret
-; 11420
 
-CheckDayDependentEventHL: ; 11420
+CheckDayDependentEventHL:
 	inc hl
 	push hl
 	call CalcDaysSince
@@ -71,9 +65,8 @@
 	dec hl
 	call UpdateTimeRemaining
 	ret
-; 1142e
 
-RestartReceiveCallDelay: ; 1142e
+RestartReceiveCallDelay:
 	ld hl, wReceiveCallDelay_MinsRemaining
 	ld [hl], a
 	call UpdateTime
@@ -80,9 +73,8 @@
 	ld hl, wReceiveCallDelay_StartTime
 	call CopyDayHourMinToHL
 	ret
-; 1143c
 
-CheckReceiveCallDelay: ; 1143c
+CheckReceiveCallDelay:
 	ld hl, wReceiveCallDelay_StartTime
 	call CalcMinsHoursDaysSince
 	call GetMinutesSinceIfLessThan60
@@ -89,14 +81,12 @@
 	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
@@ -128,9 +118,8 @@
 	call SampleKenjiBreakCountdown
 .DontRestartKenjiBreakCountdown:
 	jr RestartDailyResetTimer
-; 11485
 
-SampleKenjiBreakCountdown: ; 11485
+SampleKenjiBreakCountdown:
 ; Generate a random number between 3 and 6
 	call Random
 	and %11
@@ -137,9 +126,8 @@
 	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 @@
 	ld hl, wBugContestStartTime
 	call CopyDayHourMinSecToHL
 	ret
-; 114a4
 
-
-CheckBugContestTimer:: ; 114a4 (4:54a4)
+CheckBugContestTimer::
 	ld hl, wBugContestStartTime
 	call CalcSecsMinsHoursDaysSince
 	ld a, [wDaysSince]
@@ -185,15 +171,13 @@
 	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 @@
 .done
 	xor a
 	ret
-; 114fc
 
-SetUnusedTwoDayTimer: ; 114fc
+SetUnusedTwoDayTimer:
 	ld a, 2
 	ld hl, wUnusedTwoDayTimer
 	ld [hl], a
@@ -214,9 +197,8 @@
 	ld hl, wUnusedTwoDayTimerStartDate
 	call CopyDayToHL
 	ret
-; 1150c
 
-CheckUnusedTwoDayTimer: ; 1150c
+CheckUnusedTwoDayTimer:
 	ld hl, wUnusedTwoDayTimerStartDate
 	call CalcDaysSince
 	call GetDaysSince
@@ -223,13 +205,11 @@
 	ld hl, wUnusedTwoDayTimer
 	call UpdateTimeRemaining
 	ret
-; 1151c
 
 ; unused
 	ld hl, wDailyFlags
 	set DAILYFLAGS_FISH_SWARM_F, [hl]
 	ret
-; 11522
 
 ; unused
 	and a
@@ -238,15 +218,13 @@
 	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 @@
 
 .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 @@
 	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 @@
 	ld [hl], a
 	scf
 	ret
-; 11599
 
-GetSecondsSinceIfLessThan60: ; 11599
+GetSecondsSinceIfLessThan60:
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@@ -331,9 +305,8 @@
 	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 @@
 	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 @@
 	dec hl
 	ld [wSecondsSince], a ; seconds since
 
-_CalcMinsHoursDaysSince: ; 115eb
+_CalcMinsHoursDaysSince:
 	ld a, [hMinutes]
 	ld c, a
 	sbc [hl]
@@ -405,7 +371,7 @@
 	dec hl
 	ld [wMinutesSince], a ; minutes since
 
-_CalcHoursDaysSince: ; 115f8
+_CalcHoursDaysSince:
 	ld a, [hHours]
 	ld c, a
 	sbc [hl]
@@ -426,9 +392,8 @@
 	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 @@
 	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 @@
 	ld a, [hMinutes]
 	ld [hli], a
 	ret
-; 11639
--- a/engine/overworld/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 @@
 	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,9 +66,8 @@
 	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
@@ -76,9 +74,8 @@
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
-; 806d3
 
-.CountSeenMons: ; 806d3
+.CountSeenMons:
 ; Seen mons.
 	ld hl, wPokedexSeen
 	ld b, wEndPokedexSeen - wPokedexSeen
@@ -85,9 +82,8 @@
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
-; 806e1
 
-.CountBadges: ; 806e1
+.CountBadges:
 ; Number of owned badges.
 	ld hl, wBadges
 	ld b, 2
@@ -94,9 +90,8 @@
 	call CountSetBits
 	ld a, [wd265]
 	jp .loadstringbuffer2
-; 806ef
 
-.PlayerFacing: ; 806ef
+.PlayerFacing:
 ; The direction the player is facing.
 	ld a, [wPlayerDirection]
 	and $c
@@ -103,15 +98,13 @@
 	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 @@
 	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 @@
 	call CloseSRAM
 	ld a, b
 	jp .loadstringbuffer2
-; 80728
 
-.BattleResult: ; 80728
+.BattleResult:
 	ld a, [wBattleResult]
 	and $ff ^ BATTLERESULT_BITMASK
 	jp .loadstringbuffer2
-; 80730
--- a/engine/overworld/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 @@
 	call ResetBikeFlags
 	ld a, MAPCALLBACK_NEWMAP
 	call RunMapCallback
-InitCommandQueue: ; 1045c4
+InitCommandQueue:
 	farcall ClearCmdQueue
 	ld a, MAPCALLBACK_CMDQUEUE
 	call RunMapCallback
@@ -15,8 +15,7 @@
 	ld [wMapTimeOfDay], a
 	ret
 
-
-EnterMapConnection: ; 1045d6
+EnterMapConnection:
 ; Return carry if a connection has been entered.
 	ld a, [wPlayerStepDirection]
 	and a
@@ -150,9 +149,8 @@
 .done
 	scf
 	ret
-; 1046c6
 
-LoadWarpData: ; 1046c6
+LoadWarpData:
 	call .SaveDigWarp
 	call .SetSpawn
 	ld a, [wNextWarp]
@@ -163,7 +161,7 @@
 	ld [wMapNumber], a
 	ret
 
-.SaveDigWarp: ; 1046df (41:46df)
+.SaveDigWarp:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	ret nz
@@ -195,7 +193,7 @@
 	ld [wDigMapNumber], a
 	ret
 
-.SetSpawn: ; 104718 (41:4718)
+.SetSpawn:
 	call GetMapEnvironment
 	call CheckOutdoorMap
 	ret nz
@@ -227,7 +225,7 @@
 	ld [wLastSpawnMapNumber], a
 	ret
 
-LoadMapTimeOfDay: ; 104750
+LoadMapTimeOfDay:
 	ld hl, wVramState
 	res 6, [hl]
 	ld a, $1
@@ -239,7 +237,7 @@
 	call .PushAttrMap
 	ret
 
-.ClearBGMap: ; 104770 (41:4770)
+.ClearBGMap:
 	ld a, HIGH(vBGMap0)
 	ld [wBGMapAnchor + 1], a
 	xor a ; LOW(vBGMap0)
@@ -267,7 +265,7 @@
 	call ByteFill
 	ret
 
-.PushAttrMap: ; 1047a3 (41:47a3)
+.PushAttrMap:
 	decoord 0, 0
 	call .copy
 	ld a, [hCGB]
@@ -298,7 +296,7 @@
 	ld [rVBK], a
 	ret
 
-LoadGraphics: ; 1047cf
+LoadGraphics:
 	call LoadTileset
 	call LoadTilesetGFX
 	xor a
@@ -310,12 +308,11 @@
 	farcall LoadOverworldFont
 	ret
 
-LoadMapPalettes: ; 1047eb
+LoadMapPalettes:
 	ld b, SCGB_MAPPALS
 	jp GetSGBLayout
-; 1047f0
 
-RefreshMapSprites: ; 1047f0
+RefreshMapSprites:
 	call ClearSprites
 	farcall ReturnFromMapSetupScript
 	call GetMovementPermissions
@@ -333,7 +330,7 @@
 	ld [wPlayerSpriteSetupFlags], a
 	ret
 
-CheckMovingOffEdgeOfMap:: ; 104820 (41:4820)
+CheckMovingOffEdgeOfMap::
 	ld a, [wPlayerStepDirection]
 	cp STANDING
 	ret z
@@ -390,8 +387,7 @@
 	scf
 	ret
 
-
-GetCoordOfUpperLeftCorner:: ; 10486d
+GetCoordOfUpperLeftCorner::
 	ld hl, wOverworldMapBlocks
 	ld a, [wXCoord]
 	bit 0, a
@@ -436,4 +432,3 @@
 	and $1
 	ld [wMetatileStandingX], a
 	ret
-; 1048ba
--- a/engine/overworld/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 @@
 	ld [wWaterEncounterRate], a
 	ret
 
-FindNest: ; 2a01f
+FindNest:
 ; Parameters:
 ; e: 0 = Johto, 1 = Kanto
 ; wNamedObjectIndexBuffer: species
@@ -51,9 +51,8 @@
 	call .FindGrass
 	ld hl, KantoWaterWildMons
 	jp .FindWater
-; 2a052
 
-.FindGrass: ; 2a052
+.FindGrass:
 	ld a, [hl]
 	cp -1
 	ret z
@@ -76,9 +75,8 @@
 	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 @@
 	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 @@
 
 .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 @@
 .found
 	pop af
 	jp .AppendNest
-; 2a09c
 
-.AppendNest: ; 2a09c
+.AppendNest:
 	push de
 	call GetWorldMapLocation
 	ld c, a
@@ -144,9 +140,8 @@
 	pop de
 	and a
 	ret
-; 2a0b7
 
-.RoamMon1: ; 2a0b7
+.RoamMon1:
 	ld a, [wRoamMon1Species]
 	ld b, a
 	ld a, [wNamedObjectIndexBuffer]
@@ -161,9 +156,8 @@
 	ld [de], a
 	inc de
 	ret
-; 2a0cf
 
-.RoamMon2: ; 2a0cf
+.RoamMon2:
 	ld a, [wRoamMon2Species]
 	ld b, a
 	ld a, [wNamedObjectIndexBuffer]
@@ -178,9 +172,8 @@
 	ld [de], a
 	inc de
 	ret
-; 2a0e7
 
-TryWildEncounter:: ; 2a0e7
+TryWildEncounter::
 ; Try to trigger a wild encounter.
 	call .EncounterRate
 	jr nc, .no_battle
@@ -198,9 +191,8 @@
 	ld a, 1
 	and a
 	ret
-; 2a103
 
-.EncounterRate: ; 2a103
+.EncounterRate:
 	call GetMapEncounterRate
 	call ApplyMusicEffectOnEncounterRate
 	call ApplyCleanseTagEffectOnEncounterRate
@@ -207,9 +199,8 @@
 	call Random
 	cp b
 	ret
-; 2a111
 
-GetMapEncounterRate: ; 2a111
+GetMapEncounterRate:
 	ld hl, wMornEncounterRate
 	call CheckOnWater
 	ld a, wWaterEncounterRate - wMornEncounterRate
@@ -221,9 +212,8 @@
 	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 @@
 .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 @@
 .cleansetag
 	srl b
 	ret
-; 2a14f
 
-ChooseWildEncounter: ; 2a14f
+ChooseWildEncounter:
 	call LoadWildMonDataPointer
 	jp nc, .nowildbattle
 	call CheckEncounterRoamMon
@@ -276,7 +264,7 @@
 	inc hl
 	inc hl
 	ld a, [wTimeOfDay]
-	ld bc, $e
+	ld bc, NUM_GRASSMON * 2
 	call AddNTimes
 	ld de, GrassMonProbTable
 
@@ -355,11 +343,10 @@
 .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 @@
 .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 @@
 	ld bc, GRASS_WILDDATA_LENGTH
 	jr _NormalWildmonOK
 
-_WaterWildmonLookup: ; 2a21d
+_WaterWildmonLookup:
 	ld hl, SwarmWaterWildMons
 	ld bc, WATER_WILDDATA_LENGTH
 	call _SwarmWildmonCheck
@@ -467,17 +453,15 @@
 _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 @@
 	pop hl
 	scf
 	ret
-; 2a2a0
 
-
-InitRoamMons: ; 2a2a0
+InitRoamMons:
 ; initialize wRoamMon structs
 
 ; species
@@ -540,10 +522,8 @@
 	ld [wRoamMon2HP], a
 
 	ret
-; 2a2ce
 
-
-CheckEncounterRoamMon: ; 2a2ce
+CheckEncounterRoamMon:
 	push hl
 ; Don't trigger an encounter if we're on water.
 	call CheckOnWater
@@ -589,10 +569,8 @@
 	pop hl
 	and a
 	ret
-; 2a30d
 
-
-UpdateRoamMons: ; 2a30d
+UpdateRoamMons:
 	ld a, [wRoamMon1MapGroup]
 	cp GROUP_N_A
 	jr z, .SkipRaikou
@@ -633,10 +611,8 @@
 
 .Finished:
 	jp _BackUpMapIndices
-; 2a355
 
-
-.Update: ; 2a355
+.Update:
 	ld hl, RoamMaps
 .loop
 ; Are we at the end of the table?
@@ -675,7 +651,7 @@
 	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]
@@ -693,7 +669,7 @@
 	ld c, [hl]
 	ret
 
-JumpRoamMons: ; 2a394
+JumpRoamMons:
 	ld a, [wRoamMon1MapGroup]
 	cp GROUP_N_A
 	jr z, .SkipRaikou
@@ -726,7 +702,7 @@
 .Finished:
 	jp _BackUpMapIndices
 
-JumpRoamMon: ; 2a3cd
+JumpRoamMon:
 .loop
 	ld hl, RoamMaps
 .innerloop1                   ; This loop happens to be unnecessary.
@@ -760,9 +736,8 @@
 	ld b, a
 	ld c, [hl]
 	ret
-; 2a3f6
 
-_BackUpMapIndices: ; 2a3f6
+_BackUpMapIndices:
 	ld a, [wRoamMons_CurrentMapNumber]
 	ld [wRoamMons_LastMapNumber], a
 	ld a, [wRoamMons_CurrentMapGroup]
@@ -772,13 +747,10 @@
 	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
@@ -790,11 +762,10 @@
 .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.
-RandomUnseenWildMon: ; 2a4ab
+RandomUnseenWildMon:
 	farcall GetCallerLocation
 	ld d, b
 	ld e, c
@@ -819,7 +790,7 @@
 	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.
@@ -865,9 +836,8 @@
 	; I just saw some rare @  in @ . I'll call you if I see another rare #MON, OK?
 	text_jump UnknownText_0x1bd34b
 	db "@"
-; 0x2a51f
 
-RandomPhoneWildMon: ; 2a51f
+RandomPhoneWildMon:
 	farcall GetCallerLocation
 	ld d, b
 	ld e, c
@@ -894,7 +864,7 @@
 	call Random
 	and %11
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 	inc hl
@@ -905,9 +875,8 @@
 	ld de, wStringBuffer4
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
-; 2a567
 
-RandomPhoneMon: ; 2a567
+RandomPhoneMon:
 ; Get a random monster owned by the trainer who's calling.
 	farcall GetCallerLocation
 	ld hl, TrainerGroups
@@ -989,8 +958,6 @@
 	ld de, wStringBuffer4
 	ld bc, MON_NAME_LENGTH
 	jp CopyBytes
-; 2a5e9
-
 
 INCLUDE "data/wild/johto_grass.asm"
 INCLUDE "data/wild/johto_water.asm"
--- a/engine/phone/buenas_password.asm
+++ b/engine/phone/buenas_password.asm
@@ -165,6 +165,5 @@
 .two
 	writetext UnknownText_0xa1e2f
 	end
-; a0c28
 
 INCLUDE "data/phone/text/buena.asm"
--- a/engine/phone/generic_calls.asm
+++ b/engine/phone/generic_calls.asm
@@ -1254,9 +1254,7 @@
 	farwritetext UnknownText_0x1b522b
 	buttonsound
 	farjump PhoneScript_HangupText_Male
-; be643
 
-
 GrandmaString: db "Grandma@"
 GrandpaString: db "Grandpa@"
 MomString: db "Mom@"
@@ -1263,4 +1261,3 @@
 DadString: db "Dad@"
 SisterString: db "Sister@"
 BrotherString: db "Brother@"
-
--- 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 @@
 .cant_add
 	scf
 	ret
-; 9000f
 
-
-DelCellNum:: ; 9000f
+DelCellNum::
 	call _CheckCellNum
 	jr nc, .not_in_list
 	xor a
@@ -23,13 +21,11 @@
 .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 @@
 	dec hl
 	scf
 	ret
-; 9002d
 
-Phone_FindOpenSlot: ; 9002d
+Phone_FindOpenSlot:
 	call GetRemainingSpaceInPhoneList
 	ld b, a
 	ld hl, wPhoneList
@@ -64,9 +59,8 @@
 	dec hl
 	scf
 	ret
-; 90040
 
-GetRemainingSpaceInPhoneList: ; 90040
+GetRemainingSpaceInPhoneList:
 	xor a
 	ld [wBuffer1], a
 	ld hl, PermanentNumbers
@@ -96,12 +90,10 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	xor a
 	ret
 
-GetAvailableCallers: ; 900de (24:40de)
+GetAvailableCallers:
 	farcall CheckTime
 	ld a, c
 	ld [wEngineBuffer1], a
@@ -246,7 +236,7 @@
 	jr nz, .loop
 	ret
 
-CheckSpecialPhoneCall:: ; 90136 (24:4136)
+CheckSpecialPhoneCall::
 	ld a, [wSpecialPhoneCallID]
 	and a
 	jr z, .NoPhoneCall
@@ -288,14 +278,12 @@
 .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 @@
 	call AddNTimes
 	ret
 
-SpecialCallOnlyWhenOutside: ; 90188
+SpecialCallOnlyWhenOutside:
 	ld a, [wEnvironment]
 	cp TOWN
 	jr z, .outside
@@ -318,11 +306,11 @@
 	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 @@
 	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 @@
 	ld bc, 12
 	call FarCopyBytes
 	ret
-; 90233 (24:4233)
 
-WrongNumber: ; 90233
+WrongNumber:
 	db TRAINER_NONE, PHONE_00
 	dba .script
 .script
@@ -434,9 +418,8 @@
 	; Huh? Sorry, wrong number!
 	text_jump UnknownText_0x1c5565
 	db "@"
-; 90241
 
-Script_ReceivePhoneCall: ; 0x90241
+Script_ReceivePhoneCall:
 	refreshscreen
 	callasm RingTwice_StartCall
 	ptcall wPhoneScriptPointer
@@ -445,9 +428,8 @@
 	closetext
 	callasm InitCallReceiveDelay
 	end
-; 0x90255
 
-Script_SpecialBillCall:: ; 0x90255
+Script_SpecialBillCall::
 	callasm .LoadBillScript
 	jump Script_ReceivePhoneCall
 
@@ -454,9 +436,8 @@
 .LoadBillScript:
 	ld e, PHONE_BILL
 	jp LoadCallerScript
-; 90261
 
-UnknownScript_0x90261: ; 0x90261
+UnknownScript_0x90261:
 	callasm .LoadElmScript
 	pause 30
 	jump Script_ReceivePhoneCall
@@ -464,16 +445,14 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +565,8 @@
 	call UpdateSprites
 	farcall PhoneRing_CopyTilemapAtOnce
 	ret
-; 90355
 
-HangUp_Wait20Frames: ; 90355
+HangUp_Wait20Frames:
 	jr Phone_Wait20Frames
 
 Phone_Wait20Frames:
@@ -609,10 +574,8 @@
 	call DelayFrames
 	farcall PhoneRing_CopyTilemapAtOnce
 	ret
-; 90363
 
-
-Function90363: ; 90363 (24:4363)
+Function90363:
 	push bc
 	call Phone_CallerTextbox
 	hlcoord 1, 1
@@ -625,17 +588,14 @@
 	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 @@
 	call GetCallerName
 	ret
 
-CheckCanDeletePhoneNumber: ; 9038a (24:438a)
+CheckCanDeletePhoneNumber:
 	ld a, c
 	call GetCallerTrainerClass
 	ld a, c
@@ -657,7 +617,7 @@
 	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 @@
 	ld c, a
 	pop hl
 	ret
-; 903a9
 
-
-GetCallerName: ; 903a9 (24:43a9)
+GetCallerName:
 	ld a, c
 	and a
 	jr z, .NotTrainer
@@ -702,11 +660,10 @@
 	pop hl
 	call PlaceString
 	ret
-; 903d6 (24:43d6)
 
 INCLUDE "data/phone/non_trainer_names.asm"
 
-Phone_GetTrainerName: ; 90423 (24:4423)
+Phone_GetTrainerName:
 	push hl
 	push bc
 	farcall GetTrainerName
@@ -714,7 +671,7 @@
 	pop hl
 	ret
 
-Phone_GetTrainerClassName: ; 9042e (24:442e)
+Phone_GetTrainerClassName:
 	push hl
 	push bc
 	farcall GetTrainerClassName
@@ -722,7 +679,7 @@
 	pop hl
 	ret
 
-GetCallerLocation: ; 90439
+GetCallerLocation:
 	ld a, [wCurrentCaller]
 	call GetCallerTrainerClass
 	ld d, c
@@ -742,43 +699,34 @@
 	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
--- 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,7 +15,7 @@
 	iftrue MomPhoneNoPokedexScript
 	jump MomPhoneNoPokemonScript
 
-.bcec5 ; 0xbcec5
+.bcec5
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
 	iftrue MomPhoneHangUpScript
 	farwritetext MomPhoneGreetingText
@@ -26,12 +26,12 @@
 	ifequal 2, MomPhonePalette2
 	jump MomPhoneOther
 
-MomPhoneLandmark: ; 0xbcedf
+MomPhoneLandmark:
 	farwritetext MomPhoneLandmarkText
 	buttonsound
 	jump MomSavingMoney
 
-MomPhonePalette1: ; 0xbcee7
+MomPhonePalette1:
 	checkcode VAR_MAPGROUP
 	ifequal GROUP_NEW_BARK_TOWN, .newbark
 	ifequal GROUP_CHERRYGROVE_CITY, .cherrygrove
@@ -42,37 +42,37 @@
 	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 .NotSaving
 	checkmoney MOMS_MONEY, 0
@@ -79,12 +79,12 @@
 	ifequal HAVE_MORE, .SavingHasMoney
 	jump .SavingNoMoney
 
-.NotSaving: ; 0xbcf49
+.NotSaving:
 	checkmoney MOMS_MONEY, 0
 	ifequal HAVE_MORE, .HasMoney
 	jump .NoMoney
 
-.SavingHasMoney: ; 0xbcf55
+.SavingHasMoney:
 	readmoney MOMS_MONEY, MEM_BUFFER_0
 	farwritetext MomCheckBalanceText
 	yesorno
@@ -91,19 +91,19 @@
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-.SavingNoMoney: ; 0xbcf63
+.SavingNoMoney:
 	farwritetext MomImportantToSaveText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-.NoMoney: ; 0xbcf6e
+.NoMoney:
 	farwritetext MomYoureNotSavingText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
 	jump MomPhoneWontSaveMoneyScript
 
-.HasMoney: ; 0xbcf79
+.HasMoney:
 	readmoney MOMS_MONEY, MEM_BUFFER_0
 	farwritetext MomYouveSavedText
 	yesorno
@@ -110,35 +110,35 @@
 	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_MOM_ACTIVE
 	specialphonecall SPECIALCALL_NONE
@@ -149,7 +149,7 @@
 
 ; Bill
 
-BillPhoneScript1: ; 0xbcfc5
+BillPhoneScript1:
 	checktime DAY
 	iftrue .daygreet
 	checktime NITE
@@ -158,17 +158,17 @@
 	buttonsound
 	jump .main
 
-.daygreet ; 0xbcfd7
+.daygreet
 	farwritetext BillPhoneDayGreetingText
 	buttonsound
 	jump .main
 
-.nitegreet ; 0xbcfdf
+.nitegreet
 	farwritetext BillPhoneNiteGreetingText
 	buttonsound
 	jump .main
 
-.main ; 0xbcfe7
+.main
 	farwritetext BillPhoneGenericText
 	buttonsound
 	checkcode VAR_BOXSPACE
@@ -178,15 +178,15 @@
 	farwritetext BillPhoneNotFullText
 	end
 
-.nearlyfull ; 0xbcffd
+.nearlyfull
 	farwritetext BillPhoneNearlyFullText
 	end
 
-.full ; 0xbd002
+.full
 	farwritetext BillPhoneFullText
 	end
 
-BillPhoneScript2: ; 0xbd007
+BillPhoneScript2:
 	farwritetext BillPhoneNewlyFullText
 	waitbutton
 	end
@@ -193,7 +193,7 @@
 
 ; Elm
 
-ElmPhoneScript1: ; 0xbd00d
+ElmPhoneScript1:
 	checkcode VAR_SPECIALPHONECALL
 	ifequal SPECIALCALL_POKERUS, .pokerus
 	checkevent EVENT_SHOWED_TOGEPI_TO_ELM
@@ -216,47 +216,47 @@
 	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
 	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
 	ifequal SPECIALCALL_ROBBED, .disaster
 	ifequal SPECIALCALL_ASSISTANT, .assistant
@@ -267,13 +267,13 @@
 	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
@@ -280,21 +280,20 @@
 	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
 
--- a/engine/phone/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 @@
 	ld [hBGMapMode], a
 	ret
 
-.CopyTilemapAtOnce: ; 4d1cb
+.CopyTilemapAtOnce:
 	ld [hSPBuffer], sp
 	ld sp, hl
 	ld a, [hBGMapAddress + 1]
--- a/engine/pokedex/new_pokedex_entry.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 @@
 	pop af
 	ld [hMapAnims], a
 	ret
-; fb8c8
 
-.ReturnFromDexRegistration: ; fb8c8
+.ReturnFromDexRegistration:
 	call ClearTileMap
 	call LoadFontsExtra
 	call LoadStandardFont
@@ -49,4 +48,3 @@
 	call GetSGBLayout
 	call SetPalettes
 	ret
-; fb8f1
--- 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 @@
 	ld [hWY], a
 	ret
 
-InitPokedex: ; 40063
+InitPokedex:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -106,7 +105,7 @@
 	call Pokedex_ResetBGMapMode
 	ret
 
-Pokedex_CheckUnlockedUnownMode: ; 400a2
+Pokedex_CheckUnlockedUnownMode:
 	ld a, [wStatusFlags]
 	bit STATUSFLAGS_UNOWN_DEX_F, a
 	jr nz, .unlocked
@@ -120,7 +119,7 @@
 	ld [wUnlockedUnownMode], a
 	ret
 
-Pokedex_InitCursorPosition: ; 400b4
+Pokedex_InitCursorPosition:
 	ld hl, wPokedexOrder
 	ld a, [wPrevDexEntry]
 	and a
@@ -162,7 +161,7 @@
 .done
 	ret
 
-Pokedex_GetLandmark: ; 400ed
+Pokedex_GetLandmark:
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -182,13 +181,13 @@
 	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 @@
 	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 @@
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateMainScreen: ; 401ae (10:41ae)
+Pokedex_UpdateMainScreen:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -324,7 +323,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
+Pokedex_InitDexEntryScreen:
 	call LowVolume
 	xor a ; page 1
 	ld [wPokedexStatus], a
@@ -350,7 +349,7 @@
 	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 @@
 	ld [wJumptableIndex], a
 	ret
 
-Pokedex_Page: ; 40292
+Pokedex_Page:
 	ld a, [wPokedexStatus]
 	xor 1 ; toggle page
 	ld [wPokedexStatus], a
@@ -394,7 +393,7 @@
 	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,7 +419,7 @@
 	dec [hl]
 	ret
 
-DexEntryScreen_ArrowCursorData: ; 402e8
+DexEntryScreen_ArrowCursorData:
 	db D_RIGHT | D_LEFT, 4
 	dwcoord 1, 17  ; PAGE
 	dwcoord 6, 17  ; AREA
@@ -427,14 +426,13 @@
 	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 @@
 	call Pokedex_GetSGBLayout
 	ret
 
-.Cry: ; 40340
+.Cry:
 	call Pokedex_GetSelectedMon
 	ld a, [wd265]
 	call GetCryIndex
@@ -474,7 +472,7 @@
 	call PlayCry
 	ret
 
-.Print: ; 4034f
+.Print:
 	call Pokedex_ApplyPrintPals
 	xor a
 	ld [hSCX], a
@@ -502,7 +500,7 @@
 	call Pokedex_ApplyUsualPals
 	ret
 
-Pokedex_RedisplayDexEntry: ; 4038d
+Pokedex_RedisplayDexEntry:
 	call Pokedex_DrawDexEntryScreenBG
 	call Pokedex_GetSelectedMon
 	farcall DisplayDexEntry
@@ -509,7 +507,7 @@
 	call Pokedex_DrawFootprint
 	ret
 
-Pokedex_InitOptionScreen: ; 4039d (10:439d)
+Pokedex_InitOptionScreen:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -524,7 +522,7 @@
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateOptionScreen: ; 403be (10:43be)
+Pokedex_UpdateOptionScreen:
 	ld a, [wUnlockedUnownMode]
 	and a
 	jr nz, .okay
@@ -556,13 +554,13 @@
 	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
@@ -569,24 +567,24 @@
 	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 @@
 	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 @@
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateSearchScreen: ; 40471 (10:4471)
+Pokedex_UpdateSearchScreen:
 	ld de, .ArrowCursorData
 	call Pokedex_MoveArrowCursor
 	call Pokedex_UpdateSearchMonType
@@ -658,7 +656,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-.ArrowCursorData: ; 4049e
+.ArrowCursorData:
 	db D_UP | D_DOWN, 4
 	dwcoord 2, 4  ; TYPE 1
 	dwcoord 2, 6  ; TYPE 2
@@ -665,18 +663,18 @@
 	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 @@
 	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 @@
 	call Pokedex_IncrementDexPointer
 	ret
 
-Pokedex_UpdateSearchResultsScreen: ; 40562 (10:4562)
+Pokedex_UpdateSearchResultsScreen:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -797,7 +795,7 @@
 	ld [hWX], a
 	ret
 
-Pokedex_InitUnownMode: ; 405bd (10:45bd)
+Pokedex_InitUnownMode:
 	call Pokedex_LoadUnownFont
 	call Pokedex_DrawUnownModeBG
 	xor a
@@ -811,7 +809,7 @@
 	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 @@
 .done
 	ret
 
-Pokedex_UnownModeHandleDPadInput: ; 40610 (10:4610)
+Pokedex_UnownModeHandleDPadInput:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_RIGHT
@@ -883,15 +881,15 @@
 	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 @@
 	ld [hl], c
 	ret
 
-Pokedex_NextOrPreviousDexEntry: ; 4066c (10:466c)
+Pokedex_NextOrPreviousDexEntry:
 	ld a, [wDexListingCursor]
 	ld [wBackupDexListingCursor], a
 	ld a, [wDexListingScrollOffset]
@@ -955,7 +953,7 @@
 	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 @@
 	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 @@
 	dec [hl]
 	jr Pokedex_ListingPosChanged
 
-Pokedex_ListingMoveCursorDown: ; 406fe (10:46fe)
+Pokedex_ListingMoveCursorDown:
 	ld hl, wDexListingCursor
 	ld a, [hl]
 	inc a
@@ -1012,7 +1010,7 @@
 	inc [hl]
 	jr Pokedex_ListingPosChanged
 
-Pokedex_ListingMoveUpOnePage: ; 40716 (10:4716)
+Pokedex_ListingMoveUpOnePage:
 	ld hl, wDexListingScrollOffset
 	ld a, [hl]
 	and a
@@ -1028,7 +1026,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .done
 	ret
 
-Pokedex_DrawUnownModeBG: ; 409f1 (10:49f1)
+Pokedex_DrawUnownModeBG:
 	call Pokedex_FillBackgroundColor2
 	hlcoord 2, 1
 	lb bc, 10, 13
@@ -1320,7 +1317,7 @@
 	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 @@
 	ld [wDexUnownCount], a
 	ret
 
-UnownModeLetterAndCursorCoords: ; 40a3e
+UnownModeLetterAndCursorCoords:
 ; entries correspond to Unown forms
 ;           letter, cursor
 	dwcoord   4,11,   3,11 ; A
@@ -1377,7 +1374,7 @@
 	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
@@ -1384,9 +1381,9 @@
 	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 @@
 	jr nz, .row
 	ret
 
-Pokedex_PlaceString: ; 40acd
+Pokedex_PlaceString:
 .loop
 	ld a, [de]
 	cp -1
@@ -1416,8 +1413,7 @@
 	ld [hli], a
 	jr .loop
 
-
-Pokedex_PlaceBorder: ; 40ad5
+Pokedex_PlaceBorder:
 	push hl
 	ld a, $33
 	ld [hli], a
@@ -1449,7 +1445,7 @@
 	ld [hl], a
 	ret
 
-.FillRow: ; 40b06
+.FillRow:
 	ld e, c
 .row_loop
 	ld a, e
@@ -1460,8 +1456,7 @@
 	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 @@
 	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 @@
 	call PlaceString
 	ret
 
-Pokedex_PrintNumberIfOldMode: ; 40b6a (10:4b6a)
+Pokedex_PrintNumberIfOldMode:
 	ld a, [wCurrentDexMode]
 	cp DEXMODE_OLD
 	jr z, .printnum
@@ -1542,7 +1537,7 @@
 	pop hl
 	ret
 
-Pokedex_PlaceCaughtSymbolIfCaught: ; 40b82 (10:4b82)
+Pokedex_PlaceCaughtSymbolIfCaught:
 	call Pokedex_CheckCaught
 	jr nz, .place_caught_symbol
 	inc hl
@@ -1553,7 +1548,7 @@
 	ld [hli], a
 	ret
 
-Pokedex_PlaceDefaultStringIfNotSeen: ; 40b8d (10:4b8d)
+Pokedex_PlaceDefaultStringIfNotSeen:
 	call Pokedex_CheckSeen
 	ret nz
 	inc hl
@@ -1562,10 +1557,10 @@
 	scf
 	ret
 
-.NameNotSeen: ; 40b9a
+.NameNotSeen:
 	db "-----@"
 
-Pokedex_DrawFootprint: ; 40ba0
+Pokedex_DrawFootprint:
 	hlcoord 18, 1
 	ld a, $62
 	ld [hli], a
@@ -1578,8 +1573,7 @@
 	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 @@
 	ld [wd265], a
 	ret
 
-
-Pokedex_CheckCaught: ; 40bc4 (10:4bc4)
+Pokedex_CheckCaught:
 	push de
 	push hl
 	ld a, [wd265]
@@ -1605,8 +1598,7 @@
 	pop de
 	ret
 
-
-Pokedex_CheckSeen: ; 40bd0
+Pokedex_CheckSeen:
 	push de
 	push hl
 	ld a, [wd265]
@@ -1616,9 +1608,7 @@
 	pop de
 	ret
 
-
-
-Pokedex_OrderMonsByMode: ; 40bdc
+Pokedex_OrderMonsByMode:
 	ld hl, wPokedexOrder
 	ld bc, wPokedexOrderEnd - wPokedexOrder
 	xor a
@@ -1628,12 +1618,12 @@
 	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 @@
 	call .FindLastSeen
 	ret
 
-.OldMode: ; 40c08 (10:4c08)
+.OldMode:
 	ld hl, wPokedexOrder
 	ld a, $1
 	ld c, NUM_POKEMON
@@ -1658,7 +1648,7 @@
 	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 @@
 	ld [wDexListingEnd], a
 	ret
 
-Pokedex_ABCMode: ; 40c30
+Pokedex_ABCMode:
 	xor a
 	ld [wDexListingEnd], a
 	ld hl, wPokedexOrder
@@ -1711,13 +1701,11 @@
 .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 @@
 	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 @@
 	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 @@
 	and a
 	ret
 
-Pokedex_PrevSearchMonType: ; 40f65
+Pokedex_PrevSearchMonType:
 	ld a, [wDexArrowCursorPosIndex]
 	and a
 	jr nz, .type2
@@ -1821,7 +1809,7 @@
 	scf
 	ret
 
-Pokedex_NextSearchMonType: ; 40f84
+Pokedex_NextSearchMonType:
 	ld a, [wDexArrowCursorPosIndex]
 	and a
 	jr nz, .type2
@@ -1850,7 +1838,7 @@
 	scf
 	ret
 
-Pokedex_PlaceSearchScreenTypeStrings: ; 40fa8 (10:4fa8)
+Pokedex_PlaceSearchScreenTypeStrings:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 9, 3
@@ -1867,7 +1855,7 @@
 	ld [hBGMapMode], a
 	ret
 
-Pokedex_PlaceTypeString: ; 40fcd (10:4fcd)
+Pokedex_PlaceTypeString:
 	push hl
 	ld e, a
 	ld d, 0
@@ -1883,7 +1871,7 @@
 
 INCLUDE "data/types/search_strings.asm"
 
-Pokedex_SearchForMons: ; 41086
+Pokedex_SearchForMons:
 	ld a, [wDexSearchMonType2]
 	and a
 	call nz, .Search
@@ -1892,7 +1880,7 @@
 	call nz, .Search
 	ret
 
-.Search: ; 41095
+.Search:
 	dec a
 	ld e, a
 	ld d, 0
@@ -1960,7 +1948,7 @@
 
 INCLUDE "data/types/search_types.asm"
 
-Pokedex_DisplayTypeNotFoundMessage: ; 41107
+Pokedex_DisplayTypeNotFoundMessage:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 12
@@ -1975,11 +1963,11 @@
 	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 @@
 	call Pokedex_PutScrollbarOAM
 	ret
 
-Pokedex_PutOldModeCursorOAM: ; 41157 (10:5157)
+Pokedex_PutOldModeCursorOAM:
 	ld hl, .CursorOAM
 	ld a, [wDexListingCursor]
 	or a
@@ -1997,7 +1985,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,7 +2174,7 @@
 	ld [hl], $0
 	ret
 
-Pokedex_InitArrowCursor: ; 4134f (10:534f)
+Pokedex_InitArrowCursor:
 	xor a
 	ld [wDexArrowCursorPosIndex], a
 	ld [wDexArrowCursorDelayCounter], a
@@ -2193,7 +2181,7 @@
 	ld [wDexArrowCursorBlinkCounter], a
 	ret
 
-Pokedex_MoveArrowCursor: ; 4135a (10:535a)
+Pokedex_MoveArrowCursor:
 ; bc = [de] - 1
 	ld a, [de]
 	ld b, a
@@ -2275,7 +2263,7 @@
 	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 @@
 	ld l, a
 	ret
 
-Pokedex_BlinkArrowCursor: ; 413e0 (10:53e0)
+Pokedex_BlinkArrowCursor:
 	ld hl, wDexArrowCursorBlinkCounter
 	ld a, [hl]
 	inc [hl]
@@ -2301,7 +2289,7 @@
 	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 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 
-Pokedex_ApplyPrintPals: ; 41415
+Pokedex_ApplyPrintPals:
 	ld a, $ff
 	call DmgToCgbBGPals
 	ld a, $ff
@@ -2337,11 +2325,11 @@
 	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 @@
 	call DmgToCgbObjPal0
 	ret
 
-
-Pokedex_LoadPointer: ; 41432
+Pokedex_LoadPointer:
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -2360,7 +2347,7 @@
 	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 @@
 	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 @@
 
 	ret
 
-
-Pokedex_LoadGFX: ; 414b7
+Pokedex_LoadGFX:
 	call DisableLCD
 	ld hl, vTiles2
 	ld bc, $31 tiles
@@ -2462,12 +2447,12 @@
 	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 @@
 	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 @@
 	dec a
 	ret
 
-Pokedex_LoadUnownFont: ; 41a2c
+Pokedex_LoadUnownFont:
 	ld a, BANK(sScratch)
 	call GetSRAMBank
 	ld hl, UnownFont
@@ -2501,16 +2486,16 @@
 	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 @@
 	ld [wUnownLetter], a
 	ret
 
-_NewPokedexEntry: ; 41a7f
+_NewPokedexEntry:
 	xor a
 	ld [hBGMapMode], a
 	farcall DrawDexEntryScreenRightEdge
@@ -2561,8 +2546,7 @@
 	call PlayMonCry
 	ret
 
-
-Pokedex_SetBGMapMode3: ; 41ad7 (10:5ad7)
+Pokedex_SetBGMapMode3:
 	ld a, $3
 	ld [hBGMapMode], a
 	ld c, 4
@@ -2569,7 +2553,7 @@
 	call DelayFrames
 	ret
 
-Pokedex_SetBGMapMode4: ; 41ae1 (10:5ae1)
+Pokedex_SetBGMapMode4:
 	ld a, $4
 	ld [hBGMapMode], a
 	ld c, 4
@@ -2576,7 +2560,7 @@
 	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 @@
 	call Pokedex_SetBGMapMode3
 	ret
 
-
-Pokedex_ResetBGMapMode: ; 41af7
+Pokedex_ResetBGMapMode:
 	xor a
 	ld [hBGMapMode], a
 	ret
--- 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 @@
 	call DelayFrames
 	ret
 
-.FrameIDs: ; 441fc
+.FrameIDs:
 	; frame ID, duration
 	db 0, 7
 	db 1, 7
@@ -38,7 +38,7 @@
 	db 4, 7
 	db -2
 
-DoDexSearchSlowpokeFrame: ; 44207
+DoDexSearchSlowpokeFrame:
 	ld a, [wDexSearchSlowpokeFrame]
 	ld hl, .SlowpokeSpriteData
 	ld de, wVirtualOAMSprite00
@@ -64,7 +64,7 @@
 	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 @@
 	dsprite 13, 0, 11, 0, $22, 0
 	db -1
 
-DisplayDexEntry: ; 4424d
+DisplayDexEntry:
 	call GetPokemonName
 	hlcoord 9, 3
 	call PlaceString ; mon species
@@ -211,11 +211,11 @@
 	call FarString
 	ret
 
-UnreferencedPOKeString: ; 44331
+UnreferencedPOKeString:
 ; unused
 	db "#@"
 
-GetDexEntryPointer: ; 44333
+GetDexEntryPointer:
 ; return dex entry pointer b:de
 	push hl
 	ld hl, PokedexDataPointerTable
@@ -242,13 +242,13 @@
 	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")
 
-GetDexEntryPagePointer: ; 44355
-	call GetDexEntryPointer ; b:de
+GetDexEntryPagePointer:
+	call GetDexEntryPointer
 	push hl
 	ld h, d
 	ld l, e
@@ -279,3 +279,5 @@
 	ld e, l
 	pop hl
 	ret
+
+INCLUDE "data/pokemon/dex_entry_pointers.asm"
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -1,10 +1,10 @@
-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
@@ -11,19 +11,19 @@
 	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
+.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 @@
 .Done:
 	ret
 
-DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1)
+DrawPokedexSearchResultsWindow:
 	ld a, $34
 	hlcoord 0, 0
 	ld bc, 11
@@ -111,7 +111,7 @@
 	call PlaceString
 	ret
 
-.esults_D ; 1de23c
+.esults_D
 ; (SEARCH R)
 	db   "ESULTS"
 	next ""
@@ -118,7 +118,7 @@
 ; (### FOUN)
 	next "D!@"
 
-DrawDexEntryScreenRightEdge: ; 1de247
+DrawDexEntryScreenRightEdge:
 	ld a, [hBGMapAddress]
 	ld l, a
 	ld a, [hBGMapAddress + 1]
@@ -150,7 +150,7 @@
 	ld [hBGMapAddress + 1], a
 	ret
 
-Bank77_FillColumn: ; 1de27f
+Bank77_FillColumn:
 	push de
 	ld de, SCREEN_WIDTH
 .loop
--- 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 @@
 	dec hl
 	ld [hl], c
 	ret
-; fba2e
 
-PrintUnownWord: ; fba2e (3e:7a2e)
+PrintUnownWord:
 	hlcoord 4, 15
 	ld bc, 12
 	ld a, " "
@@ -46,7 +45,5 @@
 	inc de
 	ld [hli], a
 	jr .loop
-; fba5a (3e:7a5a)
-
 
 INCLUDE "data/pokemon/unown_words.asm"
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -22,7 +22,7 @@
 	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 @@
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-.InitTilemap: ; 90bea (24:4bea)
+.InitTilemap:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -109,7 +109,7 @@
 	call DmgToCgbObjPal0
 	ret
 
-Pokegear_LoadGFX: ; 90c4e
+Pokegear_LoadGFX:
 	call ClearVBank1
 	ld hl, TownMapGFX
 	ld de, vTiles2
@@ -157,13 +157,10 @@
 	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 @@
 	ld [hl], $0
 	ret
 
-AnimatePokegearModeIndicatorArrow: ; 90d41 (24:4d41)
+AnimatePokegearModeIndicatorArrow:
 	ld hl, wPokegearCard
 	ld e, [hl]
 	ld d, 0
@@ -184,16 +181,13 @@
 	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 @@
 	call GetWorldMapLocation
 	ret
 
-; 90d70
-
-TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70)
+TownMap_InitCursorAndPlayerIconPositions:
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
@@ -236,7 +228,7 @@
 	ld [wPokegearMapCursorLandmark], a
 	ret
 
-Pokegear_InitJumptableIndices: ; 90d9e (24:4d9e)
+Pokegear_InitJumptableIndices:
 	ld a, POKEGEARSTATE_CLOCKINIT
 	ld [wJumptableIndex], a
 	xor a ; POKEGEARCARD_CLOCK
@@ -243,7 +235,7 @@
 	ld [wPokegearCard], a
 	ret
 
-InitPokegearTilemap: ; 90da8 (24:4da8)
+InitPokegearTilemap:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -294,7 +286,7 @@
 	ld [wPokegearMapRegion], a
 	ret
 
-.UpdateBGMap: ; 90e00 (24:4e00)
+.UpdateBGMap:
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -306,17 +298,14 @@
 	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 @@
 	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 @@
 	call PokegearMap_UpdateLandmarkName
 	ret
 
-; 90e72
-
-.Radio: ; 90e72
+.Radio:
 	ld de, RadioTilemapRLE
 	call Pokegear_LoadTilemapRLE
 	hlcoord 0, 12
@@ -370,9 +354,7 @@
 	call TextBox
 	ret
 
-; 90e82
-
-.Phone: ; 90e82
+.Phone:
 	ld de, PhoneTilemapRLE
 	call Pokegear_LoadTilemapRLE
 	hlcoord 0, 12
@@ -382,9 +364,7 @@
 	call PokegearPhone_UpdateDisplayList
 	ret
 
-; 90e98
-
-.PlacePhoneBars: ; 90e98 (24:4e98)
+.PlacePhoneBars:
 	hlcoord 17, 1
 	ld a, $3c
 	ld [hli], a
@@ -400,7 +380,7 @@
 	ld [hl], $3f
 	ret
 
-Pokegear_FinishTilemap: ; 90eb0 (24:4eb0)
+Pokegear_FinishTilemap:
 	hlcoord 0, 0
 	ld bc, $8
 	ld a, $4f
@@ -424,20 +404,20 @@
 	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 @@
 	ld [hld], a
 	ret
 
-PokegearJumptable: ; 90f04 (24:4f04)
+PokegearJumptable:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -461,7 +441,7 @@
 	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 @@
 	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 @@
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-PokegearClock_Joypad: ; 90f3e (24:4f3e)
+PokegearClock_Joypad:
 	call .UpdateClock
 	ld hl, hJoyLast
 	ld a, [hl]
@@ -525,7 +505,7 @@
 	set 7, [hl]
 	ret
 
-.UpdateClock: ; 90f7b (24:4f7b)
+.UpdateClock:
 	xor a
 	ld [hBGMapMode], a
 	call Pokegear_UpdateClock
@@ -533,7 +513,7 @@
 	ld [hBGMapMode], a
 	ret
 
-Pokegear_UpdateClock: ; 90f86 (24:4f86)
+Pokegear_UpdateClock:
 	hlcoord 3, 5
 	lb bc, 5, 14
 	call ClearBox
@@ -548,17 +528,14 @@
 	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 @@
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-PokegearMap_Init: ; 90fcd (24:4fcd)
+PokegearMap_Init:
 	call InitPokegearTilemap
 	ld a, [wPokegearMapPlayerIconLandmark]
 	call PokegearMap_InitPlayerIcon
@@ -590,14 +567,14 @@
 	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
@@ -639,7 +616,7 @@
 	set 7, [hl]
 	ret
 
-.DPad: ; 9102f (24:502f)
+.DPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -682,7 +659,7 @@
 	call PokegearMap_UpdateCursorPosition
 	ret
 
-PokegearMap_InitPlayerIcon: ; 9106a
+PokegearMap_InitPlayerIcon:
 	push af
 	depixel 0, 0
 	ld b, SPRITE_ANIM_INDEX_RED_WALK
@@ -709,9 +686,7 @@
 	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 @@
 	pop bc
 	ret
 
-; 910b4
-
-PokegearMap_UpdateLandmarkName: ; 910b4
+PokegearMap_UpdateLandmarkName:
 	push af
 	hlcoord 8, 0
 	lb bc, 2, 12
@@ -745,9 +718,7 @@
 	ld [hl], $34
 	ret
 
-; 910d4
-
-PokegearMap_UpdateCursorPosition: ; 910d4
+PokegearMap_UpdateCursorPosition:
 	push bc
 	ld e, a
 	farcall GetLandmarkCoords
@@ -760,9 +731,7 @@
 	ld [hl], d
 	ret
 
-; 910e8
-
-TownMap_GetKantoLandmarkLimits: ; 910e8
+TownMap_GetKantoLandmarkLimits:
 	ld a, [wStatusFlags]
 	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	jr z, .not_hof
@@ -775,9 +744,7 @@
 	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 @@
 	inc [hl]
 	ret
 
-PokegearRadio_Joypad: ; 91112 (24:5112)
+PokegearRadio_Joypad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and B_BUTTON
@@ -836,7 +803,7 @@
 	set 7, [hl]
 	ret
 
-PokegearPhone_Init: ; 91156 (24:5156)
+PokegearPhone_Init:
 	ld hl, wJumptableIndex
 	inc [hl]
 	xor a
@@ -849,7 +816,7 @@
 	call PrintText
 	ret
 
-PokegearPhone_Joypad: ; 91171 (24:5171)
+PokegearPhone_Joypad:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -925,7 +892,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
+PokegearPhone_MakePhoneCall:
 	call GetMapPhoneService
 	and a
 	jr nz, .no_service
@@ -967,23 +934,17 @@
 	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 @@
 	call PrintText
 	ret
 
-PokegearPhone_GetDPad: ; 9126d (24:526d)
+PokegearPhone_GetDPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
@@ -1050,7 +1011,7 @@
 	call WaitBGMap
 	ret
 
-PokegearPhone_UpdateCursor: ; 912b7 (24:52b7)
+PokegearPhone_UpdateCursor:
 	ld a, " "
 	hlcoord 1, 4
 	ld [hl], a
@@ -1067,7 +1028,7 @@
 	ld [hl], "▶"
 	ret
 
-PokegearPhone_UpdateDisplayList: ; 912d8 (24:52d8)
+PokegearPhone_UpdateDisplayList:
 	hlcoord 1, 3
 	ld b, 9
 	ld a, " "
@@ -1110,9 +1071,7 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-; 91342
-
-PokegearPhoneContactSubmenu: ; 91342 (24:5342)
+PokegearPhoneContactSubmenu:
 	ld hl, wPhoneList
 	ld a, [wPokegearPhoneScrollPosition]
 	ld e, a
@@ -1248,15 +1205,13 @@
 	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 @@
 	scf
 	ret
 
-; 9141b
-
-.Call: ; 9141b
+.Call:
 	and a
 	ret
 
-; 9141d
-
-.UpdateCursor: ; 9141d (24:541d)
+.UpdateCursor:
 	push de
 	ld a, [de]
 	inc de
@@ -1307,9 +1258,7 @@
 	pop de
 	ret
 
-; 9143f (24:543f)
-
-.CallDeleteCancelStrings: ; 9143f
+.CallDeleteCancelStrings:
 	dwcoord 10, 6
 	db 3
 	db   "CALL"
@@ -1316,29 +1265,23 @@
 	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 @@
 	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 @@
 	call DeleteSpriteAnimStruct2ToEnd
 	ret
 
-ExitPokegearRadio_HandleMusic: ; 91492
+ExitPokegearRadio_HandleMusic:
 	ld a, [wPokegearRadioMusicPlaying]
 	cp RESTART_MAP_MUSIC
 	jr z, .restart_map_music
@@ -1381,9 +1322,7 @@
 	ld [wPokegearRadioMusicPlaying], a
 	ret
 
-; 914ab
-
-DeleteSpriteAnimStruct2ToEnd: ; 914ab (24:54ab)
+DeleteSpriteAnimStruct2ToEnd:
 	ld hl, wSpriteAnim2
 	ld bc, wSpriteAnimationStructsEnd - wSpriteAnim2
 	xor a
@@ -1392,7 +1331,7 @@
 	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 @@
 	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 @@
 	ld [hl], a
 	ret
 
-.TuningKnob: ; 9164e (24:564e)
+.TuningKnob:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN
@@ -1489,7 +1418,7 @@
 	inc [hl]
 	inc [hl]
 .update
-UpdateRadioStation: ; 9166f (24:566f)
+UpdateRadioStation:
 	ld hl, wRadioTuningKnob
 	ld d, [hl]
 	ld hl, RadioChannels
@@ -1527,8 +1456,6 @@
 	ld [hBGMapMode], a
 	ret
 
-; 916a1 (24:56a1)
-
 ; unused
 	ld [wPokegearRadioChannelBank], a
 	ld a, [hli]
@@ -1537,8 +1464,6 @@
 	ld [wPokegearRadioChannelAddr + 1], a
 	ret
 
-; 916ad
-
 RadioChannels:
 ; entries correspond to constants/radio_constants.asm
 
@@ -1611,7 +1536,7 @@
 	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 STATUSFLAGS_ROCKET_SIGNAL_F, a
 	jr z, .NoSignal
@@ -1646,7 +1571,7 @@
 	scf
 	ret
 
-LoadStation_OaksPokemonTalk: ; 91753 (24:5753)
+LoadStation_OaksPokemonTalk:
 	xor a ; OAKS_POKEMON_TALK
 	ld [wCurrentRadioLine], a
 	ld [wNumRadioLinesPrinted], a
@@ -1656,7 +1581,7 @@
 	ld de, OaksPKMNTalkName
 	ret
 
-LoadStation_PokedexShow: ; 91766 (24:5766)
+LoadStation_PokedexShow:
 	ld a, POKEDEX_SHOW
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1667,7 +1592,7 @@
 	ld de, PokedexShowName
 	ret
 
-LoadStation_PokemonMusic: ; 9177b (24:577b)
+LoadStation_PokemonMusic:
 	ld a, POKEMON_MUSIC
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1678,7 +1603,7 @@
 	ld de, PokemonMusicName
 	ret
 
-LoadStation_LuckyChannel: ; 91790 (24:5790)
+LoadStation_LuckyChannel:
 	ld a, LUCKY_CHANNEL
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1689,7 +1614,7 @@
 	ld de, LuckyChannelName
 	ret
 
-LoadStation_BuenasPassword: ; 917a5 (24:57a5)
+LoadStation_BuenasPassword:
 	ld a, BUENAS_PASSWORD
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1704,12 +1629,10 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld de, PokeFluteStationName
 	ret
 
-LoadStation_EvolutionRadio: ; 9183e (24:583e)
+LoadStation_EvolutionRadio:
 	ld a, EVOLUTION_RADIO
 	ld [wCurrentRadioLine], a
 	xor a
@@ -1779,12 +1698,10 @@
 	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 @@
 	call PlayMusic
 	ret
 
-RadioMusicRestartPokemonChannel: ; 91868 (24:5868)
+RadioMusicRestartPokemonChannel:
 	push de
 	ld a, RESTART_MAP_MUSIC
 	ld [wPokegearRadioMusicPlaying], a
@@ -1807,7 +1724,7 @@
 	call PlayMusic
 	ret
 
-Radio_BackUpFarCallParams: ; 9187c (24:587c)
+Radio_BackUpFarCallParams:
 	ld [wPokegearRadioChannelBank], a
 	ld a, l
 	ld [wPokegearRadioChannelAddr], a
@@ -1815,7 +1732,7 @@
 	ld [wPokegearRadioChannelAddr + 1], a
 	ret
 
-NoRadioStation: ; 91888 (24:5888)
+NoRadioStation:
 	call NoRadioMusic
 	call NoRadioName
 	xor a
@@ -1826,7 +1743,7 @@
 	ld [hBGMapMode], a
 	ret
 
-NoRadioMusic: ; 9189d (24:589d)
+NoRadioMusic:
 	ld de, MUSIC_NONE
 	call PlayMusic
 	ld a, ENTER_MAP_MUSIC
@@ -1833,7 +1750,7 @@
 	ld [wPokegearRadioMusicPlaying], a
 	ret
 
-NoRadioName: ; 918a9 (24:58a9)
+NoRadioName:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 1, 8
@@ -1844,8 +1761,6 @@
 	call TextBox
 	ret
 
-; 918bf
-
 OaksPKMNTalkName:     db "OAK's <PK><MN> Talk@"
 PokedexShowName:      db "#DEX Show@"
 PokemonMusicName:     db "#MON Music@"
@@ -1855,9 +1770,8 @@
 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 @@
 	call PokegearMap_UpdateCursorPosition
 	pop de
 	jr .loop2
-; 91a04
 
-.InitTilemap: ; 91a04
+.InitTilemap:
 	ld a, [wTownMapPlayerIconLandmark]
 	cp KANTO_LANDMARK
 	jr nc, .kanto2
@@ -2025,9 +1938,8 @@
 	call PokegearMap_UpdateLandmarkName
 	farcall TownMapPals
 	ret
-; 91a53
 
-PlayRadio: ; 91a53
+PlayRadio:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -2058,9 +1970,7 @@
 	call ExitPokegearRadio_HandleMusic
 	ret
 
-; 91a87
-
-.PlayStation: ; 91a87
+.PlayStation:
 	ld a, ENTER_MAP_MUSIC
 	ld [wPokegearRadioMusicPlaying], a
 	ld hl, .StationPointers
@@ -2080,19 +1990,17 @@
 	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 @@
 	dw LoadStation_LetsAllSing
 	dw LoadStation_RocketRadio
 
-; 91acb
-
-.OakOrPnP: ; 91acb
+.OakOrPnP:
 	call IsInJohto
 	and a
 	jr nz, .kanto
@@ -2119,9 +2025,7 @@
 .kanto
 	jp LoadStation_PlacesAndPeople
 
-; 91ae1
-
-PokegearMap: ; 91ae1
+PokegearMap:
 	ld a, e
 	and a
 	jr nz, .kanto
@@ -2134,9 +2038,7 @@
 	call FillKantoMap
 	ret
 
-; 91af3
-
-_FlyMap: ; 91af3
+_FlyMap:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -2199,9 +2101,7 @@
 	ld e, a
 	ret
 
-; 91b73
-
-FlyMapScroll: ; 91b73
+FlyMapScroll:
 	ld a, [wStartFlypoint]
 	ld e, a
 	ld a, [wEndFlypoint]
@@ -2248,9 +2148,7 @@
 	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 @@
 	call PlaceString
 	ret
 
-; 91c17
-
-GetMapCursorCoordinates: ; 91c17
+GetMapCursorCoordinates:
 	ld a, [wTownMapPlayerIconLandmark]
 	ld l, a
 	ld h, 0
@@ -2335,9 +2231,7 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wTownMapCursorCoordinates + 1], a
 	ret
 
-; 91d11
-
-Pokedex_GetArea: ; 91d11
+Pokedex_GetArea:
 ; e: Current landmark
 	ld a, [wTownMapPlayerIconLandmark]
 	push af
@@ -2537,9 +2423,7 @@
 	ld [wTownMapPlayerIconLandmark], a
 	ret
 
-; 91d9b
-
-.LeftRightInput: ; 91d9b
+.LeftRightInput:
 	ld a, [hl]
 	and D_LEFT
 	jr nz, .left
@@ -2573,9 +2457,7 @@
 	call .GetAndPlaceNest
 	ret
 
-; 91dcd
-
-.BlinkNestIcons: ; 91dcd
+.BlinkNestIcons:
 	ld a, [hVBlankCounter]
 	ld e, a
 	and $f
@@ -2593,9 +2475,7 @@
 	call CopyBytes
 	ret
 
-; 91de9
-
-.PlaceString_MonsNest: ; 91de9
+.PlaceString_MonsNest:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH
 	ld a, " "
@@ -2616,13 +2496,10 @@
 	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 @@
 	call CopyBytes
 	ret
 
-; 91e5a
-
-.HideNestsShowPlayer: ; 91e5a
+.HideNestsShowPlayer:
 	call .CheckPlayerLocation
 	ret c
 	ld a, [wTownMapPlayerIconLandmark]
@@ -2706,9 +2581,7 @@
 	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
@@ -2715,9 +2588,8 @@
 	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 @@
 	scf
 	ret
 
-; 91ed0
-
-.GetPlayerOrFastShipIcon: ; 91ed0
+.GetPlayerOrFastShipIcon:
 	ld a, [wTownMapPlayerIconLandmark]
 	cp FAST_SHIP
 	jr z, .FastShip
@@ -2762,9 +2632,7 @@
 	ld b, BANK(FastShipGFX)
 	ret
 
-; 91ee4
-
-TownMapBGUpdate: ; 91ee4
+TownMapBGUpdate:
 ; Update BG Map tiles and attributes
 
 ; BG Map address
@@ -2792,15 +2660,13 @@
 	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 @@
 	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 @@
 
 .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 @@
 	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
@@ -2939,9 +2800,7 @@
 	ld [hl], d
 	ret
 
-; 0x91ff2
-
-LoadTownMapGFX: ; 91ff2
+LoadTownMapGFX:
 	ld hl, TownMapGFX
 	ld de, vTiles2
 	lb bc, BANK(TownMapGFX), 48
@@ -2948,19 +2807,15 @@
 	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 @@
 	ld e, a
 	ret
 
-; 923b8
-
-.HandleDPad: ; 923b8
+.HandleDPad:
 	ld hl, hJoyLast
 	ld a, [hl]
 	and D_DOWN | D_RIGHT
@@ -3093,5 +2946,3 @@
 	xor a
 	ld [hBGMapMode], a
 	ret
-
-; 92402
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -126,7 +126,6 @@
 	dw PokedexShow7 ; $56
 	dw PokedexShow8 ; $57
 
-
 PrintRadioLine:
 	ld [wNextRadioLine], a
 	ld hl, wRadioText
@@ -703,10 +702,10 @@
 	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")
 
 PokedexShow1:
 	call StartRadioStation
--- a/engine/pokegear/townmap_convertlinebreakcharacters.asm
+++ b/engine/pokegear/townmap_convertlinebreakcharacters.asm
@@ -1,4 +1,4 @@
-TownMap_ConvertLineBreakCharacters: ; 1de2c5
+TownMap_ConvertLineBreakCharacters:
 	ld hl, wStringBuffer1
 .loop
 	ld a, [hl]
@@ -5,14 +5,14 @@
 	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
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1,4 +1,4 @@
-_DepositPKMN: ; e2391 (38:6391)
+_DepositPKMN:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -35,13 +35,13 @@
 	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
@@ -48,7 +48,7 @@
 	dw .Submenu
 	dw BillsPC_EndJumptableLoop
 
-.Init: ; e23e9 (38:63e9)
+.Init:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -69,7 +69,7 @@
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-.HandleJoypad: ; e241a (38:641a)
+.HandleJoypad:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and B_BUTTON
@@ -100,7 +100,6 @@
 	ld a, $2
 	ld [wJumptableIndex], a
 	ret
-; e2452 (38:6452)
 
 .go_back
 	ld hl, wJumptableIndex
@@ -112,7 +111,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-.WhatsUp: ; e245d (38:645d)
+.WhatsUp:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -127,7 +126,7 @@
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-.Submenu: ; e247d (38:647d)
+.Submenu:
 	ld hl, BillsPCDepositMenuHeader
 	call CopyMenuHeader
 	ld a, [wMenuCursorY]
@@ -147,14 +146,13 @@
 	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,7 +169,7 @@
 	call BillsPC_PlaceString
 	ret
 
-BillsPCDepositFuncStats: ; e24c8 (38:64c8)
+BillsPCDepositFuncStats:
 	call LoadStandardMenuHeader
 	call BillsPC_StatsScreen
 	call ExitMenu
@@ -182,7 +180,7 @@
 	call BillsPC_ApplyPalettes
 	ret
 
-BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
+BillsPCDepositFuncRelease:
 	call BillsPC_CheckMail_PreventBlackout
 	jr c, BillsPCDepositFuncCancel
 	call BillsPC_IsMonAnEgg
@@ -222,20 +220,18 @@
 	ld [wMenuCursorY], a
 	ret
 
-BillsPCDepositFuncCancel: ; e2537 (38:6537)
+BillsPCDepositFuncCancel:
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e253d (38:653d)
 
-BillsPCDepositMenuHeader: ; 0xe253d (38:653d)
+BillsPCDepositMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe2545
 
-.MenuData: ; 0xe2545 (38:6545)
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "DEPOSIT@"
@@ -242,9 +238,8 @@
 	db "STATS@"
 	db "RELEASE@"
 	db "CANCEL@"
-; 0xe2564 (38:6564)
 
-Unreferenced_BillsPCClearThreeBoxes: ; e2564
+Unreferenced_BillsPCClearThreeBoxes:
 	hlcoord 0, 0
 	ld b,  4
 	ld c,  8
@@ -258,9 +253,8 @@
 	ld c,  8
 	call ClearBox
 	ret
-; e2583
 
-_WithdrawPKMN: ; e2583 (38:6583)
+_WithdrawPKMN:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -297,13 +291,13 @@
 	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
@@ -310,7 +304,7 @@
 	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 @@
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-.Joypad: ; e2612 (38:6612)
+.Joypad:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and B_BUTTON
@@ -362,7 +356,7 @@
 	jr z, .b_button
 	ld a, $2
 	ld [wJumptableIndex], a
-	ret ; e264a (38:664a)
+	ret
 
 .unused
 	ld hl, wJumptableIndex
@@ -373,9 +367,8 @@
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; e2655
 
-.PrepSubmenu: ; e2655 (38:6655)
+.PrepSubmenu:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -390,7 +383,7 @@
 	call BillsPC_IncrementJumptableIndex
 	ret
 
-BillsPC_Withdraw: ; e2675 (38:6675)
+BillsPC_Withdraw:
 	ld hl, .MenuHeader
 	call CopyMenuHeader
 	ld a, [wMenuCursorY]
@@ -410,14 +403,13 @@
 	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,7 +425,7 @@
 	call BillsPC_PlaceString
 	ret
 
-.stats ; e26c0 (38:66c0)
+.stats
 	call LoadStandardMenuHeader
 	call BillsPC_StatsScreen
 	call ExitMenu
@@ -444,7 +436,7 @@
 	call BillsPC_ApplyPalettes
 	ret
 
-.release ; e26d8 (38:66d8)
+.release
 	ld a, [wMenuCursorY]
 	push af
 	call BillsPC_IsMonAnEgg
@@ -481,20 +473,18 @@
 	ld [wMenuCursorY], a
 	ret
 
-.cancel ; e272b (38:672b)
+.cancel
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e2731 (38:6731)
 
-.MenuHeader: ; 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@"
@@ -501,9 +491,8 @@
 	db "STATS@"
 	db "RELEASE@"
 	db "CANCEL@"
-; 0xe2759
 
-_MovePKMNWithoutMail: ; e2759
+_MovePKMNWithoutMail:
 	ld hl, wOptions
 	ld a, [hl]
 	push af
@@ -542,16 +531,14 @@
 	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 @@
 	dw .PrepInsertCursor
 	dw .Joypad2
 	dw BillsPC_EndJumptableLoop
-; e27ba
 
-.Init: ; e27ba
+.Init:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -581,9 +567,8 @@
 	call BillsPC_UpdateSelectionCursor
 	call BillsPC_IncrementJumptableIndex
 	ret
-; e27eb
 
-.Joypad: ; e27eb
+.Joypad:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -633,9 +618,8 @@
 	ld a, $6
 	ld [wJumptableIndex], a
 	ret
-; e283d
 
-.PrepSubmenu: ; e283d
+.PrepSubmenu:
 	xor a
 	ld [hBGMapMode], a
 	call ClearSprites
@@ -649,9 +633,8 @@
 	ld [wMenuCursorY], a
 	call BillsPC_IncrementJumptableIndex
 	ret
-; e285d
 
-.MoveMonWOMailSubmenu: ; e285d
+.MoveMonWOMailSubmenu:
 	ld hl, .MenuHeader
 	call CopyMenuHeader
 	ld a, [wMenuCursorY]
@@ -670,15 +653,13 @@
 	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,9 +671,8 @@
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; e28a5
 
-.Stats: ; e28a5
+.Stats:
 	call LoadStandardMenuHeader
 	call BillsPC_StatsScreen
 	call ExitMenu
@@ -702,30 +682,26 @@
 	ld a, SCGB_BILLS_PC
 	call BillsPC_ApplyPalettes
 	ret
-; e28bd
 
-.Cancel: ; e28bd
+.Cancel:
 	ld a, $0
 	ld [wJumptableIndex], a
 	ret
-; e28c3
 
-.MenuHeader: ; 0xe28c3
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe28cb
 
-.MenuData: ; 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 @@
 	call WaitBGMap
 	call BillsPC_IncrementJumptableIndex
 	ret
-; e2903
 
-.Joypad2: ; e2903
+.Joypad2:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and B_BUTTON
@@ -795,9 +770,8 @@
 	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 @@
 	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 @@
 .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 @@
 	jr nz, BillsPC_PressDown
 .empty
 	jp BillsPC_JoypadDidNothing
-; e29d0 (38:69d0)
 
-MoveMonWithoutMail_DPad: ; e29d0
+MoveMonWithoutMail_DPad:
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -886,7 +859,7 @@
 	jr nz, BillsPC_PressRight
 	jr BillsPC_JoypadDidNothing
 
-MoveMonWithoutMail_DPad_2: ; e29f4
+MoveMonWithoutMail_DPad_2:
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -911,7 +884,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,9 +968,8 @@
 	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
@@ -1007,9 +976,8 @@
 	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 @@
 	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 @@
 	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 @@
 	call CloseSRAM
 	ret
 
-BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
+BillsPC_RefreshTextboxes:
 	hlcoord 8, 2
 	lb bc, 10, 10
 	call TextBox
@@ -1287,13 +1253,11 @@
 	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 @@
 	ld de, .Placeholder
 	call PlaceString
 	ret
-; e2d2a (38:6d2a)
 
 .Placeholder:
 	db "-----@"
-; e2d30
 
 copy_box_data: MACRO
 .loop\@
@@ -1442,7 +1404,7 @@
 	ld [wBillsPC_NumMonsInBox], a
 ENDM
 
-CopyBoxmonSpecies: ; e2d30 (38:6d30)
+CopyBoxmonSpecies:
 	xor a
 	ld hl, wBillsPCPokemonList
 	ld bc, 3 * 30
@@ -1476,7 +1438,7 @@
 	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 @@
 	ld a, [hl]
 	ret
 
-BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
+BillsPC_UpdateSelectionCursor:
 	ld a, [wBillsPC_NumMonsInBox]
 	and a
 	jr nz, .place_cursor
@@ -1516,9 +1478,8 @@
 	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 @@
 	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
@@ -1566,9 +1526,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	scf
 	ret
 
-BillsPC_IsMonAnEgg: ; e2f5f (38:6f5f)
+BillsPC_IsMonAnEgg:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
@@ -1693,7 +1649,7 @@
 	scf
 	ret
 
-BillsPC_StatsScreen: ; e2f7e (38:6f7e)
+BillsPC_StatsScreen:
 	call LowVolume
 	call BillsPC_CopyMon
 	ld a, $3
@@ -1703,7 +1659,7 @@
 	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 @@
 	ld [wMenuJoypad], a
 	ret
 
-BillsPC_CopyMon: ; e2fd6 (38:6fd6)
+BillsPC_CopyMon:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1809,7 +1765,7 @@
 	farcall CalcBufferMonStats
 	ret
 
-DepositPokemon: ; e307c (38:707c)
+DepositPokemon:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1861,7 +1817,7 @@
 	scf
 	ret
 
-TryWithdrawPokemon: ; e30fa (38:70fa)
+TryWithdrawPokemon:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -1916,8 +1872,7 @@
 	scf
 	ret
 
-
-ReleasePKMN_ByePKMN: ; e3180 (38:7180)
+ReleasePKMN_ByePKMN:
 	hlcoord 0, 0
 	lb bc, 15, 8
 	call ClearBox
@@ -1962,9 +1917,8 @@
 	ld c, 50
 	call DelayFrames
 	ret
-; e31e7 (38:71e7)
 
-MovePKMNWitoutMail_InsertMon: ; e31e7
+MovePKMNWitoutMail_InsertMon:
 	push hl
 	push de
 	push bc
@@ -2005,27 +1959,23 @@
 	ld de, .dw_return
 	push de
 	jp hl
-; e322a
 
-.dw_return ; e322a
+.dw_return
 	pop af
 	ld e, a
 	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 @@
 	call .CheckTrivialMove
 	call .CopyToBox
 	ret
-; e3267
 
-.PartyToBox: ; e3267
+.PartyToBox:
 	call .CopyFromParty
 	ld a, $1
 	ld [wGameLogicPaused], a
@@ -2050,22 +1999,19 @@
 	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,9 +2035,8 @@
 	ret z
 	dec [hl]
 	ret
-; e32b0
 
-.CopyFromBox: ; e32b0
+.CopyFromBox:
 	ld a, [wBillsPC_BackupLoadedBox]
 	dec a
 	ld e, a
@@ -2117,9 +2062,8 @@
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret
-; e32fa
 
-.CopyToBox: ; e32fa
+.CopyToBox:
 	ld a, [wBillsPC_LoadedBox]
 	dec a
 	ld e, a
@@ -2130,9 +2074,8 @@
 	ld [wCurPartyMon], a
 	farcall InsertPokemonIntoBox
 	ret
-; e3316
 
-.CopyFromParty: ; e3316
+.CopyFromParty:
 	ld a, [wBillsPC_BackupCursorPosition]
 	ld hl, wBillsPC_BackupScrollPosition
 	add [hl]
@@ -2150,9 +2093,8 @@
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret
-; e3346
 
-.CopyToParty: ; e3346
+.CopyToParty:
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -2159,9 +2101,8 @@
 	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 @@
 	ld [wCurPartySpecies], a
 	ret
 
-CopyNicknameToTemp: ; e3363 (38:7363)
+CopyNicknameToTemp:
 	ld bc, MON_NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
@@ -2179,7 +2120,7 @@
 	call CopyBytes
 	ret
 
-CopyOTNameToTemp: ; e3376 (38:7376)
+CopyOTNameToTemp:
 	ld bc, NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
@@ -2188,7 +2129,7 @@
 	call CopyBytes
 	ret
 
-CopyMonToTemp: ; e3389 (38:7389)
+CopyMonToTemp:
 	ld a, [wCurPartyMon]
 	call AddNTimes
 	ld de, wBufferMon
@@ -2195,7 +2136,7 @@
 	call CopyBytes
 	ret
 
-GetBoxPointer: ; e3396 (38:7396)
+GetBoxPointer:
 	dec b
 	ld c, b
 	ld b, 0
@@ -2209,9 +2150,8 @@
 	ld h, [hl]
 	ld l, a
 	ret
-; e33a6 (38:73a6)
 
-.boxes ; e33a6
+.boxes
 	;  bank, address
 	dba sBox1
 	dba sBox2
@@ -2227,9 +2167,8 @@
 	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 @@
 	call DmgToCgbObjPal0
 	ret
 
-BillsPC_Jumptable: ; e33df (38:73df)
+BillsPC_Jumptable:
 	ld e, a
 	ld d, $0
 	add hl, de
@@ -2248,7 +2187,7 @@
 	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 @@
 	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,10 +2226,8 @@
 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)
+_ChangeBox:
 	call LoadStandardMenuHeader
 	call BillsPC_ClearTilemap
 .loop
@@ -2318,7 +2253,7 @@
 	call CloseWindow
 	ret
 
-BillsPC_ClearTilemap: ; e35e2 (38:75e2)
+BillsPC_ClearTilemap:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -2326,16 +2261,14 @@
 	ld a, " "
 	call ByteFill
 	ret
-; e35f1 (38:75f1)
 
-_ChangeBox_MenuHeader: ; 0xe35f1
+_ChangeBox_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 5, 9, 12
 	dw .MenuData
 	db 1 ; default option
-; 0xe35f9
 
-.MenuData ; 0xe35f9
+.MenuData
 	db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
 	db 4, 0
 	db 1
@@ -2343,9 +2276,8 @@
 	dba .boxnames
 	dba NULL
 	dba BillsPC_PrintBoxCountAndCapacity
-; e3609
 
-.boxes ; e3609
+.boxes
 	db NUM_BOXES
 x = 1
 rept NUM_BOXES
@@ -2353,9 +2285,8 @@
 x = x + 1
 endr
 	db -1
-; e3619
 
-.boxnames ; e3619
+.boxnames
 	push de
 	ld a, [wMenuSelection]
 	dec a
@@ -2363,9 +2294,8 @@
 	pop hl
 	call PlaceString
 	ret
-; e3626
 
-GetBoxName: ; e3626 (38:7626)
+GetBoxName:
 	ld bc, BOX_NAME_LENGTH
 	ld hl, wBoxNames
 	call AddNTimes
@@ -2372,9 +2302,8 @@
 	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 @@
 	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 @@
 	ld a, [hl]
 	call CloseSRAM
 	ret
-; e36a5 (38:76a5)
 
-.boxbanks ; e36a5
+.boxbanks
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -2464,9 +2389,8 @@
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; e36cf
 
-BillsPC_PrintBoxName: ; e36cf (38:76cf)
+BillsPC_PrintBoxName:
 	hlcoord 0, 0
 	ld b, 2
 	ld c, 18
@@ -2480,13 +2404,11 @@
 	hlcoord 11, 2
 	call PlaceString
 	ret
-; e36f1 (38:76f1)
 
-.Current: ; e36f1
+.Current:
 	db "CURRENT@"
-; e36f9
 
-BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
+BillsPC_ChangeBoxSubmenu:
 	ld hl, .MenuHeader
 	call LoadMenuHeader
 	call VerticalMenu
@@ -2552,18 +2474,16 @@
 	ld de, wd002
 	call CopyName2
 	ret
-; e3778 (38:7778)
 
 	hlcoord 11, 7 ; unused
 
-.MenuHeader: ; 0xe377b
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
-; 0xe3783
 
-.MenuData: ; 0xe3783
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "SWITCH@"
@@ -2570,27 +2490,22 @@
 	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 @@
 	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
--- a/engine/pokemon/bills_pc_top.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -1,4 +1,4 @@
-_BillsPC: ; e3fd
+_BillsPC:
 	call .CheckCanUsePC
 	ret c
 	call .LogIn
@@ -5,7 +5,7 @@
 	call .UseBillsPC
 	jp .LogOut
 
-.CheckCanUsePC: ; e40a (3:640a)
+.CheckCanUsePC:
 	ld a, [wPartyCount]
 	and a
 	ret nz
@@ -14,12 +14,12 @@
 	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 LoadStandardMenuHeader
@@ -35,16 +35,16 @@
 	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)
+.UseBillsPC:
 	ld hl, .MenuHeader
 	call LoadMenuHeader
 	ld a, $1
@@ -68,13 +68,13 @@
 	call CloseWindow
 	ret
 
-.MenuHeader: ; 0xe46f
+.MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData: ; 0xe477
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 0 ; items
 	dw .items
@@ -81,7 +81,7 @@
 	dw PlaceMenuStrings
 	dw .strings
 
-.strings ; e47f
+.strings
 	db "WITHDRAW <PK><MN>@"
 	db "DEPOSIT <PK><MN>@"
 	db "CHANGE BOX@"
@@ -88,7 +88,7 @@
 	db "MOVE <PK><MN> W/O MAIL@"
 	db "SEE YA!@"
 
-.Jumptable: ; e4ba (3:64ba)
+.Jumptable:
 	dw BillsPC_WithdrawMenu
 	dw BillsPC_DepositMenu
 	dw BillsPC_ChangeBoxMenu
@@ -95,7 +95,7 @@
 	dw BillsPC_MovePKMNMenu
 	dw BillsPC_SeeYa
 
-.items ; e4c4
+.items
 	db 5 ; # items
 	db 0 ; WITHDRAW
 	db 1 ; DEPOSIT
@@ -104,11 +104,11 @@
 	db 4 ; SEE YA!
 	db -1
 
-BillsPC_SeeYa: ; e4cb
+BillsPC_SeeYa:
 	scf
 	ret
 
-BillsPC_MovePKMNMenu: ; e4cd
+BillsPC_MovePKMNMenu:
 	call LoadStandardMenuHeader
 	farcall IsAnyMonHoldingMail
 	jr nc, .no_mail
@@ -128,12 +128,12 @@
 	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)
+BillsPC_DepositMenu:
 	call LoadStandardMenuHeader
 	farcall _DepositPKMN
 	call ReturnToMapFromSubmenu
@@ -163,17 +163,17 @@
 	scf
 	ret
 
-.Text_NoMon: ; 0xe52e
+.Text_NoMon:
 	; You don't have a single #MON!
 	text_jump UnknownText_0x1c1062
 	db "@"
 
-.Text_ItsYourLastMon: ; 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,7 +202,7 @@
 	and a
 	ret
 
-BillsPC_WithdrawMenu: ; e559 (3:6559)
+BillsPC_WithdrawMenu:
 	call LoadStandardMenuHeader
 	farcall _WithdrawPKMN
 	call ReturnToMapFromSubmenu
@@ -224,17 +224,17 @@
 	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 @@
 	call SetPalettes ; load regular palettes?
 	ret
 
-CopyBoxmonToTempMon: ; e5bb
+CopyBoxmonToTempMon:
 	ld a, [wCurPartyMon]
 	ld hl, sBoxMon1Species
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -370,7 +370,7 @@
 	call CloseSRAM
 	ret
 
-.BoxAddrs: ; e66e
+.BoxAddrs:
 	dba sBox1
 	dba sBox2
 	dba sBox3
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -1,4 +1,4 @@
-CheckBreedmonCompatibility: ; 16e1d
+CheckBreedmonCompatibility:
 	call .CheckBreedingGroupCompatibility
 	ld c, $0
 	jp nc, .done
@@ -83,10 +83,8 @@
 	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,9 +101,8 @@
 	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]
@@ -173,9 +170,8 @@
 .Compatible:
 	scf
 	ret
-; 16f3e
 
-DoEggStep:: ; 16f3e
+DoEggStep::
 	ld de, wPartySpecies
 	ld hl, wPartyMon1Happiness
 	ld c, 0
@@ -198,9 +194,8 @@
 	add hl, de
 	pop de
 	jr .loop
-; 16f5e
 
-OverworldHatchEgg:: ; 16f5e
+OverworldHatchEgg::
 	call RefreshScreen
 	call LoadStandardMenuHeader
 	call HatchEggs
@@ -207,15 +202,14 @@
 	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
@@ -348,7 +342,7 @@
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
-.next ; 1707d (5:707d)
+.next
 	ld hl, wCurPartyMon
 	inc [hl]
 	pop hl
@@ -357,11 +351,10 @@
 	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 @@
 	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,9 +420,8 @@
 
 .done
 	ret
-; 170e4
 
-GetEggMove: ; 170e4
+GetEggMove:
 	push bc
 	ld a, [wEggMonSpecies]
 	dec a
@@ -445,7 +433,7 @@
 	ld a, BANK(EggMovePointers)
 	call GetFarHalfword
 .loop
-	ld a, BANK(EggMoves)
+	ld a, BANK("Egg Moves")
 	call GetFarByte
 	cp -1
 	jr z, .reached_end
@@ -479,18 +467,18 @@
 	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]
@@ -526,9 +514,8 @@
 	pop bc
 	and a
 	ret
-; 17169
 
-LoadEggMove: ; 17169
+LoadEggMove:
 	push de
 	push bc
 	ld a, [de]
@@ -561,9 +548,8 @@
 	pop bc
 	pop de
 	ret
-; 17197
 
-GetHeritableMoves: ; 17197
+GetHeritableMoves:
 	ld hl, wBreedMon2Moves
 	ld a, [wBreedMon1Species]
 	cp DITTO
@@ -619,9 +605,8 @@
 	pop af
 	ld [wCurPartySpecies], a
 	ret
-; 1720b
 
-GetBreedmonMovePointer: ; 1720b
+GetBreedmonMovePointer:
 	ld hl, wBreedMon1Moves
 	ld a, [wBreedMon1Species]
 	cp DITTO
@@ -636,10 +621,8 @@
 .ditto
 	ld hl, wBreedMon2Moves
 	ret
-; 17224
 
-
-GetEggFrontpic: ; 17224 (5:7224)
+GetEggFrontpic:
 	push de
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
@@ -649,7 +632,7 @@
 	pop de
 	predef_jump GetMonFrontpic
 
-GetHatchlingFrontpic: ; 1723c (5:723c)
+GetHatchlingFrontpic:
 	push de
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
@@ -659,7 +642,7 @@
 	pop de
 	predef_jump GetAnimatedFrontpic
 
-Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
+Hatch_UpdateFrontpicBGMapCenter:
 	push af
 	call WaitTop
 	push hl
@@ -681,7 +664,7 @@
 	call SetPalettes
 	jp WaitBGMap
 
-EggHatch_DoAnimFrame: ; 1727f (5:727f)
+EggHatch_DoAnimFrame:
 	push hl
 	push de
 	push bc
@@ -692,7 +675,7 @@
 	pop hl
 	ret
 
-EggHatch_AnimationSequence: ; 1728f (5:728f)
+EggHatch_AnimationSequence:
 	ld a, [wd265]
 	ld [wJumptableIndex], a
 	ld a, [wCurSpecies]
@@ -782,13 +765,13 @@
 	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
@@ -808,13 +791,11 @@
 	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
@@ -856,7 +837,6 @@
 	call PlaySFX
 	call EggHatch_DoAnimFrame
 	ret
-; 173ef (5:73ef)
 
 shell_fragment: MACRO
 ; y tile, y pxl, x tile, x pxl, frameset offset, ???
@@ -863,7 +843,7 @@
 	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
@@ -875,9 +855,8 @@
 	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
@@ -885,7 +864,7 @@
 	jr nz, .loop
 	ret
 
-DayCareMon1: ; 17421
+DayCareMon1:
 	ld hl, DayCareMon1Text
 	call PrintText
 	ld a, [wBreedMon1Species]
@@ -898,7 +877,7 @@
 	call DayCareMonCompatibilityText
 	jp PrintText
 
-DayCareMon2: ; 17440
+DayCareMon2:
 	ld hl, DayCareMon2Text
 	call PrintText
 	ld a, [wBreedMon2Species]
@@ -911,23 +890,20 @@
 	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
@@ -951,44 +927,35 @@
 
 .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
-
--- a/engine/pokemon/breedmon_level_growth.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 @@
 	ld d, a
 	ret
 
-GetBreedMon2LevelGrowth: ; e6b3
+GetBreedMon2LevelGrowth:
 	ld hl, wBreedMon2Stats
 	ld de, wTempMon
 	ld bc, BOXMON_STRUCT_LENGTH
--- a/engine/pokemon/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
@@ -1,4 +1,4 @@
-CheckPartyFullAfterContest: ; 4d9e5
+CheckPartyFullAfterContest:
 	ld a, [wContestMon]
 	and a
 	jp z, .DidntCatchAnything
@@ -85,7 +85,7 @@
 	ld [wScriptVar], a
 	ret
 
-.TryAddToBox: ; 4daa3
+.TryAddToBox:
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld hl, sBoxCount
@@ -146,27 +146,27 @@
 	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
@@ -199,7 +199,7 @@
 	ld [hl], a
 	ret
 
-SetBoxMonCaughtData: ; 4db83
+SetBoxMonCaughtData:
 	ld a, BANK(sBoxMon1CaughtLevel)
 	call GetSRAMBank
 	ld hl, sBoxMon1CaughtLevel
@@ -207,7 +207,7 @@
 	call CloseSRAM
 	ret
 
-SetGiftBoxMonCaughtData: ; 4db92
+SetGiftBoxMonCaughtData:
 	push bc
 	ld a, BANK(sBoxMon1CaughtLevel)
 	call GetSRAMBank
@@ -217,7 +217,7 @@
 	call CloseSRAM
 	ret
 
-SetGiftPartyMonCaughtData: ; 4dba3
+SetGiftPartyMonCaughtData:
 	ld a, [wPartyCount]
 	dec a
 	ld hl, wPartyMon1CaughtLevel
@@ -224,7 +224,7 @@
 	push bc
 	call GetPartyLocation
 	pop bc
-SetGiftMonCaughtData: ; 4dbaf
+SetGiftMonCaughtData:
 	xor a
 	ld [hli], a
 	ld a, GIFT_LOCATION
@@ -233,7 +233,7 @@
 	ld [hl], a
 	ret
 
-SetEggMonCaughtData: ; 4dbb8 (13:5bb8)
+SetEggMonCaughtData:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1CaughtLevel
 	call GetPartyLocation
--- a/engine/pokemon/correct_nick_errors.asm
+++ b/engine/pokemon/correct_nick_errors.asm
@@ -1,4 +1,4 @@
-CorrectNickErrors:: ; 669f
+CorrectNickErrors::
 ; error-check monster nick before use
 ; must be a peace offering to gamesharkers
 
@@ -60,7 +60,7 @@
 	pop bc
 	ret
 
-.textcommands ; 66cf
+.textcommands
 ; table defining which characters are actually text commands
 ; format:
 	;      ≥           <
--- a/engine/pokemon/correct_party_errors.asm
+++ b/engine/pokemon/correct_party_errors.asm
@@ -201,13 +201,11 @@
 	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 @@
 .done
 	pop de
 	ret
-; 13b87
--- a/engine/pokemon/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 @@
 	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 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-HandleSpanishItalianMail: ; 1df220
+HandleSpanishItalianMail:
 LeerCorreosIngleses:
 LeggiPostaInglese:
 ; This function converts certain characters between
--- a/engine/pokemon/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 @@
 	ld c, a
 	ld b, SET_FLAG
 	call EvoFlagAction
-EvolveAfterBattle: ; 421e6
+EvolveAfterBattle:
 	xor a
 	ld [wMonTriedToEvolve], a
 	dec a
@@ -87,7 +87,6 @@
 	cp EVOLVE_HAPPINESS
 	jr z, .happiness
 
-
 ; EVOLVE_STAT
 	ld a, [wTempMonLevel]
 	cp [hl]
@@ -116,7 +115,6 @@
 	inc hl
 	jr .proceed
 
-
 .happiness
 	ld a, [wTempMonHappiness]
 	cp HAPPINESS_TO_EVOLVE
@@ -143,7 +141,6 @@
 	jp z, .dont_evolve_3
 	jr .proceed
 
-
 .trade
 	ld a, [wLinkMode]
 	and a
@@ -169,7 +166,6 @@
 	ld [wTempMonItem], a
 	jr .proceed
 
-
 .item
 	ld a, [hli]
 	ld b, a
@@ -185,7 +181,6 @@
 	jp nz, .dont_evolve_3
 	jr .proceed
 
-
 .level
 	ld a, [hli]
 	ld b, a
@@ -323,7 +318,6 @@
 	ld l, e
 	ld h, d
 	jp EvolveAfterBattle_MasterLoop
-; 423f8
 
 .dont_evolve_1
 	inc hl
@@ -349,9 +343,8 @@
 	and a
 	call nz, RestartMapMusic
 	ret
-; 42414
 
-UpdateSpeciesNameIfNotNicknamed: ; 42414
+UpdateSpeciesNameIfNotNicknamed:
 	ld a, [wCurSpecies]
 	push af
 	ld a, [wBaseDexNo]
@@ -382,17 +375,15 @@
 	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 @@
 	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 @@
 	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 @@
 	pop de
 	pop hl
 	ret
-; 4256e
 
-ShiftMoves: ; 4256e
+ShiftMoves:
 	ld c, NUM_MOVES - 1
 .loop
 	inc de
@@ -615,18 +597,15 @@
 	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 @@
 	ld [wCurPartySpecies], a
 	scf
 	ret
-; 425b1
--- a/engine/pokemon/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 @@
 	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 @@
 	ld [hMultiplicand], a
 	ret
 
-.LevelSquared: ; 50eed
+.LevelSquared:
 	xor a
 	ld [hMultiplicand + 0], a
 	ld [hMultiplicand + 1], a
--- a/engine/pokemon/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 @@
 .done
 	ret
 
-HealPartyMon: ; c677
+HealPartyMon:
 	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld d, h
@@ -52,7 +52,7 @@
 	farcall RestoreAllPP
 	ret
 
-ComputeHPBarPixels: ; c699
+ComputeHPBarPixels:
 ; e = bc * (6 * 8) / de
 	ld a, b
 	or c
@@ -103,7 +103,7 @@
 	ld e, 0
 	ret
 
-AnimateHPBar: ; c6e0
+AnimateHPBar:
 	call WaitBGMap
 	call _AnimateHPBar
 	call WaitBGMap
--- a/engine/pokemon/knows_move.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 @@
 	scf
 	ret
 
-.Text_knows: ; 0xfa06
+.Text_knows:
 	; knows @ .
 	text_jump UnknownText_0x1c5ea8
 	db "@"
--- a/engine/pokemon/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 @@
 	call PrintText
 	ld b, 1
 	ret
-; 65d3
 
-ForgetMove: ; 65d3
+ForgetMove:
 	push hl
 	ld hl, Text_TryingToLearn
 	call PrintText
@@ -200,40 +199,34 @@
 .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 @@
 ; 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
--- a/engine/pokemon/level_up_happiness.asm
+++ b/engine/pokemon/level_up_happiness.asm
@@ -1,4 +1,4 @@
-LevelUpHappinessMod: ; 2709e
+LevelUpHappinessMod:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1CaughtLocation
 	call GetPartyLocation
--- a/engine/pokemon/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 @@
 .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 @@
 	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 @@
 	farcall ReadAnyMail
 	ret
 
-MoveMailFromPCToParty: ; 44607
+MoveMailFromPCToParty:
 	ld a, BANK(sMailboxCount)
 	call GetSRAMBank
 	push bc
@@ -114,17 +112,15 @@
 	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
 
-CheckPokeMail:: ; 44654
+CheckPokeMail::
 	push bc
 	push de
 	farcall SelectMonFromParty
@@ -191,10 +187,8 @@
 .return
 	ld [wScriptVar], a
 	ret
-; 446cc
 
-
-GivePokeMail:: ; 446cc
+GivePokeMail::
 	ld a, [wPartyCount]
 	dec a
 	push af
@@ -241,10 +235,8 @@
 	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 @@
 	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 @@
 	call CopyBytes
 	jp CloseSRAM
 
-DeletePartyMonMail: ; 44765 (11:4765)
+DeletePartyMonMail:
 	ld a, BANK(sPartyMail)
 	call GetSRAMBank
 	xor a
@@ -283,10 +274,8 @@
 	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,9 +297,8 @@
 .no_mons
 	and a
 	ret
-; 447a0
 
-_PlayerMailBoxMenu: ; 0x447a0
+_PlayerMailBoxMenu:
 	call InitMail
 	jr z, .nomail
 	call LoadStandardMenuHeader
@@ -320,13 +308,12 @@
 .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 @@
 	ld a, [wMailboxCount]
 	and a
 	ret
-; 0x447da
 
-MailboxPC_GetMailAuthor: ; 0x447da
+MailboxPC_GetMailAuthor:
 	dec a
 	ld hl, sMailbox1Author
 	ld bc, MAIL_STRUCT_LENGTH
@@ -371,17 +357,15 @@
 	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
@@ -414,9 +398,8 @@
 .exit
 	xor a
 	ret
-; 0x4484a
 
-.Submenu: ; 0x4484a
+.Submenu:
 	ld hl, .SubMenuHeader
 	call LoadMenuHeader
 	call VerticalMenu
@@ -429,7 +412,6 @@
 
 .subexit
 	ret
-; 0x44861
 
 .JumpTable:
 	dw .ReadMail
@@ -437,7 +419,7 @@
 	dw .AttachMail
 	dw .Cancel
 
-.ReadMail: ; 0x44869
+.ReadMail:
 	call FadeToMenu
 	ld a, [wMenuSelection]
 	dec a
@@ -444,9 +426,8 @@
 	ld b, a
 	call ReadMailMessage
 	jp CloseSubmenu
-; 0x44877
 
-.PutInPack: ; 0x44877
+.PutInPack:
 	ld hl, .MessageLostText
 	call MenuTextBox
 	call YesNoBox
@@ -470,21 +451,20 @@
 	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 @@
 	ld a, [hl]
 	ld [wCurItem], a
 	jp CloseSRAM
-; 0x448d2
 
-.AttachMail: ; 0x448d2
+.AttachMail:
 	call FadeToMenu
 	xor a
 	ld [wPartyMenuActionText], a
@@ -540,17 +519,16 @@
 
 .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 "@"
 
@@ -557,7 +535,7 @@
 .Cancel:
 	ret
 
-.TopMenuHeader: ; 0x4494c
+.TopMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 8, 1, SCREEN_WIDTH - 2, 10
 	dw .TopMenuData
@@ -572,7 +550,7 @@
 	dba NULL
 	dba NULL
 
-.SubMenuHeader: ; 0x44964
+.SubMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 13, 9
 	dw .SubMenuData
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -1,4 +1,4 @@
-ReadPartyMonMail: ; b9229
+ReadPartyMonMail:
 	ld a, [wCurPartyMon]
 	ld hl, sPartyMail
 	ld bc, MAIL_STRUCT_LENGTH
@@ -5,7 +5,7 @@
 	call AddNTimes
 	ld d, h
 	ld e, l
-ReadAnyMail: ; b9237
+ReadAnyMail:
 	push de
 	call ClearBGPalettes
 	call ClearSprites
@@ -63,9 +63,8 @@
 	pop af
 	ld [wJumptableIndex], a
 	jr .loop
-; b92b8
 
-.LoadGFX: ; b92b8
+.LoadGFX:
 	ld h, d
 	ld l, e
 	push hl
@@ -110,9 +109,8 @@
 	jp hl
 .done
 	ret
-; b92f8
 
-MailGFXPointers: ; b92f8
+MailGFXPointers:
 	dbw FLOWER_MAIL,  LoadFlowerMailGFX
 	dbw SURF_MAIL,    LoadSurfMailGFX
 	dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
@@ -124,9 +122,8 @@
 	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 @@
 	call LoadMailGFX_Color2
 	jr FinishLoadingSurfLiteBlueMailGFX
 
-LoadLiteBlueMailGFX: ; b9335
+LoadLiteBlueMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, LiteBlueMailBorderGFX
@@ -153,7 +150,7 @@
 	ld c, 1 * 8
 	call LoadMailGFX_Color2
 
-FinishLoadingSurfLiteBlueMailGFX: ; b9351
+FinishLoadingSurfLiteBlueMailGFX:
 	ld de, SurfLiteBlueMailSmallShapesGFX
 	ld c, 2 * 8
 	call LoadMailGFX_Color2
@@ -209,9 +206,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	dec b
 	jr nz, .loop
 	ret
-; b963e
 
-LoadFlowerMailGFX: ; b963e
+LoadFlowerMailGFX:
 	push bc
 	ld hl, vTiles2 tile $31
 	ld de, FlowerMailBorderGFX
@@ -541,9 +531,8 @@
 	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 @@
 	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 @@
 	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 @@
 	call Mail_Draw16TileRow
 	pop hl
 	jp MailGFX_PlaceMessage
-; b97f8
 
-MailGFX_GenerateMonochromeTilesColor2: ; b97f8
+MailGFX_GenerateMonochromeTilesColor2:
 .loop
 	xor a
 	ld [hli], a
@@ -689,9 +675,8 @@
 	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 @@
 
 .place_author
 	jp PlaceString
-; b984e
 
-Unreferenced_Functionb984e: ; b984e
+Unreferenced_Functionb984e:
 .loop
 	ld a, [hl]
 	xor $ff
@@ -735,9 +719,8 @@
 	or c
 	jr nz, .loop
 	ret
-; b9858
 
-DrawMailBorder: ; b9858
+DrawMailBorder:
 	hlcoord 0, 0
 	ld a, $31
 	ld [hli], a
@@ -757,9 +740,8 @@
 	ld a, $38
 	ld [hl], a
 	ret
-; b987b
 
-DrawMailBorder2: ; b987b
+DrawMailBorder2:
 	hlcoord 0, 0
 	ld a, $31
 	ld [hli], a
@@ -778,23 +760,22 @@
 	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 @@
 	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 @@
 	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 @@
 	dec b
 	jr nz, .loop
 	ret
-; b98ee
 
-Mail_Draw2x2Graphic: ; b98ee
+Mail_Draw2x2Graphic:
 	push af
 	ld [hli], a
 	inc a
@@ -883,9 +860,8 @@
 	ld [hl], a
 	pop af
 	ret
-; b98fc
 
-Mail_Draw3x2Graphic: ; b98fc
+Mail_Draw3x2Graphic:
 	ld [hli], a
 	inc a
 	ld [hli], a
@@ -900,9 +876,8 @@
 	inc a
 	ld [hl], a
 	ret
-; b990c
 
-LoadMailGFX_Color1: ; b990c
+LoadMailGFX_Color1:
 .loop
 	ld a, [de]
 	inc de
@@ -912,9 +887,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; b9915
 
-LoadMailGFX_Color2: ; b9915
+LoadMailGFX_Color2:
 .loop
 	xor a
 	ld [hli], a
@@ -924,9 +898,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; b991e
 
-LoadMailGFX_Color3: ; b991e
+LoadMailGFX_Color3:
 .loop
 	ld a, [de]
 	inc de
@@ -935,15 +908,13 @@
 	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"
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -1,6 +1,6 @@
 INCLUDE "data/mon_menu.asm"
 
-MonSubmenu: ; 24d19
+MonSubmenu:
 	xor a
 	ld [hBGMapMode], a
 	call GetMonSubmenuItems
@@ -17,16 +17,14 @@
 
 	call ExitMenu
 	ret
-; 24d3f
 
-.MenuHeader: ; 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
@@ -38,9 +36,8 @@
 	ld [wMenuBorderTopCoord], a
 	call MenuBox
 	ret
-; 24d59
 
-MonMenuLoop: ; 24d59
+MonMenuLoop:
 .loop
 	ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags
 	ld [wMenuDataFlags], a
@@ -72,9 +69,8 @@
 	add hl, bc
 	ld a, [hl]
 	ret
-; 24d91
 
-PopulateMonMenu: ; 24d91
+PopulateMonMenu:
 	call MenuBoxCoord2Tile
 	ld bc, 2 * SCREEN_WIDTH + 2
 	add hl, bc
@@ -93,9 +89,8 @@
 	add hl, bc
 	pop de
 	jr .loop
-; 24db0
 
-GetMonMenuString: ; 24db0
+GetMonMenuString:
 	ld hl, MonMenuOptions + 1
 	ld de, 3
 	call IsInArray
@@ -118,9 +113,8 @@
 	ld d, h
 	ld e, l
 	ret
-; 24dd4
 
-GetMonSubmenuItems: ; 24dd4
+GetMonSubmenuItems:
 	call ResetMonSubmenu
 	ld a, [wCurPartySpecies]
 	cp EGG
@@ -195,9 +189,8 @@
 	call AddMonMenuItem
 	call TerminateMonSubmenu
 	ret
-; 24e52
 
-IsFieldMove: ; 24e52
+IsFieldMove:
 	ld b, a
 	ld hl, MonMenuOptions
 .next
@@ -216,9 +209,8 @@
 
 .nope
 	ret
-; 24e68
 
-ResetMonSubmenu: ; 24e68
+ResetMonSubmenu:
 	xor a
 	ld [wBuffer1], a
 	ld hl, wBuffer2
@@ -225,9 +217,8 @@
 	ld bc, NUM_MONMENU_ITEMS + 1
 	call ByteFill
 	ret
-; 24e76
 
-TerminateMonSubmenu: ; 24e76
+TerminateMonSubmenu:
 	ld a, [wBuffer1]
 	ld e, a
 	ld d, 0
@@ -235,9 +226,8 @@
 	add hl, de
 	ld [hl], -1
 	ret
-; 24e83
 
-AddMonMenuItem: ; 24e83
+AddMonMenuItem:
 	push hl
 	push de
 	push af
@@ -253,9 +243,8 @@
 	pop de
 	pop hl
 	ret
-; 24e99
 
-BattleMonMenu: ; 24e99
+BattleMonMenu:
 	ld hl, MenuHeader_0x24ed4
 	call CopyMenuHeader
 	xor a
@@ -286,19 +275,16 @@
 .clear_carry
 	and a
 	ret
-; 24ed4
 
-MenuHeader_0x24ed4: ; 24ed4
+MenuHeader_0x24ed4:
 	db 0 ; flags
 	menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw MenuData_0x24edc
 	db 1 ; default option
-; 24edc
 
-MenuData_0x24edc: ; 24edc
+MenuData_0x24edc:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 3 ; items
 	db "SWITCH@"
 	db "STATS@"
 	db "CANCEL@"
-; 24ef2
--- a/engine/pokemon/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 @@
 	pop de
 	ret
 
-PrintTempMonStats: ; 50b7b
+PrintTempMonStats:
 ; Print wTempMon's stats at hl, with spacing bc.
 	push bc
 	push hl
@@ -105,7 +105,7 @@
 	ld de, wTempMonSpeed
 	jp PrintNum
 
-.PrintStat: ; 50bab
+.PrintStat:
 	push hl
 	call PrintNum
 	pop hl
@@ -113,7 +113,7 @@
 	add hl, de
 	ret
 
-.StatNames: ; 50bb5
+.StatNames:
 	db   "ATTACK"
 	next "DEFENSE"
 	next "SPCL.ATK"
@@ -121,7 +121,7 @@
 	next "SPEED"
 	next "@"
 
-GetGender: ; 50bdd
+GetGender:
 ; Return the gender of a given monster (wCurPartyMon/wCurOTMon/wCurWildMon).
 ; When calling this function, a should be set to an appropriate wMonType value.
 
@@ -170,7 +170,6 @@
 	call AddNTimes
 
 .DVs:
-
 ; sBoxMon data is read directly from SRAM.
 	ld a, [wMonType]
 	cp BOXMON
@@ -235,7 +234,7 @@
 	scf
 	ret
 
-ListMovePP: ; 50c50
+ListMovePP:
 	ld a, [wNumMoves]
 	inc a
 	ld c, a
@@ -316,7 +315,7 @@
 .done
 	ret
 
-.load_loop ; 50cc9
+.load_loop
 	ld [hli], a
 	ld [hld], a
 	add hl, de
@@ -324,7 +323,7 @@
 	jr nz, .load_loop
 	ret
 
-Unreferenced_Function50cd0: ; 50cd0
+Unreferenced_Function50cd0:
 .loop
 	ld [hl], $32
 	inc hl
@@ -363,7 +362,7 @@
 .egg
 	ret
 
-PlaceStatusString: ; 50d0a
+PlaceStatusString:
 	push de
 	inc de
 	inc de
@@ -382,10 +381,10 @@
 	and a
 	ret
 
-FntString: ; 50d22
+FntString:
 	db "FNT@"
 
-CopyStatusString: ; 50d25
+CopyStatusString:
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -396,7 +395,7 @@
 	ld [hl], a
 	ret
 
-PlaceNonFaintStatus: ; 50d2e
+PlaceNonFaintStatus:
 	push de
 	ld a, [de]
 	ld de, PsnString
@@ -430,7 +429,7 @@
 FrzString: db "FRZ@"
 ParString: db "PAR@"
 
-ListMoves: ; 50d6f
+ListMoves:
 ; List moves at hl, spaced every [wBuffer1] tiles.
 	ld de, wListMoves_MoveIndicesBuffer
 	ld b, $0
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1,4 +1,4 @@
-TryAddMonToParty: ; d88c
+TryAddMonToParty:
 ; Check if to copy wild mon or generate a new one
 	; Whose is it?
 	ld de, wPartyCount
@@ -76,7 +76,7 @@
 	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.
@@ -360,9 +360,8 @@
 .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
@@ -391,9 +390,8 @@
 	jr nz, .loop
 	pop bc
 	ret
-; da96
 
-AddTempmonToParty: ; da96
+AddTempmonToParty:
 	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
@@ -477,7 +475,7 @@
 	and a
 	ret
 
-SendGetMonIntoFromBox: ; db3f
+SendGetMonIntoFromBox:
 ; Sents/Gets mon into/from Box depending on Parameter
 ; wPokemonWithdrawDepositParameter == 0: get mon into Party
 ; wPokemonWithdrawDepositParameter == 1: sent mon into Box
@@ -702,15 +700,13 @@
 	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
@@ -773,9 +769,8 @@
 	pop af
 	ld [wMenuCursorY], a
 	ret
-; dd21
 
-RetrieveMonFromDayCareMan: ; dd21
+RetrieveMonFromDayCareMan:
 	ld a, [wBreedMon1Species]
 	ld [wCurPartySpecies], a
 	ld de, SFX_TRANSACTION
@@ -789,9 +784,8 @@
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RetrieveBreedmon
-; dd42
 
-RetrieveMonFromDayCareLady: ; dd42
+RetrieveMonFromDayCareLady:
 	ld a, [wBreedMon2Species]
 	ld [wCurPartySpecies], a
 	ld de, SFX_TRANSACTION
@@ -805,9 +799,8 @@
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RetrieveBreedmon
-; dd64
 
-RetrieveBreedmon: ; dd64
+RetrieveBreedmon:
 	ld hl, wPartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
@@ -902,9 +895,8 @@
 	ld [hl], a
 	and a
 	ret
-; de1a
 
-GetLastPartyMon: ; de1a
+GetLastPartyMon:
 	ld a, [wPartyCount]
 	dec a
 	ld hl, wPartyMon1Species
@@ -913,25 +905,22 @@
 	ld d, h
 	ld e, l
 	ret
-; de2a
 
-DepositMonWithDayCareMan: ; de2a
+DepositMonWithDayCareMan:
 	ld de, wBreedMon1Nick
 	call DepositBreedmon
 	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RemoveMonFromPartyOrBox
-; de37
 
-DepositMonWithDayCareLady: ; de37
+DepositMonWithDayCareLady:
 	ld de, wBreedMon2Nick
 	call DepositBreedmon
 	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RemoveMonFromPartyOrBox
-; de44
 
-DepositBreedmon: ; de44
+DepositBreedmon:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call SkipNames
@@ -947,7 +936,7 @@
 	ld bc, BOXMON_STRUCT_LENGTH
 	jp CopyBytes
 
-SendMonIntoBox: ; de6e
+SendMonIntoBox:
 ; Sends the mon into one of Bills Boxes
 ; the data comes mainly from 'wEnemyMon:'
 	ld a, BANK(sBoxCount)
@@ -1073,15 +1062,13 @@
 	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
@@ -1127,9 +1114,8 @@
 	or b
 	jr nz, .loop
 	ret
-; df8c
 
-GiveEgg:: ; df8c
+GiveEgg::
 	ld a, [wCurPartySpecies]
 	push af
 	callfar GetPreEvolution
@@ -1226,13 +1212,11 @@
 	ld [hl], a
 	and a
 	ret
-; e035
 
-String_Egg: ; e035
+String_Egg:
 	db "EGG@"
-; e039
 
-RemoveMonFromPartyOrBox: ; e039
+RemoveMonFromPartyOrBox:
 	ld hl, wPartyCount
 
 	ld a, [wPokemonWithdrawDepositParameter]
@@ -1382,10 +1366,8 @@
 	jr nz, .loop2
 .close_sram
 	jp CloseSRAM
-; e134
 
-
-ComputeNPCTrademonStats: ; e134
+ComputeNPCTrademonStats:
 	ld a, MON_LEVEL
 	call GetPartyParamLocation
 	ld a, [hl]
@@ -1413,9 +1395,8 @@
 	ld a, [de]
 	ld [hl], a
 	ret
-; e167
 
-CalcMonStats: ; e167
+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
@@ -1422,7 +1403,7 @@
 ; hl is the path to the Stat EXP
 ; de points to where the final stats will be saved
 
-	ld c, $0
+	ld c, STAT_HP - 1 ; first stat
 .loop
 	inc c
 	call CalcMonStatC
@@ -1433,12 +1414,11 @@
 	ld [de], a
 	inc de
 	ld a, c
-	cp STAT_SDEF
+	cp STAT_SDEF ; last stat
 	jr nz, .loop
 	ret
-; e17b
 
-CalcMonStatC: ; e17b
+CalcMonStatC:
 ; 'c' is 1-6 and points to the BaseStat
 ; 1: HP
 ; 2: Attack
@@ -1454,7 +1434,7 @@
 	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
@@ -1461,7 +1441,7 @@
 	pop hl
 	push hl
 	ld a, c
-	cp STAT_SDEF
+	cp STAT_SDEF ; last stat
 	jr nz, .not_spdef
 	dec hl
 	dec hl
@@ -1632,9 +1612,8 @@
 	pop de
 	pop hl
 	ret
-; e277
 
-GivePoke:: ; e277
+GivePoke::
 	push de
 	push bc
 	xor a ; PARTYMON
@@ -1812,22 +1791,19 @@
 	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 LoadStandardMenuHeader
 	call DisableSpriteUpdates
@@ -1842,4 +1818,3 @@
 	ld hl, ExitAllMenus
 	rst FarCall
 	ret
-; e3fd
--- a/engine/pokemon/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 @@
 	farcall RestorePPofDepositedPokemon
 	jp CloseSRAM
 
-InsertPokemonIntoParty: ; 5138b
+InsertPokemonIntoParty:
 	ld hl, wPartyCount
 	call InsertSpeciesIntoBoxOrParty
 	ld a, [wPartyCount]
@@ -63,7 +63,7 @@
 	call InsertDataIntoBoxOrParty
 	ret
 
-InsertSpeciesIntoBoxOrParty: ; 513cb
+InsertSpeciesIntoBoxOrParty:
 	inc [hl]
 	inc hl
 	ld a, [wCurPartyMon]
@@ -81,7 +81,7 @@
 	jr nz, .loop
 	ret
 
-InsertDataIntoBoxOrParty: ; 513e0
+InsertDataIntoBoxOrParty:
 	push de
 	push hl
 	push bc
--- a/engine/pokemon/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 @@
 	call PartyMenuSelect
 	call ReturnToMapWithSpeechTextbox
 	ret
-; 5001d
 
-
-SelectTradeOrDayCareMon: ; 5001d
+SelectTradeOrDayCareMon:
 	ld a, b
 	ld [wPartyMenuActionText], a
 	call DisableSpriteUpdates
@@ -27,9 +25,8 @@
 	call PartyMenuSelect
 	call ReturnToMapWithSpeechTextbox
 	ret
-; 5003f
 
-InitPartyMenuLayout: ; 5003f
+InitPartyMenuLayout:
 	call LoadPartyMenuGFX
 	call InitPartyMenuWithCancel
 	call InitPartyMenuGFX
@@ -36,17 +33,14 @@
 	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 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 0x50089
 
-.Jumptable: ; 50089
+.Jumptable:
 ; entries correspond to PARTYMENUQUALITY_* constants
 	dw PlacePartyNicknames
 	dw PlacePartyHPBar
@@ -84,9 +77,8 @@
 	dw PlacePartyMonEvoStoneCompatibility
 	dw PlacePartyMonGender
 	dw PlacePartyMonMobileBattleSelection
-; 5009b
 
-PlacePartyNicknames: ; 5009b
+PlacePartyNicknames:
 	hlcoord 3, 1
 	ld a, [wPartyCount]
 	and a
@@ -116,14 +108,11 @@
 	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 @@
 	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 @@
 	ld e, a
 	predef ComputeHPBarPixels
 	ret
-; 50138
 
-PlacePartyMenuHPDigits: ; 50138
+PlacePartyMenuHPDigits:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -233,9 +220,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 50176
 
-PlacePartyMonLevel: ; 50176
+PlacePartyMonLevel:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -276,9 +262,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 501b2
 
-PlacePartyMonStatus: ; 501b2
+PlacePartyMonStatus:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -309,9 +294,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 501e0
 
-PlacePartyMonTMHMCompatibility: ; 501e0
+PlacePartyMonTMHMCompatibility:
 	ld a, [wPartyCount]
 	and a
 	ret z
@@ -344,9 +328,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 50215
 
-.PlaceAbleNotAble: ; 50215
+.PlaceAbleNotAble:
 	ld a, c
 	and a
 	jr nz, .able
@@ -356,18 +339,14 @@
 .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 @@
 	dec c
 	jr nz, .loop
 	ret
-; 50268
 
-.DetermineCompatibility: ; 50268
+.DetermineCompatibility:
 	ld de, wStringBuffer1
 	ld a, BANK(EvosAttacksPointers)
 	ld bc, 2
@@ -416,7 +394,7 @@
 	ld h, [hl]
 	ld l, a
 	ld de, wStringBuffer1
-	ld a, BANK(EvosAttacks)
+	ld a, BANK("Evolutions and Attacks")
 	ld bc, 10
 	call FarCopyBytes
 	ld hl, wStringBuffer1
@@ -441,17 +419,13 @@
 .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 @@
 	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 @@
 	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 @@
 	ld a, [de]
 	cp EGG
 	ret
-; 50396
 
-GetPartyMenuQualityIndexes: ; 50396
+GetPartyMenuQualityIndexes:
 	ld a, [wPartyMenuActionText]
 	and $f0
 	jr nz, .skip
@@ -618,12 +580,10 @@
 .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 @@
 	jr nz, .loop
 	callfar PlaySpriteAnimations
 	ret
-; 50405
 
-InitPartyMenuWithCancel: ; 50405
+InitPartyMenuWithCancel:
 ; with cancel
 	xor a
 	ld [wSwitchMon], a
@@ -675,9 +634,8 @@
 	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 @@
 	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 @@
 	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 @@
 	call WaitSFX
 	scf
 	ret
-; 0x5049a
 
-
-PrintPartyMenuText: ; 5049a
+PrintPartyMenuText:
 	hlcoord 0, 14
 	lb bc, 2, 18
 	call TextBox
@@ -764,7 +718,7 @@
 	jr nz, .haspokemon
 	ld de, YouHaveNoPKMNString
 	jr .gotstring
-.haspokemon ; 504ae
+.haspokemon
 	ld a, [wPartyMenuActionText]
 	and $f ; drop high nibble
 	ld hl, PartyMenuStrings
@@ -775,7 +729,7 @@
 	ld a, [hli]
 	ld d, [hl]
 	ld e, a
-.gotstring ; 504be
+.gotstring
 	ld a, [wOptions]
 	push af
 	set NO_TEXT_SCROLL, a
@@ -785,9 +739,8 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 0x504d2
 
-PartyMenuStrings: ; 0x504d2
+PartyMenuStrings:
 	dw ChooseAMonString
 	dw UseOnWhichPKMNString
 	dw WhichPKMNString
@@ -798,36 +751,36 @@
 	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,8 @@
 	ld hl, .MenuActionTexts
 	call .PrintText
 	ret
-; 5057b
 
-.MenuActionTexts: ; 5057b
+.MenuActionTexts:
 ; entries correspond to PARTYMENUTEXT_* constants
 	dw .Text_CuredOfPoison
 	dw .Text_BurnWasHealed
@@ -850,70 +802,58 @@
 	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
@@ -929,4 +869,3 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 505da
--- a/engine/pokemon/search.asm
+++ b/engine/pokemon/search.asm
@@ -1,4 +1,4 @@
-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,8 +28,7 @@
 	ld [wScriptVar], a
 	ret
 
-
-MonCheck: ; 0x4a711
+MonCheck:
 ; Check if the player owns any Pokémon of the species in wScriptVar.
 ; Return the result in wScriptVar.
 
@@ -46,8 +45,7 @@
 	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 @@
 	and a
 	ret
 
-
-CheckOwnMon: ; 0x4a7ba
+CheckOwnMon:
 ; Check if a Pokémon belongs to the player and is of a specific species.
 
 ; inputs:
@@ -246,9 +243,8 @@
 	pop bc
 	scf
 	ret
-; 0x4a810
 
-BoxAddressTable1: ; 4a810
+BoxAddressTable1:
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -263,9 +259,8 @@
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; 4a83a
 
-UpdateOTPointer: ; 0x4a83a
+UpdateOTPointer:
 	push hl
 	ld hl, NAME_LENGTH
 	add hl, bc
@@ -273,4 +268,3 @@
 	ld c, l
 	pop hl
 	ret
-; 0x4a843
--- a/engine/pokemon/search2.asm
+++ b/engine/pokemon/search2.asm
@@ -1,18 +1,18 @@
-_FindPartyMonAboveLevel: ; 4dbd2
+_FindPartyMonAboveLevel:
 	ld hl, wPartyMon1Level
 	call FindAboveLevel
 	ret
 
-_FindPartyMonAtLeastThatHappy: ; 4dbd9
+_FindPartyMonAtLeastThatHappy:
 	ld hl, wPartyMon1Happiness
 	call FindAtLeastThatHappy
 	ret
 
-_FindPartyMonThatSpecies: ; 4dbe0
+_FindPartyMonThatSpecies:
 	ld hl, wPartyMon1Species
 	jp FindThatSpecies
 
-_FindPartyMonThatSpeciesYourTrainerID: ; 4dbe6
+_FindPartyMonThatSpeciesYourTrainerID:
 	ld hl, wPartyMon1Species
 	call FindThatSpecies
 	ret z
@@ -35,7 +35,7 @@
 	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 @@
 	and a
 	ret
 
-FindAboveLevel: ; 4dc31
+FindAboveLevel:
 	ld c, $0
 	ld a, [wPartyCount]
 	ld d, a
@@ -98,7 +98,7 @@
 	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 @@
 	and a
 	ret
 
-RetroactivelyIgnoreEggs: ; 4dc67
+RetroactivelyIgnoreEggs:
 	ld e, -2
 	ld hl, wPartySpecies
 .loop
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -4,7 +4,7 @@
 	const BLUE_PAGE  ; 3
 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 @@
 	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 @@
 	pop af
 	ld [hMapAnims], a
 	ret
-; 0x4dcd2
 
-StatsScreenMain: ; 0x4dcd2
+StatsScreenMain:
 	xor a
 	ld [wJumptableIndex], a
 	; stupid interns
@@ -67,7 +66,7 @@
 	and %11111100
 	or 1
 	ld [wcf64], a
-.loop ; 4dce3
+.loop
 	ld a, [wJumptableIndex]
 	and $ff ^ (1 << 7)
 	ld hl, StatsScreenPointerTable
@@ -77,9 +76,8 @@
 	bit 7, a
 	jr z, .loop
 	ret
-; 0x4dcf7
 
-StatsScreenMobile: ; 4dcf7
+StatsScreenMobile:
 	xor a
 	ld [wJumptableIndex], a
 	; stupid interns
@@ -103,9 +101,8 @@
 
 .exit
 	ret
-; 4dd2a
 
-StatsScreenPointerTable: ; 4dd2a
+StatsScreenPointerTable:
 	dw MonStatsInit       ; regular pokémon
 	dw EggStatsInit       ; egg
 	dw StatsScreenWaitCry
@@ -114,10 +111,8 @@
 	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,7 +132,7 @@
 	farcall HDMATransferTileMapToWRAMBank3
 	ret
 
-StatsScreen_SetJumptableIndex: ; 4dd62 (13:5d62)
+StatsScreen_SetJumptableIndex:
 	ld a, [wJumptableIndex]
 	and $80
 	or h
@@ -144,12 +139,12 @@
 	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 @@
 	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 @@
 	call StatsScreen_SetJumptableIndex
 	ret
 
-StatsScreen_LoadPage: ; 4ddc6 (13:5dc6)
+StatsScreen_LoadPage:
 	call StatsScreen_LoadGFX
 	ld hl, wcf64
 	res 4, [hl]
@@ -207,7 +200,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-MonStatsJoypad: ; 4ddd6 (13:5dd6)
+MonStatsJoypad:
 	call StatsScreen_GetJoypad
 	jr nc, .next
 	ld h, 0
@@ -218,7 +211,7 @@
 	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,7 +219,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2)
+StatsScreen_CopyToTempMon:
 	ld a, [wMonType]
 	cp TEMPMON
 	jr nz, .breedmon
@@ -252,7 +245,7 @@
 	and a
 	ret
 
-StatsScreen_GetJoypad: ; 4de2c (13:5e2c)
+StatsScreen_GetJoypad:
 	call GetJoypad
 	ld a, [wMonType]
 	cp TEMPMON
@@ -280,7 +273,7 @@
 	scf
 	ret
 
-StatsScreen_JoypadAction: ; 4de54 (13:5e54)
+StatsScreen_JoypadAction:
 	push af
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
@@ -374,12 +367,12 @@
 	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 @@
 	call StatsScreen_PlaceShinyIcon
 	ret
 
-.PlaceHPBar: ; 4df45 (13:5f45)
+.PlaceHPBar:
 	ld hl, wTempMonHP
 	ld a, [hli]
 	ld b, a
@@ -433,7 +426,7 @@
 	call DelayFrame
 	ret
 
-.PlaceGenderChar: ; 4df66 (13:5f66)
+.PlaceGenderChar:
 	push hl
 	farcall GetGender
 	pop hl
@@ -444,16 +437,14 @@
 .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 @@
 	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,7 +466,7 @@
 	jr nz, .loop
 	ret
 
-StatsScreen_PlacePageSwitchArrows: ; 4df9b (13:5f9b)
+StatsScreen_PlacePageSwitchArrows:
 	hlcoord 12, 6
 	ld [hl], "◀"
 	hlcoord 19, 6
@@ -483,7 +473,7 @@
 	ld [hl], "▶"
 	ret
 
-StatsScreen_PlaceShinyIcon: ; 4dfa6 (13:5fa6)
+StatsScreen_PlaceShinyIcon:
 	ld bc, wTempMonDVs
 	farcall CheckShininess
 	ret nc
@@ -491,7 +481,7 @@
 	ld [hl], "⁂"
 	ret
 
-StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
+StatsScreen_LoadGFX:
 	ld a, [wBaseDexNo]
 	ld [wd265], a
 	ld [wCurSpecies], a
@@ -510,7 +500,7 @@
 	call StatsScreen_PlaceFrontpic
 	ret
 
-.ClearBox: ; 4dfda (13:5fda)
+.ClearBox:
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
 	ld c, a
@@ -520,7 +510,7 @@
 	call ClearBox
 	ret
 
-.LoadPals: ; 4dfed (13:5fed)
+.LoadPals:
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
 	ld c, a
@@ -530,7 +520,7 @@
 	set 5, [hl]
 	ret
 
-.PageTilemap: ; 4e002 (13:6002)
+.PageTilemap:
 	ld a, [wcf64]
 	maskbits NUM_STAT_PAGES
 	dec a
@@ -538,13 +528,13 @@
 	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 @@
 	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 @@
 	ld [wTempMonLevel], a
 	ret
 
-.CalcExpToNextLevel: ; 4e0e7 (13:60e7)
+.CalcExpToNextLevel:
 	ld a, [wTempMonLevel]
 	cp MAX_LEVEL
 	jr z, .AlreadyAtMaxLevel
@@ -666,34 +656,27 @@
 	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 @@
 	predef ListMovePP
 	ret
 
-.GetItemName: ; 4e189 (13:6189)
+.GetItemName:
 	ld de, .ThreeDashes
 	ld a, [wTempMonItem]
 	and a
@@ -728,21 +711,17 @@
 	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 @@
 	predef PrintTempMonStats
 	ret
 
-.PlaceOTInfo: ; 4e1cc (13:61cc)
+.PlaceOTInfo:
 	ld de, IDNoString
 	hlcoord 0, 9
 	call PlaceString
@@ -789,24 +768,20 @@
 	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 @@
 	call PlayMonCry2
 	ret
 
-.AnimateMon: ; 4e253 (13:6253)
+.AnimateMon:
 	ld hl, wcf64
 	set 5, [hl]
 	ld a, [wCurPartySpecies]
@@ -849,7 +824,7 @@
 	call _PrepMonFrontpic
 	ret
 
-.AnimateEgg: ; 4e271 (13:6271)
+.AnimateEgg:
 	ld a, [wCurPartySpecies]
 	cp UNOWN
 	jr z, .unownegg
@@ -864,7 +839,7 @@
 	call .get_animation
 	ret
 
-.get_animation ; 4e289 (13:6289)
+.get_animation
 	ld a, [wCurPartySpecies]
 	call IsAPokemon
 	ret c
@@ -879,13 +854,13 @@
 	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
@@ -892,7 +867,7 @@
 	dw .Tempmon
 	dw .Wildmon
 
-.PartyMon: ; 4e2bf (13:62bf)
+.PartyMon:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
@@ -901,11 +876,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	pop bc
 	ret
 
-CopyNickname: ; 4e505 (13:6505)
+CopyNickname:
 	ld de, wStringBuffer1
 	ld bc, MON_NAME_LENGTH
 	jr .okay ; utterly pointless
@@ -1137,7 +1107,7 @@
 	pop de
 	ret
 
-GetNicknamePointer: ; 4e528 (13:6528)
+GetNicknamePointer:
 	ld a, [wMonType]
 	add a
 	ld c, a
@@ -1152,8 +1122,7 @@
 	ld a, [wCurPartyMon]
 	jp SkipNames
 
-
-CheckFaintedFrzSlp: ; 4e53f
+CheckFaintedFrzSlp:
 	ld hl, MON_HP
 	add hl, bc
 	ld a, [hli]
@@ -1170,4 +1139,3 @@
 .fainted_frz_slp
 	scf
 	ret
-; 4e554
--- a/engine/pokemon/switchpartymons.asm
+++ b/engine/pokemon/switchpartymons.asm
@@ -16,7 +16,7 @@
 .skip
 	ret
 
-.ClearSprite: ; 50f34 (14:4f34)
+.ClearSprite:
 	push af
 	hlcoord 0, 1
 	ld bc, 2 * SCREEN_WIDTH
@@ -39,7 +39,7 @@
 	call WaitPlaySFX
 	ret
 
-.SwapMonAndMail: ; 50f62 (14:4f62)
+.SwapMonAndMail:
 	push hl
 	push de
 	push bc
@@ -136,10 +136,10 @@
 	pop hl
 	ret
 
-.CopyNameTowd002: ; 51036 (14:5036)
+.CopyNameTowd002:
 	ld de, wd002
 
-.CopyName: ; 51039 (14:5039)
+.CopyName:
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ret
--- a/engine/pokemon/tempmon.asm
+++ b/engine/pokemon/tempmon.asm
@@ -1,4 +1,4 @@
-CopyMonToTempMon: ; 5084a
+CopyMonToTempMon:
 ; gets the BaseData of a mon
 ; and copies the party_struct to wTempMon
 
@@ -32,13 +32,13 @@
 .done
 	ret
 
-CalcBufferMonStats: ; 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]
@@ -82,7 +82,7 @@
 	ld [hl], a
 	ret
 
-GetMonSpecies: ; 508d5
+GetMonSpecies:
 ; [wMonType] has the type of the mon
 ; e = Nr. of mon (i.e. [wCurPartyMon])
 
--- a/engine/pokemon/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 @@
 	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 @@
 
 	ld b, a
 
-
-PrintType: ; 50953
+PrintType:
 ; Print type b at hl.
 
 	ld a, b
@@ -75,10 +72,8 @@
 	pop hl
 
 	jp PlaceString
-; 50964
 
-
-GetTypeName: ; 50964
+GetTypeName:
 ; Copy the name of type [wd265] to wStringBuffer1.
 
 	ld a, [wd265]
@@ -93,7 +88,5 @@
 	ld de, wStringBuffer1
 	ld bc, MOVE_NAME_LENGTH
 	jp CopyBytes
-; 5097b
-
 
 INCLUDE "data/types/names.asm"
--- 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 @@
 	ld a, [hl]
 
 	ret
-; 856b
 
 INCLUDE "data/predef_pointers.asm"
--- a/engine/printer/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 @@
 	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 @@
 	ld a, b
 	call nz, FarString
 	ret
-; 1dc26a
 
-.FillColumn: ; 1dc26a
+.FillColumn:
 	push de
 	ld de, SCREEN_WIDTH
 .column_loop
@@ -101,9 +99,8 @@
 	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 @@
 	next "Check the Game Boy"
 	next "Printer Manual."
 	db   "@"
-; 1dc381
 
-PrintPartyMonPage1: ; 1dc381
+PrintPartyMonPage1:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -232,9 +228,8 @@
 	call GetSGBLayout
 	call SetPalettes
 	ret
-; 1dc47b
 
-PrintPartyMonPage2: ; 1dc47b
+PrintPartyMonPage2:
 	call ClearBGPalettes
 	call ClearTileMap
 	call ClearSprites
@@ -284,15 +279,13 @@
 	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
@@ -299,9 +292,8 @@
 	ld e, l
 	ld d, h
 	ret
-; 1dc51a
 
-Function1dc51a: ; 1dc51a
+Function1dc51a:
 	and a
 	jr z, .no_move
 
@@ -315,9 +307,8 @@
 .got_string
 	call PlaceString
 	ret
-; 1dc52c
 
-Function1dc52c: ; 1dc52c
+Function1dc52c:
 	farcall GetGender
 	ld a, " "
 	jr c, .got_gender
@@ -334,18 +325,17 @@
 	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 @@
 	next "SPEED"
 	db   "@"
 
-String1dc584: ; 1dc584
+String1dc584:
 	db "------------@"
-; 1dc591
 
-GBPrinterHPIcon: ; 1dc591
+GBPrinterHPIcon:
 INCBIN "gfx/printer/hp.1bpp"
 
-GBPrinterLvIcon: ; 1dc599
+GBPrinterLvIcon:
 INCBIN "gfx/printer/lv.1bpp"
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -1,6 +1,4 @@
-INCLUDE "engine/printer/printer_serial.asm"
-
-SendScreenToPrinter: ; 843f0
+SendScreenToPrinter:
 .loop
 	call JoyTextDelay
 	call CheckCancelPrint
@@ -21,16 +19,14 @@
 .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
@@ -37,15 +33,13 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 8461a
 
-PrintPartymon: ; 8461a
+PrintPartymon:
 	ld a, [wPrinterQueueLength]
 	push af
 	xor a
@@ -385,9 +375,8 @@
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 84688
 
-_PrintDiploma: ; 84688
+_PrintDiploma:
 	ld a, [wPrinterQueueLength]
 	push af
 
@@ -449,9 +438,8 @@
 	pop af
 	ld [wPrinterQueueLength], a
 	ret
-; 846f6
 
-CheckCancelPrint: ; 846f6
+CheckCancelPrint:
 	ld a, [hJoyDown]
 	and B_BUTTON
 	jr nz, .pressed_b
@@ -484,25 +472,22 @@
 	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
@@ -509,20 +494,17 @@
 	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 @@
 .load_text_index
 	ld [wPrinterStatus], a
 	ret
-; 84785
 
-PlacePrinterStatusString: ; 84785
+PlacePrinterStatusString:
 ; Print nonzero printer status
 	ld a, [wPrinterStatus]
 	and a
@@ -594,9 +575,8 @@
 	xor a
 	ld [wPrinterStatus], a
 	ret
-; 847bd
 
-Unreferenced_Function847bd: ; 847bd
+Unreferenced_Function847bd:
 	ld a, [wPrinterStatus]
 	and a
 	ret z
@@ -626,13 +606,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call Printer_PrintBoxListSegment
 	ret
 
-Printer_PrintBoxListSegment: ; 848e7 (21:48e7)
+Printer_PrintBoxListSegment:
 	ld a, [wBankOfBoxToPrint]
 	call GetSRAMBank
 .loop
@@ -839,7 +814,7 @@
 	call CloseSRAM
 	ret
 
-Printer_GetMonGender: ; 8498a (21:498a)
+Printer_GetMonGender:
 	push hl
 	ld a, [wAddrOfBoxToPrint]
 	ld l, a
@@ -871,7 +846,7 @@
 	ld [hli], a
 	ret
 
-Printer_GetBoxMonSpecies: ; 849c6 (21:49c6)
+Printer_GetBoxMonSpecies:
 	push hl
 	ld e, a
 	ld d, $0
@@ -885,7 +860,7 @@
 	pop hl
 	ret
 
-Printer_PlaceTopBorder: ; 849d7 (21:49d7)
+Printer_PlaceTopBorder:
 	hlcoord 0, 0
 	ld a, "┌"
 	ld [hli], a
@@ -899,7 +874,7 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-Printer_PlaceBottomBorders: ; 849fc (21:49fc)
+Printer_PlaceBottomBorders:
 	hlcoord 0, 17
 	ld a, "└"
 	ld [hli], a
@@ -927,7 +902,7 @@
 	ld [hl], a
 	ret
 
-Printer_PlaceEmptyBoxSlotString: ; 84a0e (21:4a0e)
+Printer_PlaceEmptyBoxSlotString:
 	hlcoord 2, 0
 	ld c, $6
 .loop
@@ -942,8 +917,6 @@
 	dec c
 	jr nz, .loop
 	ret
-; 84a25 (21:4a25)
 
-String84a25: ; 84a25
+String84a25:
 	db "  ------@"
-; 84a2e
--- a/engine/printer/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 @@
 	xor a
 	ld [wJumptableIndex], a
 	ret
-; 84022
 
-PrinterJumptableIteration: ; 84022
+PrinterJumptableIteration:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -27,9 +26,8 @@
 	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,17 +51,17 @@
 	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
@@ -70,16 +68,16 @@
 	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 @@
 	ld [wPrinterStatus], a
 	ret
 
-Printer_StartTransmittingTilemap: ; 84099 (21:4099)
+Printer_StartTransmittingTilemap:
 	call Printer_ResetData
 	; check ???
 	ld hl, wPrinterRowIndex
@@ -118,7 +116,7 @@
 	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 @@
 	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 @@
 	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 @@
 	call Printer_WaitHandshake
 	ret
 
-Printer_WaitSerial: ; 84120 (21:4120)
+Printer_WaitSerial:
 	ld hl, wPrinterSerialFrameDelay
 	inc [hl]
 	ld a, [hl]
@@ -177,7 +175,7 @@
 	call Printer_NextSection
 	ret
 
-Printer_WaitSerialAndLoopBack2: ; 8412e (21:412e)
+Printer_WaitSerialAndLoopBack2:
 	ld hl, wPrinterSerialFrameDelay
 	inc [hl]
 	ld a, [hl]
@@ -191,7 +189,7 @@
 	call Printer_PrevSection
 	ret
 
-Printer_CheckConnectionStatus: ; 84143 (21:4143)
+Printer_CheckConnectionStatus:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -224,7 +222,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-Printer_TransmissionLoop: ; 84180 (21:4180)
+Printer_TransmissionLoop:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -246,7 +244,7 @@
 	ld [wJumptableIndex], a
 	ret
 
-Printer_WaitUntilFinished: ; 841a1 (21:41a1)
+Printer_WaitUntilFinished:
 	ld a, [wPrinterOpcode]
 	and a
 	ret nz
@@ -256,9 +254,9 @@
 	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 @@
 	ld [wJumptableIndex], a
 	ret
 
-Printer_WaitHandshake: ; 841c3 (21:41c3)
+Printer_WaitHandshake:
 .loop
 	ld a, [wPrinterOpcode]
 	and a
@@ -287,7 +285,7 @@
 	ld [rSC], a
 	ret
 
-Printer_CopyPacket: ; 841e2 (21:41e2)
+Printer_CopyPacket:
 	ld a, [hli]
 	ld [wPrinterData], a
 	ld a, [hli]
@@ -302,7 +300,7 @@
 	ld [wPrinterChecksum + 1], a
 	ret
 
-Printer_ResetData: ; 841fb (21:41fb)
+Printer_ResetData:
 	xor a
 	ld hl, wPrinterData
 	ld [hli], a
@@ -320,7 +318,7 @@
 	call Printer_ByteFill
 	ret
 
-Printer_ComputeChecksum: ; 84219 (21:4219)
+Printer_ComputeChecksum:
 	ld hl, 0
 	ld bc, 4
 	ld de, wPrinterData
@@ -337,7 +335,7 @@
 	ld [wPrinterChecksum + 1], a
 	ret
 
-.ComputeChecksum: ; 8423c (21:423c)
+.ComputeChecksum:
 .loop
 	ld a, [de]
 	inc de
@@ -352,7 +350,7 @@
 	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 @@
 	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 @@
 	jr nz, .loop2
 	ret
 
-Printer_ByteFill: ; 842ab
+Printer_ByteFill:
 	push de
 	ld e, a
 .loop
@@ -433,7 +431,6 @@
 	ld a, e
 	pop de
 	ret
-; 842b7
 
 PrinterDataPacket1:
 	db  1, 0, $00, 0
@@ -453,9 +450,8 @@
 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 @@
 	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 @@
 	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 @@
 
 .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,7 +594,7 @@
 	call Printer_NextInstruction
 	ret
 
-Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop: ; 843b6 (21:43b6)
+Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop:
 	ld a, [rSB]
 	ld [wPrinterStatusFlags], a
 	xor a
@@ -606,25 +601,25 @@
 	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 @@
 	ld [rSC], a
 	ret
 
-Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop_: ; 843e6 (21:43e6)
+Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop_:
 	ld a, [rSB]
 	ld [wPrinterStatusFlags], a
 	xor a
--- a/engine/rtc/print_hours_mins.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 @@
 	pop bc
 	ret
 
-PrintHoursMins: ; 1dd6bb (77:56bb)
+PrintHoursMins:
 ; Hours in b, minutes in c
 	ld a, b
 	cp 12
@@ -59,5 +59,5 @@
 	call PlaceString
 	ret
 
-String_AM: db "AM@" ; 1dd6fc
-String_PM: db "PM@" ; 1dd6ff
+String_AM: db "AM@"
+String_PM: db "PM@"
--- a/engine/rtc/reset_password.asm
+++ b/engine/rtc/reset_password.asm
@@ -1,4 +1,4 @@
-_ResetClock: ; 4d3b1
+_ResetClock:
 	farcall BlankScreen
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
@@ -31,34 +31,34 @@
 	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_MenuHeader: ; 0x4d40d
+.NoYes_MenuHeader:
 	db 0 ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw .NoYes_MenuData
 	db 1 ; default option
 
-.NoYes_MenuData: ; 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 @@
 	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 @@
 	ld [hl], "▲"
 	ret
 
-.dpadinput ; 4d490
+.dpadinput
 	ld a, b
 	and D_LEFT
 	jr nz, .left
@@ -186,7 +186,7 @@
 	ld [hl], 9
 	ret
 
-.getcurrentdigit ; 4d4d5
+.getcurrentdigit
 	ld a, [wStringBuffer2 + 5]
 	ld e, a
 	ld d, $0
@@ -194,7 +194,7 @@
 	add hl, de
 	ret
 
-.ConvertDecIDToBytes: ; 4d4e0
+.ConvertDecIDToBytes:
 	ld hl, 0
 	ld de, wStringBuffer2 + 4
 	ld bc, 1
@@ -206,7 +206,7 @@
 	ld bc, 1000
 	call .ConvertToBytes
 	ld bc, 10000
-.ConvertToBytes: ; 4d501
+.ConvertToBytes:
 	ld a, [de]
 	dec de
 	push hl
@@ -218,7 +218,7 @@
 	add hl, bc
 	ret
 
-.CalculatePassword: ; 4d50f
+.CalculatePassword:
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld de, 0
@@ -234,7 +234,7 @@
 	call CloseSRAM
 	ret
 
-.ComponentFromNumber: ; 4d533
+.ComponentFromNumber:
 	ld a, [hli]
 	add e
 	ld e, a
@@ -245,7 +245,7 @@
 	jr nz, .ComponentFromNumber
 	ret
 
-.ComponentFromString: ; 4d53e
+.ComponentFromString:
 	ld a, [hli]
 	cp "@"
 	ret z
--- a/engine/rtc/restart_clock.asm
+++ b/engine/rtc/restart_clock.asm
@@ -1,4 +1,4 @@
-RestartClock_GetWraparoundTime: ; 20000 (8:4000)
+RestartClock_GetWraparoundTime:
 	push hl
 	dec a
 	ld e, a
@@ -16,9 +16,8 @@
 	ld c, [hl]
 	pop hl
 	ret
-; 20015 (8:4015)
 
-.WrapAroundTimes: ; 20015
+.WrapAroundTimes:
 	dw wBuffer4
 	db 7, 4
 
@@ -27,9 +26,8 @@
 
 	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
@@ -48,21 +46,18 @@
 	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
@@ -105,19 +100,16 @@
 .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
@@ -193,7 +185,7 @@
 	xor a
 	ret
 
-.PrintTime: ; 2011f (8:411f)
+.PrintTime:
 	hlcoord 0, 5
 	ld b, 5
 	ld c, 18
@@ -217,17 +209,15 @@
 	ld a, [wBuffer1]
 	ld [wBuffer2], a
 	ret
-; 20160 (8:4160)
 
-.unreferenced ; 20160
+.unreferenced
 ; unused
 	ld a, [wBuffer3]
 	ld b, a
 	call Coord2Tile
 	ret
-; 20168
 
-.PlaceChars: ; 20168 (8:4168)
+.PlaceChars:
 	push de
 	call RestartClock_GetWraparoundTime
 	ld a, [wBuffer3]
@@ -240,14 +230,11 @@
 	add hl, bc
 	ld [hl], e
 	ret
-; 2017c (8:417c)
 
-UnreferencedString_HourJP: ; 2017c
+UnreferencedString_HourJP:
 ; unused
 	db "じ@" ; HR
-; 2017e
 
-UnreferencedString_MinuteJP: ; 2017e
+UnreferencedString_MinuteJP:
 ; unused
 	db "ふん@" ; MIN
-; 20181
--- a/engine/rtc/rtc.asm
+++ b/engine/rtc/rtc.asm
@@ -9,9 +9,8 @@
 	ld [MBC3RTC], a
 	call CloseSRAM
 	ret
-; 14019
 
-StartRTC: ; 14019
+StartRTC:
 	ld a, SRAM_ENABLE
 	ld [MBC3SRamEnable], a
 	call LatchClock
@@ -22,9 +21,8 @@
 	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 @@
 	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,7 +53,6 @@
 	db NITE_HOUR, DAY_F
 	db MAX_HOUR,  NITE_F
 	db -1, MORN_F
-; 1404e
 
 Unreferenced_1404e:
 	db 20, NITE_F
@@ -63,9 +59,8 @@
 	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 @@
 	ld a, [hSeconds]
 	ld [hli], a
 	ret
-; 1406a
 
-SaveRTC: ; 1406a
+SaveRTC:
 	ld a, $a
 	ld [MBC3SRamEnable], a
 	call LatchClock
@@ -93,9 +87,8 @@
 	ld [sRTCStatusFlags], a
 	call CloseSRAM
 	ret
-; 14089
 
-StartClock:: ; 14089
+StartClock::
 	call GetClock
 	call Function1409b
 	call FixDays
@@ -107,9 +100,8 @@
 .skip_set
 	call StartRTC
 	ret
-; 1409b
 
-Function1409b: ; 1409b
+Function1409b:
 	ld hl, hRTCDayHi
 	bit 7, [hl]
 	jr nz, .set_bit_7
@@ -123,9 +115,8 @@
 	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 @@
 .dont_update
 	xor a
 	ret
-; 140ed
 
-_InitTime:: ; 140ed
+_InitTime::
 	call GetClock
 	call FixDays
 	ld hl, hRTCSeconds
@@ -206,4 +196,3 @@
 .okay_days
 	ld [de], a
 	ret
-; 1412a
--- a/engine/rtc/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
@@ -120,7 +120,7 @@
 	ld [hInMenu], a
 	ret
 
-.ClearScreen: ; 90783 (24:4783)
+.ClearScreen:
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
@@ -131,7 +131,7 @@
 	ld [hBGMapMode], a
 	ret
 
-SetHour: ; 90795 (24:4795)
+SetHour:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr nz, .Confirm
@@ -183,7 +183,7 @@
 	scf
 	ret
 
-DisplayHourOClock: ; 907de (24:47de)
+DisplayHourOClock:
 	push hl
 	ld a, [wInitHourBuffer]
 	ld c, a
@@ -195,9 +195,8 @@
 	call PlaceString
 	pop hl
 	ret
-; 907f1 (24:47f1)
 
-UnreferencedFunction907f1: ; 907f1
+UnreferencedFunction907f1:
 	ld h, d
 	ld l, e
 	push hl
@@ -222,9 +221,8 @@
 	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 @@
 	scf
 	ret
 
-DisplayMinutesWithMinString: ; 90859 (24:4859)
+DisplayMinutesWithMinString:
 	ld de, wInitMinuteBuffer
 	call PrintTwoDigitNumberRightAlign
 	inc hl
@@ -281,7 +279,7 @@
 	call PlaceString
 	ret
 
-PrintTwoDigitNumberRightAlign: ; 90867 (24:4867)
+PrintTwoDigitNumberRightAlign:
 	push hl
 	ld a, " "
 	ld [hli], a
@@ -290,25 +288,21 @@
 	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 @@
 	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 @@
 	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 @@
 .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
 
-SetDayOfWeek: ; 90913
+SetDayOfWeek:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -459,9 +442,8 @@
 	pop af
 	ld [hInMenu], a
 	ret
-; 90993
 
-.GetJoypadAction: ; 90993
+.GetJoypadAction:
 	ld a, [hJoyPressed]
 	and A_BUTTON
 	jr z, .not_A
@@ -515,9 +497,8 @@
 	call WaitBGMap
 	and a
 	ret
-; 909de
 
-.PlaceWeekdayString: ; 909de
+.PlaceWeekdayString:
 	push hl
 	ld a, [wTempDayOfWeek]
 	ld e, a
@@ -531,9 +512,8 @@
 	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 @@
 .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
 
-InitialSetDSTFlag: ; 90a54
+InitialSetDSTFlag:
 	ld a, [wDST]
 	set 7, a
 	ld [wDST], a
@@ -583,9 +559,8 @@
 	ld hl, .Text
 	call PlaceHLTextAtBC
 	ret
-; 90a6c
 
-.Text: ; 90a6c
+.Text:
 	start_asm
 	call UpdateTime
 	ld a, [hHours]
@@ -596,15 +571,13 @@
 	farcall PrintHoursMins
 	ld hl, .DSTIsThatOK
 	ret
-; 90a83 (24:4a83)
 
-.DSTIsThatOK: ; 0x90a83
+.DSTIsThatOK:
 	; DST, is that OK?
 	text_jump Text_DSTIsThatOK
 	db "@"
-; 0x90a88
 
-InitialClearDSTFlag: ; 90a88
+InitialClearDSTFlag:
 	ld a, [wDST]
 	res 7, a
 	ld [wDST], a
@@ -614,9 +587,8 @@
 	ld hl, .Text
 	call PlaceHLTextAtBC
 	ret
-; 90aa0
 
-.Text: ; 90aa0
+.Text:
 	start_asm
 	call UpdateTime
 	ld a, [hHours]
@@ -627,15 +599,13 @@
 	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
@@ -642,9 +612,8 @@
 	ld hl, .Text
 	call PlaceHLTextAtBC
 	ret
-; 90acc
 
-.Text: ; 0x90acc
+.Text:
 	start_asm
 	call UpdateTime
 
@@ -694,14 +663,12 @@
 .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 @@
 	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 @@
 	call PrintTwoDigitNumberRightAlign
 	ret
 
-GetTimeOfDayString: ; 90b58 (24:4b58)
+GetTimeOfDayString:
 	ld a, c
 	cp MORN_HOUR
 	jr c, .nite
@@ -750,12 +716,10 @@
 .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
--- a/engine/smallflag.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.
 
--- a/engine/tilesets/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
@@ -44,7 +44,7 @@
 	jr nz, .loop
 	ret
 
-ScrollBGMapPalettes:: ; 4c03f
+ScrollBGMapPalettes::
 	ld hl, wBGMapBuffer
 	ld de, wBGMapPalBuffer
 .loop
--- a/engine/tilesets/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 @@
 	ld bc, 9 tiles
 	call CopyBytes
 	ret
-; 1c021
-
 
 INCLUDE "data/maps/roofs.asm"
--- a/engine/tilesets/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,16 +32,15 @@
 	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
@@ -48,14 +47,13 @@
 	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
@@ -62,9 +60,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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,15 +115,14 @@
 	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
@@ -136,9 +129,8 @@
 	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 @@
 	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 @@
 	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,10 +169,9 @@
 	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
@@ -189,7 +178,7 @@
 	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,9 +191,8 @@
 	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
@@ -211,7 +199,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	and %100
 	jr nz, ScrollTileDown
 	jr ScrollTileUp
-; fc327
 
-ScrollTileLeft: ; fc327
+ScrollTileLeft:
 	ld h, d
 	ld l, e
 	ld c, 4
@@ -344,9 +323,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; fc33b
 
-ScrollTileRight: ; fc33b
+ScrollTileRight:
 	ld h, d
 	ld l, e
 	ld c, 4
@@ -359,9 +337,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; fc34f
 
-ScrollTileUp: ; fc34f
+ScrollTileUp:
 	ld h, d
 	ld l, e
 	ld d, [hl]
@@ -386,9 +363,8 @@
 	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 @@
 	dec a
 	jr nz, .loop
 	ret
-; fc387
 
-
-AnimateFountain: ; fc387
+AnimateFountain:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
@@ -454,10 +428,8 @@
 .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,14 +460,11 @@
 	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
@@ -523,21 +492,16 @@
 	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
@@ -569,10 +533,8 @@
 	ld sp, hl
 	ld hl, vTiles2 tile $0f
 	jp WriteTile
-; fc4f2
 
-
-ForestTreeLeftAnimation2: ; fc4f2
+ForestTreeLeftAnimation2:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
@@ -601,10 +563,8 @@
 	ld sp, hl
 	ld hl, vTiles2 tile $0c
 	jp WriteTile
-; fc51c
 
-
-ForestTreeRightAnimation2: ; fc51c
+ForestTreeRightAnimation2:
 	ld hl, sp+0
 	ld b, h
 	ld c, l
@@ -637,10 +597,8 @@
 	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 @@
 .even
 	xor a
 	ret
-; fc56d
 
-
-AnimateFlowerTile: ; fc56d
+AnimateFlowerTile:
 ; No parameters.
 
 ; Save sp in bc (see WriteTile).
@@ -694,17 +650,14 @@
 	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 @@
 	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 @@
 	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 @@
 
 .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 @@
 	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 @@
 	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 @@
 
 	; 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 @@
 	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.
@@ -978,10 +915,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; fc71e
 
-
-FlickeringCaveEntrancePalette: ; fc71e
+FlickeringCaveEntrancePalette:
 ; No palette changes on DMG.
 	ld a, [hCGB]
 	and a
@@ -1020,9 +955,7 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; fc750
 
-
 TowerPillarTilePointer1:  dw vTiles2 tile $2d, TowerPillarTile1
 TowerPillarTilePointer2:  dw vTiles2 tile $2f, TowerPillarTile2
 TowerPillarTilePointer3:  dw vTiles2 tile $3d, TowerPillarTile3
@@ -1044,17 +977,13 @@
 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
--- a/engine/tilesets/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,9 +51,8 @@
 .do_nothing
 	and a
 	ret
-; 494f2
 
-LoadPokeComPalette: ; 494f2
+LoadPokeComPalette:
 	ld a, BANK(wBGPals1)
 	ld de, wBGPals1
 	ld hl, PokeComPalette
@@ -60,13 +59,11 @@
 	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
@@ -73,13 +70,11 @@
 	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
@@ -86,13 +81,11 @@
 	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
@@ -99,13 +92,11 @@
 	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
@@ -112,17 +103,14 @@
 	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 @@
 	ld bc, 1 palettes
 	call FarCopyWRAM
 	ret
-; 496fe
 
-MansionPalette2: ; 496fe
+MansionPalette2:
 INCLUDE "gfx/tilesets/mansion_2.pal"
-; 49706
--- a/engine/tilesets/timeofday_pals.asm
+++ b/engine/tilesets/timeofday_pals.asm
@@ -1,8 +1,8 @@
-DummyPredef35: ; 8c000
+DummyPredef35:
 DummyPredef36:
 	ret
 
-UpdateTimeOfDayPal:: ; 8c001
+UpdateTimeOfDayPal::
 	call UpdateTime
 	ld a, [wTimeOfDay]
 	ld [wCurTimeOfDay], a
@@ -9,10 +9,8 @@
 	call GetTimePalette
 	ld [wTimeOfDayPal], a
 	ret
-; 8c011
 
-
-_TimeOfDayPals:: ; 8c011
+_TimeOfDayPals::
 ; return carry if pals are changed
 
 ; forced pals?
@@ -66,12 +64,10 @@
 	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,25 +105,21 @@
 ; no change occurred
 	and a
 	ret
-; 8c070
 
-
-_UpdateTimePals:: ; 8c070
+_UpdateTimePals::
 	ld c, $9 ; normal
 	call GetTimePalFade
 	call DmgToCgbTimePals
 	ret
-; 8c079
 
-FadeInPalettes:: ; 8c079
+FadeInPalettes::
 	ld c, $12
 	call GetTimePalFade
 	ld b, $4
 	call ConvertTimePalsDecHL
 	ret
-; 8c084
 
-FadeOutPalettes:: ; 8c084
+FadeOutPalettes::
 	call FillWhiteBGColor
 	ld c, $9
 	call GetTimePalFade
@@ -134,9 +126,8 @@
 	ld b, $4
 	call ConvertTimePalsIncHL
 	ret
-; 8c092
 
-BattleTowerFade: ; 8c092
+BattleTowerFade:
 	call FillWhiteBGColor
 	ld c, $9
 	call GetTimePalFade
@@ -151,26 +142,22 @@
 	dec b
 	jr nz, .asm_8c09c
 	ret
-; 8c0ab
 
-FadeInQuickly: ; 8c0ab
+FadeInQuickly:
 	ld c, $0
 	call GetTimePalFade
 	ld b, $4
 	call ConvertTimePalsIncHL
 	ret
-; 8c0b6
 
-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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 8c0e5
 
-ReplaceTimeOfDayPals: ; 8c0e5
+ReplaceTimeOfDayPals:
 	ld hl, .BrightnessLevels
 	ld a, [wMapTimeOfDay]
 	cp $4 ; Dark cave, needs Flash
@@ -226,9 +212,8 @@
 	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 @@
 	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 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 8c126
 
 .TimePalettes:
 	dw .MorningPalette
@@ -282,10 +265,8 @@
 	rlca
 	rlca
 	ret
-; 8c14e
 
-
-DmgToCgbTimePals: ; 8c14e
+DmgToCgbTimePals:
 	push hl
 	push de
 	ld a, [hli]
@@ -298,9 +279,8 @@
 	pop de
 	pop hl
 	ret
-; 8c15e
 
-ConvertTimePalsIncHL: ; 8c15e
+ConvertTimePalsIncHL:
 .loop
 	call DmgToCgbTimePals
 	inc hl
@@ -311,9 +291,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 8c16d
 
-ConvertTimePalsDecHL: ; 8c16d
+ConvertTimePalsDecHL:
 .loop
 	call DmgToCgbTimePals
 	dec hl
@@ -324,10 +303,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 8c17c
 
-
-GetTimePalFade: ; 8c17c
+GetTimePalFade:
 ; check cgb
 	ld a, [hCGB]
 	and a
@@ -412,4 +389,3 @@
 	db %10010000, %10010000, %10010000
 	db %01000000, %01000000, %01000000
 	db %00000000, %00000000, %00000000
-; 8c20f
--- 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 @@
 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
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -7,7 +7,7 @@
 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/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
--- 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"
--- 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"
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -4,6 +4,7 @@
 ; 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"
@@ -34,7 +35,6 @@
 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
@@ -55,7 +55,6 @@
 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
@@ -78,7 +77,6 @@
 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
@@ -103,7 +101,6 @@
 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
@@ -129,7 +126,6 @@
 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
@@ -157,7 +153,6 @@
 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
@@ -187,7 +182,6 @@
 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
@@ -219,7 +213,6 @@
 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
@@ -255,7 +248,6 @@
 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
@@ -295,7 +287,6 @@
 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
@@ -338,7 +329,6 @@
 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
@@ -384,7 +374,6 @@
 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
@@ -432,7 +421,6 @@
 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
@@ -483,7 +471,6 @@
 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
@@ -537,7 +524,6 @@
 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
@@ -595,7 +581,6 @@
 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
@@ -661,7 +646,6 @@
 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
@@ -726,7 +710,6 @@
 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
@@ -800,14 +783,10 @@
 
 SECTION "Pics 20", ROMX
 
-
 SECTION "Pics 21", ROMX
 
-
 SECTION "Pics 22", ROMX
 
-
 SECTION "Pics 23", ROMX
-
 
 SECTION "Pics 24", ROMX
--- a/gfx/pokemon/abra/anim.asm
+++ b/gfx/pokemon/abra/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 09
 	dorepeat 1
 	endanim
-; 0xd0c5a
--- 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
--- a/gfx/pokemon/aerodactyl/anim.asm
+++ b/gfx/pokemon/aerodactyl/anim.asm
@@ -6,4 +6,3 @@
 	frame 1, 08
 	dorepeat 4
 	endanim
-; 0xd10a1
--- 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
--- a/gfx/pokemon/aipom/anim.asm
+++ b/gfx/pokemon/aipom/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 12
 	dorepeat 2
 	endanim
-; 0xd1369
--- 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
--- a/gfx/pokemon/alakazam/anim.asm
+++ b/gfx/pokemon/alakazam/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 2
 	frame 3, 07
 	endanim
-; 0xd0c76
--- 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
--- a/gfx/pokemon/ampharos/anim.asm
+++ b/gfx/pokemon/ampharos/anim.asm
@@ -7,4 +7,3 @@
 	frame 1, 06
 	frame 4, 06
 	endanim
-; 0xd12fa
--- 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
--- 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"
--- a/gfx/pokemon/arbok/anim.asm
+++ b/gfx/pokemon/arbok/anim.asm
@@ -12,4 +12,3 @@
 	frame 3, 05
 	dorepeat 8
 	endanim
-; 0xd09ed
--- 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
--- a/gfx/pokemon/arcanine/anim.asm
+++ b/gfx/pokemon/arcanine/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 7, 25
 	endanim
-; 0xd0c26
--- 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
--- a/gfx/pokemon/ariados/anim.asm
+++ b/gfx/pokemon/ariados/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 24
 	endanim
-; 0xd124d
--- 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
--- a/gfx/pokemon/articuno/anim.asm
+++ b/gfx/pokemon/articuno/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 2
 	frame 5, 12
 	endanim
-; 0xd10c1
--- 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
--- a/gfx/pokemon/azumarill/anim.asm
+++ b/gfx/pokemon/azumarill/anim.asm
@@ -6,4 +6,3 @@
 	frame 1, 08
 	frame 4, 08
 	endanim
-; 0xd1329
--- 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
--- a/gfx/pokemon/bayleef/anim.asm
+++ b/gfx/pokemon/bayleef/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 11
 	frame 3, 15
 	endanim
-; 0xd116c
--- 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
--- a/gfx/pokemon/beedrill/anim.asm
+++ b/gfx/pokemon/beedrill/anim.asm
@@ -9,4 +9,3 @@
 	frame 3, 10
 	dorepeat 7
 	endanim
-; 0xd0954
--- 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
--- a/gfx/pokemon/bellossom/anim.asm
+++ b/gfx/pokemon/bellossom/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 12
 	frame 4, 10
 	endanim
-; 0xd130b
--- 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
--- a/gfx/pokemon/bellsprout/anim.asm
+++ b/gfx/pokemon/bellsprout/anim.asm
@@ -9,4 +9,3 @@
 	frame 1, 08
 	dorepeat 5
 	endanim
-; 0xd0cb2
--- 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
--- a/gfx/pokemon/blastoise/anim.asm
+++ b/gfx/pokemon/blastoise/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 08
 	frame 1, 04
 	endanim
-; 0xd0908
--- 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
--- a/gfx/pokemon/blissey/anim.asm
+++ b/gfx/pokemon/blissey/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 06
 	frame 3, 08
 	endanim
-; 0xd1607
--- 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
--- a/gfx/pokemon/bulbasaur/anim.asm
+++ b/gfx/pokemon/bulbasaur/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 05
 	frame 5, 05
 	endanim
-; 0xd089c
--- 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
--- a/gfx/pokemon/butterfree/anim.asm
+++ b/gfx/pokemon/butterfree/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 06
 	dorepeat 3
 	endanim
-; 0xd0929
--- 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
--- a/gfx/pokemon/caterpie/anim.asm
+++ b/gfx/pokemon/caterpie/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	frame 1, 08
 	endanim
-; 0xd0915
--- 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
--- a/gfx/pokemon/celebi/anim.asm
+++ b/gfx/pokemon/celebi/anim.asm
@@ -13,4 +13,3 @@
 	frame 13, 05
 	dorepeat 11
 	endanim
-; 0xd1696
--- 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
--- a/gfx/pokemon/chansey/anim.asm
+++ b/gfx/pokemon/chansey/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 05
 	dorepeat 5
 	endanim
-; 0xd0f26
--- 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
--- a/gfx/pokemon/charizard/anim.asm
+++ b/gfx/pokemon/charizard/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 09
 	dorepeat 3
 	endanim
-; 0xd08e1
--- 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
--- a/gfx/pokemon/charmander/anim.asm
+++ b/gfx/pokemon/charmander/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 10
 	frame 4, 10
 	endanim
-; 0xd08c5
--- 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
--- a/gfx/pokemon/charmeleon/anim.asm
+++ b/gfx/pokemon/charmeleon/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 08
 	frame 4, 30
 	endanim
-; 0xd08d4
--- 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
--- a/gfx/pokemon/chikorita/anim.asm
+++ b/gfx/pokemon/chikorita/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 4
 	endanim
-; 0xd1165
--- 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
--- a/gfx/pokemon/chinchou/anim.asm
+++ b/gfx/pokemon/chinchou/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 5
 	frame 3, 10
 	endanim
-; 0xd1271
--- 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
--- a/gfx/pokemon/clefable/anim.asm
+++ b/gfx/pokemon/clefable/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 10
 	frame 1, 10
 	endanim
-; 0xd0aa7
--- 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
--- a/gfx/pokemon/clefairy/anim.asm
+++ b/gfx/pokemon/clefairy/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 05
 	dorepeat 4
 	endanim
-; 0xd0a9e
--- 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
--- a/gfx/pokemon/cleffa/anim.asm
+++ b/gfx/pokemon/cleffa/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 10
 	frame 3, 10
 	endanim
-; 0xd1290
--- 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
--- a/gfx/pokemon/cloyster/anim.asm
+++ b/gfx/pokemon/cloyster/anim.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 3, 09
 	endanim
-; 0xd0dd0
--- 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
--- a/gfx/pokemon/corsola/anim.asm
+++ b/gfx/pokemon/corsola/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 12
 	frame 3, 18
 	endanim
-; 0xd1501
--- 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
--- a/gfx/pokemon/crobat/anim.asm
+++ b/gfx/pokemon/crobat/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 05
 	dorepeat 1
 	endanim
-; 0xd125e
--- 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
--- a/gfx/pokemon/croconaw/anim.asm
+++ b/gfx/pokemon/croconaw/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 05
 	dorepeat 1
 	endanim
-; 0xd11d2
--- 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
--- a/gfx/pokemon/cubone/anim.asm
+++ b/gfx/pokemon/cubone/anim.asm
@@ -9,4 +9,3 @@
 	frame 6, 02
 	frame 1, 08
 	endanim
-; 0xd0e9f
--- 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
--- a/gfx/pokemon/cyndaquil/anim.asm
+++ b/gfx/pokemon/cyndaquil/anim.asm
@@ -9,4 +9,3 @@
 	frame 3, 09
 	frame 1, 03
 	endanim
-; 0xd1194
--- 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
--- a/gfx/pokemon/delibird/anim.asm
+++ b/gfx/pokemon/delibird/anim.asm
@@ -9,4 +9,3 @@
 	frame 0, 05
 	frame 6, 05
 	endanim
-; 0xd152a
--- 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
--- a/gfx/pokemon/dewgong/anim.asm
+++ b/gfx/pokemon/dewgong/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 09
 	frame 5, 14
 	endanim
-; 0xd0daa
--- 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
--- a/gfx/pokemon/diglett/anim.asm
+++ b/gfx/pokemon/diglett/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 09
 	dorepeat 2
 	endanim
-; 0xd0b97
--- 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
--- a/gfx/pokemon/ditto/anim.asm
+++ b/gfx/pokemon/ditto/anim.asm
@@ -8,4 +8,3 @@
 	frame 7, 12
 	frame 8, 12
 	endanim
-; 0xd1029
--- 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
--- a/gfx/pokemon/dodrio/anim.asm
+++ b/gfx/pokemon/dodrio/anim.asm
@@ -3,4 +3,3 @@
 	frame 4, 10
 	frame 1, 09
 	endanim
-; 0xd0d92
--- 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
--- a/gfx/pokemon/doduo/anim.asm
+++ b/gfx/pokemon/doduo/anim.asm
@@ -6,4 +6,3 @@
 	frame 1, 08
 	dorepeat 4
 	endanim
-; 0xd0d89
--- 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
--- a/gfx/pokemon/donphan/anim.asm
+++ b/gfx/pokemon/donphan/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 10
 	frame 4, 06
 	endanim
-; 0xd1587
--- 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
--- a/gfx/pokemon/dragonair/anim.asm
+++ b/gfx/pokemon/dragonair/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	dorepeat 1
 	endanim
-; 0xd10fd
--- 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
--- a/gfx/pokemon/dragonite/anim.asm
+++ b/gfx/pokemon/dragonite/anim.asm
@@ -10,4 +10,3 @@
 	frame 1, 12
 	dorepeat 8
 	endanim
-; 0xd1114
--- 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
--- a/gfx/pokemon/dratini/anim.asm
+++ b/gfx/pokemon/dratini/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 09
 	frame 3, 09
 	endanim
-; 0xd10f0
--- 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
--- a/gfx/pokemon/drowzee/anim.asm
+++ b/gfx/pokemon/drowzee/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 05
 	frame 4, 05
 	endanim
-; 0xd0e1b
--- 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
--- a/gfx/pokemon/dugtrio/anim.asm
+++ b/gfx/pokemon/dugtrio/anim.asm
@@ -13,4 +13,3 @@
 	frame 2, 06
 	frame 1, 06
 	endanim
-; 0xd0bb4
--- 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
--- a/gfx/pokemon/dunsparce/anim.asm
+++ b/gfx/pokemon/dunsparce/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 4, 12
 	endanim
-; 0xd1441
--- 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
--- a/gfx/pokemon/eevee/anim.asm
+++ b/gfx/pokemon/eevee/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 10
 	endanim
-; 0xd1038
--- 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
--- a/gfx/pokemon/egg/anim.asm
+++ b/gfx/pokemon/egg/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 04
 	dorepeat 1
 	endanim
-; 0xd16a3
--- 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
--- a/gfx/pokemon/ekans/anim.asm
+++ b/gfx/pokemon/ekans/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 20
 	endanim
-; 0xd09d2
--- 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
--- a/gfx/pokemon/electabuzz/anim.asm
+++ b/gfx/pokemon/electabuzz/anim.asm
@@ -10,4 +10,3 @@
 	dorepeat 7
 	dorepeat 7
 	endanim
-; 0xd0fcc
--- 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
--- a/gfx/pokemon/electrode/anim.asm
+++ b/gfx/pokemon/electrode/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 05
 	frame 2, 40
 	endanim
-; 0xd0e5c
--- a/gfx/pokemon/electrode/anim_idle.asm
+++ b/gfx/pokemon/electrode/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 3, 45
 	endanim
-; 0xd1ca8
--- a/gfx/pokemon/elekid/anim.asm
+++ b/gfx/pokemon/elekid/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 03
 	dorepeat 6
 	endanim
-; 0xd15e0
--- 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
--- a/gfx/pokemon/entei/anim.asm
+++ b/gfx/pokemon/entei/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 12
 	frame 3, 30
 	endanim
-; 0xd161d
--- 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
--- a/gfx/pokemon/espeon/anim.asm
+++ b/gfx/pokemon/espeon/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 07
 	dorepeat 3
 	endanim
-; 0xd13af
--- 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
--- a/gfx/pokemon/exeggcute/anim.asm
+++ b/gfx/pokemon/exeggcute/anim.asm
@@ -14,4 +14,3 @@
 	frame 0, 08
 	frame 3, 08
 	endanim
-; 0xd0e7b
--- 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
--- a/gfx/pokemon/exeggutor/anim.asm
+++ b/gfx/pokemon/exeggutor/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 06
 	dorepeat 4
 	endanim
-; 0xd0e8a
--- 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
--- 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
--- 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
--- a/gfx/pokemon/fearow/anim.asm
+++ b/gfx/pokemon/fearow/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 06
 	dorepeat 2
 	endanim
-; 0xd09c3
--- 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
--- a/gfx/pokemon/feraligatr/anim.asm
+++ b/gfx/pokemon/feraligatr/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 36
 	frame 2, 12
 	endanim
-; 0xd11dd
--- 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
--- a/gfx/pokemon/flaaffy/anim.asm
+++ b/gfx/pokemon/flaaffy/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 3, 18
 	endanim
-; 0xd12e9
--- 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
--- a/gfx/pokemon/flareon/anim.asm
+++ b/gfx/pokemon/flareon/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 08
 	dorepeat 2
 	endanim
-; 0xd105f
--- 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
--- a/gfx/pokemon/forretress/anim.asm
+++ b/gfx/pokemon/forretress/anim.asm
@@ -8,4 +8,3 @@
 	frame 2, 25
 	frame 1, 08
 	endanim
-; 0xd1434
--- 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
--- a/gfx/pokemon/furret/anim.asm
+++ b/gfx/pokemon/furret/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	dorepeat 2
 	endanim
-; 0xd11f3
--- 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
--- a/gfx/pokemon/gastly/anim.asm
+++ b/gfx/pokemon/gastly/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 12
 	frame 1, 12
 	endanim
-; 0xd0ddd
--- 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
--- a/gfx/pokemon/gengar/anim.asm
+++ b/gfx/pokemon/gengar/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 09
 	dorepeat 4
 	endanim
-; 0xd0df7
--- 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
--- a/gfx/pokemon/geodude/anim.asm
+++ b/gfx/pokemon/geodude/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 07
 	dorepeat 3
 	endanim
-; 0xd0ceb
--- 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
--- a/gfx/pokemon/girafarig/anim.asm
+++ b/gfx/pokemon/girafarig/anim.asm
@@ -11,4 +11,3 @@
 	frame 5, 05
 	frame 3, 05
 	endanim
-; 0xd141c
--- 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
--- a/gfx/pokemon/gligar/anim.asm
+++ b/gfx/pokemon/gligar/anim.asm
@@ -1,3 +1,2 @@
 	frame 1, 35
 	endanim
-; 0xd1444
--- a/gfx/pokemon/gligar/anim_idle.asm
+++ b/gfx/pokemon/gligar/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 1, 35
 	endanim
-; 0xd208c
--- a/gfx/pokemon/gloom/anim.asm
+++ b/gfx/pokemon/gloom/anim.asm
@@ -9,4 +9,3 @@
 	frame 0, 06
 	frame 5, 06
 	endanim
-; 0xd0b35
--- 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
--- a/gfx/pokemon/golbat/anim.asm
+++ b/gfx/pokemon/golbat/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 08
 	dorepeat 6
 	endanim
-; 0xd0b0d
--- 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
--- a/gfx/pokemon/goldeen/anim.asm
+++ b/gfx/pokemon/goldeen/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 12
 	dorepeat 3
 	endanim
-; 0xd0f61
--- 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
--- a/gfx/pokemon/golduck/anim.asm
+++ b/gfx/pokemon/golduck/anim.asm
@@ -10,4 +10,3 @@
 	frame 6, 10
 	dorepeat 8
 	endanim
-; 0xd0bf4
--- 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
--- a/gfx/pokemon/golem/anim.asm
+++ b/gfx/pokemon/golem/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 12
 	frame 3, 12
 	endanim
-; 0xd0d07
--- 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
--- a/gfx/pokemon/granbull/anim.asm
+++ b/gfx/pokemon/granbull/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 07
 	dorepeat 3
 	endanim
-; 0xd146f
--- 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
--- a/gfx/pokemon/graveler/anim.asm
+++ b/gfx/pokemon/graveler/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 09
 	dorepeat 5
 	endanim
-; 0xd0cfc
--- 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
--- a/gfx/pokemon/grimer/anim.asm
+++ b/gfx/pokemon/grimer/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 08
 	frame 2, 28
 	endanim
-; 0xd0db3
--- 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
--- a/gfx/pokemon/growlithe/anim.asm
+++ b/gfx/pokemon/growlithe/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 08
 	dorepeat 4
 	endanim
-; 0xd0c1b
--- 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
--- a/gfx/pokemon/gyarados/anim.asm
+++ b/gfx/pokemon/gyarados/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 11
 	dorepeat 1
 	endanim
-; 0xd100b
--- 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
--- a/gfx/pokemon/haunter/anim.asm
+++ b/gfx/pokemon/haunter/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 10
 	frame 1, 10
 	endanim
-; 0xd0de8
--- a/gfx/pokemon/haunter/anim_idle.asm
+++ b/gfx/pokemon/haunter/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 4, 58
 	endanim
-; 0xd1c5a
--- a/gfx/pokemon/heracross/anim.asm
+++ b/gfx/pokemon/heracross/anim.asm
@@ -2,4 +2,3 @@
 	frame 1, 20
 	frame 2, 18
 	endanim
-; 0xd14a5
--- 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
--- a/gfx/pokemon/hitmonchan/anim.asm
+++ b/gfx/pokemon/hitmonchan/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 40
 	frame 2, 10
 	endanim
-; 0xd0eda
--- 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
--- a/gfx/pokemon/hitmonlee/anim.asm
+++ b/gfx/pokemon/hitmonlee/anim.asm
@@ -10,4 +10,3 @@
 	frame 4, 05
 	frame 1, 08
 	endanim
-; 0xd0ec7
--- 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
--- a/gfx/pokemon/hitmontop/anim.asm
+++ b/gfx/pokemon/hitmontop/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 4, 25
 	endanim
-; 0xd15c6
--- 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
--- 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
--- 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
--- a/gfx/pokemon/hoothoot/anim.asm
+++ b/gfx/pokemon/hoothoot/anim.asm
@@ -9,4 +9,3 @@
 	frame 5, 05
 	dorepeat 7
 	endanim
-; 0xd1208
--- 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
--- a/gfx/pokemon/hoppip/anim.asm
+++ b/gfx/pokemon/hoppip/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 10
 	dorepeat 1
 	endanim
-; 0xd134e
--- 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
--- a/gfx/pokemon/horsea/anim.asm
+++ b/gfx/pokemon/horsea/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 03
 	dorepeat 3
 	endanim
-; 0xd0f49
--- 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
--- a/gfx/pokemon/houndoom/anim.asm
+++ b/gfx/pokemon/houndoom/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 04
 	frame 4, 08
 	endanim
-; 0xd1560
--- 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
--- a/gfx/pokemon/houndour/anim.asm
+++ b/gfx/pokemon/houndour/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 07
 	frame 3, 07
 	endanim
-; 0xd154f
--- 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
--- a/gfx/pokemon/hypno/anim.asm
+++ b/gfx/pokemon/hypno/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 15
 	dorepeat 1
 	endanim
-; 0xd0e26
--- 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
--- a/gfx/pokemon/igglybuff/anim.asm
+++ b/gfx/pokemon/igglybuff/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 14
 	frame 1, 06
 	endanim
-; 0xd1299
--- 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
--- a/gfx/pokemon/ivysaur/anim.asm
+++ b/gfx/pokemon/ivysaur/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 20
 	frame 1, 06
 	endanim
-; 0xd08a5
--- 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
--- a/gfx/pokemon/jigglypuff/anim.asm
+++ b/gfx/pokemon/jigglypuff/anim.asm
@@ -8,4 +8,3 @@
 	frame 4, 05
 	dorepeat 6
 	endanim
-; 0xd0ade
--- 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
--- 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"
--- a/gfx/pokemon/jolteon/anim.asm
+++ b/gfx/pokemon/jolteon/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 06
 	dorepeat 5
 	endanim
-; 0xd1054
--- 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
--- a/gfx/pokemon/jumpluff/anim.asm
+++ b/gfx/pokemon/jumpluff/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 09
 	frame 3, 09
 	endanim
-; 0xd135e
--- 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
--- a/gfx/pokemon/jynx/anim.asm
+++ b/gfx/pokemon/jynx/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 16
 	dorepeat 1
 	endanim
-; 0xd0fb5
--- 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
--- a/gfx/pokemon/kabuto/anim.asm
+++ b/gfx/pokemon/kabuto/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 16
 	frame 2, 12
 	endanim
-; 0xd1085
--- 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
--- a/gfx/pokemon/kabutops/anim.asm
+++ b/gfx/pokemon/kabutops/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 25
 	endanim
-; 0xd1092
--- 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
--- a/gfx/pokemon/kadabra/anim.asm
+++ b/gfx/pokemon/kadabra/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 1, 12
 	endanim
-; 0xd0c67
--- 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
--- a/gfx/pokemon/kakuna/anim.asm
+++ b/gfx/pokemon/kakuna/anim.asm
@@ -1,4 +1,3 @@
 	frame 0, 12
 	frame 1, 24
 	endanim
-; 0xd093f
--- 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
--- a/gfx/pokemon/kangaskhan/anim.asm
+++ b/gfx/pokemon/kangaskhan/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 09
 	frame 4, 15
 	endanim
-; 0xd0f3c
--- 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
--- 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"
--- a/gfx/pokemon/kingdra/anim.asm
+++ b/gfx/pokemon/kingdra/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 06
 	dorepeat 5
 	endanim
-; 0xd1571
--- 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
--- a/gfx/pokemon/kingler/anim.asm
+++ b/gfx/pokemon/kingler/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 15
 	frame 2, 15
 	endanim
-; 0xd0e4a
--- 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
--- a/gfx/pokemon/koffing/anim.asm
+++ b/gfx/pokemon/koffing/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 5, 15
 	endanim
-; 0xd0ef0
--- a/gfx/pokemon/koffing/anim_idle.asm
+++ b/gfx/pokemon/koffing/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 5, 48
 	endanim
-; 0xd1cee
--- a/gfx/pokemon/krabby/anim.asm
+++ b/gfx/pokemon/krabby/anim.asm
@@ -8,4 +8,3 @@
 	frame 4, 03
 	dorepeat 3
 	endanim
-; 0xd0e39
--- 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
--- a/gfx/pokemon/lanturn/anim.asm
+++ b/gfx/pokemon/lanturn/anim.asm
@@ -6,4 +6,3 @@
 	frame 4, 05
 	dorepeat 4
 	endanim
-; 0xd1280
--- 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
--- a/gfx/pokemon/lapras/anim.asm
+++ b/gfx/pokemon/lapras/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 09
 	frame 1, 10
 	endanim
-; 0xd1016
--- 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
--- a/gfx/pokemon/larvitar/anim.asm
+++ b/gfx/pokemon/larvitar/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 28
 	frame 3, 08
 	endanim
-; 0xd163d
--- 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
--- a/gfx/pokemon/ledian/anim.asm
+++ b/gfx/pokemon/ledian/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 1, 08
 	endanim
-; 0xd1233
--- 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
--- a/gfx/pokemon/ledyba/anim.asm
+++ b/gfx/pokemon/ledyba/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 12
 	dorepeat 2
 	endanim
-; 0xd1224
--- 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
--- a/gfx/pokemon/lickitung/anim.asm
+++ b/gfx/pokemon/lickitung/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 06
 	frame 3, 06
 	endanim
-; 0xd0ee5
--- 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
--- a/gfx/pokemon/lugia/anim.asm
+++ b/gfx/pokemon/lugia/anim.asm
@@ -5,4 +5,3 @@
 	frame 5, 14
 	frame 6, 11
 	endanim
-; 0xd1666
--- 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
--- a/gfx/pokemon/machamp/anim.asm
+++ b/gfx/pokemon/machamp/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 3
 	frame 7, 08
 	endanim
-; 0xd0c9d
--- 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
--- a/gfx/pokemon/machoke/anim.asm
+++ b/gfx/pokemon/machoke/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 40
 	frame 1, 10
 	endanim
-; 0xd0c8a
--- 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
--- a/gfx/pokemon/machop/anim.asm
+++ b/gfx/pokemon/machop/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 12
 	dorepeat 3
 	endanim
-; 0xd0c83
--- 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
--- a/gfx/pokemon/magby/anim.asm
+++ b/gfx/pokemon/magby/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 4, 16
 	endanim
-; 0xd15ed
--- 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
--- a/gfx/pokemon/magcargo/anim.asm
+++ b/gfx/pokemon/magcargo/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 1, 25
 	endanim
-; 0xd14e4
--- a/gfx/pokemon/magcargo/anim_idle.asm
+++ b/gfx/pokemon/magcargo/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 1, 60
 	endanim
-; 0xd20f0
--- a/gfx/pokemon/magikarp/anim.asm
+++ b/gfx/pokemon/magikarp/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 07
 	dorepeat 2
 	endanim
-; 0xd1002
--- 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
--- a/gfx/pokemon/magmar/anim.asm
+++ b/gfx/pokemon/magmar/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 07
 	dorepeat 2
 	endanim
-; 0xd0fd7
--- 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
--- a/gfx/pokemon/magnemite/anim.asm
+++ b/gfx/pokemon/magnemite/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	dorepeat 1
 	endanim
-; 0xd0d5c
--- 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
--- a/gfx/pokemon/magneton/anim.asm
+++ b/gfx/pokemon/magneton/anim.asm
@@ -9,4 +9,3 @@
 	frame 2, 04
 	frame 3, 04
 	endanim
-; 0xd0d71
--- 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
--- a/gfx/pokemon/mankey/anim.asm
+++ b/gfx/pokemon/mankey/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 08
 	dorepeat 2
 	endanim
-; 0xd0bff
--- 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
--- a/gfx/pokemon/mantine/anim.asm
+++ b/gfx/pokemon/mantine/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 15
 	frame 5, 15
 	endanim
-; 0xd1539
--- 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
--- a/gfx/pokemon/mareep/anim.asm
+++ b/gfx/pokemon/mareep/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 06
 	dorepeat 4
 	endanim
-; 0xd12dc
--- 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
--- a/gfx/pokemon/marill/anim.asm
+++ b/gfx/pokemon/marill/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 10
 	dorepeat 4
 	endanim
-; 0xd131a
--- 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
--- a/gfx/pokemon/marowak/anim.asm
+++ b/gfx/pokemon/marowak/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 07
 	dorepeat 5
 	endanim
-; 0xd0eb0
--- 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
--- a/gfx/pokemon/meganium/anim.asm
+++ b/gfx/pokemon/meganium/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 07
 	dorepeat 6
 	endanim
-; 0xd117f
--- 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
--- a/gfx/pokemon/meowth/anim.asm
+++ b/gfx/pokemon/meowth/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 14
 	dorepeat 2
 	endanim
-; 0xd0bbf
--- 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
--- a/gfx/pokemon/metapod/anim.asm
+++ b/gfx/pokemon/metapod/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 24
 	frame 1, 12
 	endanim
-; 0xd091c
--- 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
--- a/gfx/pokemon/mew/anim.asm
+++ b/gfx/pokemon/mew/anim.asm
@@ -15,4 +15,3 @@
 	frame 0, 15
 	frame 4, 15
 	endanim
-; 0xd1154
--- 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
--- a/gfx/pokemon/mewtwo/anim.asm
+++ b/gfx/pokemon/mewtwo/anim.asm
@@ -14,4 +14,3 @@
 	frame 5, 14
 	frame 3, 04
 	endanim
-; 0xd1133
--- 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
--- a/gfx/pokemon/miltank/anim.asm
+++ b/gfx/pokemon/miltank/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 3, 05
 	endanim
-; 0xd15fa
--- 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
--- a/gfx/pokemon/misdreavus/anim.asm
+++ b/gfx/pokemon/misdreavus/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 13
 	frame 3, 13
 	endanim
-; 0xd13e9
--- 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
--- a/gfx/pokemon/moltres/anim.asm
+++ b/gfx/pokemon/moltres/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 12
 	frame 1, 12
 	endanim
-; 0xd10e3
--- 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
--- 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
--- 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
--- a/gfx/pokemon/muk/anim.asm
+++ b/gfx/pokemon/muk/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 12
 	frame 1, 12
 	endanim
-; 0xd0dbc
--- 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
--- a/gfx/pokemon/murkrow/anim.asm
+++ b/gfx/pokemon/murkrow/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 07
 	frame 1, 07
 	endanim
-; 0xd13cf
--- 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
--- a/gfx/pokemon/natu/anim.asm
+++ b/gfx/pokemon/natu/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 25
 	frame 2, 10
 	endanim
-; 0xd12bc
--- a/gfx/pokemon/natu/anim_idle.asm
+++ b/gfx/pokemon/natu/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 4, 35
 	endanim
-; 0xd1f86
--- a/gfx/pokemon/nidoking/anim.asm
+++ b/gfx/pokemon/nidoking/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 36
 	frame 1, 12
 	endanim
-; 0xd0a8f
--- 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
--- a/gfx/pokemon/nidoqueen/anim.asm
+++ b/gfx/pokemon/nidoqueen/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 10
 	frame 5, 10
 	endanim
-; 0xd0a64
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/gfx/pokemon/nidorina/anim.asm
+++ b/gfx/pokemon/nidorina/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 06
 	dorepeat 2
 	endanim
-; 0xd0a53
--- 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
--- a/gfx/pokemon/nidorino/anim.asm
+++ b/gfx/pokemon/nidorino/anim.asm
@@ -9,4 +9,3 @@
 	frame 3, 06
 	dorepeat 6
 	endanim
-; 0xd0a86
--- 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
--- a/gfx/pokemon/ninetales/anim.asm
+++ b/gfx/pokemon/ninetales/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 10
 	frame 1, 08
 	endanim
-; 0xd0acb
--- 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
--- a/gfx/pokemon/noctowl/anim.asm
+++ b/gfx/pokemon/noctowl/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 06
 	dorepeat 5
 	endanim
-; 0xd1219
--- 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
--- a/gfx/pokemon/octillery/anim.asm
+++ b/gfx/pokemon/octillery/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 05
 	dorepeat 3
 	endanim
-; 0xd1515
--- 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
--- a/gfx/pokemon/oddish/anim.asm
+++ b/gfx/pokemon/oddish/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 07
 	dorepeat 6
 	endanim
-; 0xd0b20
--- 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
--- a/gfx/pokemon/omanyte/anim.asm
+++ b/gfx/pokemon/omanyte/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 22
 	frame 1, 08
 	endanim
-; 0xd1075
--- 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
--- a/gfx/pokemon/omastar/anim.asm
+++ b/gfx/pokemon/omastar/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 40
 	frame 1, 06
 	endanim
-; 0xd107c
--- 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
--- a/gfx/pokemon/onix/anim.asm
+++ b/gfx/pokemon/onix/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 12
 	frame 6, 12
 	endanim
-; 0xd0e08
--- 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
--- a/gfx/pokemon/paras/anim.asm
+++ b/gfx/pokemon/paras/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 32
 	frame 1, 08
 	endanim
-; 0xd0b4f
--- 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
--- a/gfx/pokemon/parasect/anim.asm
+++ b/gfx/pokemon/parasect/anim.asm
@@ -10,4 +10,3 @@
 	frame 4, 04
 	dorepeat 8
 	endanim
-; 0xd0b66
--- 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
--- a/gfx/pokemon/persian/anim.asm
+++ b/gfx/pokemon/persian/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 08
 	frame 2, 06
 	endanim
-; 0xd0bd0
--- 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
--- a/gfx/pokemon/phanpy/anim.asm
+++ b/gfx/pokemon/phanpy/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 05
 	dorepeat 3
 	endanim
-; 0xd157e
--- 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
--- a/gfx/pokemon/pichu/anim.asm
+++ b/gfx/pokemon/pichu/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 12
 	frame 4, 08
 	endanim
-; 0xd1289
--- 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
--- a/gfx/pokemon/pidgeot/anim.asm
+++ b/gfx/pokemon/pidgeot/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 06
 	dorepeat 3
 	endanim
-; 0xd0987
--- 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
--- a/gfx/pokemon/pidgeotto/anim.asm
+++ b/gfx/pokemon/pidgeotto/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 5
 	frame 2, 20
 	endanim
-; 0xd097a
--- 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
--- a/gfx/pokemon/pidgey/anim.asm
+++ b/gfx/pokemon/pidgey/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 03
 	dorepeat 4
 	endanim
-; 0xd0967
--- 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
--- a/gfx/pokemon/pikachu/anim.asm
+++ b/gfx/pokemon/pikachu/anim.asm
@@ -9,4 +9,3 @@
 	frame 4, 05
 	dorepeat 7
 	endanim
-; 0xd0a02
--- 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
--- a/gfx/pokemon/piloswine/anim.asm
+++ b/gfx/pokemon/piloswine/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 10
 	frame 3, 10
 	endanim
-; 0xd14f6
--- 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
--- a/gfx/pokemon/pineco/anim.asm
+++ b/gfx/pokemon/pineco/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 06
 	frame 2, 18
 	endanim
-; 0xd1421
--- 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
--- a/gfx/pokemon/pinsir/anim.asm
+++ b/gfx/pokemon/pinsir/anim.asm
@@ -5,4 +5,3 @@
 	frame 4, 12
 	dorepeat 3
 	endanim
-; 0xd0fe4
--- 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
--- a/gfx/pokemon/politoed/anim.asm
+++ b/gfx/pokemon/politoed/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 1, 08
 	endanim
-; 0xd1345
--- 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
--- a/gfx/pokemon/poliwag/anim.asm
+++ b/gfx/pokemon/poliwag/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 08
 	dorepeat 3
 	endanim
-; 0xd0c33
--- 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
--- a/gfx/pokemon/poliwhirl/anim.asm
+++ b/gfx/pokemon/poliwhirl/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 16
 	endanim
-; 0xd0c42
--- 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
--- a/gfx/pokemon/poliwrath/anim.asm
+++ b/gfx/pokemon/poliwrath/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 08
 	dorepeat 3
 	endanim
-; 0xd0c4f
--- 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
--- a/gfx/pokemon/ponyta/anim.asm
+++ b/gfx/pokemon/ponyta/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 06
 	frame 3, 06
 	endanim
-; 0xd0d18
--- 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
--- a/gfx/pokemon/porygon/anim.asm
+++ b/gfx/pokemon/porygon/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 06
 	frame 1, 06
 	endanim
-; 0xd106e
--- 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
--- a/gfx/pokemon/porygon2/anim.asm
+++ b/gfx/pokemon/porygon2/anim.asm
@@ -4,4 +4,3 @@
 	frame 0, 06
 	dorepeat 1
 	endanim
-; 0xd1592
--- a/gfx/pokemon/porygon2/anim_idle.asm
+++ b/gfx/pokemon/porygon2/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 3, 30
 	endanim
-; 0xd216c
--- a/gfx/pokemon/primeape/anim.asm
+++ b/gfx/pokemon/primeape/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 05
 	frame 3, 25
 	endanim
-; 0xd0c0c
--- 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
--- a/gfx/pokemon/psyduck/anim.asm
+++ b/gfx/pokemon/psyduck/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 14
 	dorepeat 3
 	endanim
-; 0xd0bdd
--- 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
--- a/gfx/pokemon/pupitar/anim.asm
+++ b/gfx/pokemon/pupitar/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 04
 	dorepeat 2
 	endanim
-; 0xd164a
--- 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
--- a/gfx/pokemon/quagsire/anim.asm
+++ b/gfx/pokemon/quagsire/anim.asm
@@ -3,4 +3,3 @@
 	frame 3, 09
 	frame 4, 09
 	endanim
-; 0xd13a0
--- 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
--- a/gfx/pokemon/quilava/anim.asm
+++ b/gfx/pokemon/quilava/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 10
 	frame 4, 08
 	endanim
-; 0xd11a3
--- 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
--- a/gfx/pokemon/qwilfish/anim.asm
+++ b/gfx/pokemon/qwilfish/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 11
 	dorepeat 3
 	endanim
-; 0xd147c
--- 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
--- a/gfx/pokemon/raichu/anim.asm
+++ b/gfx/pokemon/raichu/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 10
 	frame 1, 08
 	endanim
-; 0xd0a0f
--- 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
--- a/gfx/pokemon/raikou/anim.asm
+++ b/gfx/pokemon/raikou/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 2
 	frame 2, 35
 	endanim
-; 0xd1614
--- 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
--- a/gfx/pokemon/rapidash/anim.asm
+++ b/gfx/pokemon/rapidash/anim.asm
@@ -11,4 +11,3 @@
 	frame 3, 12
 	dorepeat 9
 	endanim
-; 0xd0d31
--- 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
--- a/gfx/pokemon/raticate/anim.asm
+++ b/gfx/pokemon/raticate/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 04
 	dorepeat 2
 	endanim
-; 0xd09a3
--- 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
--- a/gfx/pokemon/rattata/anim.asm
+++ b/gfx/pokemon/rattata/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 5
 	endanim
-; 0xd0998
--- 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
--- a/gfx/pokemon/remoraid/anim.asm
+++ b/gfx/pokemon/remoraid/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 10
 	frame 3, 10
 	endanim
-; 0xd1508
--- 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
--- a/gfx/pokemon/rhydon/anim.asm
+++ b/gfx/pokemon/rhydon/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 02
 	dorepeat 5
 	endanim
-; 0xd0f15
--- 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
--- a/gfx/pokemon/rhyhorn/anim.asm
+++ b/gfx/pokemon/rhyhorn/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 13
 	frame 1, 40
 	endanim
-; 0xd0f04
--- 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
--- a/gfx/pokemon/sandshrew/anim.asm
+++ b/gfx/pokemon/sandshrew/anim.asm
@@ -10,4 +10,3 @@
 	frame 4, 05
 	dorepeat 8
 	endanim
-; 0xd0a26
--- 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
--- a/gfx/pokemon/sandslash/anim.asm
+++ b/gfx/pokemon/sandslash/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 07
 	frame 2, 08
 	endanim
-; 0xd0a37
--- 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
--- a/gfx/pokemon/scizor/anim.asm
+++ b/gfx/pokemon/scizor/anim.asm
@@ -7,4 +7,3 @@
 	dorepeat 3
 	frame 6, 18
 	endanim
-; 0xd148d
--- 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
--- a/gfx/pokemon/scyther/anim.asm
+++ b/gfx/pokemon/scyther/anim.asm
@@ -6,4 +6,3 @@
 	frame 5, 04
 	dorepeat 4
 	endanim
-; 0xd0fa8
--- 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
--- a/gfx/pokemon/seadra/anim.asm
+++ b/gfx/pokemon/seadra/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 10
 	dorepeat 1
 	endanim
-; 0xd0f54
--- 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
--- a/gfx/pokemon/seaking/anim.asm
+++ b/gfx/pokemon/seaking/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 12
 	dorepeat 1
 	endanim
-; 0xd0f6c
--- 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
--- a/gfx/pokemon/seel/anim.asm
+++ b/gfx/pokemon/seel/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 10
 	dorepeat 3
 	endanim
-; 0xd0d9f
--- 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
--- a/gfx/pokemon/sentret/anim.asm
+++ b/gfx/pokemon/sentret/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 15
 	dorepeat 1
 	endanim
-; 0xd11e6
--- 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
--- a/gfx/pokemon/shellder/anim.asm
+++ b/gfx/pokemon/shellder/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd0dc5
--- 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
--- a/gfx/pokemon/shuckle/anim.asm
+++ b/gfx/pokemon/shuckle/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 05
 	dorepeat 5
 	endanim
-; 0xd149e
--- 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
--- a/gfx/pokemon/skarmory/anim.asm
+++ b/gfx/pokemon/skarmory/anim.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 1, 08
 	endanim
-; 0xd1544
--- 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
--- a/gfx/pokemon/skiploom/anim.asm
+++ b/gfx/pokemon/skiploom/anim.asm
@@ -3,4 +3,3 @@
 	frame 2, 14
 	frame 3, 14
 	endanim
-; 0xd1357
--- 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
--- a/gfx/pokemon/slowbro/anim.asm
+++ b/gfx/pokemon/slowbro/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 10
 	frame 4, 10
 	endanim
-; 0xd0d4f
--- 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
--- a/gfx/pokemon/slowking/anim.asm
+++ b/gfx/pokemon/slowking/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 06
 	dorepeat 6
 	endanim
-; 0xd13e2
--- 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
--- a/gfx/pokemon/slowpoke/anim.asm
+++ b/gfx/pokemon/slowpoke/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 28
 	frame 1, 10
 	endanim
-; 0xd0d38
--- a/gfx/pokemon/slowpoke/anim_idle.asm
+++ b/gfx/pokemon/slowpoke/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 3, 20
 	endanim
-; 0xd1bd0
--- a/gfx/pokemon/slugma/anim.asm
+++ b/gfx/pokemon/slugma/anim.asm
@@ -7,4 +7,3 @@
 	frame 8, 06
 	frame 0, 14
 	endanim
-; 0xd14d9
--- 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
--- a/gfx/pokemon/smeargle/anim.asm
+++ b/gfx/pokemon/smeargle/anim.asm
@@ -4,4 +4,3 @@
 	frame 1, 07
 	dorepeat 1
 	endanim
-; 0xd15ac
--- 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
--- a/gfx/pokemon/smoochum/anim.asm
+++ b/gfx/pokemon/smoochum/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 08
 	frame 3, 24
 	endanim
-; 0xd15cd
--- 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
--- a/gfx/pokemon/sneasel/anim.asm
+++ b/gfx/pokemon/sneasel/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 04
 	frame 2, 30
 	endanim
-; 0xd14aa
--- 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
--- a/gfx/pokemon/snorlax/anim.asm
+++ b/gfx/pokemon/snorlax/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 09
 	dorepeat 5
 	endanim
-; 0xd10b2
--- 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
--- a/gfx/pokemon/snubbull/anim.asm
+++ b/gfx/pokemon/snubbull/anim.asm
@@ -8,4 +8,3 @@
 	frame 0, 08
 	dorepeat 6
 	endanim
-; 0xd1462
--- 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
--- a/gfx/pokemon/spearow/anim.asm
+++ b/gfx/pokemon/spearow/anim.asm
@@ -8,4 +8,3 @@
 	frame 4, 04
 	dorepeat 6
 	endanim
-; 0xd09b6
--- 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
--- a/gfx/pokemon/spinarak/anim.asm
+++ b/gfx/pokemon/spinarak/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 05
 	dorepeat 3
 	endanim
-; 0xd1240
--- 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
--- a/gfx/pokemon/squirtle/anim.asm
+++ b/gfx/pokemon/squirtle/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 15
 	frame 4, 05
 	endanim
-; 0xd08f2
--- 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
--- a/gfx/pokemon/stantler/anim.asm
+++ b/gfx/pokemon/stantler/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 08
 	frame 2, 08
 	endanim
-; 0xd15a1
--- 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
--- a/gfx/pokemon/starmie/anim.asm
+++ b/gfx/pokemon/starmie/anim.asm
@@ -5,4 +5,3 @@
 	frame 2, 07
 	frame 3, 07
 	endanim
-; 0xd0f86
--- 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
--- a/gfx/pokemon/staryu/anim.asm
+++ b/gfx/pokemon/staryu/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 04
 	frame 2, 04
 	endanim
-; 0xd0f79
--- 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
--- a/gfx/pokemon/steelix/anim.asm
+++ b/gfx/pokemon/steelix/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 08
 	frame 1, 06
 	endanim
-; 0xd144f
--- 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
--- a/gfx/pokemon/sudowoodo/anim.asm
+++ b/gfx/pokemon/sudowoodo/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 10
 	dorepeat 1
 	endanim
-; 0xd1336
--- 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
--- a/gfx/pokemon/suicune/anim.asm
+++ b/gfx/pokemon/suicune/anim.asm
@@ -10,4 +10,3 @@
 	frame 0, 03
 	dorepeat 6
 	endanim
-; 0xd1634
--- 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
--- a/gfx/pokemon/sunflora/anim.asm
+++ b/gfx/pokemon/sunflora/anim.asm
@@ -2,4 +2,3 @@
 	frame 2, 06
 	frame 3, 16
 	endanim
-; 0xd137b
--- 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
--- a/gfx/pokemon/sunkern/anim.asm
+++ b/gfx/pokemon/sunkern/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 04
 	dorepeat 2
 	endanim
-; 0xd1374
--- 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
--- a/gfx/pokemon/swinub/anim.asm
+++ b/gfx/pokemon/swinub/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 09
 	dorepeat 2
 	endanim
-; 0xd14ef
--- 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
--- a/gfx/pokemon/tangela/anim.asm
+++ b/gfx/pokemon/tangela/anim.asm
@@ -2,4 +2,3 @@
 	frame 0, 24
 	frame 2, 10
 	endanim
-; 0xd0f2d
--- 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
--- a/gfx/pokemon/tauros/anim.asm
+++ b/gfx/pokemon/tauros/anim.asm
@@ -8,4 +8,3 @@
 	dorepeat 5
 	frame 1, 07
 	endanim
-; 0xd0ff7
--- 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
--- a/gfx/pokemon/teddiursa/anim.asm
+++ b/gfx/pokemon/teddiursa/anim.asm
@@ -6,4 +6,3 @@
 	frame 3, 10
 	dorepeat 4
 	endanim
-; 0xd14b9
--- 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
--- a/gfx/pokemon/tentacool/anim.asm
+++ b/gfx/pokemon/tentacool/anim.asm
@@ -3,4 +3,3 @@
 	frame 4, 10
 	frame 5, 16
 	endanim
-; 0xd0cd3
--- 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
--- a/gfx/pokemon/tentacruel/anim.asm
+++ b/gfx/pokemon/tentacruel/anim.asm
@@ -4,4 +4,3 @@
 	dorepeat 1
 	frame 2, 08
 	endanim
-; 0xd0cde
--- 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
--- a/gfx/pokemon/togepi/anim.asm
+++ b/gfx/pokemon/togepi/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 06
 	frame 2, 06
 	endanim
-; 0xd12a6
--- 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
--- a/gfx/pokemon/togetic/anim.asm
+++ b/gfx/pokemon/togetic/anim.asm
@@ -5,4 +5,3 @@
 	frame 4, 09
 	dorepeat 3
 	endanim
-; 0xd12b3
--- 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
--- a/gfx/pokemon/totodile/anim.asm
+++ b/gfx/pokemon/totodile/anim.asm
@@ -7,4 +7,3 @@
 	frame 2, 10
 	dorepeat 5
 	endanim
-; 0xd11c7
--- 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
--- a/gfx/pokemon/typhlosion/anim.asm
+++ b/gfx/pokemon/typhlosion/anim.asm
@@ -8,4 +8,3 @@
 	frame 1, 03
 	dorepeat 6
 	endanim
-; 0xd11b6
--- 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
--- a/gfx/pokemon/tyranitar/anim.asm
+++ b/gfx/pokemon/tyranitar/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 16
 	frame 4, 16
 	endanim
-; 0xd1659
--- 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
--- a/gfx/pokemon/tyrogue/anim.asm
+++ b/gfx/pokemon/tyrogue/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 06
 	dorepeat 2
 	endanim
-; 0xd15b7
--- 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
--- a/gfx/pokemon/umbreon/anim.asm
+++ b/gfx/pokemon/umbreon/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 2, 30
 	endanim
-; 0xd13be
--- 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
--- a/gfx/pokemon/unown/anim.asm
+++ b/gfx/pokemon/unown/anim.asm
@@ -9,4 +9,3 @@
 	frame 9, 05
 	frame 10, 05
 	endanim
-; 0xd13fe
--- 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
--- a/gfx/pokemon/unown/bitmask.asm
+++ b/gfx/pokemon/unown/bitmask.asm
@@ -28,4 +28,3 @@
 	db %00010000
 	db %00000000
 	db %00000000
-; 0xd36ab
--- a/gfx/pokemon/unown/frames.asm
+++ b/gfx/pokemon/unown/frames.asm
@@ -42,4 +42,3 @@
 .frame11
 	db $05 ; bitmask
 	db $27
-; 0xd8e5e
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/gfx/pokemon/ursaring/anim.asm
+++ b/gfx/pokemon/ursaring/anim.asm
@@ -6,4 +6,3 @@
 	dorepeat 3
 	frame 1, 10
 	endanim
-; 0xd14c8
--- 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
--- a/gfx/pokemon/vaporeon/anim.asm
+++ b/gfx/pokemon/vaporeon/anim.asm
@@ -4,4 +4,3 @@
 	frame 2, 10
 	dorepeat 2
 	endanim
-; 0xd1043
--- 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
--- a/gfx/pokemon/venomoth/anim.asm
+++ b/gfx/pokemon/venomoth/anim.asm
@@ -3,4 +3,3 @@
 	frame 1, 06
 	dorepeat 1
 	endanim
-; 0xd0b8c
--- 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
--- a/gfx/pokemon/venonat/anim.asm
+++ b/gfx/pokemon/venonat/anim.asm
@@ -13,4 +13,3 @@
 	frame 0, 02
 	dorepeat 11
 	endanim
-; 0xd0b83
--- 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
--- a/gfx/pokemon/venusaur/anim.asm
+++ b/gfx/pokemon/venusaur/anim.asm
@@ -7,4 +7,3 @@
 	frame 5, 10
 	dorepeat 5
 	endanim
-; 0xd08b6
--- 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
--- a/gfx/pokemon/victreebel/anim.asm
+++ b/gfx/pokemon/victreebel/anim.asm
@@ -4,4 +4,3 @@
 	frame 4, 10
 	frame 5, 10
 	endanim
-; 0xd0cca
--- 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
--- a/gfx/pokemon/vileplume/anim.asm
+++ b/gfx/pokemon/vileplume/anim.asm
@@ -7,4 +7,3 @@
 	frame 0, 07
 	frame 1, 07
 	endanim
-; 0xd0b46
--- 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
--- a/gfx/pokemon/voltorb/anim.asm
+++ b/gfx/pokemon/voltorb/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 04
 	dorepeat 3
 	endanim
-; 0xd0e57
--- 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
--- a/gfx/pokemon/vulpix/anim.asm
+++ b/gfx/pokemon/vulpix/anim.asm
@@ -8,4 +8,3 @@
 	frame 3, 05
 	dorepeat 6
 	endanim
-; 0xd0aba
--- 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
--- a/gfx/pokemon/wartortle/anim.asm
+++ b/gfx/pokemon/wartortle/anim.asm
@@ -5,4 +5,3 @@
 	frame 1, 09
 	dorepeat 3
 	endanim
-; 0xd08ff
--- 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
--- a/gfx/pokemon/weedle/anim.asm
+++ b/gfx/pokemon/weedle/anim.asm
@@ -7,4 +7,3 @@
 	frame 3, 06
 	dorepeat 3
 	endanim
-; 0xd093a
--- 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
--- a/gfx/pokemon/weepinbell/anim.asm
+++ b/gfx/pokemon/weepinbell/anim.asm
@@ -5,4 +5,3 @@
 	dorepeat 1
 	frame 3, 12
 	endanim
-; 0xd0cbf
--- 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
--- a/gfx/pokemon/weezing/anim.asm
+++ b/gfx/pokemon/weezing/anim.asm
@@ -5,4 +5,3 @@
 	frame 4, 10
 	dorepeat 2
 	endanim
-; 0xd0efd
--- 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
--- a/gfx/pokemon/wigglytuff/anim.asm
+++ b/gfx/pokemon/wigglytuff/anim.asm
@@ -6,4 +6,3 @@
 	frame 0, 06
 	frame 2, 04
 	endanim
-; 0xd0aed
--- 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
--- a/gfx/pokemon/wobbuffet/anim.asm
+++ b/gfx/pokemon/wobbuffet/anim.asm
@@ -1,4 +1,3 @@
 	frame 1, 07
 	frame 2, 30
 	endanim
-; 0xd1403
--- a/gfx/pokemon/wobbuffet/anim_idle.asm
+++ b/gfx/pokemon/wobbuffet/anim_idle.asm
@@ -1,3 +1,2 @@
 	frame 0, 30
 	endanim
-; 0xd2069
--- a/gfx/pokemon/wooper/anim.asm
+++ b/gfx/pokemon/wooper/anim.asm
@@ -5,4 +5,3 @@
 	frame 0, 08
 	frame 4, 08
 	endanim
-; 0xd1397
--- 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
--- a/gfx/pokemon/xatu/anim.asm
+++ b/gfx/pokemon/xatu/anim.asm
@@ -7,4 +7,3 @@
 	frame 4, 12
 	dorepeat 5
 	endanim
-; 0xd12cd
--- 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
--- a/gfx/pokemon/yanma/anim.asm
+++ b/gfx/pokemon/yanma/anim.asm
@@ -6,4 +6,3 @@
 	frame 2, 03
 	dorepeat 4
 	endanim
-; 0xd138a
--- 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
--- a/gfx/pokemon/zapdos/anim.asm
+++ b/gfx/pokemon/zapdos/anim.asm
@@ -4,4 +4,3 @@
 	frame 3, 10
 	dorepeat 2
 	endanim
-; 0xd10cc
--- 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
--- a/gfx/pokemon/zubat/anim.asm
+++ b/gfx/pokemon/zubat/anim.asm
@@ -5,4 +5,3 @@
 	frame 3, 07
 	frame 0, 07
 	endanim
-; 0xd0afa
--- 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
--- a/gfx/sgb/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
@@ -13,7 +13,6 @@
 	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
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -16,7 +16,6 @@
 	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
 
@@ -79,7 +78,6 @@
 
 PalPacket_GamefreakLogo:
 	sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00
-
 
 PalPacket_9ce6:
 	sgb_pal01
--- 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"
--- a/gfx/tileset_palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@@ -9,141 +9,107 @@
 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
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -6,430 +6,332 @@
 
 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
--- a/home.asm
+++ b/home.asm
@@ -2,12 +2,11 @@
 
 
 SECTION "NULL", ROM0
+
 NULL::
 
-
 INCLUDE "home/rst.asm"
 
-
 INCLUDE "home/interrupts.asm"
 
 
@@ -43,7 +42,7 @@
 INCLUDE "home/game_time.asm"
 INCLUDE "home/map.asm"
 
-InexplicablyEmptyFunction:: ; 2d43
+InexplicablyEmptyFunction::
 ; unused
 ; Inexplicably empty.
 ; Seen in PredefPointers.
@@ -51,7 +50,6 @@
 	nop
 endr
 	ret
-; 2d54
 
 INCLUDE "home/farcall.asm"
 INCLUDE "home/predef.asm"
@@ -58,7 +56,7 @@
 INCLUDE "home/window.asm"
 INCLUDE "home/flag.asm"
 
-Unreferenced_Function2ebb:: ; 2ebb
+Unreferenced_Function2ebb::
 	ld a, [wMonStatusFlags]
 	bit 1, a
 	ret z
@@ -66,34 +64,29 @@
 	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
 
 INCLUDE "home/sprite_updates.asm"
 INCLUDE "home/string.asm"
 INCLUDE "home/region.asm"
 
-ret_2f3e:: ; 2f3e
+ret_2f3e::
 	ret
-; 2f3f
 
 INCLUDE "home/item.asm"
 INCLUDE "home/random.asm"
@@ -101,14 +94,12 @@
 
 ; Register aliases
 
-_hl_:: ; 2fec
+_hl_::
 	jp hl
-; 2fed
 
-_de_:: ; 2fed
+_de_::
 	push de
 	ret
-; 2fef
 
 INCLUDE "home/double_speed.asm"
 INCLUDE "home/clear_sprites.asm"
@@ -116,7 +107,7 @@
 INCLUDE "home/copy_tilemap.asm"
 INCLUDE "home/copy_name.asm"
 
-IsInArray:: ; 30e1
+IsInArray::
 ; Find value a for every de bytes in array hl.
 ; Return index in b and carry if found.
 
@@ -139,9 +130,8 @@
 .InArray:
 	scf
 	ret
-; 30f4
 
-SkipNames:: ; 0x30f4
+SkipNames::
 ; Skip a names.
 	ld bc, NAME_LENGTH
 	and a
@@ -151,12 +141,11 @@
 	dec a
 	jr nz, .loop
 	ret
-; 0x30fe
 
 INCLUDE "home/math.asm"
 INCLUDE "home/print_text.asm"
 
-CallPointerAt:: ; 31be
+CallPointerAt::
 	ld a, [hROMBank]
 	push af
 	ld a, [hli]
@@ -172,13 +161,12 @@
 	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
@@ -186,9 +174,8 @@
 	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
@@ -200,9 +187,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 0x31e4
 
-CompareLong:: ; 31e4
+CompareLong::
 ; Compare bc bytes at de and hl.
 ; Return carry if they all match.
 
@@ -224,12 +210,11 @@
 .Diff:
 	and a
 	ret
-; 31f3
 
 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
@@ -252,9 +237,8 @@
 	ld a, c
 	ld [wd265], a
 	ret
-; 0x3376
 
-GetWeekday:: ; 3376
+GetWeekday::
 	ld a, [wCurDay]
 .mod
 	sub 7
@@ -261,7 +245,6 @@
 	jr nc, .mod
 	add 7
 	ret
-; 3380
 
 INCLUDE "home/pokedex_flags.asm"
 INCLUDE "home/names.asm"
--- 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 @@
 	pop de
 	pop hl
 	ret
-; 3b6a
 
-
-UpdateSound:: ; 3b6a
-
+UpdateSound::
 	push hl
 	push de
 	push bc
@@ -51,13 +47,9 @@
 	pop de
 	pop hl
 	ret
-; 3b86
 
-
-_LoadMusicByte:: ; 3b86
+_LoadMusicByte::
 ; wCurMusicByte = [a:de]
-GLOBAL LoadMusicByte
-
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 
@@ -68,10 +60,8 @@
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 	ret
-; 3b97
 
-
-PlayMusic:: ; 3b97
+PlayMusic::
 ; Play music de.
 
 	push hl
@@ -104,10 +94,8 @@
 	pop de
 	pop hl
 	ret
-; 3bbc
 
-
-PlayMusic2:: ; 3bbc
+PlayMusic2::
 ; Stop playing music, then play music de.
 
 	push hl
@@ -138,10 +126,7 @@
 	pop hl
 	ret
 
-; 3be3
-
-
-PlayCry:: ; 3be3
+PlayCry::
 ; Play cry de.
 
 	push hl
@@ -191,10 +176,8 @@
 	pop de
 	pop hl
 	ret
-; 3c23
 
-
-PlaySFX:: ; 3c23
+PlaySFX::
 ; Play sound effect de.
 ; Sound effects are ordered by priority (highest to lowest)
 
@@ -233,17 +216,13 @@
 	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
@@ -264,9 +243,8 @@
 
 	pop hl
 	ret
-; 3c74
 
-IsSFXPlaying:: ; 3c74
+IsSFXPlaying::
 ; Return carry if no sound effect is playing.
 ; The inverse of CheckSFX.
 	push hl
@@ -292,39 +270,33 @@
 	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 @@
 	dec a
 	call UpdateSound
 	jr .loop
-; 3cbc
 
-FadeToMapMusic:: ; 3cbc
+FadeToMapMusic::
 	push hl
 	push de
 	push bc
@@ -360,9 +331,8 @@
 	pop de
 	pop hl
 	ret
-; 3cdf
 
-PlayMapMusic:: ; 3cdf
+PlayMapMusic::
 	push hl
 	push de
 	push bc
@@ -388,9 +358,8 @@
 	pop de
 	pop hl
 	ret
-; 3d03
 
-EnterMapMusic:: ; 3d03
+EnterMapMusic::
 	push hl
 	push de
 	push bc
@@ -419,9 +388,8 @@
 	pop de
 	pop hl
 	ret
-; 3d2f
 
-TryRestartMapMusic:: ; 3d2f
+TryRestartMapMusic::
 	ld a, [wDontPlayMapMusicOnReload]
 	and a
 	jr z, RestartMapMusic
@@ -433,9 +401,8 @@
 	xor a
 	ld [wDontPlayMapMusicOnReload], a
 	ret
-; 3d47
 
-RestartMapMusic:: ; 3d47
+RestartMapMusic::
 	push hl
 	push de
 	push bc
@@ -452,9 +419,8 @@
 	pop de
 	pop hl
 	ret
-; 3d62
 
-SpecialMapMusic:: ; 3d62
+SpecialMapMusic::
 	ld a, [wPlayerState]
 	cp PLAYER_SURF
 	jr z, .surf
@@ -493,16 +459,14 @@
 	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,9 +500,8 @@
 	ld [wVirtualOAMSprite38TileID], a
 	ld [wVirtualOAMSprite39TileID], a
 	ret
-; 3dde
 
-CheckSFX:: ; 3dde
+CheckSFX::
 ; Return carry if any SFX channels are active.
 	ld a, [wChannel5Flags1]
 	bit 0, a
@@ -557,9 +520,8 @@
 .playing
 	scf
 	ret
-; 3dfe
 
-TerminateExpBarSound:: ; 3dfe
+TerminateExpBarSound::
 	xor a
 	ld [wChannel5Flags1], a
 	ld [wSoundInput], a
@@ -569,10 +531,8 @@
 	ld [rNR13], a
 	ld [rNR14], a
 	ret
-; 3e10
 
-
-ChannelsOff:: ; 3e10
+ChannelsOff::
 ; Quickly turn off music channels
 	xor a
 	ld [wChannel1Flags1], a
@@ -581,9 +541,8 @@
 	ld [wChannel4Flags1], a
 	ld [wSoundInput], a
 	ret
-; 3e21
 
-SFXChannelsOff:: ; 3e21
+SFXChannelsOff::
 ; Quickly turn off sound effect channels
 	xor a
 	ld [wChannel5Flags1], a
@@ -592,4 +551,3 @@
 	ld [wChannel8Flags1], a
 	ld [wSoundInput], a
 	ret
-; 3e32
--- 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 @@
 .ot
 	pop af
 	jr OTPartyAttr
-; 3951
 
-
-OpponentPartyAttr:: ; 3951
+OpponentPartyAttr::
 	push af
 	ld a, [hBattleTurn]
 	and a
@@ -21,10 +19,8 @@
 .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 @@
 	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 @@
 	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 @@
 	ld hl, wBattleMonLevel
 	ld bc, wBattleMonMaxHP - wBattleMonLevel
 	jp CopyBytes
-; 39b0
 
-UpdateEnemyMonInParty:: ; 39b0
+UpdateEnemyMonInParty::
 ; Update level, status, current HP
 
 ; No wildmons.
@@ -119,27 +104,21 @@
 	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 @@
 	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 @@
 	; 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 @@
 	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 @@
 	pop af
 	rst Bankswitch
 	ret
-; 3ae1
 
-GetBattleAnimPointer:: ; 3ae1
-
+GetBattleAnimPointer::
 	ld a, BANK(BattleAnimations)
 	rst Bankswitch
 
@@ -227,10 +194,8 @@
 	rst Bankswitch
 
 	ret
-; 3af0
 
-GetBattleAnimByte:: ; 3af0
-
+GetBattleAnimByte::
 	push hl
 	push de
 
@@ -258,4 +223,3 @@
 
 	ld a, [wBattleAnimByte]
 	ret
-; 3b0c
--- a/home/battle_vars.asm
+++ b/home/battle_vars.asm
@@ -1,12 +1,11 @@
-GetBattleVar:: ; 39e1
+GetBattleVar::
 ; Preserves hl.
 	push hl
 	call GetBattleVarAddr
 	pop hl
 	ret
-; 39e7
 
-GetBattleVarAddr:: ; 39e7
+GetBattleVarAddr::
 ; Get variable from pair a, depending on whose turn it is.
 ; There are 21 variable pairs.
 
@@ -110,4 +109,3 @@
 	dw wCurPlayerMove,             wCurEnemyMove
 	dw wLastPlayerCounterMove,     wLastEnemyCounterMove
 	dw wLastPlayerMove,            wLastEnemyMove
-; 3a90
--- a/home/clear_sprites.asm
+++ b/home/clear_sprites.asm
@@ -1,4 +1,4 @@
-ClearSprites:: ; 300b
+ClearSprites::
 ; Erase OAM data
 	ld hl, wVirtualOAM
 	ld b, wVirtualOAMEnd - wVirtualOAM
@@ -8,9 +8,8 @@
 	dec b
 	jr nz, .loop
 	ret
-; 3016
 
-HideSprites:: ; 3016
+HideSprites::
 ; Set all OAM y-positions to 160 to hide them offscreen
 	ld hl, wVirtualOAMSprite00YCoord
 	ld de, SPRITEOAMSTRUCT_LENGTH
@@ -22,4 +21,3 @@
 	dec b
 	jr nz, .loop
 	ret
-; 3026
--- 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 @@
 	homecall _Get2bpp
 
 	ret
-; ddc
 
-Get1bpp_2:: ; ddc
+Get1bpp_2::
 	ld a, [rLCDC]
 	bit rLCDC_ENABLE, a
 	jp z, Copy1bpp
@@ -19,9 +17,8 @@
 	homecall _Get1bpp
 
 	ret
-; def
 
-FarCopyBytesDouble_DoubleBankSwitch:: ; def
+FarCopyBytesDouble_DoubleBankSwitch::
 	ld [hBuffer], a
 	ld a, [hROMBank]
 	push af
@@ -33,9 +30,8 @@
 	pop af
 	rst Bankswitch
 	ret
-; dfd
 
-OldDMATransfer:: ; dfd
+OldDMATransfer::
 	dec c
 	ld a, [hBGMapMode]
 	push af
@@ -96,41 +92,29 @@
 	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 @@
 	call Request2bpp
 	call CloseSRAM
 	ret
-; e8d
 
-
-
-FarCopyBytes:: ; e8d
+FarCopyBytes::
 ; copy bc bytes from a:hl to de
 
 	ld [hBuffer], a
@@ -165,10 +146,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 
 	pop hl
 	jp FarCopyBytesDouble
-; fb6
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -1,4 +1,4 @@
-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
@@ -14,7 +14,7 @@
 	jr nz, .CopyByte
 	ret
 
-SwapBytes:: ; 0x3034
+SwapBytes::
 ; swap bc bytes between hl and de
 .Loop:
 	; stash [hl] away on the stack
@@ -37,7 +37,7 @@
 	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
@@ -51,7 +51,7 @@
 	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 @@
 	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 @@
 	pop af
 	rst Bankswitch
 	ret
-; 0x306b
 
-FarCopyWRAM:: ; 306b
+FarCopyWRAM::
 	ld [hBuffer], a
 	ld a, [rSVBK]
 	push af
@@ -104,9 +103,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 307b
 
-GetFarWRAMByte:: ; 307b
+GetFarWRAMByte::
 	ld [hBuffer], a
 	ld a, [rSVBK]
 	push af
@@ -118,9 +116,8 @@
 	ld [rSVBK], a
 	ld a, [hBuffer]
 	ret
-; 308d
 
-GetFarWRAMWord:: ; 308d
+GetFarWRAMWord::
 	ld [hBuffer], a
 	ld a, [rSVBK]
 	push af
@@ -132,4 +129,3 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 309d
--- a/home/copy_name.asm
+++ b/home/copy_name.asm
@@ -1,8 +1,8 @@
-CopyName1:: ; 30d6
+CopyName1::
 ; Copies the name from de to wStringBuffer2
 	ld hl, wStringBuffer2
 
-CopyName2:: ; 30d9
+CopyName2::
 ; Copies the name from de to hl
 .loop
 	ld a, [de]
@@ -11,4 +11,3 @@
 	cp "@"
 	jr nz, .loop
 	ret
-; 30e1
--- a/home/copy_tilemap.asm
+++ b/home/copy_tilemap.asm
@@ -1,4 +1,4 @@
-LoadTileMapToTempTileMap:: ; 309d
+LoadTileMapToTempTileMap::
 ; Load wTileMap into wTempTileMap
 	ld a, [rSVBK]
 	push af
@@ -11,9 +11,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 30b4
 
-Call_LoadTempTileMapToTileMap:: ; 30b4
+Call_LoadTempTileMapToTileMap::
 	xor a
 	ld [hBGMapMode], a
 	call LoadTempTileMapToTileMap
@@ -20,9 +19,8 @@
 	ld a, 1
 	ld [hBGMapMode], a
 	ret
-; 30bf
 
-LoadTempTileMapToTileMap:: ; 30bf
+LoadTempTileMapToTileMap::
 ; Load wTempTileMap into wTileMap
 	ld a, [rSVBK]
 	push af
@@ -35,4 +33,3 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 30d6
--- 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 @@
 	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 @@
 	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 @@
 	pop af
 	call _PlayMonCry
 	ret
-; 37e2
 
-_PlayMonCry:: ; 37e2
+_PlayMonCry::
 	push hl
 	push de
 	push bc
@@ -52,9 +48,8 @@
 	pop de
 	pop hl
 	ret
-; 37f3
 
-LoadCry:: ; 37f3
+LoadCry::
 ; Load cry bc.
 
 	call GetCryIndex
@@ -88,9 +83,8 @@
 	rst Bankswitch
 	and a
 	ret
-; 381e
 
-GetCryIndex:: ; 381e
+GetCryIndex::
 	and a
 	jr z, .no
 	cp NUM_POKEMON + 1
@@ -105,4 +99,3 @@
 .no
 	scf
 	ret
-; 382d
--- 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 @@
 	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 @@
 
 ; Additional parameters are read during command execution.
 
-
 ; Commands:
 
 LZ_LITERAL   EQU 0 << 5 ; Read literal data for n bytes.
@@ -40,7 +35,6 @@
 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_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 @@
 ; 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 @@
 	inc bc
 	jr .command
 
-
 .short
 	push af
 
@@ -125,7 +115,6 @@
 	; read at least 1 byte
 	inc c
 
-
 .command
 	; Increment loop counts.
 	; We bail the moment they hit 0.
@@ -144,7 +133,6 @@
 	cp LZ_ZERO
 	jr z, .Zero
 
-
 .Literal:
 ; Read literal data for bc bytes.
 .lloop
@@ -159,7 +147,6 @@
 	inc de
 	jr .lloop
 
-
 .Iter:
 ; Write the same byte for bc bytes.
 	ld a, [hli]
@@ -175,7 +162,6 @@
 	inc de
 	jr .iloop
 
-
 .Alt:
 ; Alternate two bytes for bc bytes.
 	dec c
@@ -205,7 +191,6 @@
 	inc hl
 	jr .Main
 
-
 .Zero:
 ; Write 0 for bc bytes.
 	xor a
@@ -221,7 +206,6 @@
 	inc de
 	jr .zloop
 
-
 .rewrite
 ; Repeat decompressed data from output.
 	push hl
@@ -275,7 +259,6 @@
 ; 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 @@
 	inc de
 	jr .Repeat
 
-
 .Flip:
 ; Copy bitflipped decompressed data for bc bytes.
 	dec c
@@ -315,7 +297,6 @@
 	inc de
 	jr .Flip
 
-
 .Reverse:
 ; Copy reversed decompressed data for bc bytes.
 	dec c
@@ -330,7 +311,6 @@
 	inc de
 	jr .Reverse
 
-
 .donerw
 	pop hl
 
@@ -340,4 +320,3 @@
 .next
 	inc hl
 	jp .Main
-; c2f
--- 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 @@
 	and a
 	jr nz, .halt
 	ret
-; 468
 
-
-DelayFrames:: ; 468
+DelayFrames::
 ; Wait c frames
 	call DelayFrame
 	dec c
 	jr nz, DelayFrames
 	ret
-; 46f
--- 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 @@
 	ld [rJOYP], a
 	stop ; rgbasm adds a nop after this instruction by default
 	ret
-; 300b
--- 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 @@
 	ld a, [hli]
 	ld [rOBP1], a
 	ret
-; 4a3
 
-
-RotateFourPalettesRight:: ; 4a3
+RotateFourPalettesRight::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -35,9 +32,8 @@
 	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 @@
 .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 @@
 	dec b
 	jr nz, RotatePalettesRight
 	ret
-; 4dd
 
-RotateFourPalettesLeft:: ; 4dd
+RotateFourPalettesLeft::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -79,9 +74,8 @@
 	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 @@
 .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 @@
 	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_14:: db %01000000, %01000000, %01000000
 
 IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
-; 547
--- 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 @@
 .de
 	push de
 	ret
-; 2d63
 
-
-FarCall_hl:: ; 2d63
+FarCall_hl::
 ; Call a:hl.
 ; Preserves other registers.
 
@@ -26,9 +24,8 @@
 	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 @@
 	ld a, [wFarCallBCBuffer + 1]
 	ld c, a
 	ret
-; 2d82
 
-FarJump_hl:: ; 2d82
+FarJump_hl::
 	jp hl
-; 2d83
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -1,19 +1,17 @@
-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 ROUTE
 	jr z, .outdoors
@@ -25,15 +23,13 @@
 	ld hl, wStatusFlags
 	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,10 +95,8 @@
 	and [hl]
 	ld [hl], a
 	ret
-; 0x2ead
 
-
-CheckReceivedDex:: ; 2ead
+CheckReceivedDex::
 	ld de, ENGINE_POKEDEX
 	ld b, CHECK_FLAG
 	farcall EngineFlagAction
@@ -109,4 +103,3 @@
 	ld a, c
 	and a
 	ret
-; 2ebb
--- 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 @@
 	ld [wGameTimeSeconds], a
 	ld [wGameTimeFrames], a
 	ret
-; 209e
 
-
-GameTimer:: ; 209e
-
+GameTimer::
 	nop
 
 	ld a, [rSVBK]
@@ -24,14 +21,11 @@
 	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
@@ -47,7 +41,6 @@
 	bit 0, [hl]
 	ret nz
 
-
 ; +1 frame
 	ld hl, wGameTimeFrames
 	ld a, [hl]
@@ -59,7 +52,6 @@
 	ld [hl], a
 	ret
 
-
 .second
 	xor a
 	ld [hl], a
@@ -75,7 +67,6 @@
 	ld [hl], a
 	ret
 
-
 .minute
 	xor a
 	ld [hl], a
@@ -91,7 +82,6 @@
 	ld [hl], a
 	ret
 
-
 .hour
 	xor a
 	ld [hl], a
@@ -103,7 +93,6 @@
 	ld l, a
 	inc hl
 
-
 ; Cap the timer after 1000 hours.
 	ld a, h
 	cp HIGH(1000)
@@ -121,7 +110,6 @@
 	ld [wGameTimeSeconds], a
 	ret
 
-
 .ok
 	ld a, h
 	ld [wGameTimeHours], a
@@ -128,4 +116,3 @@
 	ld a, l
 	ld [wGameTimeHours + 1], a
 	ret
-; 210f
--- 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 @@
 	ld [rSC], a
 
 	ret
-; 208a
--- 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 @@
 .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 @@
 	db WATERFALL
 	db WHIRLPOOL
 	db -1 ; end
-; 34f8
--- a/home/hp_pals.asm
+++ b/home/hp_pals.asm
@@ -1,11 +1,10 @@
-SetHPPal:: ; 334e
+SetHPPal::
 ; Set palette for hp bar pixel length e at hl.
 	call GetHPPal
 	ld [hl], d
 	ret
-; 3353
 
-GetHPPal:: ; 3353
+GetHPPal::
 ; Get palette for hp bar pixel length e in d.
 	ld d, HP_GREEN
 	ld a, e
@@ -16,4 +15,3 @@
 	ret nc
 	inc d ; HP_RED
 	ret
-; 335f
--- 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 @@
 	call DelayFrames
 
 	jr Init
-; 16e
 
-
-_Start:: ; 16e
+_Start::
 	cp $11
 	jr z, .cgb
 	xor a
@@ -33,11 +31,8 @@
 	ld [hCGB], a
 	ld a, $1
 	ld [hSystemBooted], a
-; 17d
 
-
-Init:: ; 17d
-
+Init::
 	di
 
 	xor a
@@ -102,7 +97,6 @@
 	call ClearSprites
 	call ClearsScratch
 
-
 	ld a, BANK(WriteOAMDMACodeToHRAM)
 	rst Bankswitch
 
@@ -172,10 +166,8 @@
 	xor a
 	ld [wMapMusic], a
 	jp GameInit
-; 245
 
-
-ClearVRAM:: ; 245
+ClearVRAM::
 ; Wipe VRAM banks 0 and 1
 
 	ld a, 1
@@ -190,9 +182,8 @@
 	xor a
 	call ByteFill
 	ret
-; 25a
 
-ClearWRAM:: ; 25a
+ClearWRAM::
 ; Wipe swappable WRAM banks (1-7)
 ; Assumes CGB or AGB
 
@@ -209,9 +200,8 @@
 	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 @@
 	call ByteFill
 	call CloseSRAM
 	ret
-; 283
--- 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 @@
 	pop de
 	pop hl
 	ret
-; 2f53
 
-TossItem:: ; 2f53
+TossItem::
 	push hl
 	push de
 	push bc
@@ -32,9 +30,8 @@
 	pop de
 	pop hl
 	ret
-; 2f66
 
-ReceiveItem:: ; 2f66
+ReceiveItem::
 	push bc
 	ld a, [hROMBank]
 	push af
@@ -52,9 +49,8 @@
 	rst Bankswitch
 	pop bc
 	ret
-; 2f79
 
-CheckItem:: ; 2f79
+CheckItem::
 	push hl
 	push de
 	push bc
@@ -72,4 +68,3 @@
 	pop de
 	pop hl
 	ret
-; 2f8c
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -1,12 +1,11 @@
-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
@@ -13,9 +12,8 @@
 ; 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 @@
 	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 @@
 	rst Bankswitch
 	jr .quit
 
-
 .updateauto
 ; An input of $ff will end the stream.
 	ld a, [hli]
@@ -232,10 +227,8 @@
 	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 @@
 	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 @@
 ; Back to normal input.
 	ld [wInputType], a
 	ret
-; a1b
 
-
-JoyTitleScreenInput:: ; a1b
+JoyTitleScreenInput::
 .loop
 
 	call DelayFrame
@@ -297,10 +286,8 @@
 .keycombo
 	scf
 	ret
-; a36
 
-
-JoyWaitAorB:: ; a36
+JoyWaitAorB::
 .loop
 	call DelayFrame
 	call GetJoypad
@@ -309,9 +296,8 @@
 	ret nz
 	call RTC
 	jr .loop
-; a46
 
-WaitButton:: ; a46
+WaitButton::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, 1
@@ -321,9 +307,8 @@
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; a57
 
-JoyTextDelay:: ; a57
+JoyTextDelay::
 	call GetJoypad
 	ld a, [hInMenu]
 	and a
@@ -351,9 +336,8 @@
 	ld a, 5
 	ld [wTextDelayFrames], a
 	ret
-; a80
 
-WaitPressAorB_BlinkCursor:: ; a80
+WaitPressAorB_BlinkCursor::
 	ld a, [hMapObjectIndexBuffer]
 	push af
 	ld a, [hObjectStructIndexBuffer]
@@ -379,9 +363,8 @@
 	pop af
 	ld [hMapObjectIndexBuffer], a
 	ret
-; aa5
 
-SimpleWaitPressAorB:: ; aa5
+SimpleWaitPressAorB::
 .loop
 	call JoyTextDelay
 	ld a, [hJoyLast]
@@ -388,9 +371,8 @@
 	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 @@
 .link
 	ld c, 65
 	jp DelayFrames
-; ac6
 
-.wait_input ; ac6
+.wait_input
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -432,9 +413,8 @@
 	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 @@
 .load_cursor_state
 	ldcoord_a 18, 17
 	ret
-; b06
 
-BlinkCursor:: ; b06
+BlinkCursor::
 	push bc
 	ld a, [hl]
 	ld b, a
@@ -491,4 +470,3 @@
 	ld a, "▼"
 	ld [hl], a
 	ret
-; b40
--- 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 @@
 	ld a, [wLYOverrides]
 	ld [$ff00+c], a
 	ret
-; 552
 
-
-LCD:: ; 552
+LCD::
 	push af
 	ld a, [hLCDCPointer]
 	and a
@@ -34,10 +31,8 @@
 .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 @@
 	ld a, b
 	ld [rIE], a
 	ret
-; 58a
 
-
-EnableLCD:: ; 58a
+EnableLCD::
 	ld a, [rLCDC]
 	set rLCDC_ENABLE, a
 	ld [rLCDC], a
 	ret
-; 591
--- 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 @@
 .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 @@
 	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 @@
 
 	pop bc
 	ret
-; 2173
 
-OverworldTextModeSwitch:: ; 2173
+OverworldTextModeSwitch::
 	call LoadMapPart
 	call FarCallSwapTextboxPalettes
 	ret
-; 217a
 
-LoadMapPart:: ; 217a
+LoadMapPart::
 	ld a, [hROMBank]
 	push af
 
@@ -121,9 +116,8 @@
 	pop af
 	rst Bankswitch
 	ret
-; 2198
 
-LoadMetatiles:: ; 2198
+LoadMetatiles::
 	; de <- wOverworldMapAnchor
 	ld a, [wOverworldMapAnchor]
 	ld e, a
@@ -210,9 +204,8 @@
 	dec b
 	jp nz, .row
 	ret
-; 222a
 
-ReturnToMapFromSubmenu:: ; 222a
+ReturnToMapFromSubmenu::
 	ld a, MAPSETUP_SUBMENU
 	ld [hMapEntryMethod], a
 	farcall RunMapSetupScript
@@ -219,9 +212,8 @@
 	xor a
 	ld [hMapEntryMethod], a
 	ret
-; 2238
 
-CheckWarpTile:: ; 2238
+CheckWarpTile::
 	call GetDestinationWarpNumber
 	ret nc
 
@@ -233,16 +225,14 @@
 	call CopyWarpData
 	scf
 	ret
-; 224a
 
-WarpCheck:: ; 224a
+WarpCheck::
 	call GetDestinationWarpNumber
 	ret nc
 	call CopyWarpData
 	ret
-; 2252
 
-GetDestinationWarpNumber:: ; 2252
+GetDestinationWarpNumber::
 	farcall CheckWarpCollision
 	ret nc
 
@@ -256,9 +246,8 @@
 	ld a, d
 	rst Bankswitch
 	ret
-; 2266
 
-.GetDestinationWarpNumber: ; 2266
+.GetDestinationWarpNumber:
 	ld a, [wPlayerStandingMapY]
 	sub 4
 	ld e, a
@@ -315,9 +304,8 @@
 	inc hl
 	scf
 	ret
-; 22a7
 
-CopyWarpData:: ; 22a7
+CopyWarpData::
 	ld a, [hROMBank]
 	push af
 
@@ -328,9 +316,8 @@
 	rst Bankswitch
 	scf
 	ret
-; 22b4
 
-.CopyWarpData: ; 22b4
+.CopyWarpData:
 	push bc
 	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
@@ -364,16 +351,14 @@
 	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 @@
 	ret z
 	cp GATE
 	ret
-; 2300
 
 ; unused
 	cp INDOOR
@@ -391,9 +375,8 @@
 	ret z
 	cp ENVIRONMENT_5
 	ret
-; 2309
 
-LoadMapAttributes:: ; 2309
+LoadMapAttributes::
 	call CopyMapPartialAndAttributes
 	call SwitchToMapScriptsBank
 	call ReadMapScripts
@@ -400,9 +383,8 @@
 	xor a ; do not skip object_events
 	call ReadMapEvents
 	ret
-; 2317
 
-LoadMapAttributes_SkipPeople:: ; 2317
+LoadMapAttributes_SkipPeople::
 	call CopyMapPartialAndAttributes
 	call SwitchToMapScriptsBank
 	call ReadMapScripts
@@ -409,9 +391,8 @@
 	ld a, TRUE ; skip object events
 	call ReadMapEvents
 	ret
-; 2326
 
-CopyMapPartialAndAttributes:: ; 2326
+CopyMapPartialAndAttributes::
 	call CopyMapPartial
 	call SwitchToMapAttributesBank
 	call GetMapAttributesPointer
@@ -418,9 +399,8 @@
 	call CopyMapAttributes
 	call GetMapConnections
 	ret
-; 2336
 
-ReadMapEvents:: ; 2336
+ReadMapEvents::
 	push af
 	ld hl, wMapEventsPointer
 	ld a, [hli]
@@ -438,9 +418,8 @@
 
 	call ReadObjectEvents
 	ret
-; 234f
 
-ReadMapScripts:: ; 234f
+ReadMapScripts::
 	ld hl, wMapScriptsPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -448,9 +427,8 @@
 	call ReadMapSceneScripts
 	call ReadMapCallbacks
 	ret
-; 235c
 
-CopyMapAttributes:: ; 235c
+CopyMapAttributes::
 	ld de, wMapAttributes
 	ld c, wMapAttributesEnd - wMapAttributes
 .loop
@@ -460,9 +438,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 2368
 
-GetMapConnections:: ; 2368
+GetMapConnections::
 	ld a, $ff
 	ld [wNorthConnectedMapGroup], a
 	ld [wSouthConnectedMapGroup], a
@@ -497,9 +474,8 @@
 .no_east
 
 	ret
-; 23a3
 
-GetMapConnection:: ; 23a3
+GetMapConnection::
 ; Load map connection struct at hl into de.
 	ld c, wSouthMapConnection - wNorthMapConnection
 .loop
@@ -509,9 +485,8 @@
 	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 @@
 	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 @@
 	ld bc, 3
 	call AddNTimes
 	ret
-; 23da
 
-ReadWarps:: ; 23da
+ReadWarps::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapWarpCount], a
@@ -559,9 +532,8 @@
 	ld bc, 5
 	call AddNTimes
 	ret
-; 23f1
 
-ReadCoordEvents:: ; 23f1
+ReadCoordEvents::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapCoordEventCount], a
@@ -577,9 +549,8 @@
 	ld bc, 8
 	call AddNTimes
 	ret
-; 2408
 
-ReadBGEvents:: ; 2408
+ReadBGEvents::
 	ld a, [hli]
 	ld c, a
 	ld [wCurrMapBGEventCount], a
@@ -595,9 +566,8 @@
 	ld bc, 5
 	call AddNTimes
 	ret
-; 241f
 
-ReadObjectEvents:: ; 241f
+ReadObjectEvents::
 	push hl
 	call ClearObjectStructs
 	pop de
@@ -641,9 +611,8 @@
 	ld h, d
 	ld l, e
 	ret
-; 2457
 
-CopyMapObjectEvents:: ; 2457
+CopyMapObjectEvents::
 	and a
 	ret z
 
@@ -668,9 +637,8 @@
 	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 @@
 	dec c
 	jr nz, .loop
 	ret
-; 248a
 
-RestoreFacingAfterWarp:: ; 248a
+RestoreFacingAfterWarp::
 	call GetMapScriptsBank
 	rst Bankswitch
 
@@ -719,7 +686,6 @@
 .skip
 	farcall GetCoordOfUpperLeftCorner
 	ret
-; 24ba
 
 .backup
 	ld a, [wPrevWarp]
@@ -729,9 +695,8 @@
 	ld a, [wPrevMapNumber]
 	ld [wBackupMapNumber], a
 	ret
-; 24cd
 
-LoadBlockData:: ; 24cd
+LoadBlockData::
 	ld hl, wOverworldMapBlocks
 	ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks
 	ld a, 0
@@ -741,9 +706,8 @@
 	ld a, MAPCALLBACK_TILES
 	call RunMapCallback
 	ret
-; 24e4
 
-ChangeMap:: ; 24e4
+ChangeMap::
 	ld a, [hROMBank]
 	push af
 
@@ -791,10 +755,8 @@
 	pop af
 	rst Bankswitch
 	ret
-; 2524
 
-FillMapConnections:: ; 2524
-
+FillMapConnections::
 ; North
 	ld a, [wNorthConnectedMapGroup]
 	cp $ff
@@ -889,11 +851,9 @@
 
 .Done:
 	ret
-; 25d3
 
 FillNorthConnectionStrip::
-FillSouthConnectionStrip:: ; 25d3
-
+FillSouthConnectionStrip::
 	ld c, 3
 .y
 	push de
@@ -925,11 +885,9 @@
 	dec c
 	jr nz, .y
 	ret
-; 25f6
 
 FillWestConnectionStrip::
-FillEastConnectionStrip:: ; 25f6
-
+FillEastConnectionStrip::
 .loop
 	ld a, [wMapWidth]
 	add 6
@@ -964,14 +922,12 @@
 	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,9 +941,8 @@
 
 	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
@@ -994,9 +949,8 @@
 	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 @@
 	pop af
 	rst Bankswitch
 	ret
-; 2653
 
-.FindCallback: ; 2653
+.FindCallback:
 	ld a, [wCurrMapCallbackCount]
 	ld c, a
 	and a
@@ -1046,9 +999,8 @@
 	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 @@
 	pop af
 	ld [wScriptMode], a
 	ret
-; 269a
 
-MapTextbox:: ; 269a
+MapTextbox::
 	ld a, [hROMBank]
 	push af
 
@@ -1087,9 +1038,8 @@
 	pop af
 	rst Bankswitch
 	ret
-; 26b7
 
-Call_a_de:: ; 26b7
+Call_a_de::
 ; Call a:de.
 
 	ld [hBuffer], a
@@ -1107,9 +1057,8 @@
 .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 @@
 	ld a, h
 	rst Bankswitch
 	ret
-; 26d4
 
-GetScriptByte:: ; 0x26d4
+GetScriptByte::
 ; Return byte at wScriptBank:wScriptPos in a.
 
 	push hl
@@ -1154,36 +1102,29 @@
 	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 @@
 	add hl, de
 	ld a, [hl]
 	ret
-; 2712
 
-MaskObject:: ; 2712
+MaskObject::
 	ld a, [hMapObjectIndexBuffer]
 	ld e, a
 	ld d, $0
@@ -1201,9 +1141,8 @@
 	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 @@
 	add hl, de
 	ld [hl], 0 ; unmasked
 	ret
-; 272a
 
-ScrollMapDown:: ; 272a
+ScrollMapDown::
 	hlcoord 0, 0
 	ld de, wBGMapBuffer
 	call BackupBGMapRow
@@ -1227,9 +1165,8 @@
 	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 @@
 	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 @@
 	ld a, $1
 	ld [hBGMapUpdate], a
 	ret
-; 2771
 
-ScrollMapRight:: ; 2771
+ScrollMapRight::
 	hlcoord 0, 0
 	ld de, wBGMapBuffer
 	call BackupBGMapColumn
@@ -1267,9 +1203,8 @@
 	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 @@
 	ld a, $1
 	ld [hBGMapUpdate], a
 	ret
-; 27b7
 
-BackupBGMapRow:: ; 27b7
+BackupBGMapRow::
 	ld c, 2 * SCREEN_WIDTH
 .loop
 	ld a, [hli]
@@ -1301,9 +1235,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 27c0
 
-BackupBGMapColumn:: ; 27c0
+BackupBGMapColumn::
 	ld c, SCREEN_HEIGHT
 .loop
 	ld a, [hli]
@@ -1322,9 +1255,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 27d3
 
-UpdateBGMapRow:: ; 27d3
+UpdateBGMapRow::
 	ld hl, wBGMapBufferPtrs
 	push de
 	call .iteration
@@ -1354,9 +1286,8 @@
 	ld a, SCREEN_WIDTH
 	ld [hBGMapTileCount], a
 	ret
-; 27f8
 
-UpdateBGMapColumn:: ; 27f8
+UpdateBGMapColumn::
 	ld hl, wBGMapBufferPtrs
 	ld c, SCREEN_HEIGHT
 .loop
@@ -1381,7 +1312,6 @@
 	ld a, SCREEN_HEIGHT
 	ld [hBGMapTileCount], a
 	ret
-; 2816
 
 Unreferenced_Function2816::
 	ld hl, wBGMapBuffer
@@ -1389,9 +1319,8 @@
 	xor a
 	call ByteFill
 	ret
-; 2821
 
-LoadTilesetGFX:: ; 2821
+LoadTilesetGFX::
 	ld hl, wTilesetAddress
 	ld a, [hli]
 	ld h, [hl]
@@ -1446,9 +1375,8 @@
 	xor a
 	ld [hTileAnimFrame], a
 	ret
-; 2879
 
-BufferScreen:: ; 2879
+BufferScreen::
 	ld hl, wOverworldMapAnchor
 	ld a, [hli]
 	ld h, [hl]
@@ -1475,9 +1403,8 @@
 	dec c
 	jr nz, .row
 	ret
-; 289d
 
-SaveScreen:: ; 289d
+SaveScreen::
 	ld hl, wOverworldMapAnchor
 	ld a, [hli]
 	ld h, [hl]
@@ -1524,7 +1451,7 @@
 	ld c, SCREEN_META_HEIGHT
 	jr SaveScreen_LoadNeighbor
 
-LoadNeighboringBlockData:: ; 28e3
+LoadNeighboringBlockData::
 	ld hl, wOverworldMapAnchor
 	ld a, [hli]
 	ld h, [hl]
@@ -1536,7 +1463,7 @@
 	ld b, SCREEN_META_WIDTH
 	ld c, SCREEN_META_HEIGHT
 
-SaveScreen_LoadNeighbor:: ; 28f7
+SaveScreen_LoadNeighbor::
 .row
 	push bc
 	push hl
@@ -1564,9 +1491,8 @@
 	dec c
 	jr nz, .row
 	ret
-; 2914
 
-GetMovementPermissions:: ; 2914
+GetMovementPermissions::
 	xor a
 	ld [wTilePermissions], a
 	call .LeftRight
@@ -1594,9 +1520,8 @@
 	or [hl]
 	ld [hl], a
 	ret
-; 2945
 
-.MovementPermissionsData: ; 2945
+.MovementPermissionsData:
 	db DOWN_MASK
 	db UP_MASK
 	db LEFT_MASK
@@ -1605,7 +1530,6 @@
 	db UP_MASK | RIGHT_MASK
 	db DOWN_MASK | LEFT_MASK
 	db UP_MASK | LEFT_MASK
-; 294d
 
 .UpDown:
 	ld a, [wPlayerStandingMapX]
@@ -1625,7 +1549,6 @@
 	ld [wTileUp], a
 	call .Up
 	ret
-; 296c
 
 .LeftRight:
 	ld a, [wPlayerStandingMapX]
@@ -1645,7 +1568,6 @@
 	ld [wTileRight], a
 	call .Right
 	ret
-; 298b
 
 .Down:
 	call .CheckHiNybble
@@ -1664,7 +1586,6 @@
 	or FACE_DOWN
 	ld [wTilePermissions], a
 	ret
-; 29a8
 
 .Up:
 	call .CheckHiNybble
@@ -1683,7 +1604,6 @@
 	or FACE_UP
 	ld [wTilePermissions], a
 	ret
-; 29c5
 
 .Right:
 	call .CheckHiNybble
@@ -1702,7 +1622,6 @@
 	or FACE_RIGHT
 	ld [wTilePermissions], a
 	ret
-; 29e2
 
 .Left:
 	call .CheckHiNybble
@@ -1721,17 +1640,15 @@
 	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 @@
 	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,9 +1725,8 @@
 .nope
 	ld a, -1
 	ret
-; 2a66
 
-GetBlockLocation:: ; 2a66
+GetBlockLocation::
 	ld a, [wMapWidth]
 	add 6
 	ld c, a
@@ -1839,9 +1754,8 @@
 	ld b, 0
 	add hl, bc
 	ret
-; 2a8b
 
-CheckFacingBGEvent:: ; 2a8b
+CheckFacingBGEvent::
 	call GetFacingTileCoord
 ; Load facing into b.
 	ld b, a
@@ -1866,9 +1780,8 @@
 	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 @@
 	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,9 +1890,8 @@
 	call CopyBytes
 	scf
 	ret
-; 2b29
 
-FadeToMenu:: ; 2b29
+FadeToMenu::
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardMenuHeader
@@ -1988,9 +1899,8 @@
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
-; 2b3c
 
-CloseSubmenu:: ; 2b3c
+CloseSubmenu::
 	call ClearBGPalettes
 	call ReloadTilesetAndPalettes
 	call UpdateSprites
@@ -1997,15 +1907,14 @@
 	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
@@ -2013,9 +1922,8 @@
 	farcall FadeInPalettes
 	call EnableSpriteUpdates
 	ret
-; 2b74
 
-ReturnToMapWithSpeechTextbox:: ; 0x2b74
+ReturnToMapWithSpeechTextbox::
 	push af
 	ld a, $1
 	ld [wSpriteUpdatesEnabled], a
@@ -2038,9 +1946,8 @@
 	ld [hMapAnims], a
 	pop af
 	ret
-; 0x2bae
 
-ReloadTilesetAndPalettes:: ; 2bae
+ReloadTilesetAndPalettes::
 	call DisableLCD
 	call ClearSprites
 	farcall RefreshSprites
@@ -2063,14 +1970,13 @@
 
 	call EnableLCD
 	ret
-; 2be5
 
-GetMapPointer:: ; 2be5
+GetMapPointer::
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-GetAnyMapPointer:: ; 0x2bed
+GetAnyMapPointer::
 ; Prior to calling this function, you must have switched banks so that
 ; MapGroupPointers is visible.
 
@@ -2100,9 +2006,8 @@
 	ld a, 9
 	call AddNTimes
 	ret
-; 0x2c04
 
-GetMapField:: ; 0x2c04
+GetMapField::
 ; Extract data from the current map's group entry.
 
 ; inputs:
@@ -2116,7 +2021,7 @@
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-GetAnyMapField:: ; 0x2c0c
+GetAnyMapField::
 	; bankswitch
 	ld a, [hROMBank]
 	push af
@@ -2133,25 +2038,23 @@
 	pop af
 	rst Bankswitch
 	ret
-; 0x2c1c
 
-SwitchToMapAttributesBank:: ; 2c1c
+SwitchToMapAttributesBank::
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-SwitchToAnyMapAttributesBank:: ; 2c24
+SwitchToAnyMapAttributesBank::
 	call GetAnyMapAttributesBank
 	rst Bankswitch
 	ret
-; 2c29
 
-GetMapAttributesBank:: ; 2c29
+GetMapAttributesBank::
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-GetAnyMapAttributesBank:: ; 2c31
+GetAnyMapAttributesBank::
 	push hl
 	push de
 	ld de, MAP_MAPATTRIBUTES_BANK
@@ -2160,9 +2063,8 @@
 	pop de
 	pop hl
 	ret
-; 2c3d
 
-CopyMapPartial:: ; 2c3d
+CopyMapPartial::
 ; Copy map data bank, tileset, environment, and map data address
 ; from the current map's entry within its group.
 	ld a, [hROMBank]
@@ -2178,20 +2080,17 @@
 	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
@@ -2219,9 +2118,8 @@
 	pop de
 	pop hl
 	ret
-; 2c7d
 
-GetMapAttributesPointer:: ; 0x2c7d
+GetMapAttributesPointer::
 ; returns the current map's data pointer in hl.
 	push bc
 	push de
@@ -2232,9 +2130,8 @@
 	pop de
 	pop bc
 	ret
-; 2c8a
 
-GetMapEnvironment:: ; 2c8a
+GetMapEnvironment::
 	push hl
 	push de
 	push bc
@@ -2245,12 +2142,10 @@
 	pop de
 	pop hl
 	ret
-; 2c98
 
 	ret ; unused
-; 2c99
 
-GetAnyMapEnvironment:: ; 2c99
+GetAnyMapEnvironment::
 	push hl
 	push de
 	push bc
@@ -2261,16 +2156,14 @@
 	pop de
 	pop hl
 	ret
-; 2ca7
 
-GetAnyMapTileset:: ; 2ca7
+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
@@ -2284,9 +2177,8 @@
 	pop de
 	pop hl
 	ret
-; 0x2cbd
 
-GetMapMusic:: ; 2cbd
+GetMapMusic::
 	push hl
 	push bc
 	ld de, MAP_MUSIC
@@ -2329,22 +2221,19 @@
 .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
 
@@ -2355,9 +2244,8 @@
 	pop bc
 	pop hl
 	ret
-; 2d19
 
-GetFishingGroup:: ; 2d19
+GetFishingGroup::
 	push de
 	push hl
 	push bc
@@ -2370,9 +2258,8 @@
 	pop hl
 	pop de
 	ret
-; 2d27
 
-LoadTileset:: ; 2d27
+LoadTileset::
 	push hl
 	push bc
 
@@ -2390,4 +2277,3 @@
 	pop bc
 	pop hl
 	ret
-; 2d43
--- 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 @@
 	pop de
 	pop hl
 	ret
-; 180e
 
-GetSpriteVTile:: ; 180e
+GetSpriteVTile::
 	push hl
 	push bc
 	ld hl, wUsedSprites + 2
@@ -49,9 +48,8 @@
 	pop bc
 	pop hl
 	ret
-; 1836
 
-DoesSpriteHaveFacings:: ; 1836
+DoesSpriteHaveFacings::
 	push de
 	push hl
 
@@ -72,16 +70,14 @@
 	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
@@ -88,9 +84,8 @@
 	ret z
 	and a
 	ret
-; 185d
 
-GetTileCollision:: ; 185d
+GetTileCollision::
 ; Get the collision type of tile a.
 
 	push de
@@ -115,9 +110,8 @@
 	pop hl
 	pop de
 	ret
-; 1875
 
-CheckGrassTile:: ; 1875
+CheckGrassTile::
 	ld d, a
 	and $f0
 	cp HI_NYBBLE_TALL_GRASS
@@ -140,44 +134,38 @@
 	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
@@ -184,9 +172,8 @@
 	ret z
 	scf
 	ret
-; 18b4
 
-CheckWhirlpoolTile:: ; 18b4
+CheckWhirlpoolTile::
 	nop
 	cp COLL_WHIRLPOOL
 	ret z
@@ -194,16 +181,14 @@
 	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 @@
 	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 @@
 	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 @@
 .not_visible
 	scf
 	ret
-; 18f5
 
-CheckObjectTime:: ; 18f5
+CheckObjectTime::
 	ld hl, MAPOBJECT_HOUR
 	add hl, bc
 	ld a, [hl]
@@ -317,7 +299,6 @@
 .no
 	scf
 	ret
-; 194d
 
 ; unused
 	ld [hMapObjectIndexBuffer], a
@@ -324,9 +305,8 @@
 	call GetMapObject
 	call CopyObjectStruct
 	ret
-; 1956
 
-_CopyObjectStruct:: ; 1956
+_CopyObjectStruct::
 	ld [hMapObjectIndexBuffer], a
 	call UnmaskObject
 	ld a, [hMapObjectIndexBuffer]
@@ -333,9 +313,8 @@
 	call GetMapObject
 	farcall CopyObjectStruct
 	ret
-; 1967
 
-ApplyDeletionToMapObject:: ; 1967
+ApplyDeletionToMapObject::
 	ld [hMapObjectIndexBuffer], a
 	call GetMapObject
 	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
@@ -364,15 +343,13 @@
 	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
@@ -384,7 +361,6 @@
 	ld bc, OBJECT_LENGTH - 1
 	call CopyBytes
 	ret
-; 19b8
 
 Unreferenced_Function19b8:
 	call GetMapObject
@@ -414,9 +390,8 @@
 	call GetObjectStruct
 	farcall DeleteMapObject
 	ret
-; 19e9
 
-LoadMovementDataPointer:: ; 19e9
+LoadMovementDataPointer::
 ; Load the movement data pointer for object a.
 	ld [wMovementObject], a
 	ld a, [hROMBank]
@@ -441,9 +416,8 @@
 	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.
@@ -471,9 +445,8 @@
 	pop de
 	pop bc
 	ret
-; 1a2f
 
-GetSpriteMovementFunction:: ; 1a2f
+GetSpriteMovementFunction::
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, bc
 	ld a, [hl]
@@ -490,9 +463,8 @@
 endr
 	ld a, [hl]
 	ret
-; 1a47
 
-GetInitialFacing:: ; 1a47
+GetInitialFacing::
 	push bc
 	push de
 	ld e, a
@@ -509,9 +481,8 @@
 	pop de
 	pop bc
 	ret
-; 1a61
 
-CopySpriteMovementData:: ; 1a61
+CopySpriteMovementData::
 	ld l, a
 	ld a, [hROMBank]
 	push af
@@ -527,9 +498,8 @@
 	rst Bankswitch
 
 	ret
-; 1a71
 
-.CopyData: ; 1a71
+.CopyData:
 	ld hl, OBJECT_MOVEMENTTYPE
 	add hl, de
 	ld [hl], a
@@ -578,9 +548,8 @@
 	add hl, de
 	ld [hl], a
 	ret
-; 1aae
 
-_GetMovementByte:: ; 1aae
+_GetMovementByte::
 ; Switch to the movement data bank
 	ld a, [hROMBank]
 	push af
@@ -604,21 +573,18 @@
 
 	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
@@ -626,9 +592,8 @@
 	farcall Function55e0
 	farcall _UpdateSprites
 	ret
-; 1ae5
 
-GetObjectStruct:: ; 1ae5
+GetObjectStruct::
 	ld bc, OBJECT_STRUCT_LENGTH
 	ld hl, wObjectStructs
 	call AddNTimes
@@ -635,17 +600,15 @@
 	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
@@ -658,12 +621,10 @@
 	or e
 	ld [hl], a
 	ret
-; 1b07
 
-GetSpriteDirection:: ; 1b07
+GetSpriteDirection::
 	ld hl, OBJECT_FACING
 	add hl, bc
 	ld a, [hl]
 	maskbits NUM_DIRECTIONS, 2
 	ret
-; 1b0f
--- 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 @@
 	dec a
 	jr nz, .loop
 	ret
-; 0x3105
 
-SimpleMultiply:: ; 3105
+SimpleMultiply::
 ; Return a * c.
 	and a
 	ret z
@@ -23,10 +22,8 @@
 	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 @@
 	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 @@
 	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 @@
 	pop de
 	pop hl
 	ret
-; 3136
 
-
-SubtractSigned:: ; 3136
+SubtractSigned::
 ; Return a - b, sign in carry.
 	sub b
 	ret nc
@@ -75,4 +66,3 @@
 	add 1
 	scf
 	ret
-; 313d
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -1,6 +1,5 @@
 ; Functions used in displaying and handling menus.
 
-
 LoadMenuHeader::
 	call CopyMenuHeader
 	call PushWindow
@@ -13,61 +12,50 @@
 	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
+LoadMenuTextBox::
 	ld hl, .MenuHeader
 	call LoadMenuHeader
 	ret
-; 1d5f
 
-.MenuHeader: ; 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
 
-LoadStandardMenuHeader:: ; 1d6e
+LoadStandardMenuHeader::
 	ld hl, .MenuHeader
 	call LoadMenuHeader
 	ret
-; 1d75
 
-.MenuHeader: ; 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
@@ -92,15 +80,13 @@
 .okay
 	and a
 	ret
-; 0x1dab
 
-GetMenu2:: ; 1dab
+GetMenu2::
 	call LoadMenuHeader
 	call VerticalMenu
 	call CloseWindow
 	ld a, [wMenuCursorY]
 	ret
-; 1db8
 
 CopyNameFromMenu::
 	push hl
@@ -120,20 +106,18 @@
 	pop bc
 	pop hl
 	ret
-; 0x1dcf
 
-
-YesNoBox:: ; 1dcf
+YesNoBox::
 	lb bc, SCREEN_WIDTH - 6, 7
 
-PlaceYesNoBox:: ; 1dd2
+PlaceYesNoBox::
 	jr _YesNoBox
 
-PlaceGenericTwoOptionBox:: ; 1dd4
+PlaceGenericTwoOptionBox::
 	call LoadMenuHeader
 	jr InterpretTwoOptionMenu
 
-_YesNoBox:: ; 1dd9
+_YesNoBox::
 ; Return nc (yes) or c (no).
 	push bc
 	ld hl, YesNoMenuHeader
@@ -158,7 +142,7 @@
 	ld [wMenuBorderBottomCoord], a
 	call PushWindow
 
-InterpretTwoOptionMenu:: ; 1dfe
+InterpretTwoOptionMenu::
 	call VerticalMenu
 	push af
 	ld c, $f
@@ -177,29 +161,25 @@
 	ld [wMenuCursorY], a
 	scf
 	ret
-; 1e1d
 
-YesNoMenuHeader:: ; 1e1d
+YesNoMenuHeader::
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 5, 15, 9
 	dw .MenuData
 	db 1 ; default option
-; 1e25
 
-.MenuData: ; 1e25
+.MenuData:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
 	db 2
 	db "YES@"
 	db "NO@"
-; 1e2e
 
-OffsetMenuHeader:: ; 1e2e
+OffsetMenuHeader::
 	call _OffsetMenuHeader
 	call PushWindow
 	ret
-; 1e35
 
-_OffsetMenuHeader:: ; 1e35
+_OffsetMenuHeader::
 	push de
 	call CopyMenuHeader
 	pop de
@@ -222,9 +202,8 @@
 	add l
 	ld [wMenuBorderBottomCoord], a
 	ret
-; 1e5d
 
-DoNthMenu:: ; 1e5d
+DoNthMenu::
 	call DrawVariableLengthMenuBox
 	call MenuWriteText
 	call InitMenuCursorAndButtonPermissions
@@ -232,9 +211,8 @@
 	call GetMenuJoypad
 	call MenuClickSound
 	ret
-; 1e70
 
-SetUpMenu:: ; 1e70
+SetUpMenu::
 	call DrawVariableLengthMenuBox ; ???
 	call MenuWriteText
 	call InitMenuCursorAndButtonPermissions ; set up selection pointer
@@ -263,9 +241,8 @@
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; 0x1ea6
 
-AutomaticGetMenuBottomCoord:: ; 1ea6
+AutomaticGetMenuBottomCoord::
 	ld a, [wMenuBorderLeftCoord]
 	ld c, a
 	ld a, [wMenuBorderRightCoord]
@@ -279,9 +256,8 @@
 	add b
 	ld [wMenuBorderBottomCoord], a
 	ret
-; 1ebd
 
-GetMenuIndexSet:: ; 1ebd
+GetMenuIndexSet::
 	ld hl, wMenuDataIndicesPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -304,9 +280,8 @@
 	ld a, [hl]
 	ld [wMenuDataItems], a
 	ret
-; 1eda
 
-RunMenuItemPrintingFunction:: ; 1eda
+RunMenuItemPrintingFunction::
 	call MenuBoxCoord2Tile
 	ld bc, 2 * SCREEN_WIDTH + 2
 	add hl, bc
@@ -327,16 +302,14 @@
 	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, [wMenuDataFlags]
@@ -353,21 +326,17 @@
 
 .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,9 +387,8 @@
 	ld [wMenuSelection], a
 	scf
 	ret
-; 1f79
 
-PlaceMenuStrings:: ; 1f79
+PlaceMenuStrings::
 	push de
 	ld hl, wMenuDataPointerTableAddr
 	ld a, [hli]
@@ -433,9 +401,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 1f8d
 
-PlaceNthMenuStrings:: ; 1f8d
+PlaceNthMenuStrings::
 	push de
 	ld a, [wMenuSelection]
 	call GetMenuDataPointerTableEntry
@@ -447,9 +414,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 1f9e
 
-Unreferenced_Function1f9e:: ; 1f9e
+Unreferenced_Function1f9e::
 	call GetMenuDataPointerTableEntry
 	inc hl
 	inc hl
@@ -457,9 +423,8 @@
 	ld d, [hl]
 	ld e, a
 	ret
-; 1fa7
 
-MenuJumptable:: ; 1fa7
+MenuJumptable::
 	ld a, [wMenuSelection]
 	call GetMenuDataPointerTableEntry
 	ld a, [hli]
@@ -466,9 +431,8 @@
 	ld h, [hl]
 	ld l, a
 	jp hl
-; 1fb1
 
-GetMenuDataPointerTableEntry:: ; 1fb1
+GetMenuDataPointerTableEntry::
 	ld e, a
 	ld d, $0
 	ld hl, wMenuDataPointerTableAddr
@@ -480,9 +444,8 @@
 	add hl, de
 	add hl, de
 	ret
-; 1fbf
 
-ClearWindowData:: ; 1fbf
+ClearWindowData::
 	ld hl, wWindowStackPointer
 	call .bytefill
 	ld hl, wMenuHeader
@@ -509,16 +472,14 @@
 	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 @@
 .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 @@
 	rst Bankswitch
 
 	ret
-; 202a
 
-_2DMenu:: ; 202a
+_2DMenu::
 	ld a, [hROMBank]
 	ld [wMenuData_2DMenuItemStringsBank], a
 	farcall _2DMenu_
 	ld a, [wMenuCursorBuffer]
 	ret
-; 2039
 
-InterpretBattleMenu:: ; 2039
+InterpretBattleMenu::
 	ld a, [hROMBank]
 	ld [wMenuData_2DMenuItemStringsBank], a
 	farcall _InterpretBattleMenu
 	ld a, [wMenuCursorBuffer]
 	ret
-; 2048
 
-InterpretMobileMenu:: ; 2048
+InterpretMobileMenu::
 	ld a, [hROMBank]
 	ld [wMenuData_2DMenuItemStringsBank], a
 	farcall _InterpretMobileMenu
 	ld a, [wMenuCursorBuffer]
 	ret
-; 2057
--- a/home/menu_window.asm
+++ b/home/menu_window.asm
@@ -1,19 +1,18 @@
-PushWindow:: ; 1c00
+PushWindow::
 	callfar _PushWindow
 	ret
-; 1c07
 
-ExitMenu:: ; 0x1c07
+ExitMenu::
 	push af
 	callfar _ExitMenu
 	pop af
 	ret
 
-InitVerticalMenuCursor:: ; 0x1c10
+InitVerticalMenuCursor::
 	callfar _InitVerticalMenuCursor
 	ret
 
-CloseWindow:: ; 0x1c17
+CloseWindow::
 	push af
 	call ExitMenu
 	call ApplyTilemap
@@ -21,15 +20,14 @@
 	pop af
 	ret
 
-RestoreTileBackup:: ; 0x1c23
+RestoreTileBackup::
 	call MenuBoxCoord2Tile
 	call .copy
 	call MenuBoxCoord2Attr
 	call .copy
 	ret
-; 0x1c30
 
-.copy ; 0x1c30
+.copy
 	call GetMenuBoxDims
 	inc b
 	inc c
@@ -43,7 +41,7 @@
 	ld [hli], a
 	dec de
 	dec c
-	jr nz, .col ; 0x1c3b $fa
+	jr nz, .col
 
 	pop hl
 	ld bc, SCREEN_WIDTH
@@ -50,11 +48,11 @@
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .row ; 0x1c44 $ef
+	jr nz, .row
 
 	ret
 
-PopWindow:: ; 0x1c47
+PopWindow::
 	ld b, $10
 	ld de, wMenuFlags
 .loop
@@ -62,10 +60,10 @@
 	ld [de], a
 	inc de
 	dec b
-	jr nz, .loop ; 0x1c50 $fa
+	jr nz, .loop
 	ret
 
-GetMenuBoxDims:: ; 0x1c53
+GetMenuBoxDims::
 	ld a, [wMenuBorderTopCoord] ; top
 	ld b, a
 	ld a, [wMenuBorderBottomCoord] ; bottom
@@ -77,9 +75,8 @@
 	sub c
 	ld c, a
 	ret
-; 0x1c66
 
-CopyMenuData:: ; 1c66
+CopyMenuData::
 	push hl
 	push de
 	push bc
@@ -96,9 +93,8 @@
 	pop de
 	pop hl
 	ret
-; 1c7e
 
-GetWindowStackTop:: ; 1c7e
+GetWindowStackTop::
 	ld hl, wWindowStackPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -108,9 +104,8 @@
 	ld h, [hl]
 	ld l, a
 	ret
-; 1c89
 
-PlaceVerticalMenuItems:: ; 1c89
+PlaceVerticalMenuItems::
 	call CopyMenuData
 	ld hl, wMenuDataPointer
 	ld e, [hl]
@@ -143,17 +138,15 @@
 	ld b, $0
 	add hl, bc
 	jp PlaceString
-; 1cbb
 
-MenuBox:: ; 1cbb
+MenuBox::
 	call MenuBoxCoord2Tile
 	call GetMenuBoxDims
 	dec b
 	dec c
 	jp TextBox
-; 1cc6
 
-GetMenuTextStartCoord:: ; 1cc6
+GetMenuTextStartCoord::
 	ld a, [wMenuBorderTopCoord]
 	ld b, a
 	inc b
@@ -175,9 +168,8 @@
 
 .bit_7_clear
 	ret
-; 1ce1
 
-ClearMenuBoxInterior:: ; 1ce1
+ClearMenuBoxInterior::
 	call MenuBoxCoord2Tile
 	ld bc, SCREEN_WIDTH + 1
 	add hl, bc
@@ -186,9 +178,8 @@
 	dec c
 	call ClearBox
 	ret
-; 1cf1
 
-ClearWholeMenuBox:: ; 1cf1
+ClearWholeMenuBox::
 	call MenuBoxCoord2Tile
 	call GetMenuBoxDims
 	inc c
@@ -195,18 +186,14 @@
 	inc b
 	call ClearBox
 	ret
-; 1cfd
 
-
-MenuBoxCoord2Tile:: ; 1cfd
+MenuBoxCoord2Tile::
 	ld a, [wMenuBorderLeftCoord]
 	ld c, a
 	ld a, [wMenuBorderTopCoord]
 	ld b, a
-; 1d05
 
-
-Coord2Tile:: ; 1d05
+Coord2Tile::
 ; Return the address of wTileMap(c, b) in hl.
 	xor a
 	ld h, a
@@ -226,15 +213,14 @@
 	bccoord 0, 0
 	add hl, bc
 	ret
-; 1d19
 
-MenuBoxCoord2Attr:: ; 1d19
+MenuBoxCoord2Attr::
 	ld a, [wMenuBorderLeftCoord]
 	ld c, a
 	ld a, [wMenuBorderTopCoord]
 	ld b, a
 
-Coord2Attr:: ; 1d21
+Coord2Attr::
 ; Return the address of wAttrMap(c, b) in hl.
 	xor a
 	ld h, a
@@ -254,4 +240,3 @@
 	bccoord 0, 0, wAttrMap
 	add hl, bc
 	ret
-; 1d35
--- 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 @@
 	rst Bankswitch
 
 	jp Function110030
-; 3e60
 
-Function3e60:: ; 3e60
+Function3e60::
 ; Return from Function110030
 	ld [$c986], a
 	ld a, l
@@ -50,9 +49,8 @@
 	ld l, a
 	ld a, [$c986]
 	ret
-; 3e80
 
-MobileReceive:: ; 3e80
+MobileReceive::
 	ld a, [hROMBank]
 	push af
 	ld a, BANK(_MobileReceive)
@@ -66,10 +64,8 @@
 	rst Bankswitch
 
 	ret
-; 3e93
 
-
-Timer:: ; 3e93
+Timer::
 	push af
 	push bc
 	push de
@@ -125,9 +121,8 @@
 	pop bc
 	pop af
 	reti
-; 3ed7
 
-Unreferenced_Function3ed7:: ; 3ed7
+Unreferenced_Function3ed7::
 	ld [$dc02], a
 	ld a, [hROMBank]
 	push af
@@ -141,9 +136,8 @@
 
 	ld a, [$dc02]
 	ret
-; 3eea
 
-Function3eea:: ; 3eea
+Function3eea::
 	push hl
 	push bc
 	ld de, wAttrMap - wTileMap
@@ -157,9 +151,8 @@
 	pop hl
 	call MobileHome_PlaceBox
 	ret
-; 3efd
 
-Unreferenced_Function3efd:: ; 3efd
+Unreferenced_Function3efd::
 	push hl
 	hlcoord 0, 12
 	ld b, 4
@@ -168,7 +161,6 @@
 	pop hl
 	call PrintTextBoxText
 	ret
-; 3f0d
 
 .fill_attr
 	push hl
@@ -184,9 +176,8 @@
 	pop hl
 	call TextBoxBorder
 	ret
-; 3f20
 
-Function3f20:: ; 3f20
+Function3f20::
 	hlcoord 0, 0, wAttrMap
 	ld b,  6
 	ld c, 20
@@ -196,9 +187,8 @@
 	ld c, 18
 	call MobileHome_PlaceBox
 	ret
-; 3f35
 
-Function3f35:: ; 3f35
+Function3f35::
 	ld a, 6
 	ld de, SCREEN_WIDTH
 .row
@@ -214,9 +204,8 @@
 	dec b
 	jr nz, .row
 	ret
-; 3f47
 
-MobileHome_PlaceBox: ; 3f47
+MobileHome_PlaceBox:
 	push bc
 	call .FillTop
 	pop bc
@@ -228,7 +217,6 @@
 	jr nz, .RowLoop
 	call .FillBottom
 	ret
-; 3f58
 
 .FillTop:
 	ld a, $63
@@ -260,9 +248,8 @@
 	ld de, SCREEN_WIDTH
 	add hl, de
 	ret
-; 3f7c
 
-Function3f7c:: ; 3f7c
+Function3f7c::
 	call MenuBoxCoord2Tile
 	call GetMenuBoxDims
 	dec b
@@ -269,9 +256,8 @@
 	dec c
 	call Function3eea
 	ret
-; 3f88
 
-Function3f88:: ; 3f88
+Function3f88::
 	ld hl, wDecompressScratch
 	ld b, 0
 .row
@@ -290,9 +276,8 @@
 	dec c
 	jr nz, .row
 	ret
-; 3f9f
 
-Function3f9f:: ; 3f9f
+Function3f9f::
 	ld hl, wDecompressScratch
 .row
 	push bc
@@ -311,4 +296,3 @@
 	dec c
 	jr nz, .row
 	ret
-; 3fb5
--- a/home/mon_data.asm
+++ b/home/mon_data.asm
@@ -1,4 +1,4 @@
-Unreferenced_GetNthMove:: ; 384d
+Unreferenced_GetNthMove::
 	ld hl, wListMoves_MoveIndicesBuffer
 	ld c, a
 	ld b, 0
@@ -5,9 +5,8 @@
 	add hl, bc
 	ld a, [hl]
 	ret
-; 3856
 
-GetBaseData:: ; 3856
+GetBaseData::
 	push bc
 	push de
 	push hl
@@ -62,13 +61,12 @@
 	pop de
 	pop bc
 	ret
-; 389c
 
-GetCurNick:: ; 389c
+GetCurNick::
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 
-GetNick:: ; 38a2
+GetNick::
 ; Get nickname a from list hl.
 
 	push hl
@@ -87,4 +85,3 @@
 	pop bc
 	pop hl
 	ret
-; 38bb
--- a/home/mon_data_2.asm
+++ b/home/mon_data_2.asm
@@ -1,4 +1,4 @@
-GetPartyParamLocation:: ; 3917
+GetPartyParamLocation::
 ; Get the location of parameter a from wCurPartyMon in hl
 	push bc
 	ld hl, wPartyMons
@@ -9,15 +9,13 @@
 	call GetPartyLocation
 	pop bc
 	ret
-; 3927
 
-GetPartyLocation:: ; 3927
+GetPartyLocation::
 ; Add the length of a PartyMon struct to hl a times.
 	ld bc, PARTYMON_STRUCT_LENGTH
 	jp AddNTimes
-; 392d
 
-Unreferenced_GetDexNumber:: ; 392d
+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
@@ -34,4 +32,3 @@
 	ld c, h
 	pop hl
 	ret
-; 3945
--- a/home/mon_stats.asm
+++ b/home/mon_stats.asm
@@ -1,4 +1,4 @@
-IsAPokemon:: ; 3741
+IsAPokemon::
 ; Return carry if species a is not a Pokemon.
 	and a
 	jr z, .NotAPokemon
@@ -14,9 +14,8 @@
 .Pokemon:
 	and a
 	ret
-; 3750
 
-DrawBattleHPBar:: ; 3750
+DrawBattleHPBar::
 ; Draw an HP bar d tiles long at hl
 ; Fill it up to e pixels
 
@@ -75,13 +74,12 @@
 	pop de
 	pop hl
 	ret
-; 3786
 
-PrepMonFrontpic:: ; 3786
+PrepMonFrontpic::
 	ld a, $1
 	ld [wBoxAlignment], a
 
-_PrepMonFrontpic:: ; 378b
+_PrepMonFrontpic::
 	ld a, [wCurPartySpecies]
 	call IsAPokemon
 	jr c, .not_pokemon
@@ -104,4 +102,3 @@
 	inc a
 	ld [wCurPartySpecies], a
 	ret
-; 37b6
--- a/home/movement.asm
+++ b/home/movement.asm
@@ -1,4 +1,4 @@
-InitMovementBuffer:: ; 1b1e
+InitMovementBuffer::
 	ld [wMovementBufferObject], a
 	xor a
 	ld [wMovementBufferCount], a
@@ -9,9 +9,8 @@
 	ld a, HIGH(wMovementBuffer)
 	ld [wUnusedMovementBufferPointer + 1], a
 	ret
-; 1b35
 
-DecrementMovementBufferCount:: ; 1b35
+DecrementMovementBufferCount::
 	ld a, [wMovementBufferCount]
 	and a
 	ret z
@@ -18,9 +17,8 @@
 	dec a
 	ld [wMovementBufferCount], a
 	ret
-; 1b3f
 
-AppendToMovementBuffer:: ; 1b3f
+AppendToMovementBuffer::
 	push hl
 	push de
 	ld hl, wMovementBufferCount
@@ -33,9 +31,8 @@
 	pop de
 	pop hl
 	ret
-; 1b50
 
-AppendToMovementBufferNTimes:: ; 1b50
+AppendToMovementBufferNTimes::
 	push af
 	ld a, c
 	and a
@@ -50,9 +47,8 @@
 	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 @@
 	ld c, e
 	call AppendToMovementBufferNTimes
 	ret
-; 1b92
 
-.GetMovementData: ; 1b92
+.GetMovementData:
 	push de
 	push hl
 	ld l, b
@@ -118,7 +113,6 @@
 	pop hl
 	pop de
 	ret
-; 1ba5
 
 .MovementData:
 	slow_step DOWN
@@ -133,9 +127,8 @@
 	big_step UP
 	big_step LEFT
 	big_step RIGHT
-; 1bb1
 
-SetMenuAttributes:: ; 1bb1
+SetMenuAttributes::
 	push hl
 	push bc
 	ld hl, w2DMenuCursorInitY
@@ -156,21 +149,18 @@
 	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,9 +174,8 @@
 	ld a, b
 	pop bc
 	ret
-; 1bee
 
-PlaceHollowCursor:: ; 1bee
+PlaceHollowCursor::
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
@@ -193,9 +182,8 @@
 	ld l, a
 	ld [hl], "▷"
 	ret
-; 1bf7
 
-HideCursor:: ; 1bf7
+HideCursor::
 	ld hl, wCursorCurrentTile
 	ld a, [hli]
 	ld h, [hl]
@@ -202,5 +190,3 @@
 	ld l, a
 	ld [hl], " "
 	ret
-; 1c00
-
--- 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 @@
 	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 @@
 	pop af
 	rst Bankswitch
 	ret
-; 3411
 
-GetNthString:: ; 3411
+GetNthString::
 ; Return the address of the
 ; ath string starting from hl.
 
@@ -87,9 +85,8 @@
 	jr nz, .readChar
 	pop bc
 	ret
-; 3420
 
-GetBasePokemonName:: ; 3420
+GetBasePokemonName::
 ; Discards gender (Nidoran).
 
 	push hl
@@ -112,9 +109,7 @@
 	pop hl
 	ret
 
-; 343b
-
-GetPokemonName:: ; 343b
+GetPokemonName::
 ; Get Pokemon name wd265.
 
 	ld a, [hROMBank]
@@ -150,9 +145,8 @@
 	pop af
 	rst Bankswitch
 	ret
-; 3468
 
-GetItemName:: ; 3468
+GetItemName::
 ; Get item name wd265.
 
 	push hl
@@ -174,9 +168,8 @@
 	pop bc
 	pop hl
 	ret
-; 3487
 
-GetTMHMName:: ; 3487
+GetTMHMName::
 ; Get TM/HM name by item id wd265.
 
 	push hl
@@ -257,11 +250,10 @@
 	db "HM"
 .HMTextEnd:
 	db "@"
-; 34df
 
 INCLUDE "home/hm_moves.asm"
 
-GetMoveName:: ; 34f8
+GetMoveName::
 	push hl
 
 	ld a, MOVE_NAME
@@ -275,4 +267,3 @@
 
 	pop hl
 	ret
-; 350c
--- 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,8 +10,7 @@
 	and a
 	ret z
 
-
-UpdateCGBPals:: ; c33
+UpdateCGBPals::
 ; return carry if successful
 ; any pals to update?
 	ld a, [hCGBPalUpdate]
@@ -19,9 +17,7 @@
 	and a
 	ret z
 
-
-ForceUpdateCGBPals:: ; c37
-
+ForceUpdateCGBPals::
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals2)
@@ -68,10 +64,8 @@
 
 	scf
 	ret
-; c9f
 
-
-DmgToCgbBGPals:: ; c9f
+DmgToCgbBGPals::
 ; exists to forego reinserting cgb-converted image data
 
 ; input: a -> bgp
@@ -114,10 +108,8 @@
 .end
 	pop af
 	ret
-; ccb
 
-
-DmgToCgbObjPals:: ; ccb
+DmgToCgbObjPals::
 ; exists to forego reinserting cgb-converted image data
 
 ; input: d -> obp1
@@ -160,10 +152,8 @@
 	pop de
 	pop hl
 	ret
-; cf8
 
-
-DmgToCgbObjPal0:: ; cf8
+DmgToCgbObjPal0::
 	ld [rOBP0], a
 	push af
 
@@ -200,9 +190,8 @@
 .dmg
 	pop af
 	ret
-; d24
 
-DmgToCgbObjPal1:: ; d24
+DmgToCgbObjPal1::
 	ld [rOBP1], a
 	push af
 
@@ -238,11 +227,8 @@
 .dmg
 	pop af
 	ret
-; d50
 
-
-
-CopyPals:: ; d50
+CopyPals::
 ; copy c palettes in order b from de to hl
 
 	push bc
@@ -293,10 +279,8 @@
 	dec c
 	jr nz, CopyPals
 	ret
-; d79
 
-
-ClearVBank1:: ; d79
+ClearVBank1::
 	ld a, [hCGB]
 	and a
 	ret z
@@ -312,15 +296,11 @@
 	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
@@ -338,15 +318,11 @@
 	ld [hCGBPalUpdate], a
 	call DelayFrame
 	ret
-; db1
 
-
-FarCallSwapTextboxPalettes:: ; db1
+FarCallSwapTextboxPalettes::
 	homecall SwapTextboxPalettes
 	ret
-; dbd
 
-FarCallScrollBGMapPalettes:: ; dbd
+FarCallScrollBGMapPalettes::
 	homecall ScrollBGMapPalettes
 	ret
-; dc9
--- 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 @@
 	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
--- 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 @@
 	ld a, [wPredefTemp + 1]
 	ld l, a
 	ret
-; 2dba
--- a/home/print_bcd.asm
+++ b/home/print_bcd.asm
@@ -1,4 +1,4 @@
-PrintBCDNumber:: ; 38bb
+PrintBCDNumber::
 ; function to print a BCD (Binary-coded decimal) number
 ; de = address of BCD number
 ; hl = destination address
@@ -48,9 +48,8 @@
 	inc hl
 .done
 	ret
-; 0x38f2
 
-PrintBCDDigit:: ; 38f2
+PrintBCDDigit::
 	and %00001111
 	and a
 	jr z, .zeroDigit
@@ -78,4 +77,3 @@
 	ld a, " "
 	ld [hli], a ; if right-aligned, "print" a space by advancing the pointer
 	ret
-; 0x3917
--- a/home/print_level.asm
+++ b/home/print_level.asm
@@ -1,4 +1,4 @@
-PrintLevel:: ; 382d
+PrintLevel::
 ; Print wTempMonLevel at hl
 
 	ld a, [wTempMonLevel]
@@ -14,18 +14,15 @@
 	dec hl
 	inc c
 	jr Print8BitNumRightAlign
-; 383d
 
-PrintLevel_Force3Digits:: ; 383d
+PrintLevel_Force3Digits::
 ; Print :L and all 3 digits
 	ld [hl], "<LV>"
 	inc hl
 	ld c, 3
-; 3842
 
-Print8BitNumRightAlign:: ; 3842
+Print8BitNumRightAlign::
 	ld [wd265], a
 	ld de, wd265
 	ld b, PRINTNUM_RIGHTALIGN | 1
 	jp PrintNum
-; 384d
--- a/home/print_text.asm
+++ b/home/print_text.asm
@@ -1,4 +1,4 @@
-PrintLetterDelay:: ; 313d
+PrintLetterDelay::
 ; Wait before printing the next letter.
 
 ; The text speed setting in wOptions is actually a frame count:
@@ -79,9 +79,8 @@
 	pop de
 	pop hl
 	ret
-; 318c
 
-CopyDataUntil:: ; 318c
+CopyDataUntil::
 ; Copy [hl .. bc) to de.
 
 ; In other words, the source data is
@@ -98,19 +97,16 @@
 	cp c
 	jr nz, CopyDataUntil
 	ret
-; 0x3198
 
-PrintNum:: ; 3198
+PrintNum::
 	homecall _PrintNum
 	ret
-; 31a4
 
-MobilePrintNum:: ; 31a4
+MobilePrintNum::
 	homecall _MobilePrintNum
 	ret
-; 31b0
 
-FarPrintText:: ; 31b0
+FarPrintText::
 	ld [hBuffer], a
 	ld a, [hROMBank]
 	push af
@@ -122,4 +118,3 @@
 	pop af
 	rst Bankswitch
 	ret
-; 31be
--- 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 @@
 
 	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 @@
 	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 @@
 
 	pop bc
 	ret
-; 2fcb
--- a/home/region.asm
+++ b/home/region.asm
@@ -1,4 +1,4 @@
-IsInJohto:: ; 2f17
+IsInJohto::
 ; Return 0 if the player is in Johto, and 1 in Kanto.
 
 	ld a, [wMapGroup]
@@ -30,4 +30,3 @@
 .Kanto:
 	ld a, 1
 	ret
-; 2f3e
--- 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 @@
 	bit 0, a ; obj update
 	ret z
 
-TimeOfDayPals:: ; 47e
+TimeOfDayPals::
 	callfar _TimeOfDayPals
 	ret
-; 485
 
-UpdateTimePals:: ; 485
+UpdateTimePals::
 	callfar _UpdateTimePals
 	ret
-; 48c
--- a/home/scrolling_menu.asm
+++ b/home/scrolling_menu.asm
@@ -1,4 +1,4 @@
-ScrollingMenu:: ; 350c
+ScrollingMenu::
 	call CopyMenuData
 	ld a, [hROMBank]
 	push af
@@ -15,16 +15,14 @@
 
 	ld a, [wMenuJoypad]
 	ret
-; 3524
 
-.UpdatePalettes: ; 3524
+.UpdatePalettes:
 	ld hl, wVramState
 	bit 0, [hl]
 	jp nz, UpdateTimePals
 	jp SetPalettes
-; 352f
 
-InitScrollingMenu:: ; 352f
+InitScrollingMenu::
 	ld a, [wMenuBorderTopCoord]
 	dec a
 	ld b, a
@@ -41,9 +39,8 @@
 	call Coord2Tile
 	pop bc
 	jp TextBox
-; 354b
 
-JoyTextDelay_ForcehJoyDown:: ; 354b joypad
+JoyTextDelay_ForcehJoyDown::
 	call DelayFrame
 
 	ld a, [hInMenu]
@@ -62,4 +59,3 @@
 	or c
 	ld c, a
 	ret
-; 3567
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -1,4 +1,4 @@
-Serial:: ; 6ef
+Serial::
 ; The serial interrupt.
 
 	push af
@@ -87,9 +87,8 @@
 	pop bc
 	pop af
 	reti
-; 75f
 
-Serial_ExchangeBytes:: ; 75f
+Serial_ExchangeBytes::
 	ld a, $1
 	ld [hSerialIgnoringInitialData], a
 .loop
@@ -123,9 +122,8 @@
 	or c
 	jr nz, .loop
 	ret
-; 78a
 
-Serial_ExchangeByte:: ; 78a
+Serial_ExchangeByte::
 .loop
 	xor a
 	ld [hSerialReceivedNewData], a
@@ -232,9 +230,8 @@
 	dec a
 	jr nz, .delay_cycles
 	ret
-; 82b
 
-CheckwLinkTimeoutFramesNonzero:: ; 82b
+CheckwLinkTimeoutFramesNonzero::
 	push hl
 	ld hl, wLinkTimeoutFrames
 	ld a, [hli]
@@ -241,18 +238,16 @@
 	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 @@
 	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 @@
 	ld a, [wOtherPlayerLinkAction]
 	ld [wOtherPlayerLinkMode], a
 	ret
-; 8c1
 
-LinkTransfer:: ; 8c1
+LinkTransfer::
 	push bc
 	ld b, SERIAL_TIMECAPSULE
 	ld a, [wLinkMode]
@@ -370,9 +361,8 @@
 	call .Receive
 	pop bc
 	ret
-; 8f3
 
-.Receive: ; 8f3
+.Receive:
 	ld a, [hSerialReceive]
 	ld [wOtherPlayerLinkMode], a
 	and $f0
@@ -384,9 +374,8 @@
 	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 @@
 	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 @@
 	ld a, 1 << rSC_ON
 	ld [rSC], a
 	ret
-; 92e
--- a/home/sine.asm
+++ b/home/sine.asm
@@ -1,10 +1,9 @@
-Cosine:: ; 1b0f
+Cosine::
 ; a = d * cos(a * pi/32)
 	add %010000 ; cos(x) = sin(x + pi/2)
 	; fallthrough
-Sine:: ; 1b11
+Sine::
 ; a = d * sin(a * pi/32)
 	ld e, a
 	homecall _Sine
 	ret
-; 1b1e
--- a/home/sprite_anims.asm
+++ b/home/sprite_anims.asm
@@ -1,4 +1,4 @@
-PushLYOverrides:: ; 3b0c
+PushLYOverrides::
 	ld a, [hLCDCPointer]
 	and a
 	ret z
@@ -16,9 +16,8 @@
 	ld a, (wLYOverridesEnd - wLYOverrides) / 16
 	ld [wRequested2bpp], a
 	ret
-; 3b2a
 
-_InitSpriteAnimStruct:: ; 3b2a
+_InitSpriteAnimStruct::
 	ld [wSpriteAnimIDBuffer], a
 	ld a, [hROMBank]
 	push af
@@ -33,9 +32,8 @@
 	rst Bankswitch
 
 	ret
-; 3b3c
 
-ReinitSpriteAnimFrame:: ; 3b3c
+ReinitSpriteAnimFrame::
 	ld [wSpriteAnimIDBuffer], a
 	ld a, [hROMBank]
 	push af
@@ -50,4 +48,3 @@
 	rst Bankswitch
 
 	ret
-; 3b4e
--- a/home/sprite_updates.asm
+++ b/home/sprite_updates.asm
@@ -1,4 +1,4 @@
-DisableSpriteUpdates:: ; 0x2ed3
+DisableSpriteUpdates::
 	xor a
 	ld [hMapAnims], a
 	ld a, [wVramState]
@@ -7,9 +7,8 @@
 	ld a, $0
 	ld [wSpriteUpdatesEnabled], a
 	ret
-; 0x2ee4
 
-EnableSpriteUpdates:: ; 2ee4
+EnableSpriteUpdates::
 	ld a, $1
 	ld [wSpriteUpdatesEnabled], a
 	ld a, [wVramState]
@@ -18,4 +17,3 @@
 	ld a, $1
 	ld [hMapAnims], a
 	ret
-; 2ef6
--- 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 @@
 	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 @@
 	ld [MBC3SRamEnable], a
 	pop af
 	ret
-; 2fec
--- a/home/stone_queue.asm
+++ b/home/stone_queue.asm
@@ -1,4 +1,4 @@
-HandleStoneQueue:: ; 3567
+HandleStoneQueue::
 	ld a, [hROMBank]
 	push af
 
@@ -9,9 +9,8 @@
 	ld a, b
 	rst Bankswitch
 	ret
-; 3574
 
-.WarpAction: ; 3574
+.WarpAction:
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, de
 	ld a, [hl]
@@ -35,9 +34,8 @@
 .nope
 	and a
 	ret
-; 3599
 
-.IsObjectOnWarp: ; 3599
+.IsObjectOnWarp:
 	push de
 
 	ld hl, OBJECT_NEXT_MAP_X
@@ -56,9 +54,8 @@
 
 	pop de
 	ret
-; 35b0
 
-.check_on_warp ; 35b0
+.check_on_warp
 	ld hl, wCurrMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
@@ -102,9 +99,8 @@
 	inc a
 	scf
 	ret
-; 35de
 
-.IsObjectInStoneTable: ; 35de
+.IsObjectInStoneTable:
 	inc e
 	ld hl, CMDQUEUE_ADDR
 	add hl, bc
@@ -140,4 +136,3 @@
 .yes
 	scf
 	ret
-; 3600
--- 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 @@
 	pop bc
 	pop hl
 	ret
-; 2f17
--- 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 @@
 	dec b
 	jr nz, .row
 	ret
-; fc8
 
-
-ClearTileMap:: ; fc8
+ClearTileMap::
 ; Fill wTileMap with blank tiles.
 
 	hlcoord 0, 0
@@ -34,19 +32,15 @@
 	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 @@
 	pop hl
 	pop bc
 	jr TextBoxPalette
-; ff1
 
-
-TextBoxBorder:: ; ff1
-
+TextBoxBorder::
 	; Top
 	push hl
 	ld a, "┌"
@@ -96,9 +87,8 @@
 	ld [hl], "┘"
 
 	ret
-; 101e
 
-.PlaceChars: ; 101e
+.PlaceChars:
 ; Place char a c times.
 	ld d, c
 .loop
@@ -106,10 +96,8 @@
 	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,32 +120,26 @@
 	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
@@ -164,13 +146,12 @@
 	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
@@ -177,13 +158,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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,17 +276,13 @@
 	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
 	ld de, \1
@@ -313,35 +289,34 @@
 	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
+PrintMomsName:   print_name wMomsName
+PrintPlayerName: print_name wPlayerName
+PrintRivalName:  print_name wRivalName
+PrintRedsName:   print_name wRedsName
+PrintGreensName: print_name wGreensName
 
-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
+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:: ; 11fd
+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 @@
 	ld de, wEnemyMonNick
 	jr PlaceCommandCharacter
 
-
-PlaceEnemysName:: ; 121b
+PlaceEnemysName::
 	push de
 
 	ld a, [wLinkMode]
@@ -391,8 +365,7 @@
 	ld de, wOTClassName
 	jr PlaceCommandCharacter
 
-
-PlaceGenderedPlayerName:: ; 1252
+PlaceGenderedPlayerName::
 	push de
 	ld de, wPlayerName
 	call PlaceString
@@ -405,14 +378,12 @@
 	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 @@
 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 @@
 	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 @@
 	hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
 	pop de
 	jp NextChar
-; 131f
 
-
-_ContText:: ; 131f
+_ContText::
 	ld a, [wLinkMode]
 	or a
 	jr nz, .communication
@@ -542,7 +505,7 @@
 	call z, UnloadBlinkingCursor
 	; fallthrough
 
-_ContTextNoPause:: ; 1337
+_ContTextNoPause::
 	push de
 	call TextScroll
 	call TextScroll
@@ -549,10 +512,8 @@
 	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 @@
 	jp NextChar
 
 .cont: db "<_CONT>@"
-; 1356
 
-
-PlaceDexEnd:: ; 1356
+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,7 +551,7 @@
 	jr z, DoneText
 	call UnloadBlinkingCursor
 
-DoneText:: ; 137c
+DoneText::
 	pop hl
 	ld de, .stop
 	dec de
@@ -600,16 +558,14 @@
 	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 @@
 	ld c, 5
 	call DelayFrames
 	ret
-; 13b6
 
-Text_WaitBGMap:: ; 13b6
+Text_WaitBGMap::
 	push bc
 	ld a, [hOAMUpdate]
 	push af
@@ -655,25 +610,21 @@
 	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 @@
 	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 @@
 	pop af
 	ld [wTextBoxFlags], a
 	ret
-; 13f6
 
-DoTextUntilTerminator:: ; 13f6
+DoTextUntilTerminator::
 	ld a, [hli]
 	cp "@"
 	ret z
@@ -732,37 +679,35 @@
 	; 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
+	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
 
-Text_TX:: ; 143e
-; TX
+TextCommand_START::
+; text_start
 ; write text until "@"
 ; [$00]["...@"]
 
@@ -775,9 +720,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,19 +821,17 @@
 	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]
@@ -900,9 +838,9 @@
 
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call PlaceString
 	pop hl
 	ret
-; 1582
 
-Text_TX_DAY:: ; 1582
-; TX_DAY
+TextCommand_DAY::
+; current_day
 
 	call GetWeekday
 	push hl
@@ -1134,7 +1066,7 @@
 	pop hl
 	ret
 
-.Days: ; 15a2
+.Days:
 	dw .Sun
 	dw .Mon
 	dw .Tues
@@ -1151,4 +1083,3 @@
 .Fri:    db "FRI@"
 .Satur:  db "SATUR@"
 .Day:    db "DAY@"
-; 15d8
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -1,6 +1,6 @@
-ClearBGPalettes:: ; 31f3
+ClearBGPalettes::
 	call ClearPalettes
-WaitBGMap:: ; 31f6
+WaitBGMap::
 ; Tell VBlank to update BG Map
 	ld a, 1 ; BG Map 0 tiles
 	ld [hBGMapMode], a
@@ -8,9 +8,8 @@
 	ld c, 4
 	call DelayFrames
 	ret
-; 3200
 
-WaitBGMap2:: ; 0x3200
+WaitBGMap2::
 	ld a, [hCGB]
 	and a
 	jr z, .bg0
@@ -26,15 +25,13 @@
 	ld c, 4
 	call DelayFrames
 	ret
-; 0x3218
 
-IsCGB:: ; 3218
+IsCGB::
 	ld a, [hCGB]
 	and a
 	ret
-; 321c
 
-ApplyTilemap:: ; 321c
+ApplyTilemap::
 	ld a, [hCGB]
 	and a
 	jr z, .dmg
@@ -54,23 +51,20 @@
 	ld c, 4
 	call DelayFrames
 	ret
-; 3238
 
-CGBOnly_CopyTilemapAtOnce:: ; 3238
+CGBOnly_CopyTilemapAtOnce::
 	ld a, [hCGB]
 	and a
 	jr z, WaitBGMap
 
-CopyTilemapAtOnce:: ; 323d
+CopyTilemapAtOnce::
 	jr .CopyTilemapAtOnce
-; 323f
 
 ; unused
 	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	ret
-; 3246
 
-.CopyTilemapAtOnce: ; 3246
+.CopyTilemapAtOnce:
 	ld a, [hBGMapMode]
 	push af
 	xor a
@@ -107,9 +101,8 @@
 	pop af
 	ld [hBGMapMode], a
 	ret
-; 327b
 
-.StackPointerMagic: ; 327b
+.StackPointerMagic:
 ; Copy all tiles to vBGMap
 	ld [hSPBuffer], sp
 	ld sp, hl
@@ -149,9 +142,8 @@
 	ld h, a
 	ld sp, hl
 	ret
-; 32f9
 
-SetPalettes:: ; 32f9
+SetPalettes::
 ; Inits the Palettes
 ; depending on the system the monochromes palettes or color palettes
 	ld a, [hCGB]
@@ -172,9 +164,8 @@
 	call DmgToCgbObjPals
 	pop de
 	ret
-; 3317
 
-ClearPalettes:: ; 3317
+ClearPalettes::
 ; Make all palettes white
 
 ; CGB: make all the palette colors white
@@ -209,11 +200,10 @@
 	ld a, 1
 	ld [hCGBPalUpdate], a
 	ret
-; 333e
 
-GetMemSGBLayout:: ; 333e
+GetMemSGBLayout::
 	ld b, SCGB_RAM
-GetSGBLayout:: ; 3340
+GetSGBLayout::
 ; load sgb packets unless dmg
 
 	ld a, [hCGB]
@@ -226,4 +216,3 @@
 
 .sgb
 	predef_jump LoadSGBLayout
-; 334e
--- 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,10 +10,8 @@
 .not_mobile
 	pop af
 	reti
-; 59c
 
-
-LatchClock:: ; 59c
+LatchClock::
 ; latch clock counter data
 	ld a, 0
 	ld [MBC3LatchClock], a
@@ -21,19 +18,15 @@
 	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 @@
 ; unlatch clock / disable clock r/w
 	call CloseSRAM
 	ret
-; 5e8
 
-
-FixDays:: ; 5e8
+FixDays::
 ; fix day count
 ; mod by 140
 
@@ -134,10 +125,8 @@
 .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,9 +174,8 @@
 	adc c
 	ld [wCurDay], a
 	ret
-; 658
 
-InitTimeOfDay:: ; 658
+InitTimeOfDay::
 	xor a
 	ld [wStringBuffer2], a
 	ld a, $0 ; useless
@@ -194,7 +182,7 @@
 	ld [wStringBuffer2 + 3], a
 	jr InitTime
 
-InitDayOfWeek:: ; 663
+InitDayOfWeek::
 	call UpdateTime
 	ld a, [hHours]
 	ld [wStringBuffer2 + 1], a
@@ -204,20 +192,16 @@
 	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 @@
 	ld [hRTCDayLo], a
 	ld [hRTCDayHi], a
 	ret
-; 691
 
-
-SetClock:: ; 691
+SetClock::
 ; set clock data from hram
 
 ; enable clock r/w
@@ -274,10 +256,8 @@
 ; cleanup
 	call CloseSRAM ; unlatch clock, disable clock r/w
 	ret
-; 6c4
 
-
-ClearRTCStatus:: ; 6c4
+ClearRTCStatus::
 ; clear sRTCStatusFlags
 	xor a
 	push af
@@ -287,9 +267,8 @@
 	ld [sRTCStatusFlags], a
 	call CloseSRAM
 	ret
-; 6d3
 
-RecordRTCStatus:: ; 6d3
+RecordRTCStatus::
 ; append flags to sRTCStatusFlags
 	ld hl, sRTCStatusFlags
 	push af
@@ -300,9 +279,8 @@
 	ld [hl], a
 	call CloseSRAM
 	ret
-; 6e3
 
-CheckRTCStatus:: ; 6e3
+CheckRTCStatus::
 ; check sRTCStatusFlags
 	ld a, BANK(sRTCStatusFlags)
 	call GetSRAMBank
@@ -309,4 +287,3 @@
 	ld a, [sRTCStatusFlags]
 	call CloseSRAM
 	ret
-; 6ef
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -1,4 +1,4 @@
-CheckTrainerBattle2:: ; 3600
+CheckTrainerBattle2::
 	ld a, [hROMBank]
 	push af
 
@@ -9,9 +9,8 @@
 	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 @@
 .loop
 
 ; Start a battle if the object:
-
 	push af
 	push de
 
@@ -101,15 +99,14 @@
 	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,10 +125,8 @@
 	ld [wRunningTrainerBattleScript], a
 	scf
 	ret
-; 36a5
 
-FacingPlayerDistance_bc:: ; 36a5
-
+FacingPlayerDistance_bc::
 	push de
 	call FacingPlayerDistance
 	ld b, d
@@ -138,9 +133,8 @@
 	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 @@
 .NotFacing:
 	and a
 	ret
-; 36f5
 
-CheckTrainerFlag:: ; 36f5
+CheckTrainerFlag::
 	push bc
 	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
@@ -233,9 +226,8 @@
 	and a
 	pop bc
 	ret
-; 3718
 
-PrintWinLossText:: ; 3718
+PrintWinLossText::
 	ld a, [wBattleType]
 	cp BATTLETYPE_CANLOSE
 	jr .canlose ; ??????????
@@ -260,4 +252,3 @@
 	call WaitBGMap
 	call WaitPressAorB_BlinkCursor
 	ret
-; 3741
--- 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 @@
 	pop bc
 	pop af
 	reti
-; 2a1
 
-.VBlanks: ; 2a1
+.VBlanks:
 	dw VBlank0
 	dw VBlank1
 	dw VBlank2
@@ -45,10 +43,8 @@
 	dw VBlank5
 	dw VBlank6
 	dw VBlank0 ; just in case
-; 2b1
 
-
-VBlank0:: ; 2b1
+VBlank0::
 ; normal operation
 
 ; rng
@@ -116,7 +112,6 @@
 	call hTransferVirtualOAM
 .done_oam
 
-
 	; vblank-sensitive operations are done
 
 	xor a
@@ -148,10 +143,8 @@
 	ld [hSecondsBackup], a
 
 	ret
-; 325
 
-
-VBlank2:: ; 325
+VBlank2::
 ; sound only
 
 	ld a, [hROMBank]
@@ -167,10 +160,8 @@
 	xor a
 	ld [wVBlankOccurred], a
 	ret
-; 337
 
-
-VBlank1:: ; 337
+VBlank1::
 ; scx, scy
 ; palettes
 ; bg map
@@ -235,10 +226,8 @@
 	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 @@
 
 	and a
 	ret
-; 396
 
-
-VBlank3:: ; 396
+VBlank3::
 ; scx, scy
 ; palettes
 ; bg map
@@ -321,10 +308,8 @@
 	ld a, b
 	ld [rIF], a
 	ret
-; 3df
 
-
-VBlank4:: ; 3df
+VBlank4::
 ; bg map
 ; tiles
 ; oam
@@ -354,10 +339,8 @@
 	ld a, [hROMBankBackup]
 	rst Bankswitch
 	ret
-; 400
 
-
-VBlank5:: ; 400
+VBlank5::
 ; scx
 ; palettes
 ; bg map
@@ -404,10 +387,8 @@
 	ld a, %1111 ; serial timer lcdstat vblank
 	ld [rIE], a
 	ret
-; 436
 
-
-VBlank6:: ; 436
+VBlank6::
 ; palettes
 ; tiles
 ; dma transfer
@@ -438,4 +419,3 @@
 	ld a, [hROMBankBackup]
 	rst Bankswitch
 	ret
-; 45a
--- 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 @@
 	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 @@
 	ld hl, wBGMapPalBuffer
 	ld de, wBGMapBuffer
 
-
 .next
 ; Copy a pair of 16x8 blocks (one 16x16 block)
 
@@ -83,7 +80,6 @@
 
 	jr nz, .next
 
-
 	ld a, [hSPBuffer]
 	ld l, a
 	ld a, [hSPBuffer + 1]
@@ -97,10 +93,8 @@
 	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 @@
 	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 @@
 	ld [hBGMapAddress + 1], a
 	ret
 
-
 .Attr:
 	ld a, 1
 	ld [rVBK], a
@@ -175,11 +166,9 @@
 	ld [rVBK], a
 	ret
 
-
 .Tiles:
 	hlcoord 0, 0
 
-
 .update
 	ld [hSPBuffer], sp
 
@@ -191,10 +180,8 @@
 	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 @@
 	xor a
 	jr .start
 
-
 .middle
 	ld de, THIRD_HEIGHT * SCREEN_WIDTH
 	add hl, de
@@ -230,7 +216,6 @@
 	ld a, 2
 	jr .start
 
-
 .top
 	ld sp, hl
 
@@ -242,7 +227,6 @@
 ; Next time: middle third
 	ld a, 1
 
-
 .start
 ; Which third to update next time
 	ld [hBGMapThird], a
@@ -253,7 +237,6 @@
 ; 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,7 +255,6 @@
 	dec a
 	jr nz, .row
 
-
 	ld a, [hSPBuffer]
 	ld l, a
 	ld a, [hSPBuffer + 1]
@@ -279,10 +261,8 @@
 	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 @@
 	dec b
 	jr nz, .next
 
-
 	ld a, l
 	ld [wRequested1bppDest], a
 	ld a, h
@@ -360,10 +339,8 @@
 	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 @@
 	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 @@
 	dec b
 	jr nz, .next
 
-
 	ld a, l
 	ld [wRequested2bppDest], a
 	ld a, h
@@ -442,10 +416,8 @@
 	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 @@
 	pop af
 	rst Bankswitch
 	ret
-; 17ff
--- a/home/window.asm
+++ b/home/window.asm
@@ -1,4 +1,4 @@
-RefreshScreen:: ; 2dba
+RefreshScreen::
 	call ClearWindowData
 	ld a, [hROMBank]
 	push af
@@ -12,10 +12,8 @@
 	pop af
 	rst Bankswitch
 	ret
-; 2dcf
 
-
-CloseText:: ; 2dcf
+CloseText::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -28,9 +26,8 @@
 	ld hl, wVramState
 	res 6, [hl]
 	ret
-; 2de2
 
-.CloseText: ; 2de2
+.CloseText:
 	call ClearWindowData
 	xor a
 	ld [hBGMapMode], a
@@ -45,9 +42,8 @@
 	farcall ReturnFromMapSetupScript
 	farcall LoadOverworldFont
 	ret
-; 2e08
 
-OpenText:: ; 2e08
+OpenText::
 	call ClearWindowData
 	ld a, [hROMBank]
 	push af
@@ -62,9 +58,8 @@
 	rst Bankswitch
 
 	ret
-; 2e20
 
-_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2e20
+_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -75,9 +70,8 @@
 	pop af
 	ld [hOAMUpdate], a
 	ret
-; 2e31
 
-SafeUpdateSprites:: ; 2e31
+SafeUpdateSprites::
 	ld a, [hOAMUpdate]
 	push af
 	ld a, [hBGMapMode]
@@ -101,4 +95,3 @@
 ; unused
 	scf
 	ret
-; 2e50
--- a/hram.asm
+++ b/hram.asm
@@ -129,3 +129,4 @@
 hMobile            EQU $ffe9
 hSystemBooted      EQU $ffea
 hClockResetTrigger EQU $ffeb
+hFFEC              EQU $ffec
--- a/lib/mobile/main.asm
+++ b/lib/mobile/main.asm
@@ -7,7 +7,7 @@
 
 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 @@
 	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 @@
 	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
@@ -63,9 +61,8 @@
 	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 @@
 	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 @@
 	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 @@
 	dw Function1103ac
 	dw Function110235
 	dw Function111540
-; 1100b4
 
-Function1100b4: ; 1100b4 (44:40b4)
+Function1100b4:
 	push bc
 .loop
 	di
@@ -187,9 +182,8 @@
 .done
 	pop bc
 	ret
-; 1100dc (44:40dc)
 
-Function1100dc: ; 1100dc
+Function1100dc:
 	xor a
 	ld [rTAC], a
 	ld e, c
@@ -225,9 +219,8 @@
 	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 @@
 	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 @@
 .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 @@
 	res 1, [hl]
 	set 0, [hl]
 	ret
-; 11032c
 
-Function11032c: ; 11032c
+Function11032c:
 	ld a, [$c821]
 	bit 1, a
 	jp nz, Function110226
@@ -613,17 +601,15 @@
 	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 @@
 .asm_1103aa
 	scf
 	ret
-; 1103ac
 
-Function1103ac: ; 1103ac
+Function1103ac:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -713,13 +698,12 @@
 	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 @@
 	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 @@
 	ld a, c
 	ld [$cb4c], a
 	ret
-; 1104b0
 
-Function1104b0: ; 1104b0
+Function1104b0:
 	xor a
 	ld [$c81e], a
 	call Function110393
@@ -799,9 +781,8 @@
 	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 @@
 	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 @@
 .asm_1105d9
 	pop hl
 	jp Function110226
-; 1105dd
 
-Function1105dd: ; 1105dd
+Function1105dd:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -979,9 +955,8 @@
 	ld a, $d
 	ld [$c86a], a
 	jp Function110432
-; 110615
 
-Function110615: ; 110615
+Function110615:
 	ld b, $15
 	ld [$c86e], a
 	or a
@@ -1102,9 +1077,8 @@
 	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 @@
 	call Function11295e
 	ld a, $0
 	jp Function110615
-; 110757
 
-Function110757: ; 110757
+Function110757:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1243,9 +1216,8 @@
 .asm_1107fb
 	pop hl
 	jp Function110231
-; 1107ff
 
-Function1107ff: ; 1107ff
+Function1107ff:
 	ld a, [$c821]
 	bit 0, a
 	jp nz, Function110226
@@ -1315,21 +1287,19 @@
 	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 @@
 	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 @@
 	call Function110000
 	ld a, $1
 	jp Function110615
-; 1109a4
 
-Function1109a4: ; 1109a4
+Function1109a4:
 	ld hl, $c821
 	bit 0, [hl]
 	jp nz, Function110226
@@ -1489,9 +1457,8 @@
 	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 @@
 	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 @@
 	ld a, $1a
 	ld [$c86a], a
 	jp Function110432
-; 110af4
 
-Function110af4: ; 110af4
+Function110af4:
 	ld hl, $c827
 	ld a, e
 	ld [hli], a
@@ -1832,9 +1797,8 @@
 	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 @@
 	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 @@
 	ld a, $1c
 	ld [$c86a], a
 	jp Function110432
-; 110d37
 
-Function110d37: ; 110d37
+Function110d37:
 	push bc
 	push de
 	ld b, 0
@@ -2100,9 +2062,8 @@
 	cp $a
 	jr nz, .last_loop
 	ret
-; 110ddd
 
-Function110ddd: ; 110ddd
+Function110ddd:
 	ld a, [$c821]
 	bit 2, a
 	ld a, [$c86a]
@@ -2300,7 +2261,7 @@
 	xor a
 	ld [$c994], a
 
-Function110f07: ; 110f07
+Function110f07:
 	ld hl, $c833
 	ld a, [hli]
 	ld h, [hl]
@@ -2387,29 +2348,28 @@
 	ld a, $f
 	ld [$c86a], a
 	jp Function110432
-; 110fad
 
-URIPrefix: ; 0x110fad
+URIPrefix:
 	db "http://"
 .End
 
-HTTPDownloadURL: ; 0x110fb4
+HTTPDownloadURL:
 	db "gameboy.datacenter.ne.jp/cgb/download"
 .End
 
-HTTPUploadURL: ; 0x110fd9
+HTTPUploadURL:
 	db "gameboy.datacenter.ne.jp/cgb/upload"
 .End
 
-HTTPUtilityURL: ; 0x110ffc
+HTTPUtilityURL:
 	db "gameboy.datacenter.ne.jp/cgb/utility"
 .End
 
-HTTPRankingURL: ; 0x111020
+HTTPRankingURL:
 	db "gameboy.datacenter.ne.jp/cgb/ranking"
 .End
 
-Function111044: ; 111044
+Function111044:
 	ld hl, $c827
 	ld a, e
 	ld [hli], a
@@ -2581,9 +2541,8 @@
 	ld [$c86d], a
 	ei
 	ret
-; 11115f
 
-Function11115f: ; 11115f
+Function11115f:
 	ld e, a
 	xor a
 	cp b
@@ -2658,17 +2617,15 @@
 	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 @@
 	ld a, b
 	ld [hl], a
 	ret
-; 1111fe
 
-Function1111fe: ; 1111fe
+Function1111fe:
 	ld a, [$c821]
 	bit 2, a
 	ld a, [$c86a]
@@ -2899,9 +2855,8 @@
 	xor $1
 	ld [$c994], a
 	jp Function110f07
-; 111335
 
-Function111335: ; 111335
+Function111335:
 	ld hl, $c876
 	ld a, [hli]
 	ld h, [hl]
@@ -3028,27 +2983,24 @@
 	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 @@
 	call Function110231
 	ld a, $ff
 	ret
-; 11148c
 
-Function11148c: ; 11148c
+Function11148c:
 	ld a, [$c822]
 	bit 4, a
 	jp z, Function110226
@@ -3258,12 +3209,11 @@
 	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 @@
 	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 @@
 	ld a, $1
 	ld [hl], a
 	ret
-; 1115e4
 
-Function1115e4: ; 1115e4
+Function1115e4:
 	di
 	push af
 	ld hl, $c821
@@ -3383,9 +3331,8 @@
 .asm_11160d
 	ei
 	jr .asm_111604
-; 111610
 
-Function111610: ; 111610
+Function111610:
 	ld hl, $c86a
 	ld a, [hl]
 	dec a
@@ -3404,9 +3351,8 @@
 	ld [hli], a
 	ld [hl], b
 	ret
-; 11162d
 
-Function11162d: ; 11162d
+Function11162d:
 	ld a, [$c86a]
 	cp $1
 	jp nz, Function110226
@@ -3426,9 +3372,8 @@
 	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 @@
 	ld [hl], a
 	ret
 
-Function111664: ; 111664 (44:5664)
+Function111664:
 	ld hl, $ca3a
 	ld a, [hli]
 	ld e, a
@@ -3467,7 +3412,7 @@
 	ld [hl], d
 	ret
 
-Function111686: ; 111686 (44:5686)
+Function111686:
 	xor a
 	ld [rTAC], a
 	ld c, $ff
@@ -3483,17 +3428,16 @@
 	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 @@
 	and b
 	ld [$cb47], a
 	ret
-; 1116c5
 
-_MobileReceive:: ; 1116c5 (44:56c5)
+_MobileReceive::
 	ld a, [$c800]
 	rrca
 	jp nc, Function1118bc
@@ -3618,7 +3561,7 @@
 .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 @@
 	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 @@
 	ld [hl], a
 	jp Function1118bc
 
-Function1117e7: ; 1117e7 (44:57e7)
+Function1117e7:
 	ld a, [$c80b]
 	or a
 	jr z, .asm_1117f8
@@ -3765,7 +3708,7 @@
 	ld [hl], a
 	jr Function1118bc
 
-Function11186e: ; 11186e (44:586e)
+Function11186e:
 	call Function1118c2
 	ld a, $4
 	cp [hl]
@@ -3780,7 +3723,7 @@
 	inc [hl]
 	jr Function1118bc
 
-Function111884: ; 111884 (44:5884)
+Function111884:
 	call Function1118c2
 	ld a, [$c80c]
 	cp [hl]
@@ -3790,7 +3733,7 @@
 	inc [hl]
 	jr Function1118bc
 
-Function111892: ; 111892 (44:5892)
+Function111892:
 	ld a, [rSB]
 	ld c, a
 	call Function111664
@@ -3816,12 +3759,12 @@
 	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 @@
 	inc [hl]
 	ret
 
-_Timer:: ; 1118de (44:58de)
+_Timer::
 	ld a, [$c80b]
 	cp $4
 	call z, Function111b3c
@@ -3975,7 +3918,7 @@
 	ld [$c80f], a
 	jr .asm_1119a9
 
-Function1119f0: ; 1119f0 (44:59f0)
+Function1119f0:
 	ld a, $90
 	ld [$c81e], a
 	ld [$c808], a
@@ -3987,7 +3930,7 @@
 	ld [$c806], a
 	jp Function111b3b
 
-Function111a0b: ; 111a0b (44:5a0b)
+Function111a0b:
 	ld a, [hl]
 	cp $6
 	jp z, Function111b3b
@@ -4006,7 +3949,7 @@
 	call Function111f07
 	jp Function111b3b
 
-Function111a2a: ; 111a2a (44:5a2a)
+Function111a2a:
 	ld hl, $c80b
 	ld a, [hld]
 	or a
@@ -4018,13 +3961,13 @@
 	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 @@
 	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 @@
 	ld a, $f1
 	jp Function111a42
 
-Function111b21: ; 111b21 (44:5b21)
+Function111b21:
 	ld hl, $c803
 	ld a, [hli]
 	ld e, a
@@ -4155,7 +4098,7 @@
 	ld [hld], a
 	ld [hl], e
 
-Function111b2e: ; 111b2e (44:5b2e)
+Function111b2e:
 	ld hl, $c822
 	set 1, [hl]
 	ld a, $3
@@ -4163,10 +4106,10 @@
 	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 @@
 	ld [$c807], a
 	ret
 
-Function111c06: ; 111c06 (44:5c06)
+Function111c06:
 	ld de, $c872
 	ld hl, $ca40
 	ld b, $2
@@ -4277,7 +4220,7 @@
 	ld [$c807], a
 	ret
 
-Function111c17: ; 111c17 (44:5c17)
+Function111c17:
 	ld a, [$ca3c]
 	cp $9f
 	jp z, Function111d07
@@ -4376,7 +4319,7 @@
 	call Function110000
 	jr Function111d07
 
-Function111cc2: ; 111cc2 (44:5cc2)
+Function111cc2:
 	xor a
 	cp d
 	jr nz, .asm_111cda
@@ -4425,7 +4368,7 @@
 	jr nc, Function111d07
 	inc [hl]
 
-Function111d07: ; 111d07 (44:5d07)
+Function111d07:
 	ld a, [$c822]
 	bit 4, a
 	jr z, .asm_111d1c
@@ -4440,7 +4383,7 @@
 	ld [$c807], a
 	ret
 
-Function111d23: ; 111d23 (44:5d23)
+Function111d23:
 	ld a, [$c829]
 	ld e, a
 	ld a, [$c82a]
@@ -4452,7 +4395,7 @@
 	ld [$c807], a
 	ret
 
-Function111d39: ; 111d39 (44:5d39)
+Function111d39:
 	ld de, $ca3f
 	ld hl, Unknown_112006
 	ld b, $9
@@ -4482,7 +4425,7 @@
 	xor a
 	jr .asm_111d59
 
-Function111d65: ; 111d65 (44:5d65)
+Function111d65:
 	ld a, $3
 	ld [$c807], a
 	ld hl, $c821
@@ -4489,7 +4432,7 @@
 	set 4, [hl]
 	ret
 
-Function111d70: ; 111d70 (44:5d70)
+Function111d70:
 	ld hl, $c822
 	bit 0, [hl]
 	jr z, .asm_111dc0
@@ -4544,7 +4487,7 @@
 	ld [$c807], a
 	ret
 
-Function111dd9: ; 111dd9 (44:5dd9)
+Function111dd9:
 	cp $ff
 	jr z, .asm_111de7
 	or a
@@ -4585,7 +4528,7 @@
 	ld b, $3
 	ret
 
-Function111e15: ; 111e15 (44:5e15)
+Function111e15:
 	ld a, b
 	and $7
 	rrca
@@ -4599,13 +4542,11 @@
 	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 @@
 	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 @@
 	set 5, [hl]
 	ei
 	ret
-; 111f63 (44:5f63)
 
-Function111f63: ; 111f63
+Function111f63:
 	push de
 	ld hl, 0
 	ld c, b
@@ -4819,9 +4758,8 @@
 	ld e, c
 	ld d, b
 	ret
-; 111f8d
 
-Function111f8d: ; 111f8d
+Function111f8d:
 	dec de
 	ld a, [de]
 	add l
@@ -4831,9 +4769,8 @@
 	ld h, a
 	dec b
 	ret
-; 111f97
 
-Function111f97: ; 111f97 (44:5f97)
+Function111f97:
 	ld hl, $c822
 	bit 0, [hl]
 	ret nz
@@ -4880,62 +4817,61 @@
 	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 @@
 	db $b0, $05, $ee
 	db $ec, $10, $b4
 	db $e4, $0c, $dd
-; 11209e
 
 Unknown_11209e:
 	db "HELO ", 0
@@ -4981,9 +4916,8 @@
 	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 @@
 	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 @@
 	dw Function1134cb
 	dw Function113672
 	dw Function113626
-; 1121f6
 
-Function1121f6: ; 1121f6
+Function1121f6:
 	dec a
 	jr z, .asm_1121fe
 	dec a
@@ -5147,7 +5079,7 @@
 	call Function11225d
 	jp Function1116a4
 
-Function112251: ; 112251
+Function112251:
 	xor a
 	ld [$c821], a
 	ld [$c807], a
@@ -5154,23 +5086,20 @@
 	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 @@
 	call Function11225d
 	jp Function1116a4
 
-Function11234b: ; 11234b
+Function11234b:
 	ld a, [$cb4c]
 	add $a
 	ld e, a
@@ -5313,7 +5242,7 @@
 	ld a, b
 	jp Function111f02
 
-Function11235a: ; 11235a
+Function11235a:
 	ld hl, $c86e
 	ld a, $80
 	ld [hli], a
@@ -5322,15 +5251,13 @@
 	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 @@
 	ld a, [$c872]
 	call Function11225d
 	jp Function1116a4
-; 1123b6
 
-Function1123b6: ; 1123b6
+Function1123b6:
 	dec a
 	jr z, .asm_1123be
 	dec a
@@ -5404,9 +5330,8 @@
 	set 6, [hl]
 	set 5, [hl]
 	ret
-; 1123e1
 
-Function1123e1: ; 1123e1
+Function1123e1:
 	dec a
 	jr z, .asm_1123f2
 	dec a
@@ -5458,7 +5383,7 @@
 	ld [hl], a
 	jp Function1116a0
 
-Function112430: ; 112430
+Function112430:
 	ld a, $3
 	ld [$c807], a
 	ld de, $cb47
@@ -5473,9 +5398,8 @@
 	ld a, $a4
 	ld hl, $cb47
 	jp Function111f02
-; 112451
 
-Function112451: ; 112451
+Function112451:
 	dec a
 	jr z, .asm_112458
 	dec a
@@ -5607,9 +5531,8 @@
 
 .asm_112531
 	jp Function1125bf
-; 112534
 
-Function112534: ; 112534
+Function112534:
 	ld b, $fa
 	ld hl, $c880
 	xor a
@@ -5632,9 +5555,8 @@
 	ld a, $95
 	ld hl, $cb53
 	jp Function111f02
-; 112566
 
-Function112566: ; 112566
+Function112566:
 	call Function1125c7
 	ld a, [$cb5a]
 	and $1
@@ -5661,7 +5583,7 @@
 	ld [$c86a], a
 	jr Function1125bf
 
-Function112597: ; 112597
+Function112597:
 	call Function1125c7
 	call Function11269b
 	ld a, $5
@@ -5683,14 +5605,13 @@
 .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 @@
 	ld [de], a
 	inc de
 	ret
-; 11261c
 
-Function11261c: ; 11261c
+Function11261c:
 	xor a
 	ld [$c86b], a
 	ld a, [$c86c]
@@ -5768,13 +5688,12 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld c, a
 	or c
 	ret
-; 112715
 
-Function112715: ; 112715
+Function112715:
 	xor a
 	ld [$c86c], a
 	ld a, $2
@@ -5901,13 +5814,12 @@
 	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 @@
 	ld [hl], a
 	pop hl
 	ret
-; 11273a
 
-Function11273a: ; 11273a
+Function11273a:
 	dec a
 	jr z, .asm_112752
 	dec a
@@ -6002,12 +5913,12 @@
 	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 @@
 	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 @@
 	ld a, $20
 	ld [hl], a
 	ret
-; 1127f3
 
-Function1127f3: ; 1127f3
+Function1127f3:
 	call Function112807
 	ld hl, $c82f
 	ld a, [hli]
@@ -6050,9 +5959,8 @@
 	cp $2e
 	ret nz
 	jr Function1127e7
-; 112807
 
-Function112807: ; 112807
+Function112807:
 	push bc
 	push de
 	ld hl, $ca3f
@@ -6090,9 +5998,8 @@
 	ld b, $5
 	ld de, $c82f
 	jr .asm_11282a
-; 112840
 
-Function112840: ; 112840
+Function112840:
 	dec a
 	jr z, .asm_112844
 	ret
@@ -6161,7 +6068,7 @@
 	ld hl, $cb47
 	jp Function1127c5
 
-Function1128bd: ; 1128bd
+Function1128bd:
 	ld hl, $c880
 	call Function112b11
 	ld hl, $c810
@@ -6173,16 +6080,14 @@
 	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 @@
 
 .asm_11295b
 	jp Function1128bd
-; 11295e
 
-Function11295e: ; 11295e
+Function11295e:
 	ld a, $d
 	ld [de], a
 	inc de
@@ -6271,9 +6175,8 @@
 	inc de
 	inc c
 	ret
-; 112969
 
-Function112969: ; 112969
+Function112969:
 	dec a
 	jr z, .asm_112970
 	dec a
@@ -6304,9 +6207,8 @@
 	res 7, [hl]
 	set 5, [hl]
 	ret
-; 11299c
 
-Function11299c: ; 11299c
+Function11299c:
 	dec a
 	jr z, .asm_1129aa
 	dec a
@@ -6385,7 +6287,7 @@
 	inc de
 .asm_112a2c
 
-Function112a2c: ; 112a2c
+Function112a2c:
 	ld hl, $c821
 	set 1, [hl]
 	res 0, [hl]
@@ -6399,7 +6301,7 @@
 	ld [$c86a], a
 	ret
 
-Function112a42: ; 112a42
+Function112a42:
 	ld hl, $c810
 	xor a
 	ld [hli], a
@@ -6411,9 +6313,8 @@
 	set 1, [hl]
 	res 0, [hl]
 	ret
-; 112a56
 
-Function112a56: ; 112a56
+Function112a56:
 	dec a
 	jr z, .asm_112a5a
 	ret
@@ -6468,9 +6369,8 @@
 .asm_112aa6
 	ld de, $0005
 	jp Function112a2c
-; 112aac
 
-Function112aac: ; 112aac
+Function112aac:
 	ld a, [$c872]
 	push af
 	ld a, [$c873]
@@ -6530,9 +6430,8 @@
 	pop af
 	ld [$c872], a
 	ret
-; 112b11
 
-Function112b11: ; 112b11
+Function112b11:
 	ld a, [$c872]
 	push af
 	ld a, [$c873]
@@ -6588,9 +6487,8 @@
 	pop af
 	ld [$c872], a
 	ret
-; 112b60
 
-Function112b60: ; 112b60
+Function112b60:
 	ld a, [hli]
 	cp $30
 	jr c, .asm_112b6f
@@ -6605,9 +6503,8 @@
 .asm_112b6f
 	scf
 	ret
-; 112b71
 
-Function112b71: ; 112b71
+Function112b71:
 	dec a
 	jr z, .asm_112b75
 	ret
@@ -6654,9 +6551,8 @@
 .asm_112bb5
 	ld de, $0004
 	jp Function112a2c
-; 112bbb
 
-Function112bbb: ; 112bbb
+Function112bbb:
 	dec a
 	jr z, .asm_112bbf
 	ret
@@ -6684,9 +6580,8 @@
 .asm_112be6
 	ld de, $0004
 	jp Function112a2c
-; 112bec
 
-Function112bec: ; 112bec
+Function112bec:
 	dec a
 	jr z, .asm_112bf7
 	dec a
@@ -6878,9 +6773,8 @@
 	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 @@
 .asm_112d2d
 	ld de, $0004
 	jp Function112a2c
-; 112d33
 
-Function112d33: ; 112d33
+Function112d33:
 	dec a
 	jr z, .asm_112d87
 	dec a
@@ -7221,9 +7114,8 @@
 	ld hl, $c821
 	res 0, [hl]
 	ret
-; 112f61
 
-Function112f61: ; 112f61
+Function112f61:
 	ld hl, $c989
 	ld a, [hl]
 	or a
@@ -7294,9 +7186,8 @@
 	call Function11306b
 	ld a, [$c990]
 	ret
-; 112fd5
 
-Function112fd5: ; 112fd5
+Function112fd5:
 	ld de, Unknown_113001
 	push hl
 	call Function113281
@@ -7331,13 +7222,11 @@
 	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 @@
 	ld a, $2
 	ld [$c990], a
 	ret
-; 113026
 
-Function113026: ; 113026
+Function113026:
 	ld de, Unknown_1132b2
 	push hl
 	call Function113273
@@ -7392,9 +7280,8 @@
 	pop hl
 	pop bc
 	ret
-; 113054
 
-Function113054: ; 113054
+Function113054:
 	ld de, Unknown_1132bf
 	push hl
 	call Function113273
@@ -7410,14 +7297,13 @@
 	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 @@
 	pop hl
 	jr Function113095
 
-Function113089: ; 113089
+Function113089:
 	ld a, [hl]
 	cp $d
 	jr z, .asm_113094
@@ -7440,7 +7326,7 @@
 .asm_113094
 	inc hl
 
-Function113095: ; 113095
+Function113095:
 	inc hl
 	push bc
 	ld a, [$c872]
@@ -7575,9 +7461,8 @@
 	ld a, $2
 	ld [$c989], a
 	ret
-; 113167
 
-Function113167: ; 113167
+Function113167:
 	ld de, Unknown_1132ff
 	push hl
 	call Function113273
@@ -7598,7 +7483,7 @@
 	jr nz, .asm_113178
 	jr Function113197
 
-Function113180: ; 113180
+Function113180:
 	ld de, Unknown_11330c
 	push hl
 	call Function113273
@@ -7618,7 +7503,7 @@
 	cp $a
 	jr nz, .asm_113191
 
-Function113197: ; 113197
+Function113197:
 	pop hl
 	ld c, b
 	ld de, $cb57
@@ -7633,9 +7518,8 @@
 	pop hl
 	pop bc
 	ret
-; 1131a9
 
-Function1131a9: ; 1131a9
+Function1131a9:
 	ld hl, $c979
 	ld de, $c880
 	ld b, $0
@@ -7697,9 +7581,8 @@
 	dec [hl]
 	ld a, $4
 	ret
-; 113206
 
-Function113206: ; 113206
+Function113206:
 	ld a, b
 	sub e
 	ld [$c991], a
@@ -7735,9 +7618,8 @@
 	ld a, $3
 	ld [$c86b], a
 	ret
-; 113245
 
-Function113245: ; 113245
+Function113245:
 	ld a, b
 	sub e
 	ld [$c992], a
@@ -7758,9 +7640,8 @@
 	ld a, $3
 	ld [$c86b], a
 	ret
-; 113268
 
-Function113268: ; 113268
+Function113268:
 .asm_113268
 	dec b
 	ld a, [hli]
@@ -7771,9 +7652,8 @@
 	jr nz, .asm_113268
 	scf
 	ret
-; 113273
 
-Function113273: ; 113273
+Function113273:
 	ld c, $0
 .asm_113275
 	ld a, [de]
@@ -7787,9 +7667,8 @@
 	jr z, .asm_113275
 	scf
 	ret
-; 113281
 
-Function113281: ; 113281
+Function113281:
 	ld c, $0
 	push hl
 	ld l, e
@@ -7816,9 +7695,8 @@
 	ld h, d
 	pop de
 	ret
-; 11329d
 
-Function11329d: ; 11329d
+Function11329d:
 	cp $41
 	ret c
 	cp $5b
@@ -7825,7 +7703,6 @@
 	ret nc
 	or $20
 	ret
-; 1132a6
 
 Unknown_1132a6:
 	db "Gb-Status: ", 0
@@ -7839,9 +7716,8 @@
 	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 @@
 	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 @@
 	ld a, $95
 	ld hl, $cb53
 	jp Function111f02
-; 1133de
 
-Function1133de: ; 1133de
+Function1133de:
 	call Function1126e6
 	xor a
 	ld [$c86b], a
@@ -7946,9 +7819,8 @@
 	ld a, [$c9ad]
 	ld [$c87f], a
 	ret
-; 1133fe
 
-Function1133fe: ; 1133fe
+Function1133fe:
 	ld hl, $cb58
 	ld a, [hli]
 	cp $68
@@ -8039,9 +7911,8 @@
 	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 @@
 	ld hl, $cb47
 	ld a, $95
 	jp Function111f02
-; 1134cb
 
-Function1134cb: ; 1134cb
+Function1134cb:
 	dec a
 	jr z, .asm_1134d9
 	dec a
@@ -8145,9 +8015,8 @@
 	cp $1e
 	jp nz, Function112251
 	jp Function1116a0
-; 113519
 
-Function113519: ; 113519
+Function113519:
 	dec a
 	jr z, .asm_113527
 	dec a
@@ -8228,9 +8097,8 @@
 .asm_11358c
 	call Function11225d
 	jp Function1116a4
-; 113592
 
-Function113592: ; 113592
+Function113592:
 	push de
 	ld l, e
 	ld h, d
@@ -8240,9 +8108,8 @@
 	call Function110000
 	pop de
 	ret
-; 11359d
 
-Function11359d: ; 11359d
+Function11359d:
 	ld b, $20
 	call Function113592
 	ld a, $21
@@ -8251,17 +8118,15 @@
 	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 @@
 	ld a, $11
 	ld hl, $c92e
 	jp Function11000f
-; 1135eb
 
-Function1135eb: ; 1135eb
+Function1135eb:
 	ld b, $8
 .asm_1135ed
 	ld a, [hl]
@@ -8317,19 +8181,16 @@
 	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 @@
 
 .asm_11366f
 	jp Function1116a0
-; 113672
 
-Function113672: ; 113672
+Function113672:
 	dec a
 	jr z, .asm_113680
 	dec a
@@ -8438,9 +8298,8 @@
 
 .asm_1136be
 	jp Function1116a0
-; 1136c1
 
-Function1136c1: ; 1136c1
+Function1136c1:
 	xor a
 	ld [$cc28], a
 	ld a, l
@@ -8812,9 +8671,8 @@
 	xor a
 	ld [hl], a
 	ret
-; 113909
 
-Function113909: ; 113909
+Function113909:
 	call Function11391e
 	ld a, c
 	and $f0
@@ -8827,7 +8685,7 @@
 	jp z, Function1139b7
 	jp Function1139de
 
-Function11391e: ; 11391e
+Function11391e:
 	and $f
 	ld e, a
 	ld d, $0
@@ -8837,7 +8695,7 @@
 	ld b, $8
 	jp Function110000
 
-Function11392f: ; 11392f
+Function11392f:
 	ld hl, $cbf9
 	ld a, [hli]
 	ld h, [hl]
@@ -8871,7 +8729,7 @@
 	call Function113a15
 	ret
 
-Function113973: ; 113973
+Function113973:
 	ld hl, $cbf9
 	ld a, [hli]
 	ld h, [hl]
@@ -8904,9 +8762,8 @@
 	ld de, $cc03
 	call Function113a15
 	ret
-; 1139b7
 
-Function1139b7: ; 1139b7
+Function1139b7:
 	ld hl, $cbf9
 	ld a, [hli]
 	ld h, [hl]
@@ -8927,9 +8784,8 @@
 	ld hl, $cbff
 	call Function113a28
 	ret
-; 1139de
 
-Function1139de: ; 1139de
+Function1139de:
 	ld hl, $cbfd
 	ld a, [hli]
 	ld h, [hl]
@@ -8952,9 +8808,8 @@
 	ld hl, $cbff
 	call Function113a28
 	ret
-; 113a0b
 
-Function113a0b: ; 113a0b
+Function113a0b:
 	ld b, $4
 .asm_113a0d
 	ld a, [de]
@@ -8964,9 +8819,8 @@
 	dec b
 	jr nz, .asm_113a0d
 	ret
-; 113a15
 
-Function113a15: ; 113a15
+Function113a15:
 	ld b, $4
 .asm_113a17
 	ld a, [de]
@@ -8976,9 +8830,8 @@
 	dec b
 	jr nz, .asm_113a17
 	ret
-; 113a1f
 
-Function113a1f: ; 113a1f
+Function113a1f:
 	ld b, $4
 .asm_113a21
 	ld a, [hl]
@@ -8987,9 +8840,8 @@
 	dec b
 	jr nz, .asm_113a21
 	ret
-; 113a28
 
-Function113a28: ; 113a28
+Function113a28:
 	ld b, $4
 .asm_113a2a
 	ld a, [de]
@@ -8999,9 +8851,8 @@
 	dec b
 	jr nz, .asm_113a2a
 	ret
-; 113a32
 
-Function113a32: ; 113a32
+Function113a32:
 	ld a, [de]
 	inc de
 	add [hl]
@@ -9015,9 +8866,8 @@
 	dec b
 	jr nz, .asm_113a38
 	ret
-; 113a40
 
-Function113a40: ; 113a40
+Function113a40:
 .asm_113a40
 	or a
 	push hl
@@ -9039,11 +8889,9 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $0
 	ld [hl], a
 	ret
-; 113d47
 
-Function113d47: ; 113d47
+Function113d47:
 	cp $1a
 	jr c, .asm_113d5a
 	cp $34
@@ -9258,9 +9104,8 @@
 .asm_113d63
 	ld a, $2b
 	ret
-; 113d66
 
-Function113d66: ; 113d66
+Function113d66:
 	ld a, c
 	ld [$cc10], a
 	ld a, b
@@ -9427,9 +9272,8 @@
 .asm_113e3f
 	sub $47
 	ret
-; 113e42
 
-Function113e42: ; 113e42
+Function113e42:
 	dec a
 	jr z, .asm_113e4f
 	dec a
@@ -9504,9 +9348,8 @@
 	ld a, $1
 	ld [$c86b], a
 	jp .asm_113e6d
-; 113eb8
 
-Function113eb8: ; 113eb8
+Function113eb8:
 	ld a, $ff
 	ld [$c81e], a
 	ld hl, $c822
@@ -9513,9 +9356,8 @@
 	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 @@
 	ld hl, $c822
 	set 0, [hl]
 	ret
-; 113ef2
 
-Function113ef2: ; 113ef2
+Function113ef2:
 	dec a
 	jr z, .asm_113efa
 	dec a
@@ -9588,9 +9429,8 @@
 	dec a
 	ld [hl], a
 	ret
-; 113f2d
 
-Function113f2d: ; 113f2d
+Function113f2d:
 	dec a
 	jr z, .asm_113f35
 	dec a
@@ -9649,4 +9489,3 @@
 	inc a
 	ld [hl], a
 	ret
-; 113f84
--- 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
@@ -18,7 +18,6 @@
 
 depixel EQUS "ldpixel de,"
 bcpixel EQUS "ldpixel bc,"
-
 
 ; Design patterns
 
--- a/macros/data.asm
+++ b/macros/data.asm
@@ -2,7 +2,6 @@
 
 percent EQUS "* $ff / 100"
 
-
 ; Constant data (db, dw, dl) macros
 
 dwb: MACRO
@@ -87,7 +86,6 @@
 	dw \1
 ENDM
 
-
 dbpixel: MACRO
 if _NARG >= 4
 ; x tile, x pxl, y tile, y pxl
@@ -103,7 +101,6 @@
 	db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5, \6
 ENDM
 
-
 menu_coords: MACRO
 ; x1, y1, x2, y2
 	db \2, \1 ; start coords
@@ -110,7 +107,6 @@
 	db \4, \3 ; end coords
 ENDM
 
-
 bcd: MACRO
 rept _NARG
 	dn ((\1) % 100) / 10, (\1) % 10
@@ -117,7 +113,6 @@
 	shift
 endr
 ENDM
-
 
 sine_table: MACRO
 ; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -22,7 +22,6 @@
 __enum__ = \1
 ENDM
 
-
 ; Enumerate constants
 
 const_def: MACRO
@@ -42,7 +41,6 @@
 \1 EQU (1 << const_value)
 const_value = const_value + 1
 ENDM
-
 
 ; Enumerate strings
 
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -8,7 +8,6 @@
 ; macros/scripts/audio.asm
 unknownmusic0xde EQUS "sound_duty"
 
-
 ; macros/scripts/events.asm
 
 checkmorn EQUS "checktime MORN"
@@ -54,7 +53,6 @@
 givepokeitem      EQUS "givepokemail"
 checkpokeitem     EQUS "checkpokemail"
 
-
 ; macros/scripts/maps.asm
 
 mapconst: MACRO
@@ -93,7 +91,6 @@
 PERSONTYPE_SCRIPT   EQUS "OBJECTTYPE_SCRIPT"
 PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL"
 PERSONTYPE_TRAINER  EQUS "OBJECTTYPE_TRAINER"
-
 
 ; macros/scripts/movement.asm
 
--- a/macros/scripts/battle_anims.asm
+++ b/macros/scripts/battle_anims.asm
@@ -295,7 +295,7 @@
 	dw \1 ; address
 ENDM
 
-	enum anim_ret_command ; $ff
+anim_ret_command EQU -1 ; $ff
 anim_ret: MACRO
 	db anim_ret_command
 ENDM
--- a/macros/scripts/maps.asm
+++ b/macros/scripts/maps.asm
@@ -3,7 +3,6 @@
 	db GROUP_\1, MAP_\1
 ENDM
 
-
 scene_script: MACRO
 ;\1: script pointer
 	dw \1
@@ -74,7 +73,6 @@
 	shift
 	dw \9
 ENDM
-
 
 trainer: MACRO
 ;\1: trainer group
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -46,9 +46,9 @@
 	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 @@
 	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
--- a/macros/scripts/trade_anims.asm
+++ b/macros/scripts/trade_anims.asm
@@ -166,7 +166,6 @@
 	db tradeanim_wait_180_if_ot_egg_command
 ENDM
 
-
 ; Mobile
 	enum_start $01
 
--- a/macros/wram.asm
+++ b/macros/wram.asm
@@ -76,7 +76,6 @@
 \1Special::    dw
 ENDM
 
-
 battle_struct: MACRO
 \1Species::   db
 \1Item::      db
@@ -114,7 +113,6 @@
 \1End::             ds 2 ; padding
 ENDM
 
-
 map_connection_struct: MACRO
 \1ConnectedMapGroup::       db
 \1ConnectedMapNumber::      db
@@ -146,30 +144,30 @@
 \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
--- a/main.asm
+++ b/main.asm
@@ -117,10 +117,8 @@
 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/consume_held_item.asm"
-INCLUDE "data/moves/effects_pointers.asm"
 INCLUDE "data/moves/effects.asm"
 INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm"
 
@@ -131,10 +129,10 @@
 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"
 
 
@@ -162,10 +160,7 @@
 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
@@ -186,7 +181,6 @@
 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/pokemon/mail.asm"
 
 
@@ -216,10 +210,10 @@
 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/link_2.asm"
@@ -264,9 +258,9 @@
 INCLUDE "engine/pokemon/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/names.asm"
-INCLUDE "data/unused_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"
 
@@ -287,6 +281,7 @@
 
 SECTION "bank21", ROMX
 
+INCLUDE "engine/printer/printer_serial.asm"
 INCLUDE "engine/printer/printer.asm"
 INCLUDE "gfx/battle_anims.asm"
 INCLUDE "engine/events/halloffame.asm"
@@ -376,7 +371,7 @@
 INCLUDE "data/moves/animations.asm"
 INCLUDE "engine/events/poisonstep_pals.asm"
 
-TheEndGFX:: ; cbd2e
+TheEndGFX::
 INCBIN "gfx/credits/theend.2bpp"
 
 
@@ -440,7 +435,7 @@
 
 SECTION "bank39", ROMX
 
-CopyrightGFX:: ; e4000
+CopyrightGFX::
 INCBIN "gfx/splash/copyright.2bpp"
 
 INCLUDE "engine/menus/options_menu.asm"
@@ -489,7 +484,7 @@
 
 SECTION "Intro Logo", ROMX
 
-IntroLogoGFX: ; 109407
+IntroLogoGFX:
 INCBIN "gfx/intro/logo.2bpp.lz"
 
 
@@ -569,7 +564,6 @@
 
 INCLUDE "data/items/names.asm"
 INCLUDE "engine/items/print_item_description.asm"
-INCLUDE "data/items/descriptions.asm"
 INCLUDE "data/moves/names.asm"
 INCLUDE "engine/overworld/landmarks.asm"
 
@@ -576,7 +570,7 @@
 
 SECTION "bank77", ROMX
 
-UnownFont: ; 1dc000
+UnownFont:
 INCBIN "gfx/font/unown_font.2bpp"
 
 INCLUDE "engine/printer/print_party.asm"
@@ -590,7 +584,7 @@
 INCLUDE "engine/events/catch_tutorial_input.asm"
 INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm"
 
-PokegearGFX: ; 1de2e4
+PokegearGFX:
 INCBIN "gfx/pokegear/pokegear.2bpp.lz"
 
 INCLUDE "engine/pokemon/european_mail.asm"
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -57,7 +57,7 @@
 	checkitem COIN_CASE
 	iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript
 	writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
-GoldenrodGameCornerTMVendor_LoopScript: ; 056c36
+GoldenrodGameCornerTMVendor_LoopScript:
 	special DisplayCoinCaseBalance
 	loadmenu GoldenrodGameCornerTMVendorMenuHeader
 	verticalmenu
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -131,7 +131,7 @@
 	checkcode VAR_BOXSPACE
 	ifequal 0, Route35NationalParkGate_NoRoomInBox
 
-Route35NationalParkGate_LessThanFullParty: ; 6a27d
+Route35NationalParkGate_LessThanFullParty:
 	special CheckFirstMonIsEgg
 	ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg
 	writetext UnknownText_0x6a4c6
--- 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 @@
 	ld b, h
 	scf
 	ret
-; 11c075
 
-Function11c075: ; 11c075
+Function11c075:
 	push de
 	ld a, c
 	call Function11c254
@@ -31,9 +30,8 @@
 	ld bc, wcd36
 	call Function11c08f
 	ret
-; 11c082
 
-Unreferenced_Function11c082: ; 11c082
+Unreferenced_Function11c082:
 	push de
 	ld a, c
 	call Function11c254
@@ -41,9 +39,8 @@
 	ld bc, wcd36
 	call PrintEZChatBattleMessage
 	ret
-; 11c08f
 
-Function11c08f: ; 11c08f
+Function11c08f:
 	ld l, e
 	ld h, d
 	push hl
@@ -93,9 +90,8 @@
 	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 @@
 	ld a, h
 	ld [wcf64], a
 	ret
-; 11c14a
 
-GetLengthOfWordAtC608: ; 11c14a
+GetLengthOfWordAtC608:
 	ld c, $0
 	ld hl, $c608
 .loop
@@ -221,9 +216,8 @@
 	ret z
 	inc c
 	jr .loop
-; 11c156
 
-CopyMobileEZChatToC608: ; 11c156
+CopyMobileEZChatToC608:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -272,9 +266,8 @@
 	ld hl, wStringBuffer1
 	ld bc, MON_NAME_LENGTH - 1
 	jr .copy_string
-; 11c1ab
 
-Function11c1ab: ; 11c1ab
+Function11c1ab:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -283,9 +276,8 @@
 	pop af
 	ld [hInMenu], a
 	ret
-; 11c1b9
 
-Function11c1b9: ; 11c1b9
+Function11c1b9:
 	call .InitKanaMode
 	ld a, [rSVBK]
 	push af
@@ -295,9 +287,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 11c1ca
 
-.InitKanaMode: ; 11c1ca
+.InitKanaMode:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -345,9 +336,8 @@
 	call EZChat_GetCategoryWordsByKana
 	call EZChat_GetSeenPokemonByKana
 	ret
-; 11c254
 
-Function11c254: ; 11c254
+Function11c254:
 	push af
 	ld a, $4
 	call GetSRAMBank
@@ -366,9 +356,8 @@
 	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
@@ -375,7 +364,7 @@
 	call ByteFill
 	ret
 
-EZChat_MasterLoop: ; 11c283
+EZChat_MasterLoop:
 .loop
 	call JoyTextDelay
 	ld a, [hJoyPressed]
@@ -392,13 +381,11 @@
 	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 @@
 	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 @@
 	set 2, [hl]
 	jp Function11cfb5
 
-.InitRAM: ; 11c346 (47:4346)
+.InitRAM:
 	ld a, $9
 	ld [wcd2d], a
 	ld a, $2
@@ -484,7 +471,7 @@
 	call Function11cfce
 	jp Function11cfb5
 
-Function11c35f: ; 11c35f (47:435f)
+Function11c35f:
 	ld hl, wcd2f
 	inc [hl]
 	inc [hl]
@@ -498,7 +485,7 @@
 	ret nz
 	jp Function11cfb5
 
-Function11c373: ; 11c373 (47:4373)
+Function11c373:
 	ld hl, wcd30
 	inc [hl]
 	inc [hl]
@@ -513,7 +500,7 @@
 	call Function11c38a
 	jp Function11cfb5
 
-Function11c38a: ; 11c38a (47:438a)
+Function11c38a:
 	ld hl, Unknown_11c986
 	ld bc, wcd36
 	ld a, $6
@@ -551,13 +538,11 @@
 	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 @@
 	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 @@
 	ld [hl], a
 	ret
 
-Function11c4a5: ; 11c4a5 (47:44a5)
+Function11c4a5:
 	ld hl, wcd23
 	res 0, [hl]
 	ld a, [wcd2b]
@@ -709,7 +694,7 @@
 	ld a, $15
 	ret
 
-Function11c4be: ; 11c4be (47:44be)
+Function11c4be:
 	ld a, $1
 	hlcoord 0, 6, wAttrMap
 	ld bc, $a0
@@ -720,21 +705,18 @@
 	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 @@
 	res 1, [hl]
 	call Function11cfb5
 
-Function11c53d: ; 11c53d (47:453d)
+Function11c53d:
 	ld hl, wcd21
 	ld de, hJoypadPressed ; $ffa3
 
@@ -879,9 +861,8 @@
 .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,7 +893,7 @@
 	call PlaceString
 	ret
 
-Function11c618: ; 11c618 (47:4618)
+Function11c618:
 	ld a, $2
 	hlcoord 0, 6, wAttrMap
 	ld bc, $c8
@@ -919,13 +900,11 @@
 	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 @@
 	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 @@
 	res 3, [hl]
 	call Function11cfb5
 
-Function11c675: ; 11c675 (47:4675)
+Function11c675:
 	ld hl, wMobileCommsJumptableIndex
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -1114,7 +1092,7 @@
 	ld [hl], a
 	ret
 
-Function11c770: ; 11c770 (47:4770)
+Function11c770:
 	xor a
 	ld [wMobileCommsJumptableIndex], a
 	ld [wcd26], a
@@ -1165,7 +1143,7 @@
 	ld [wcd28], a
 	jr .div_12
 
-Function11c7bc: ; 11c7bc (47:47bc)
+Function11c7bc:
 	ld bc, Unknown_11c854
 	ld a, [wcd2b]
 	and a
@@ -1284,9 +1262,8 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .asm_11c8c2
 	ret
-; 11c8c7 (47:48c7)
 
-BCD2String: ; 11c8c7
+BCD2String:
 	inc a
 	push af
 	and $f
@@ -1380,21 +1355,17 @@
 	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 @@
 	ld d, a
 	jr .asm_11c912
 
-Function11c95d: ; 11c95d (47:495d)
+Function11c95d:
 	sla a
 	ld c, a
 	ld b, 0
@@ -1496,7 +1467,6 @@
 	jr nz, .asm_11c980
 	pop hl
 	ret
-; 11c986 (47:4986)
 
 Unknown_11c986:
 	dwcoord  1,  2
@@ -1505,9 +1475,8 @@
 	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 @@
 	jr nz, .asm_11c997
 	ret
 
-Function11c9ab: ; 11c9ab (47:49ab)
+Function11c9ab:
 	ld a, $7
 	hlcoord 0, 6, wAttrMap
 	ld bc, $c8
@@ -1532,11 +1501,11 @@
 	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 @@
 	inc [hl]
 	ret
 
-Function11ca01: ; 11ca01 (47:4a01)
+Function11ca01:
 	hlcoord 14, 7, wAttrMap
 	ld de, $14
 	ld a, $5
@@ -1601,7 +1570,7 @@
 	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 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-Function11ca6a: ; 11ca6a (47:4a6a)
+Function11ca6a:
 	ld hl, wcd36
 	ld c, a
 	ld b, $0
@@ -1658,7 +1624,7 @@
 	call PlaceString
 	ret
 
-Function11ca7f: ; 11ca7f (47:4a7f)
+Function11ca7f:
 	push de
 	ld de, Unknown_11cfc6
 	call Function11cfce
@@ -1678,11 +1644,11 @@
 	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 @@
 	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 @@
 	ld d, a
 	call Function11ca7f
 
-Function11cb66: ; 11cb66 (47:4b66)
+Function11cb66:
 	ld hl, wcd2a
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -1872,7 +1835,7 @@
 	inc [hl]
 	ret
 
-Function11cbf5: ; 11cbf5 (47:4bf5)
+Function11cbf5:
 	call WaitSFX
 	ld hl, wcf64
 	dec [hl]
@@ -1880,55 +1843,52 @@
 	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 @@
 	call Function11ca19
 	call Function11cfb5
 
-Function11cd04: ; 11cd04 (47:4d04)
+Function11cd04:
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
 	and a
@@ -1945,13 +1905,11 @@
 	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 @@
 	res 5, [hl]
 	call Function11cfb5
 
-Function11cd54: ; 11cd54 (47:4d54)
+Function11cd54:
 	ld hl, wcd2c
 	ld de, hJoypadPressed ; $ffa3
 	ld a, [de]
@@ -2033,7 +1991,7 @@
 	call PlaceString
 	ret
 
-Function11cdaa: ; 11cdaa (47:4daa)
+Function11cdaa:
 	ld a, $2
 	hlcoord 0, 6, wAttrMap
 	ld bc, 6 * SCREEN_WIDTH
@@ -2044,26 +2002,22 @@
 	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 @@
 	res 2, [hl]
 	call Function11cfb5
 
-Function11ce2b: ; 11ce2b (47:4e2b)
+Function11ce2b:
 	ld a, [wcd22]
 	sla a
 	sla a
@@ -2172,9 +2126,8 @@
 	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,9 +2225,8 @@
 	db $ff, $2d
 	db $2c, $ff
 	db $ff, $2e
-; 11cf79
 
-String_11cf79: ; 11cf79
+String_11cf79:
 ; Hiragana table
 	db   "あいうえお　なにぬねの　や　ゆ　よ"
 	next "かきくけこ　はひふへほ　わ"
@@ -2281,13 +2233,11 @@
 	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_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 @@
 	ld [hl], a
 	ret
 
-Function11d035: ; 11d035 (47:5035)
+Function11d035:
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH
 	ld a, [de]
@@ -2493,7 +2442,7 @@
 	jr nz, .loop3
 	ret
 
-.AddNMinusOneTimes: ; 11d0ac (47:50ac)
+.AddNMinusOneTimes:
 	ld a, [de]
 	dec a
 	ld bc, SCREEN_WIDTH
@@ -2503,7 +2452,7 @@
 	jr nz, .add_n_minus_one_times
 	ret
 
-AnimateEZChatCursor: ; 11d0b6 (47:50b6)
+AnimateEZChatCursor:
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
@@ -2530,7 +2479,7 @@
 	dw .nine
 	dw .ten
 
-.zero ; 11d0dd (47:50dd)
+.zero
 	ld a, [wcd20] ; wcd20
 	sla a
 	ld hl, .Coords_Zero
@@ -2537,7 +2486,7 @@
 	ld e, $1
 	jr .load
 
-.one ; 11d0e9 (47:50e9)
+.one
 	ld a, [wcd21]
 	sla a
 	ld hl, .Coords_One
@@ -2544,7 +2493,7 @@
 	ld e, $2
 	jr .load
 
-.two ; 11d0f5 (47:50f5)
+.two
 	ld hl, .FramesetsIDs_Two
 	ld a, [wcd22]
 	ld e, a
@@ -2559,7 +2508,7 @@
 	ld e, $4
 	jr .load
 
-.three ; 11d10f (47:510f)
+.three
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2
 	call ReinitSpriteAnimFrame
 	ld a, [wMobileCommsJumptableIndex]
@@ -2566,7 +2515,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call .UpdateObjectFlags
 	ret
 
-.seven ; 11d175 (47:5175)
+.seven
 	ld a, [wEZChatCursorYCoord]
 	cp $4
 	jr z, .cursor0
@@ -2682,15 +2631,15 @@
 	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,7 +2660,7 @@
 	call .UpdateObjectFlags
 	ret
 
-.ten ; 11d1fc (47:51fc)
+.ten
 	ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1
 	call ReinitSpriteAnimFrame
 	ld a, $8
@@ -2718,9 +2667,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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [hl], a
 	ret
 
-Function11d323: ; 11d323
+Function11d323:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -2926,7 +2874,6 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 11d33a
 
 Palette_11d33a:
 	RGB 31, 31, 31
@@ -3008,9 +2955,8 @@
 	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
@@ -3039,7 +2985,7 @@
 	ld hl, EZChat_SortedWords
 	ld a, (EZChat_SortedWords.End - EZChat_SortedWords) / 4
 
-.MasterLoop: ; 11d3ef
+.MasterLoop:
 	push af
 ; read row
 ; offset
@@ -3186,9 +3132,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 11d493
 
-.CheckSeenMon: ; 11d493
+.CheckSeenMon:
 	push hl
 	push bc
 	push de
@@ -3204,9 +3149,8 @@
 	pop bc
 	pop hl
 	ret
-; 11d4aa
 
-EZChat_GetCategoryWordsByKana: ; 11d4aa
+EZChat_GetCategoryWordsByKana:
 	ld a, [rSVBK]
 	push af
 	ld a, $3
@@ -3289,19 +3233,16 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	db "なんで@@", $f6, $3, $0
 	db "なんなんだ", $0, $4, $0
 	db "なんの@@", $2, $4, $0
-; 11f220
 
 MobileEZChatData_WordAndPageCounts:
 macro_11f220: MACRO
--- 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 @@
 	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 @@
 	ld a, $ff
 	ret
 
-Function48187: ; 48187 (12:4187)
+Function48187:
 	ld a, [wd479]
 	bit 1, a
 	jr nz, .asm_481f1
@@ -207,13 +207,11 @@
 	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 @@
 	bit 6, a
 	jr z, .asm_4825c
 	jr .asm_4825c
-; 48241 (12:4241)
 
 	hlcoord 1, 15
 	ld b, $2
@@ -265,21 +262,19 @@
 	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
@@ -331,7 +326,7 @@
 	ld [wd003], a
 	jp Function4840c
 
-Function48304: ; 48304 (12:4304)
+Function48304:
 	call Function48283
 	hlcoord 1, 16
 	ld de, MobileDesc_Address
@@ -388,7 +383,7 @@
 	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
 	jp Function4840c
 
-Function48383: ; 48383 (12:4383)
+Function48383:
 	push bc
 	push af
 	bit 5, a
@@ -425,7 +420,7 @@
 	pop bc
 	ret
 
-Function483bb: ; 483bb (12:43bb)
+Function483bb:
 	ld hl, wScrollingMenuCursorPosition
 	ld a, [hl]
 	inc a
@@ -454,9 +449,8 @@
 	hlcoord 11, 8
 	call PlaceString
 	ret
-; 483e8 (12:43e8)
 
-Function483e8: ; 483e8
+Function483e8:
 	push de
 	ld hl, Prefectures
 	ld a, [wMenuSelection]
@@ -483,9 +477,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 4840c
 
-Function4840c: ; 4840c (12:440c)
+Function4840c:
 	call Function48187
 	call Function48283
 	hlcoord 1, 16
@@ -511,7 +504,7 @@
 	call ClearBox
 	jp Function48157
 
-Mobile12_Bin2Dec: ; 48444 (12:4444)
+Mobile12_Bin2Dec:
 	push bc
 	push af
 	push de
@@ -533,10 +526,8 @@
 	pop af
 	pop bc
 	ret
-; 4845d (12:445d)
 
-.DigitStrings: ; 4845d
-; 4845d
+.DigitStrings:
 	db "0@"
 	db "1@"
 	db "2@"
@@ -547,7 +538,6 @@
 	db "7@"
 	db "8@"
 	db "9@"
-; 48471
 
 MobileProfileString:         db "  Mobile Profile@"
 MobileString_Gender:         db "Gender@"
@@ -560,47 +550,43 @@
 MobileDesc_Age:              db "How old are you?@"
 MobileDesc_Address:          db "Where do you live?@"
 MobileDesc_ZipCode:          db "Your zip code?@"
-; 484f1
 
-MenuHeader_0x484f1: ; 0x484f1
+MenuHeader_0x484f1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 2, SCREEN_WIDTH - 1, 7
 	dw MenuData_0x484f9
 	db 1 ; default option
-; 0x484f9
 
-MenuData_0x484f9: ; 0x484f9
+MenuData_0x484f9:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 2 ; items
 Strings_484fb:
 String_484fb: db "Boy@"
 String_484ff: db "Girl@"
-; 0x48504
 
-MenuHeader_0x48504: ; 0x48504
+MenuHeader_0x48504:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 
-MenuHeader_0x48509: ; 0x48509
+MenuHeader_0x48509:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 5, SCREEN_WIDTH - 1, 7
 
-MenuHeader_0x4850e: ; 0x4850e
+MenuHeader_0x4850e:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 
-MenuHeader_0x48513: ; 0x48513
+MenuHeader_0x48513:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 1, 18, 12
 	dw MenuData_0x4851b
 	db 1 ; default option
-; 0x4851b
 
-MenuData_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 @@
 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 @@
 	call Function48cdc
 	ret
 
-Function486bf: ; 486bf (12:46bf)
+Function486bf:
 	ld hl, w2DMenuCursorInitY
 	ld a, [wd002]
 	bit 6, a
@@ -752,7 +737,7 @@
 	ld [hli], a ; cursor tile + 1
 	ret
 
-Function48725: ; 48725 (12:4725)
+Function48725:
 ;	 ld a, [wd003]
 ;	 and $f
 ;	 cp $f
@@ -779,7 +764,7 @@
 	and a
 	ret
 
-Function4873c: ; 4873c (12:473c)
+Function4873c:
 	ld hl, w2DMenuCursorInitY
 	ld a, 4
 	ld [hli], a
@@ -820,7 +805,7 @@
 	ld [hli], a ; cursor tile + 1
 	ret
 
-Function4876f: ; 4876f (12:476f)
+Function4876f:
 	call Function48283
 	hlcoord 1, 16
 	ld de, MobileDesc_Age
@@ -879,7 +864,7 @@
 	ld [hInMenu], a
 	jp Function4840c
 
-Function487ec: ; 487ec (12:47ec)
+Function487ec:
 	push hl
 	ld de, wd473
 	call Function487ff
@@ -891,7 +876,7 @@
 	call PlaceString
 	ret
 
-Function487ff: ; 487ff (12:47ff)
+Function487ff:
 	push hl
 	ld a, " "
 	ld [hli], a
@@ -901,13 +886,11 @@
 	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,27 +984,26 @@
 	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
@@ -1057,7 +1039,7 @@
 	ld d, $0
 	ld b, $0
 
-asm_48922: ; 48922 (12:4922)
+asm_48922:
 	push bc
 	call JoyTextDelay
 	ld a, [hJoyDown]
@@ -1089,9 +1071,8 @@
 	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 @@
 	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 @@
 	ld [hInMenu], a
 	jp Function4840c
 
-Function489ea: ; 489ea (12:49ea)
+Function489ea:
 	push de
 	ld a, [wd475]
 	and $f
@@ -1218,13 +1199,11 @@
 	call Mobile12_Bin2Dec
 	pop de
 	ret
-; 48a38 (12:4a38)
 
-String_48a38: ; 48a38
+String_48a38:
 	db "-@"
-; 48a3a
 
-Function48a3a: ; 48a3a (12:4a3a)
+Function48a3a:
 	ld hl, MenuHeader_0x48a9c
 	call LoadMenuHeader
 	call Function4873c
@@ -1266,22 +1245,19 @@
 	and a
 	ret
 
-Function48a9a: ; 48a9a (12:4a9a)
+Function48a9a:
 	scf
 	ret
-; 48a9c (12:4a9c)
 
-MenuHeader_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 @@
 	ld a, [hl]
 	and $f
 
-asm_48bc7: ; 48bc7 (12:4bc7)
+asm_48bc7:
 	hlcoord 11, 10
 	push af
 	ld a, d
@@ -1470,7 +1446,7 @@
 	ld a, $f
 	jr Function48c00
 
-Function48bd7: ; 48bd7 (12:4bd7)
+Function48bd7:
 	push de
 	hlcoord 10, 9
 	ld b, $1
@@ -1501,7 +1477,7 @@
 	and $f
 	jr asm_48bc7
 
-Function48c00: ; 48c00 (12:4c00)
+Function48c00:
 	push af
 	hlcoord 11, 10
 	call Function489ea
@@ -1511,15 +1487,15 @@
 	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 @@
 	ld [wd002], a
 	ret
 
-Function48c4d: ; 48c4d (12:4c4d)
+Function48c4d:
 	swap a
 	and $f0
 	push af
@@ -1568,7 +1544,7 @@
 	ld [hl], a
 	ret
 
-Function48c5a: ; 48c5a (12:4c5a)
+Function48c5a:
 	push af
 	ld a, [hl]
 	and $f0
@@ -1578,7 +1554,7 @@
 	ld [hl], a
 	ret
 
-Function48c63: ; 48c63
+Function48c63:
 	ld a, "@"
 	ld [de], a
 	ld a, c
@@ -1613,9 +1589,8 @@
 .asm_48c8c
 	scf
 	ret
-; 48c8e
 
-Unreferenced_Function48c8e: ; 48c8e
+Unreferenced_Function48c8e:
 	ld hl, wd019 + $11
 	ld d, h
 	ld e, l
@@ -1624,9 +1599,8 @@
 	call PlaceString
 	call WaitBGMap
 	ret
-; 48ca3
 
-Function48ca3: ; 48ca3
+Function48ca3:
 	push af
 	push bc
 	push de
@@ -1669,13 +1643,12 @@
 	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 @@
 	jr nz, .asm_48ced
 	ret
 
-Function48cfd: ; 48cfd (12:4cfd)
+Function48cfd:
 	push hl
 	ld a, $4
 	ld [hli], a
@@ -1733,7 +1706,7 @@
 	ld [hl], $b
 	ret
 
-Function48d2a: ; 48d2a (12:4d2a)
+Function48d2a:
 	ld d, c
 .asm_48d2b
 	ld [hli], a
@@ -1741,7 +1714,7 @@
 	jr nz, .asm_48d2b
 	ret
 
-Function48d30: ; 48d30 (12:4d30)
+Function48d30:
 	ld hl, wd475
 	call Function48d4a
 	ld hl, wd477
@@ -1748,7 +1721,7 @@
 	call Function48d4a
 	ret
 
-Function48d3d: ; 48d3d (12:4d3d)
+Function48d3d:
 	ld hl, wd475
 	call Function48d94
 	ld hl, wd477
@@ -1755,7 +1728,7 @@
 	call Function48d94
 	ret
 
-Function48d4a: ; 48d4a (12:4d4a)
+Function48d4a:
 	inc hl
 	ld a, [hl]
 	ld b, a
@@ -1805,7 +1778,7 @@
 	ld [hl], b
 	ret
 
-Function48d94: ; 48d94 (12:4d94)
+Function48d94:
 	xor a
 	ld [hDividend + 0], a
 	ld [hDividend + 1], a
--- 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 @@
 	call CloseSRAM
 	and a
 	ret
-; 4a8dc
 
-.CheckMatch: ; 4a8dc
+.CheckMatch:
 	push bc
 	push hl
 	push de
@@ -130,9 +129,8 @@
 	pop bc
 	scf
 	ret
-; 4a8f4
 
-.BoxAddrs: ; 4a8f4
+.BoxAddrs:
 	dba sBox1
 	dba sBox2
 	dba sBox3
@@ -147,9 +145,8 @@
 	dba sBox12
 	dba sBox13
 	dba sBox14
-; 4a91e
 
-.CopyName: ; 4a91e
+.CopyName:
 	push hl
 	ld hl, NAME_LENGTH
 	add hl, bc
@@ -157,9 +154,8 @@
 	ld c, l
 	pop hl
 	ret
-; 4a927
 
-UnusedFindItemInPCOrBag: ; 4a927
+UnusedFindItemInPCOrBag:
 	ld a, [wScriptVar]
 	ld [wCurItem], a
 	ld hl, wPCItems
@@ -180,9 +176,8 @@
 	ld a, 1
 	ld [wScriptVar], a
 	ret
-; 4a94e
 
-Function4a94e: ; 4a94e
+Function4a94e:
 	call FadeToMenu
 	ld a, -1
 	ld hl, wd002
@@ -243,15 +238,13 @@
 	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 @@
 .asm_4a9d5
 	scf
 	ret
-; 4a9d7
 
-Function4a9d7: ; 4a9d7
+Function4a9d7:
 	ld a, [wd002]
 	ld hl, wPartyMonNicknames
 	call GetNick
@@ -299,23 +291,21 @@
 	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 @@
 	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 @@
 
 .finished
 	ret
-; 4aab6
 
-Function4aab6: ; 4aab6
+Function4aab6:
 	ld hl, wd002
 	ld d, $3
 .loop
@@ -428,9 +415,8 @@
 
 .done
 	ret
-; 4aad3
 
-Function4aad3: ; 4aad3
+Function4aad3:
 	ld hl, wPartyCount
 	ld a, [hli]
 	and a
@@ -455,9 +441,8 @@
 	call Function4aa7a
 	farcall PlaySpriteAnimations
 	ret
-; 4aafb
 
-Function4aafb: ; 4aafb
+Function4aafb:
 	ld a, [wCurPartySpecies]
 	cp EGG
 	jr z, .egg
@@ -467,9 +452,8 @@
 .egg
 	scf
 	ret
-; 4ab06
 
-Function4ab06: ; 4ab06
+Function4ab06:
 	ld a, [wCurPartyMon]
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld hl, wPartyMon1HP
@@ -483,9 +467,8 @@
 
 .NotFainted:
 	ret
-; 4ab1a
 
-Function4ab1a: ; 4ab1a
+Function4ab1a:
 .asm_4ab1a
 	ld a, $fb
 	ld [wMenuJoypadFilter], a
@@ -549,9 +532,8 @@
 	ld [wd018], a
 	and a
 	ret
-; 4ab99
 
-Function4ab99: ; 4ab99
+Function4ab99:
 	bit 1, a
 	jr z, .asm_4aba6
 	ld a, [wd002]
@@ -563,9 +545,8 @@
 .asm_4aba6
 	and a
 	ret
-; 4aba8
 
-Function4aba8: ; 4aba8
+Function4aba8:
 	ld hl, wd004
 	ld a, [hl]
 	cp $ff
@@ -586,9 +567,8 @@
 	ld [hl], a
 	scf
 	ret
-; 4abc3
 
-Function4abc3: ; 4abc3
+Function4abc3:
 	bit 3, a
 	jr z, .asm_4abd5
 	ld a, [wPartyCount]
@@ -677,9 +657,8 @@
 .asm_4ac56
 	and a
 	ret
-; 4ac58
 
-Function4ac58: ; 4ac58
+Function4ac58:
 	lb bc, 2, 18
 	hlcoord 1, 15
 	call ClearBox
@@ -712,16 +691,14 @@
 	call ExitMenu
 	and a
 	ret
-; 4aca2
 
-MenuHeader_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 [wMenuDataFlags], a
@@ -780,7 +757,7 @@
 	jr z, Function4ad56
 	jr .asm_4acf3
 
-Function4ad17: ; 4ad17
+Function4ad17:
 	call Function4adb2
 	jr z, .asm_4ad4a
 	ld hl, wd002
@@ -815,28 +792,24 @@
 	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 @@
 .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 @@
 	ret z
 	scf
 	ret
-; 4adc2
 
-Function4adc2: ; 4adc2
+Function4adc2:
 	ld a, [wd002]
 	cp $ff
 	jr nz, .skip
@@ -917,9 +884,8 @@
 	ld a, b
 	ld [wd004], a
 	ret
-; 4adf7
 
-Function4adf7: ; 4adf7
+Function4adf7:
 	ld a, [wd019]
 	bit 0, a
 	ret z
@@ -932,4 +898,3 @@
 	res 0, a
 	ld [wd019], a
 	ret
-; 4ae12
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -1,45 +1,40 @@
 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 GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ret
 
-Function8916e: ; 8916e (22:516e)
+Function8916e:
 	ld hl, wGameTimerPause
 	res GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ret
 
-Function89174: ; 89174 (22:5174)
+Function89174:
 	ld hl, wGameTimerPause
 	bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	ret
 
-Function8917a: ; 8917a (22:517a)
+Function8917a:
 	ld hl, wd002
 	ld bc, $32
 	xor a
@@ -46,7 +41,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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,10 +104,8 @@
 	call ByteFill
 	call DelayFrame
 	ret
-; 891ca
 
-
-Function891ca: ; 891ca (22:51ca)
+Function891ca:
 	push bc
 	call Function891b8
 	call WaitBGMap
@@ -122,7 +112,7 @@
 	pop bc
 	ret
 
-Function891d3: ; 891d3 (22:51d3)
+Function891d3:
 	push bc
 	call Function891ca
 	ld c, $10
@@ -130,7 +120,7 @@
 	pop bc
 	ret
 
-Function891de: ; 891de
+Function891de:
 	call Mobile22_SetBGMapMode0
 	call ClearPalettes
 	hlcoord 0, 0, wAttrMap
@@ -143,9 +133,8 @@
 	call ByteFill
 	call Function891ab
 	ret
-; 891fe
 
-Function891fe: ; 891fe
+Function891fe:
 	push bc
 	call Function891de
 	ld c, $10
@@ -152,21 +141,18 @@
 	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 @@
 	pop bc
 	pop hl
 	ret
-; 8921f
 
-
-Function8921f: ; 8921f (22:521f)
+Function8921f:
 	push de
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -199,25 +183,22 @@
 	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
@@ -224,18 +205,18 @@
 	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, MenuHeader_0x892a3
@@ -274,26 +255,23 @@
 .done
 	scf
 	ret
-; 892a3
 
-MenuHeader_0x892a3: ; 0x892a3
+MenuHeader_0x892a3:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 10, 5, 15, 9
 	dw MenuData_0x892ab
 	db 1 ; default option
-; 0x892ab
 
-MenuData_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 @@
 	dec e
 	jr nz, .loop
 	ret
-; 89305
 
-
-Function89305: ; 89305 (22:5305)
+Function89305:
 	xor a
 	ld [wMenuSelection], a
 	ld c, 40
@@ -358,7 +334,7 @@
 	jr nz, .loop
 	ret
 
-Function8931b: ; 8931b
+Function8931b:
 	push hl
 	ld hl, $a03b ; 4:a03b
 	ld a, [wMenuSelection]
@@ -369,13 +345,12 @@
 	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 @@
 .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 @@
 .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 @@
 .done
 	pop de
 	ret
-; 89381
 
-Function89381: ; 89381
+Function89381:
 	push bc
 	push de
 	call Function89b45
@@ -485,9 +456,8 @@
 	call Function89193
 	pop bc
 	ret
-; 8939a
 
-Function8939a: ; 8939a
+Function8939a:
 	push bc
 	ld hl, 0
 	add hl, bc
@@ -500,10 +470,8 @@
 	ld de, wd008
 	call Function89381
 	ret
-; 893b3
 
-
-Function893b3: ; 893b3 (22:53b3)
+Function893b3:
 	call DisableLCD
 	call ClearSprites
 	call LoadStandardFont
@@ -514,7 +482,7 @@
 	call EnableLCD
 	ret
 
-Function893cc: ; 893cc
+Function893cc:
 	call DisableLCD
 	call ClearSprites
 	call LoadStandardFont
@@ -523,10 +491,8 @@
 	call Function89464
 	call EnableLCD
 	ret
-; 893e2
 
-
-Function893e2: ; 893e2 (22:53e2)
+Function893e2:
 	call Function89b1e
 	call Function893b3
 	call Function8a5b6
@@ -533,7 +499,7 @@
 	call Function8949c
 	ret
 
-Function893ef: ; 893ef
+Function893ef:
 	ld de, vTiles0
 	ld hl, GFX_8940b
 	ld bc, $20
@@ -540,21 +506,18 @@
 	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 @@
 	call FarCopyBytes
 	ret
 
-Function89448: ; 89448 (22:5448)
+Function89448:
 ; Clears the sprite array
 	push af
 	ld hl, wVirtualOAM
@@ -580,7 +543,7 @@
 	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 @@
 	call FarCopyBytes
 	ret
 
-Function89464: ; 89464
+Function89464:
 	ld hl, MobileAdapterGFX
 	ld de, vTiles2
 	ld bc, $20 tiles
@@ -600,9 +563,8 @@
 	ld a, BANK(MobileAdapterGFX)
 	call FarCopyBytes
 	ret
-; 89481
 
-Function89481: ; 89481
+Function89481:
 	ld d, 2
 	call Function8934a
 	ret c
@@ -613,10 +575,8 @@
 	ret z
 	inc d
 	ret
-; 89492
 
-
-Function89492: ; 89492 (22:5492)
+Function89492:
 	ld d, 0
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
@@ -624,7 +584,7 @@
 	inc d
 	ret
 
-Function8949c: ; 8949c
+Function8949c:
 	ld a, [rSVBK]
 	push af
 	ld a, 5
@@ -636,16 +596,14 @@
 	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 @@
 	call Function8a60d
 	pop bc
 	ret
-; 894ca
 
-
-Function894ca: ; 894ca (22:54ca)
+Function894ca:
 	push bc
 	call Function894dc
 	call Function895c7
@@ -666,7 +622,7 @@
 	pop bc
 	ret
 
-Function894dc: ; 894dc
+Function894dc:
 	push bc
 	ld a, [rSVBK]
 	push af
@@ -693,15 +649,13 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [rSVBK], a
 	pop bc
 	ret
-; 895c7
 
-
-Function895c7: ; 895c7 (22:55c7)
+Function895c7:
 	ld a, [rSVBK]
 	push af
 	ld a, 5
@@ -834,24 +785,21 @@
 	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 @@
 	call Function89655
 	pop bc
 	ret
-; 89605
 
-Function89605: ; 89605
+Function89605:
 	hlcoord 19, 2, wAttrMap
 	ld a, 1
 	ld de, SCREEN_WIDTH
@@ -899,9 +846,8 @@
 	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 @@
 	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 @@
 	dec b
 	jr nz, .loop
 	ret
-; 8966c
 
-Function8966c: ; 8966c
+Function8966c:
 	push bc
 	call Function89688
 	hlcoord 4, 0
@@ -947,10 +891,8 @@
 	call Function896f5
 	pop bc
 	ret
-; 8967a
 
-
-Function8967a: ; 8967a (22:567a)
+Function8967a:
 	push bc
 	call Function89688
 	hlcoord 2, 0
@@ -959,7 +901,7 @@
 	pop bc
 	ret
 
-Function89688: ; 89688
+Function89688:
 	hlcoord 0, 0
 	ld a, 1
 	ld e, SCREEN_WIDTH
@@ -997,9 +939,8 @@
 	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 @@
 	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 @@
 	ld a, 11
 	ld [hli], a
 	ret
-; 896e1
 
-Function896e1: ; 896e1
+Function896e1:
 .loop
 	ld [hli], a
 	inc a
@@ -1030,9 +969,8 @@
 	dec e
 	jr nz, .loop
 	ret
-; 896eb
 
-Function896eb: ; 896eb
+Function896eb:
 .loop
 	ld [hli], a
 	dec a
@@ -1043,9 +981,8 @@
 	dec e
 	jr nz, .loop
 	ret
-; 896f5
 
-Function896f5: ; 896f5
+Function896f5:
 	call Function8971f
 	call Function89736
 	inc hl
@@ -1052,7 +989,7 @@
 	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 @@
 	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 @@
 	ld [hl], a
 	pop hl
 	ret
-; 89736
 
-Function89736: ; 89736
+Function89736:
 	push hl
 	inc hl
 	inc hl
@@ -1130,17 +1065,15 @@
 	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 @@
 	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 @@
 	dec e
 	jr nz, .asm_8978c
 	ret
-; 89797
 
-Function89797: ; 89797
+Function89797:
 	push bc
 	ld a, $e
 	ld [hl], a
@@ -1209,9 +1139,8 @@
 	ld [hl], a
 	pop bc
 	ret
-; 897af
 
-Function897af: ; 897af
+Function897af:
 	push bc
 	ld hl, $0010
 	add hl, bc
@@ -1230,9 +1159,8 @@
 	farcall GetTrainerPic
 	pop bc
 	ret
-; 897d5
 
-Function897d5: ; 897d5
+Function897d5:
 	push bc
 	call Function8934a
 	jr nc, .asm_897f3
@@ -1263,10 +1191,8 @@
 	call Function8963d
 	pop bc
 	ret
-; 89807
 
-
-Function89807: ; 89807 (22:5807)
+Function89807:
 	ld hl, MobileAdapterGFX + $20 tiles
 	ld a, [wPlayerGender]
 	bit PLAYERGENDER_FEMALE_F, a
@@ -1282,7 +1208,7 @@
 	call DelayFrame
 	ret
 
-Function89829: ; 89829 (22:5829)
+Function89829:
 	push bc
 	ld bc, $705
 	ld de, $14
@@ -1304,7 +1230,7 @@
 	pop bc
 	ret
 
-Function89844: ; 89844
+Function89844:
 	call Function89481
 	call Function894bb
 	call Function897af
@@ -1313,9 +1239,8 @@
 	call SetPalettes
 	pop bc
 	ret
-; 89856
 
-Function89856: ; 89856
+Function89856:
 	push bc
 	call Function891b8
 	pop bc
@@ -1333,10 +1258,8 @@
 	pop bc
 	call Function897d5
 	ret
-; 8987f
 
-
-Function8987f: ; 8987f (22:587f)
+Function8987f:
 	call Function891b8
 	call Function895f2
 	call Function8967a
@@ -1353,7 +1276,7 @@
 	call Function89975
 	ret
 
-Function898aa: ; 898aa
+Function898aa:
 	ld a, [wMenuSelection]
 	and a
 	ret z
@@ -1364,9 +1287,8 @@
 	call PrintNum
 	pop bc
 	ret
-; 898be
 
-Function898be: ; 898be
+Function898be:
 	push bc
 	ld de, wd002
 	ld hl, wd002
@@ -1385,9 +1307,8 @@
 	call PlaceString
 	pop bc
 	ret
-; 898dc
 
-Function898dc: ; 898dc
+Function898dc:
 	ld hl, $0006
 	add hl, bc
 	push bc
@@ -1402,9 +1323,8 @@
 	call PlaceString
 	pop bc
 	ret
-; 898f3
 
-Function898f3: ; 898f3
+Function898f3:
 	push bc
 	ld hl, $000c
 	add hl, bc
@@ -1425,9 +1345,8 @@
 .asm_89913
 	pop bc
 	ret
-; 89915
 
-Function89915: ; 89915
+Function89915:
 	push bc
 	push hl
 	ld de, Unknown_89942
@@ -1461,15 +1380,13 @@
 	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 @@
 	pop de
 	pop hl
 	ret
-; 89962
 
-Function89962: ; 89962
+Function89962:
 	push bc
 	ld c, $4
 	ld b, $20
@@ -1503,9 +1419,8 @@
 	jr nz, .asm_89967
 	pop bc
 	ret
-; 89975
 
-Function89975: ; 89975
+Function89975:
 	push bc
 	ld e, $8
 .asm_89978
@@ -1522,9 +1437,8 @@
 	jr nz, .asm_89978
 	pop bc
 	ret
-; 8998b
 
-Function8998b: ; 8998b
+Function8998b:
 	push bc
 	and $f
 	cp $a
@@ -1540,10 +1454,8 @@
 	ld [hl], a
 	pop bc
 	ret
-; 8999c
 
-
-Function8999c: ; 8999c (22:599c)
+Function8999c:
 	ld de, wPlayerName
 	call PlaceString
 	inc bc
@@ -1552,13 +1464,11 @@
 	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 @@
 	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 @@
 	hlcoord 2, 9
 	call Function89915
 	ret
-; 899fe
 
-Function899fe: ; 899fe
+Function899fe:
 	push bc
 	push hl
 	ld hl, $0019
@@ -1606,9 +1515,8 @@
 	call Function89a0c
 	pop bc
 	ret
-; 89a0c
 
-Function89a0c: ; 89a0c
+Function89a0c:
 	push hl
 	call Function89363
 	pop hl
@@ -1622,10 +1530,8 @@
 	ld de, String_89153
 	call PlaceString
 	ret
-; 89a23
 
-
-Function89a23: ; 89a23 (22:5a23)
+Function89a23:
 	hlcoord 0, 11
 	ld b, $4
 	ld c, $12
@@ -1632,7 +1538,7 @@
 	call Function8921f
 	ret
 
-Function89a2e: ; 89a2e (22:5a2e)
+Function89a2e:
 	hlcoord 11, 12
 	ld b, $2
 	ld c, $6
@@ -1645,17 +1551,14 @@
 	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 @@
 	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 @@
 	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 @@
 .finish_decode
 	pop de
 	ret
-; 89ae6
 
-.Function89ae6: ; 89ae6
+.Function89ae6:
 	ld hl, wd031
 	xor a
 	ld [hl], a
@@ -1788,34 +1684,29 @@
 .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 @@
 	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 @@
 	pop bc
 	pop hl
 	ret
-; 89b78
 
-
-Function89b78: ; 89b78 (22:5b78)
+Function89b78:
 	push bc
 	ld a, [wd010]
 	cp $10
@@ -1904,7 +1793,7 @@
 	pop bc
 	ret
 
-Function89b97: ; 89b97 (22:5b97)
+Function89b97:
 	call Function89c34
 	jr c, .asm_89ba0
 	call Function89448
@@ -1955,16 +1844,14 @@
 	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
@@ -1971,7 +1858,7 @@
 	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
@@ -1978,7 +1865,7 @@
 	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
@@ -1985,15 +1872,14 @@
 	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 @@
 	pop bc
 	ret
 
-Function89c44: ; 89c44 (22:5c44)
+Function89c44:
 	call Function89c34
 	jr c, .asm_89c4f
 	push de
@@ -2035,7 +1921,7 @@
 	ld [hli], a ; attributes
 	ret
 
-Function89c67: ; 89c67 (22:5c67)
+Function89c67:
 ; menu scrolling?
 	call JoyTextDelay_ForcehJoyDown ; joypad
 	ld b, $0
@@ -2099,22 +1985,20 @@
 	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 @@
 	jr nz, .asm_89cee
 	ret
 
-Function89d0d: ; 89d0d (22:5d0d)
+Function89d0d:
 	call Mobile22_SetBGMapMode0
 	ld a, [rSVBK]
 	push af
@@ -2185,23 +2069,20 @@
 	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 CopyMenuHeader
 	pop af
@@ -2213,7 +2094,7 @@
 	set 7, [hl]
 	ret
 
-Function89d75: ; 89d75 (22:5d75)
+Function89d75:
 	push hl
 	call Mobile22_SetBGMapMode0
 	call _hl_
@@ -2221,7 +2102,7 @@
 	pop hl
 	jr asm_89d90
 
-Function89d85: ; 89d85 (22:5d85)
+Function89d85:
 	push hl
 	call Mobile22_SetBGMapMode0
 	call _hl_
@@ -2228,7 +2109,7 @@
 	call CGBOnly_CopyTilemapAtOnce
 	pop hl
 
-asm_89d90: ; 89d90 (22:5d90)
+asm_89d90:
 	call Mobile22_SetBGMapMode0
 	push hl
 	call _hl_
@@ -2246,7 +2127,7 @@
 	and a
 	ret
 
-Function89dab: ; 89dab (22:5dab)
+Function89dab:
 	call Mobile22_SetBGMapMode0
 	farcall MobileMenuJoypad
 	call Mobile22_SetBGMapMode0
@@ -2276,7 +2157,7 @@
 	and a
 	ret
 
-Function89de0: ; 89de0 (22:5de0)
+Function89de0:
 	call ClearSprites
 	call Function89e0a
 	jr c, .asm_89e00
@@ -2299,13 +2180,12 @@
 	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 @@
 	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 @@
 	dw Function89e58
 	dw Function89e68
 
-
-Function89e58: ; 89e58 (22:5e58)
+Function89e58:
 	ld a, $1
 	call Function8a2fe
 	call Function891fe
@@ -2364,13 +2242,13 @@
 	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 @@
 	call SetPalettes
 	jp Function89e36
 
-Function89e9a: ; 89e9a (22:5e9a)
+Function89e9a:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -2399,16 +2277,14 @@
 	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 @@
 	call SetPalettes
 	jp Function89e36
 
-Function89ee1: ; 89ee1 (22:5ee1)
+Function89ee1:
 	call ClearBGPalettes
 	call Function893e2
 	call Mobile22_SetBGMapMode0
@@ -2434,7 +2310,7 @@
 	call Function8a53d
 	ret
 
-Function89efd: ; 89efd (22:5efd)
+Function89efd:
 	ld hl, wd012
 	ld a, $ff
 	ld [hli], a
@@ -2508,7 +2384,7 @@
 	jr nz, .asm_89f60
 	jp Function89e36
 
-Function89f6a: ; 89f6a (22:5f6a)
+Function89f6a:
 	push af
 	ld de, $10
 	call Function89f9a
@@ -2519,7 +2395,7 @@
 	pop af
 	ret
 
-Function89f77: ; 89f77 (22:5f77)
+Function89f77:
 	push af
 	ld de, $10
 	call Function89f9a
@@ -2548,7 +2424,7 @@
 	pop af
 	ret
 
-Function89f9a: ; 89f9a (22:5f9a)
+Function89f9a:
 	dec a
 	ld hl, wVirtualOAM
 	and a
@@ -2559,7 +2435,7 @@
 	jr nz, .asm_89fa0
 	ret
 
-Function89fa5: ; 89fa5 (22:5fa5)
+Function89fa5:
 	ld de, $10
 	call Function89f9a
 	ld e, $2
@@ -2592,7 +2468,7 @@
 	jr nz, .asm_89faf
 	ret
 
-Function89fce: ; 89fce (22:5fce)
+Function89fce:
 	call Function8a5b6
 	ld a, $5
 	hlcoord 7, 4, wAttrMap
@@ -2605,12 +2481,12 @@
 	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,7 +2512,7 @@
 	call Mobile22_ButtonSound
 	jp Function89e36
 
-Function8a03d: ; 8a03d (22:603d)
+Function8a03d:
 	ld hl, UnknownText_0x8a107
 	call Function89209
 	call PrintText
@@ -2643,12 +2519,12 @@
 	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 @@
 	call CGBOnly_CopyTilemapAtOnce
 	jp Function89e36
 
-Function8a0a1: ; 8a0a1 (22:60a1)
+Function8a0a1:
 	call Mobile22_SetBGMapMode0
 	push bc
 	call Function8a0c9
@@ -2708,7 +2584,7 @@
 	pop bc
 	ret
 
-Function8a0c1: ; 8a0c1 (22:60c1)
+Function8a0c1:
 	push hl
 	ld bc, wAttrMap - wTileMap
 	add hl, bc
@@ -2716,7 +2592,7 @@
 	pop hl
 	ret
 
-Function8a0c9: ; 8a0c9 (22:60c9)
+Function8a0c9:
 	push bc
 	hlcoord 0, 0
 	ld de, $14
@@ -2734,56 +2610,51 @@
 	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, MenuHeader_0x8a176
@@ -2828,14 +2699,12 @@
 	call Function8920f
 	scf
 	ret
-; 8a176 (22:6176)
 
-MenuHeader_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
@@ -2850,24 +2719,21 @@
 .asm_8a198
 	ld d, a
 	ret
-; 8a19a (22:619a)
 
-MenuHeader_0x8a19a: ; 0x8a19a
+MenuHeader_0x8a19a:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 0, SCREEN_WIDTH - 1, 6
 	dw MenuData_0x8a1a2
 	db 1 ; default option
-; 0x8a1a2
 
-MenuData_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 @@
 	call Function8919e
 	call PlaceString
 	ret
-; 8a1cc
 
-Strings_8a1cc: ; 8a1cc
+Strings_8a1cc:
 	db   "めいし<NO>せいりと　へんしゅうを"
 	next "おこないます"
 	db   "@"
@@ -2893,10 +2758,8 @@
 
 	db   "まえ<NO>がめん<NI>もどります"
 	db   "@"
-; 8a20d
 
-
-Function8a20d: ; 8a20d (22:620d)
+Function8a20d:
 	ld hl, UnknownText_0x8a232
 	call PrintText
 	ld a, $2
@@ -2914,27 +2777,23 @@
 	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)
+Function8a241:
 	call LoadStandardMenuHeader
 	call Function891fe
 	call Function8a262
@@ -2951,7 +2810,7 @@
 	and a
 	ret
 
-Function8a262: ; 8a262 (22:6262)
+Function8a262:
 	call ClearBGPalettes
 	call Function893e2
 	call Mobile22_SetBGMapMode0
@@ -2977,7 +2836,7 @@
 	call Function8b5e7
 	ret
 
-Function8a2aa: ; 8a2aa (22:62aa)
+Function8a2aa:
 	ld hl, MenuHeader_0x8a2ef
 	call LoadMenuHeader
 	ld hl, UnknownText_0x8a2f4
@@ -3009,26 +2868,22 @@
 .asm_8a2ed
 	scf
 	ret
-; 8a2ef (22:62ef)
 
-MenuHeader_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,7 +2893,7 @@
 	call CloseSRAM
 	ret
 
-Function8a313: ; 8a313 (22:6313)
+Function8a313:
 	ld c, a
 	call OpenSRAMBank4
 	ld a, c
@@ -3045,7 +2900,7 @@
 	ld [$a60b], a
 	ret
 
-Function8a31c: ; 8a31c (22:631c)
+Function8a31c:
 	push bc
 	call Mobile22_SetBGMapMode0
 	farcall Function4a3a7
@@ -3090,7 +2945,7 @@
 	and a
 	ret
 
-Function8a383: ; 8a383 (22:6383)
+Function8a383:
 	farcall MobileMenuJoypad
 	ld a, c
 	ld hl, wMenuJoypadFilter
@@ -3110,7 +2965,7 @@
 	call PlayClickSFX
 	ret
 
-Function8a3a2: ; 8a3a2 (22:63a2)
+Function8a3a2:
 	ld a, [wMenuCursorY]
 	dec a
 	ld hl, wd002
@@ -3121,7 +2976,7 @@
 	ld [wMenuSelection], a
 	ret
 
-Function8a3b2: ; 8a3b2 (22:63b2)
+Function8a3b2:
 	ld a, $1
 	ld [wMenuSelection], a
 	call Function8a4fc
@@ -3143,7 +2998,7 @@
 	call CopyMenuHeader
 	ret
 
-Function8a3df: ; 8a3df (22:63df)
+Function8a3df:
 	call OpenSRAMBank4
 	ld hl, $a603
 	call Function89b45
@@ -3160,7 +3015,7 @@
 	and a
 	ret
 
-Function8a400: ; 8a400 (22:6400)
+Function8a400:
 	ld a, [de]
 	inc de
 	ld [hli], a
@@ -3167,19 +3022,17 @@
 	cp $ff
 	jr nz, Function8a400
 	ret
-; 8a408 (22:6408)
 
 Unknown_8a408: db 1, 2, -1
 Unknown_8a40b: db 1, 2, 3, -1
 
-MenuHeader_0x8a40f: ; 0x8a40f
+MenuHeader_0x8a40f:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 10, TEXTBOX_Y - 1
 	dw MenuData_0x8a417
 	db 1 ; default option
-; 0x8a417
 
-MenuData_0x8a417: ; 0x8a417
+MenuData_0x8a417:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 4 ; items
 	db "めいしりスト@"
@@ -3186,24 +3039,21 @@
 	db "じぶんの　めいし@"
 	db "めいしこうかん@"
 	db "やめる@"
-; 0x8a435
 
-MenuHeader_0x8a435: ; 0x8a435
+MenuHeader_0x8a435:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 2, 10, 9
 	dw MenuData_0x8a43d
 	db 1 ; default option
-; 0x8a43d
 
-MenuData_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 @@
 .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 @@
 
 	db   "ともだちと　じぶん<NO>めいしを"
 	next "せきがいせんで　こうかん　します@"
-; 8a4d3
 
-Function8a4d3: ; 8a4d3 (22:64d3)
+Function8a4d3:
 	ld a, [wMenuSelection]
 	cp $1
 	jr nz, .asm_8a4eb
@@ -3257,7 +3104,7 @@
 	call Function8a5a3
 	ret
 
-Function8a4fc: ; 8a4fc (22:64fc)
+Function8a4fc:
 	ld a, [wMenuSelection]
 	cp $3
 	jr nz, asm_8a529
@@ -3273,7 +3120,7 @@
 	call Function8a515
 	ret
 
-Function8a515: ; 8a515 (22:6515)
+Function8a515:
 	ld hl, wd012
 	ld a, [hl]
 	cp $38
@@ -3287,7 +3134,7 @@
 	ld [wd013], a
 	ret
 
-asm_8a529: ; 8a529 (22:6529)
+asm_8a529:
 	ld hl, wd012
 	ld a, $3c
 	ld [hli], a
@@ -3299,7 +3146,7 @@
 	call ByteFill
 	ret
 
-Function8a53d: ; 8a53d (22:653d)
+Function8a53d:
 	push hl
 	ld a, $15
 	ld c, $8
@@ -3328,7 +3175,7 @@
 	ld a, $27
 	ld c, $6
 
-Function8a573: ; 8a573 (22:6573)
+Function8a573:
 	ld [hl], a
 	call Function8a584
 	inc a
@@ -3336,7 +3183,7 @@
 	jr nz, Function8a573
 	ret
 
-Function8a57c: ; 8a57c (22:657c)
+Function8a57c:
 	ld [hl], a
 	call Function8a584
 	dec c
@@ -3343,7 +3190,7 @@
 	jr nz, Function8a57c
 	ret
 
-Function8a584: ; 8a584 (22:6584)
+Function8a584:
 	push af
 	ld a, $4
 	call Function89215
@@ -3351,7 +3198,7 @@
 	pop af
 	ret
 
-Function8a58d: ; 8a58d (22:658d)
+Function8a58d:
 	ld a, $2d
 	ld bc, $606
 	ld de, $14
@@ -3370,7 +3217,7 @@
 	jr nz, .asm_8a595
 	ret
 
-Function8a5a3: ; 8a5a3 (22:65a3)
+Function8a5a3:
 	ld bc, $603
 	ld de, $14
 .asm_8a5a9
@@ -3387,7 +3234,7 @@
 	jr nz, .asm_8a5a9
 	ret
 
-Function8a5b6: ; 8a5b6 (22:65b6)
+Function8a5b6:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -3407,9 +3254,8 @@
 	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 @@
 	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,16 +3295,14 @@
 	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)
+Function8a62c:
 	call LoadStandardMenuHeader
 	call Function891fe
 	xor a
@@ -3499,14 +3340,13 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wd012], a
 	ret
 
-Function8a765: ; 8a765 (22:6765)
+Function8a765:
 	call Function8931b
 	push bc
 	ld hl, $0
@@ -3646,7 +3484,7 @@
 	scf
 	ret
 
-Function8a78c: ; 8a78c (22:678c)
+Function8a78c:
 	call Function891fe
 	ld de, wd002
 	ld b, $5
@@ -3673,7 +3511,7 @@
 	and a
 	ret
 
-Function8a7cb: ; 8a7cb (22:67cb)
+Function8a7cb:
 	ld a, [wMenuSelection]
 	push af
 	call Function891de
@@ -3706,7 +3544,7 @@
 	and a
 	ret
 
-Function8a818: ; 8a818 (22:6818)
+Function8a818:
 	call Function89a23
 	ld hl, wd002
 	call Function89331
@@ -3743,7 +3581,6 @@
 	call CloseSRAM
 	scf
 	ret
-; 8a868 (22:6868)
 
 .string_8a868
 	db "めいし<WO>かきかえ　まし<TA!>@"
@@ -3760,14 +3597,12 @@
 	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 @@
 	and a
 	ret
 
-Function8a8c3: ; 8a8c3 (22:68c3)
+Function8a8c3:
 	call Function891de
 	call ClearBGPalettes
 	call Function893cc
@@ -3818,17 +3653,14 @@
 	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,7 +3715,7 @@
 	call CloseSRAM
 	ret
 
-Function8a999: ; 8a999 (22:6999)
+Function8a999:
 	ld hl, MenuHeader_0x8a9c9
 	call LoadMenuHeader
 	ld c, $1
@@ -3908,17 +3740,15 @@
 	call Function8920f
 	ret
 
-Jumptable_8a9c5: ; 8a9c5 (22:69c5)
+Jumptable_8a9c5:
 	dw Function8aa0a
 	dw Function8ab3b
-; 8a9c9 (22:69c9)
 
-MenuHeader_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
@@ -3940,28 +3770,24 @@
 	ld e, $0
 	scf
 	ret
-; 8a9f2 (22:69f2)
 
-MenuHeader_0x8a9f2: ; 0x8a9f2
+MenuHeader_0x8a9f2:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 4, 18, TEXTBOX_Y - 1
 	dw MenuData_0x8a9fa
 	db 1 ; default option
-; 0x8a9fa
 
-MenuData_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 @@
 	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 @@
 	and a
 	ret
 
-Function8aab6: ; 8aab6 (22:6ab6)
+Function8aab6:
 	call Function89a23
 	ld hl, wd008
 	call Function89b45
@@ -4067,13 +3892,11 @@
 	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 @@
 	and a
 	ret
 
-Function8ab11: ; 8ab11 (22:6b11)
+Function8ab11:
 	call OpenSRAMBank4
 	ld hl, $a603
 	ld de, wd008
@@ -4104,7 +3927,7 @@
 	and a
 	ret
 
-Function8ab3b: ; 8ab3b (22:6b3b)
+Function8ab3b:
 .pressed_start
 	call Function891fe
 	call ClearBGPalettes
@@ -4128,7 +3951,7 @@
 	jr c, .pressed_start
 	ret
 
-.JoypadLoop: ; 8ab77 (22:6b77)
+.JoypadLoop:
 	call JoyTextDelay_ForcehJoyDown
 	bit A_BUTTON_F, c
 	jr nz, .a_b_button
@@ -4146,7 +3969,7 @@
 	and a
 	ret
 
-Function8ab93: ; 8ab93 (22:6b93)
+Function8ab93:
 	call ClearBGPalettes
 	call LoadStandardMenuHeader
 	farcall Function105688
@@ -4154,9 +3977,8 @@
 	call Function891fe
 	call Function89b28
 	ret
-; 8aba9 (22:6ba9)
 
-Function8aba9: ; 8aba9
+Function8aba9:
 	ld a, $2
 	call Function8b94a
 	ld a, $1
@@ -4223,14 +4045,12 @@
 	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 @@
 	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 @@
 	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,19 +4218,16 @@
 .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
@@ -4420,17 +4234,15 @@
 	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 @@
 	ret z
 	scf
 	ret
-; 8addb
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -1,4 +1,4 @@
-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.
@@ -17,27 +17,22 @@
 	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
@@ -44,16 +39,14 @@
 	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 @@
 	pop bc
 	ret
 
-Function8b379: ; 8b379 (22:7379)
+Function8b379:
 	; d = [bc + e]
 	push bc
 	ld a, c
@@ -78,7 +71,7 @@
 	pop bc
 	ret
 
-Function8b385: ; 8b385 (22:7385)
+Function8b385:
 	; [bc + e] = d
 	push bc
 	ld a, c
@@ -92,7 +85,7 @@
 	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 @@
 	pop bc
 	ret
 
-Function8b3a4: ; 8b3a4 (22:73a4)
+Function8b3a4:
 	; strcmp(hl, bc, 4)
 	push de
 	push bc
@@ -124,7 +117,7 @@
 	pop de
 	ret
 
-Function8b3b0: ; 8b3b0 (22:73b0)
+Function8b3b0:
 	ld bc, $a037 ; 4:a037
 	ld a, [$a60b]
 	and a
@@ -141,7 +134,7 @@
 	ld a, [$a60b]
 	ret
 
-Function8b3cd: ; 8b3cd (22:73cd)
+Function8b3cd:
 	push de
 	push bc
 	ld e, $4
@@ -156,7 +149,7 @@
 	pop de
 	ret
 
-Function8b3dd: ; 8b3dd (22:73dd)
+Function8b3dd:
 	push de
 	push bc
 	call JoyTextDelay_ForcehJoyDown ; joypad
@@ -246,7 +239,7 @@
 	ld [wd010], a
 	ret
 
-Function8b45c: ; 8b45c (22:745c)
+Function8b45c:
 	call Function8b36c
 	xor a
 	ld [wd010], a
@@ -274,7 +267,7 @@
 	scf
 	ret
 
-Function8b493: ; 8b493 (22:7493)
+Function8b493:
 	push bc
 	call Mobile22_SetBGMapMode0
 	call Function8b521
@@ -283,12 +276,11 @@
 	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 @@
 	call Function8b3cd
 	ret
 
-Function8b4b8: ; 8b4b8 (22:74b8)
+Function8b4b8:
 	push bc
 	push de
 	call Function8b4ea
@@ -312,7 +304,7 @@
 	call Function8b3cd
 	ret
 
-Function8b4cc: ; 8b4cc (22:74cc)
+Function8b4cc:
 	push bc
 	ld hl, Unknown_8b529
 	call Function8b50a
@@ -322,7 +314,7 @@
 	pop bc
 	ret
 
-Function8b4d8: ; 8b4d8 (22:74d8)
+Function8b4d8:
 	ld hl, Unknown_8b529
 	call Function8b50a
 	push hl
@@ -338,7 +330,7 @@
 	ld l, a
 	ret
 
-Function8b4ea: ; 8b4ea (22:74ea)
+Function8b4ea:
 	ld hl, Unknown_8b529
 	call Function8b50a
 	push hl
@@ -355,7 +347,7 @@
 	ld d, a
 	ret
 
-Function8b4fd: ; 8b4fd (22:74fd)
+Function8b4fd:
 	ld hl, Unknown_8b529 + 4
 	call Function8b50a
 	ld a, [hli]
@@ -366,7 +358,7 @@
 	ld d, a
 	ret
 
-Function8b50a: ; 8b50a (22:750a)
+Function8b50a:
 	ld a, [wd02e]
 	and a
 	ret z
@@ -378,7 +370,7 @@
 	jr nz, .asm_8b513
 	ret
 
-Function8b518: ; 8b518 (22:7518)
+Function8b518:
 	push de
 	ld d, $0
 	ld e, $14
@@ -387,21 +379,19 @@
 	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 @@
 	call CGBOnly_CopyTilemapAtOnce
 	ret
 
-Function8b555: ; 8b555 (22:7555)
+Function8b555:
 .loop
 	ld hl, UnknownText_0x8b5ce
 	call PrintText
@@ -466,39 +456,33 @@
 	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 @@
 	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 @@
 	ret
 .string_8b663
 	db "@"
-; 8b664
 
-Function8b664: ; 8b664 (22:7664)
+Function8b664:
 	push bc
 	ld de, $4
 .asm_8b668
@@ -583,7 +563,7 @@
 	cp $4
 	ret
 
-Function8b677: ; 8b677
+Function8b677:
 	call ClearBGPalettes
 	call DisableLCD
 	call Function8b690
@@ -593,9 +573,8 @@
 	call Function891ab
 	call SetPalettes
 	ret
-; 8b690
 
-Function8b690: ; 8b690
+Function8b690:
 	ld hl, GFX_17afa5 + $514
 	ld de, vTiles2
 	ld bc, $160
@@ -607,14 +586,13 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $7
 	call ByteFill
 	ret
-; 8b703
 
-Function8b703: ; 8b703
+Function8b703:
 	call Mobile22_SetBGMapMode0
 	push hl
 	ld a, $c
@@ -687,9 +662,8 @@
 	pop bc
 	pop hl
 	jr Function8b744
-; 8b732
 
-Function8b732: ; 8b732
+Function8b732:
 	ld a, $12
 	ld [hli], a
 	ld a, $13
@@ -697,9 +671,8 @@
 	ld a, $14
 	ld [hl], a
 	ret
-; 8b73e
 
-Function8b73e: ; 8b73e
+Function8b73e:
 	ld d, c
 .asm_8b73f
 	ld [hli], a
@@ -706,9 +679,8 @@
 	dec d
 	jr nz, .asm_8b73f
 	ret
-; 8b744
 
-Function8b744: ; 8b744
+Function8b744:
 	ld de, wAttrMap - wTileMap
 	add hl, de
 	inc b
@@ -730,9 +702,8 @@
 	dec b
 	jr nz, .asm_8b74d
 	ret
-; 8b75d
 
-Function8b75d: ; 8b75d
+Function8b75d:
 	call Mobile22_SetBGMapMode0
 	hlcoord 0, 0
 	ld a, $1
@@ -753,13 +724,11 @@
 	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 @@
 	dec c
 	jr nz, .asm_8b788
 	ret
-; 8b79e
 
-Function8b79e: ; 8b79e
+Function8b79e:
 	hlcoord 0, 1, wAttrMap
 	ld a, $1
 	ld [hli], a
@@ -804,9 +772,8 @@
 	dec e
 	jr nz, .asm_8b7a9
 	ret
-; 8b7bd
 
-Function8b7bd: ; 8b7bd
+Function8b7bd:
 	call Function8b855
 	ld hl, MenuHeader_0x8b867
 	call CopyMenuHeader
@@ -867,9 +834,8 @@
 	ld a, [wMenuScrollPosition]
 	ld [wd031], a
 	ret
-; 8b832
 
-Function8b832: ; 8b832
+Function8b832:
 	ld a, [wMenuScrollPosition]
 	ld hl, wMenuDataItems
 	sub [hl]
@@ -876,9 +842,8 @@
 	jr nc, Function8b84b
 	xor a
 	jr Function8b84b
-; 8b83e
 
-Function8b83e: ; 8b83e
+Function8b83e:
 	ld a, [wMenuScrollPosition]
 	ld hl, wMenuDataItems
 	add [hl]
@@ -886,14 +851,13 @@
 	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 @@
 	ld a, $ff
 	ld [hl], a
 	ret
-; 8b867
 
-MenuHeader_0x8b867: ; 0x8b867
+MenuHeader_0x8b867:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 1, 3, 18, 13
 	dw MenuData_0x8b870
 	db 1 ; default option
-; 0x8b86f
 
 	db 0
 
-MenuData_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,9 +888,8 @@
 	dba Function8b880
 	dba Function8b88c
 	dba Function8b8c8
-; 8b880
 
-Function8b880: ; 8b880
+Function8b880:
 	ld h, d
 	ld l, e
 	ld de, wMenuSelection
@@ -935,9 +896,8 @@
 	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 @@
 	call PlaceString
 	call CloseSRAM
 	ret
-; 8b8c8
 
-Function8b8c8: ; 8b8c8
+Function8b8c8:
 	hlcoord 0, 14
 	ld b, $2
 	ld c, $12
@@ -1007,9 +966,8 @@
 	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_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,10 +988,8 @@
 	ld a, $1
 	ld [wd030], a
 	ret
-; 8b960
 
-
-Function8b960: ; 8b960 (22:7960)
+Function8b960:
 	ld hl, MenuHeader_0x8b9ac
 	call LoadMenuHeader
 	call Function8b9e9
@@ -1066,7 +1021,7 @@
 	ld c, a
 	ret
 
-Function8b99f: ; 8b99f (22:799f)
+Function8b99f:
 	ld hl, wd002
 	dec a
 	ld c, a
@@ -1075,39 +1030,34 @@
 	ld a, [hl]
 	cp $ff
 	ret
-; 8b9ab (22:79ab)
 
-Function8b9ab: ; 8b9ab
+Function8b9ab:
 	ret
-; 8b9ac
 
-MenuHeader_0x8b9ac: ; 0x8b9ac
+MenuHeader_0x8b9ac:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 
-MenuHeader_0x8b9b1: ; 0x8b9b1
+MenuHeader_0x8b9b1:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, 7
 	dw MenuData_0x8b9b9
 	db 1 ; default option
-; 0x8b9b9
 
-MenuData_0x8b9b9: ; 0x8b9b9
+MenuData_0x8b9b9:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 3 ; items
 	db "へんしゅう@" ; EDIT
 	db "いれかえ@"   ; REPLACE
 	db "やめる@"     ; QUIT
-; 0x8b9ca
 
-MenuHeader_0x8b9ca: ; 0x8b9ca
+MenuHeader_0x8b9ca:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw MenuData_0x8b9d2
 	db 1 ; default option
-; 0x8b9d2
 
-MenuData_0x8b9d2: ; 0x8b9d2
+MenuData_0x8b9d2:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 5 ; items
 	db "みる@"       ; VIEW
@@ -1115,9 +1065,8 @@
 	db "いれかえ@"   ; REPLACE
 	db "けす@"       ; ERASE
 	db "やめる@"     ; QUIT
-; 0x8b9e9
 
-Function8b9e9: ; 8b9e9 (22:79e9)
+Function8b9e9:
 	call OpenSRAMBank4
 	call Function8931b
 	call Function8932d
@@ -1148,11 +1097,9 @@
 	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
--- 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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 100022
 
-Function100022: ; 100022
+Function100022:
 	push de
 	push bc
 	call SetRAMStateForMobile
@@ -46,17 +45,15 @@
 	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,9 +68,8 @@
 	ld [hMapAnims], a
 	ld [hLCDCPointer], a
 	ret
-; 100082
 
-EnableMobile: ; 100082
+EnableMobile:
 	xor a
 	ld hl, wOverworldMapBlocks
 	ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks
@@ -94,9 +90,8 @@
 	ei
 
 	ret
-; 0x1000a4
 
-DisableMobile: ; 1000a4
+DisableMobile:
 	di
 	xor a
 	ld [hMobileReceive], a
@@ -110,9 +105,8 @@
 	ld [rIE], a
 	ei
 	ret
-; 1000ba
 
-Function1000ba: ; 1000ba
+Function1000ba:
 .loop
 	; call [wcd22]:([wcd23][wcd24] + [wMobileCommsJumptableIndex])
 	ld hl, wcd23
@@ -138,9 +132,8 @@
 	jr z, .loop
 	call DelayFrame
 	ret
-; 1000e8
 
-Function1000e8: ; 1000e8
+Function1000e8:
 	ld hl, wcd29
 	bit 7, [hl]
 	ret z
@@ -148,9 +141,8 @@
 	ld hl, wcd29
 	set 6, [hl]
 	ret
-; 1000fa
 
-Function1000fa: ; 1000fa
+Function1000fa:
 	ld a, [wc30d]
 	and a
 	ret z
@@ -189,9 +181,8 @@
 	pop af
 	ld [wLinkMode], a
 	ret
-; 100144
 
-Function100144: ; 100144
+Function100144:
 	ld hl, wcd29
 	bit 5, [hl]
 	jr z, .asm_100155
@@ -208,9 +199,8 @@
 	res 6, [hl]
 	farcall HDMATransferTileMapToWRAMBank3
 	ret
-; 100163
 
-Function100163: ; 100163
+Function100163:
 	ld hl, wcd29
 	bit 6, [hl]
 	ret z
@@ -217,9 +207,8 @@
 	res 6, [hl]
 	call DelayFrame
 	ret
-; 10016f
 
-Function10016f: ; 10016f
+Function10016f:
 	ld a, [wcd2b]
 	cp $01
 	ret z
@@ -313,9 +302,8 @@
 	ld [wc301], a
 	call Function10020b
 	ret
-; 10020b
 
-Function10020b: ; 10020b
+Function10020b:
 	xor a
 	ld [wc303], a
 	farcall FadeOutPalettes
@@ -333,9 +321,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 100232
 
-Function100232: ; 100232
+Function100232:
 	push de
 	farcall Function106464
 	call Function3f20
@@ -346,18 +333,15 @@
 	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,9 +390,8 @@
 	call Function1002dc
 	ld c, $01
 	ret
-; 1002c9
 
-Function1002c9: ; 1002c9
+Function1002c9:
 	ld hl, wcd2a
 	bit 0, [hl]
 	ret z
@@ -415,9 +398,8 @@
 	farcall CleanUpBattleRAM
 	farcall LoadPokemonData
 	ret
-; 1002dc
 
-Function1002dc: ; 1002dc
+Function1002dc:
 	ld a, MAPSETUP_LINKRETURN
 	ld [hMapEntryMethod], a
 	farcall RunMapSetupScript
@@ -425,9 +407,8 @@
 	ld [hMapEntryMethod], a
 	call LoadStandardFont
 	ret
-; 1002ed
 
-Function1002ed: ; 1002ed
+Function1002ed:
 	farcall LoadOW_BGPal7
 	farcall ApplyPals
 	ld a, $01
@@ -434,9 +415,8 @@
 	ld [hCGBPalUpdate], a
 	call DelayFrame
 	ret
-; 100301
 
-Function100301: ; 100301
+Function100301:
 	ld hl, wcd2a
 	bit 1, [hl]
 	ret z
@@ -446,28 +426,23 @@
 	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 @@
 	ld [wcd2b], a
 	scf
 	ret
-; 10034d
 
-Function10034d: ; 10034d
+Function10034d:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_10036a
@@ -524,30 +498,26 @@
 	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
@@ -554,9 +524,8 @@
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003ab
 
-Function1003ab: ; 1003ab
+Function1003ab:
 	ld hl, w3_d000
 	ld de, wcc60
 	ld bc, $54
@@ -563,9 +532,8 @@
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003ba
 
-Function1003ba: ; 1003ba
+Function1003ba:
 	ld hl, wccb4
 	ld de, w3_d080
 	ld bc, $54
@@ -572,9 +540,8 @@
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003c9
 
-Function1003c9: ; 1003c9
+Function1003c9:
 	ld hl, w3_d080
 	ld de, wccb4
 	ld bc, $54
@@ -581,9 +548,8 @@
 	ld a, $03
 	call FarCopyWRAM
 	ret
-; 1003d8
 
-Function1003d8: ; 1003d8
+Function1003d8:
 	ld hl, wccb4
 	ld a, [hli]
 	ld c, a
@@ -603,9 +569,8 @@
 	add $02
 	ld [wccb4], a
 	ret
-; 1003f5
 
-Function1003f5: ; 1003f5
+Function1003f5:
 	ld a, [wcc60]
 	sub $03
 	ld [wcc60], a
@@ -613,9 +578,8 @@
 	sub $03
 	ld [wccb4], a
 	ret
-; 100406
 
-Function100406: ; 100406
+Function100406:
 	ld a, [wcc60]
 	sub $02
 	ld c, a
@@ -652,9 +616,8 @@
 	pop hl
 	scf
 	ret
-; 10043a
 
-Function10043a: ; 10043a
+Function10043a:
 	push hl
 	push bc
 	ld de, 0
@@ -672,10 +635,8 @@
 	pop bc
 	pop hl
 	ret
-; 10044e
 
-
-Jumptable_10044e: ; 10044e (40:444e)
+Jumptable_10044e:
 	dw Function10046a
 	dw Function10047c
 	dw Function100493
@@ -691,7 +652,7 @@
 	dw Function1004f4
 	dw Function1004a4
 
-Function10046a: ; 10046a
+Function10046a:
 	ld hl, wBGMapPalBuffer
 	inc [hl]
 	call Function1003d8
@@ -700,9 +661,8 @@
 	inc a
 	ld [wcd27], a
 	ret
-; 10047c
 
-Function10047c: ; 10047c
+Function10047c:
 	call Function100337
 	ret c
 	ret z
@@ -719,12 +679,11 @@
 	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 @@
 	inc a
 	ld [wcd27], a
 	ret
-; 1004a4
 
-Function1004a4: ; 1004a4
+Function1004a4:
 	call Function100406
 	jr c, .asm_1004b8
 	call Function1003c9
@@ -750,9 +708,8 @@
 .asm_1004b8
 	scf
 	ret
-; 1004ba
 
-Function1004ba: ; 1004ba
+Function1004ba:
 	call Function10038a
 	and a
 	jr nz, .asm_1004c8
@@ -765,9 +722,8 @@
 	ld a, $08
 	ld [wcd27], a
 	ret
-; 1004ce
 
-Function1004ce: ; 1004ce
+Function1004ce:
 	call Function100337
 	ret c
 	ret z
@@ -777,25 +733,22 @@
 	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 @@
 	ld [wcd27], a
 	call Function10039c
 	ret
-; 100504
 
-Function100504: ; 100504
+Function100504:
 	push de
 	call Function3f20
 	call UpdateSprites
@@ -814,9 +766,8 @@
 	hlcoord 4, 2
 	call PlaceString
 	ret
-; 100513
 
-Function100513: ; 100513
+Function100513:
 	call Function3f7c
 	call PlaceVerticalMenuItems
 	call InitVerticalMenuCursor
@@ -823,24 +774,21 @@
 	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 @@
 	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,21 +829,18 @@
 	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
+Function100585:
 	ld hl, MenuHeader_1005b2
 	call LoadMenuHeader
 	ld a, 0
@@ -906,7 +849,7 @@
 	inc a
 	ld [wcd26], a
 
-Function100597: ; 100597
+Function100597:
 	call Function100522
 	ld a, [wcd28]
 	bit 7, a
@@ -921,9 +864,8 @@
 	set 7, a
 	ld [wcd26], a
 	ret
-; 1005b2
 
-MenuHeader_1005b2: ; 1005b2
+MenuHeader_1005b2:
 	db MENU_BACKUP_TILES ; flags
 	db 6, 14
 	db 10, 19
@@ -935,21 +877,18 @@
 	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
+Function1005cf:
 	ld hl, MenuHeader_1005fc
 	call LoadMenuHeader
 	ld a, 0
@@ -958,7 +897,7 @@
 	inc a
 	ld [wcd26], a
 
-Function1005e1: ; 1005e1
+Function1005e1:
 	call Function100522
 	ld a, [wcd28]
 	bit 7, a
@@ -972,9 +911,8 @@
 	set 7, a
 	ld [wcd26], a
 	ret
-; 1005fc
 
-MenuHeader_1005fc: ; 1005fc
+MenuHeader_1005fc:
 	db MENU_BACKUP_TILES ; flags
 	db 6, 14
 	db 10, 19
@@ -981,14 +919,13 @@
 	dw MenuData_100604
 	db 1 ; default option
 
-MenuData_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 @@
 	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 @@
 	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 @@
 	ret c
 	inc [hl]
 	ret
-; 100665
 
-Function100665: ; 100665
+Function100665:
 	call UpdateTime
 	ld hl, wcd36
 	ld a, [hHours]
@@ -1064,9 +996,8 @@
 	ld a, [hSeconds]
 	ld [hl], a
 	ret
-; 100675
 
-Function100675: ; 100675
+Function100675:
 	ld hl, wcd2a
 	bit 2, [hl]
 	set 2, [hl]
@@ -1073,9 +1004,8 @@
 	ret nz
 	call Function1006d3
 	ret
-; 100681
 
-Function100681: ; 100681
+Function100681:
 	push hl
 	ld hl, wcd2a
 	bit 2, [hl]
@@ -1089,7 +1019,7 @@
 .asm_100694
 	ld de, wcd32
 
-Function100697: ; 100697
+Function100697:
 	ld a, [de]
 	and a
 	jr nz, .asm_1006bb
@@ -1116,22 +1046,20 @@
 	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 @@
 .asm_1006fb
 	ld [de], a
 	ret
-; 1006fd
 
-Function1006fd: ; 1006fd
+Function1006fd:
 	ld a, $04
 	ld hl, $a800
 	call GetSRAMBank
@@ -1174,9 +1101,8 @@
 	ld [hli], a
 	call CloseSRAM
 	ret
-; 10070d
 
-Function10070d: ; 10070d
+Function10070d:
 	ld a, $04
 	ld hl, $a800
 	call GetSRAMBank
@@ -1188,9 +1114,8 @@
 	ld [hli], a
 	call CloseSRAM
 	ret
-; 100720
 
-Function100720: ; 100720
+Function100720:
 	xor a
 	ld [wcd6a], a
 	call UpdateTime
@@ -1213,9 +1138,8 @@
 	ld a, [wcd6d]
 	ld [wcd6b], a
 	ret
-; 100754
 
-Function100754: ; 100754
+Function100754:
 	call UpdateTime
 	ld a, [hHours]
 	ld [wcd72], a
@@ -1228,9 +1152,8 @@
 	ld hl, wcd2a
 	res 6, [hl]
 	ret
-; 100772
 
-Function100772: ; 100772
+Function100772:
 	push de
 	ld hl, wcd6c
 	ld a, [de]
@@ -1263,10 +1186,8 @@
 .asm_10079a
 	pop de
 	ret
-; 10079c
 
-
-Function10079c: ; 10079c
+Function10079c:
 	ld a, [wcd21]
 	cp $01
 	jr nz, .dont_quit
@@ -1322,9 +1243,8 @@
 .dont_quit
 	and a
 	ret
-; 1007f6
 
-Function1007f6: ; 1007f6
+Function1007f6:
 	call UpdateTime
 	ld hl, wcd74
 	ld de, wcd71
@@ -1343,9 +1263,8 @@
 	ld a, [hSeconds]
 	ld [wcd74], a
 	ret
-; 100826
 
-Function100826: ; 100826
+Function100826:
 	ld a, [wcd71]
 	add [hl]
 	sub $3c
@@ -1370,9 +1289,8 @@
 	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 @@
 	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 @@
 	call Function10070d
 	ld c, 0
 	ret
-; 1008e0
 
-
-Function1008e0: ; 1008e0
+Function1008e0:
 	ld a, [hBGMapMode]
 	ld b, a
 	ld a, [hVBlank]
@@ -1478,9 +1391,8 @@
 	ld a, b
 	ld [hBGMapMode], a
 	ret
-; 100902
 
-Function100902: ; 100902
+Function100902:
 	hlcoord 3, 10
 	ld b, $01
 	ld c, $0b
@@ -1515,16 +1427,13 @@
 	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 @@
 	call Function1009d2
 	call Function1009ae
 	ret
-; 100989
 
-Function100989: ; 100989
+Function100989:
 	ld hl, w3_dc00
 	decoord 0, 0
 	call Function1009a5
@@ -1546,16 +1454,14 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 1009d2
 
-Function1009d2: ; 1009d2
+Function1009d2:
 	ld a, [rSVBK]
 	push af
 	ld a, $03
@@ -1606,9 +1511,8 @@
 	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 @@
 .select_a
 	xor a
 	ret
-; 100a09
 
-_LinkBattleSendReceiveAction: ; 100a09
+_LinkBattleSendReceiveAction:
 	call .StageForSend
 	ld [wd431], a
 	farcall PlaceWaitingText
@@ -1643,9 +1546,8 @@
 
 .done
 	ret
-; 100a2e
 
-.StageForSend: ; 100a2e
+.StageForSend:
 	ld a, [wBattlePlayerAction]
 	and a
 	jr nz, .switch
@@ -1670,9 +1572,8 @@
 .use_move
 	and $0f
 	ret
-; 100a53
 
-.LinkBattle_SendReceiveAction: ; 100a53
+.LinkBattle_SendReceiveAction:
 	ld a, [wd431]
 	ld [wPlayerLinkAction], a
 	ld a, $ff
@@ -1701,9 +1602,8 @@
 	ld a, [wOtherPlayerLinkAction]
 	ld [wBattleAction], a
 	ret
-; 100a87
 
-.MobileBattle_SendReceiveAction: ; 100a87
+.MobileBattle_SendReceiveAction:
 	call Function100acf
 	call StartMobileInactivityTimer
 	ld a, 0
@@ -1739,9 +1639,8 @@
 
 .asm_100ace
 	ret
-; 100acf
 
-Function100acf: ; 100acf
+Function100acf:
 	ld de, Unknown_100b0a
 	ld hl, wccb5
 	ld a, [wd431]
@@ -1757,9 +1656,8 @@
 	ld a, c
 	ld [wccb4], a
 	ret
-; 100ae7
 
-Function100ae7: ; 100ae7
+Function100ae7:
 	ld de, Unknown_100b0a
 	ld hl, wcc62
 .asm_100aed
@@ -1783,7 +1681,6 @@
 	ld a, $f1
 	ld [wcd2b], a
 	ret
-; 100b0a
 
 
 SECTION "tetsuji", ROMX
@@ -1790,14 +1687,13 @@
 
 	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, BattleMenuHeader
@@ -1816,9 +1712,8 @@
 	ld [wBattleMenuCursorBuffer], a
 	call ExitMenu
 	ret
-; 100b45
 
-Function100b45: ; 100b45
+Function100b45:
 	call Function100b7a
 .loop
 	call Mobile_SetOverworldDelay
@@ -1842,9 +1737,8 @@
 	ld [wMenuCursorBuffer], a
 	and a
 	ret
-; 100b7a
 
-Function100b7a: ; 100b7a
+Function100b7a:
 	ld hl, CopyMenuData
 	ld a, [wMenuData_2DMenuItemStringsBank]
 	rst FarCall
@@ -1856,9 +1750,8 @@
 	ld hl, w2DMenuFlags1
 	set 7, [hl]
 	ret
-; 100b9f
 
-MobileMoveSelectionScreen: ; 100b9f
+MobileMoveSelectionScreen:
 	xor a
 	ld [wMoveSwapBuffer], a
 	farcall CheckPlayerHasUsableMoves
@@ -1872,9 +1765,8 @@
 	call Function100ed4
 	pop af
 	ret
-; 100bc2
 
-.GetMoveSelection: ; 100bc2
+.GetMoveSelection:
 	xor a
 	ld [hBGMapMode], a
 	call Function100c74
@@ -1971,9 +1863,8 @@
 	call StdBattleTextBox
 	call Call_LoadTempTileMapToTileMap
 	jp .GetMoveSelection
-; 100c74
 
-Function100c74: ; 100c74
+Function100c74:
 	hlcoord 0, 8
 	ld b, 8
 	ld c, 8
@@ -1987,9 +1878,8 @@
 	hlcoord 2, 10
 	predef ListMoves
 	ret
-; 100c98
 
-Function100c98: ; 100c98
+Function100c98:
 	ld de, .attrs
 	call SetMenuAttributes
 	ld a, [wNumMoves]
@@ -1999,9 +1889,8 @@
 	inc a
 	ld [wMenuCursorY], a
 	ret
-; 100cad
 
-.attrs ; 100cad
+.attrs
 	db 10, 1
 	db 255, 1
 	db $a0, $00
@@ -2008,7 +1897,7 @@
 	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 @@
 	call WaitSFX
 	scf
 	ret
-; 100d22
 
-MobileBattleMonMenu: ; 100d22
+MobileBattleMonMenu:
 	call Function100dd8
 	ret c
 	call Function100d67
@@ -2100,9 +1988,8 @@
 .asm_100d65
 	and a
 	ret
-; 100d67
 
-Function100d67: ; 100d67
+Function100d67:
 	ld hl, .MenuHeader
 	call CopyMenuHeader
 	xor a
@@ -2116,31 +2003,28 @@
 	ld hl, w2DMenuFlags1
 	set 6, [hl]
 	ret
-; 100d88
 
-.MenuHeader: ; 100d88
+.MenuHeader:
 	db 0 ; flags
 	menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData: ; 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 @@
 .asm_100dbe
 	xor a
 	ret
-; 100dc0
 
-
-
-Function100dc0: ; 100dc0
+Function100dc0:
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
 	jr nz, .mobile
@@ -2169,15 +2050,13 @@
 .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 @@
 .asm_100dfb
 	scf
 	ret
-; 100dfd
 
-MobileComms_CheckInactivityTimer: ; 100dfd
+MobileComms_CheckInactivityTimer:
 	ld a, [wOverworldDelay]
 	ld c, a
 	ld a, 30
@@ -2224,9 +2102,8 @@
 .quit
 	scf
 	ret
-; 100e2d
 
-Function100e2d: ; 100e2d
+Function100e2d:
 	ld a, [wOverworldDelay]
 	ld c, a
 	ld a, 30
@@ -2254,9 +2131,8 @@
 .asm_100e61
 	scf
 	ret
-; 100e63
 
-Function100e63: ; 100e63
+Function100e63:
 	ld a, e
 	cp $02
 	ret nz
@@ -2265,9 +2141,8 @@
 	ld de, SFX_ELEVATOR_END
 	call PlaySFX
 	ret
-; 100e72
 
-Function100e72: ; 100e72
+Function100e72:
 	xor a
 	ld hl, wcd29
 	bit 0, [hl]
@@ -2279,17 +2154,14 @@
 	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,8 +2174,7 @@
 	dw Function100eae
 	dw Function100ec4
 
-
-Function100ea2: ; 100ea2 (40:4ea2)
+Function100ea2:
 	call Function100dc0
 	ret nc
 	ld hl, wcd29
@@ -2310,13 +2181,12 @@
 	set 0, [hl]
 	call Function100ec5
 
-
-Function100eae: ; 100eae
+Function100eae:
 	scf
 	call Function100eca
 	jr asm_100eb8
 
-Function100eb4: ; 100eb4
+Function100eb4:
 	and a
 	call Function100eca
 
@@ -2329,7 +2199,7 @@
 	ld [hl], 0
 	jr Function100ec5
 
-Function100ec4: ; 100ec4
+Function100ec4:
 	ret
 
 Function100ec5:
@@ -2336,42 +2206,39 @@
 	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 @@
 	ld a, [wStringBuffer2 + 5]
 	ld b, a
 	ret
-; 100f3d
 
-Function100f3d: ; 100f3d
+Function100f3d:
 	; parameter
 	ld a, [wStringBuffer2]
 	cp $02
@@ -2484,9 +2350,8 @@
 	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 @@
 	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 @@
 	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,7 +2411,7 @@
 	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
@@ -2554,9 +2418,8 @@
 	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 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 10107d
 
-Function10107d: ; 10107d
+Function10107d:
 	xor a
 	ld hl, wc608
 	ld bc, wc7bd - wc608
@@ -2609,9 +2471,8 @@
 	ld a, $33
 	ld [wc7ba], a
 	ret
-; 1010cd
 
-.CopyAllFromOT: ; 1010cd
+.CopyAllFromOT:
 	push hl
 	ld hl, 0
 	ld a, [wOTPartyCount]
@@ -2621,9 +2482,8 @@
 	pop hl
 	call CopyBytes
 	ret
-; 1010de
 
-Function1010de: ; 1010de
+Function1010de:
 	push hl
 	push bc
 	ld de, 0
@@ -2641,9 +2501,8 @@
 	pop bc
 	pop hl
 	ret
-; 1010f2
 
-LoadSelectedPartiesForColosseum: ; 1010f2
+LoadSelectedPartiesForColosseum:
 	xor a
 	ld hl, wStringBuffer2
 	ld bc, 9
@@ -2673,9 +2532,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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
 
-Function1011f1: ; 1011f1
+Function1011f1:
 	ld a, $04
 	call GetSRAMBank
 	ld a, [$a60c]
@@ -2825,15 +2678,13 @@
 	ld a, LINK_MOBILE
 	ld [wLinkMode], a
 	ret
-; 101220
 
-Function101220: ; 101220
+Function101220:
 	xor a
 	ld [wLinkMode], a
 	ret
-; 101225
 
-Function101225: ; 101225
+Function101225:
 	ld d, 1
 	ld e, BANK(Jumptable_101297)
 	ld bc, Jumptable_101297
@@ -2840,7 +2691,7 @@
 	call Function100000
 	jr Function10123d
 
-Function101231: ; 101231
+Function101231:
 	ld d, 2
 	ld e, BANK(Jumptable_101297)
 	ld bc, Jumptable_101297
@@ -2847,7 +2698,7 @@
 	call Function100000
 	jr Function10123d
 
-Function10123d: ; 10123d
+Function10123d:
 	xor a
 	ld [wScriptVar], a
 	ld a, c
@@ -2854,17 +2705,15 @@
 	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
@@ -2873,31 +2722,26 @@
 	ret c
 	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 @@
 	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 @@
 	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 @@
 
 .asm_1013a9
 	ret
-; 1013aa
 
-Function1013aa: ; 1013aa
+Function1013aa:
 	call ClearBGPalettes
 	call Call_ExitMenu
 	call ReloadTilesetAndPalettes
@@ -3072,27 +2913,23 @@
 	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 @@
 	ld a, c
 	ld [de], a
 	ret
-; 1013f5
 
-Function1013f5: ; 1013f5
+Function1013f5:
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -3127,9 +2963,8 @@
 	dec c
 	jr nz, .asm_1013f9
 	ret
-; 101400
 
-Unreferenced_Function101400: ; 101400
+Unreferenced_Function101400:
 	ld a, [de]
 	inc de
 	cp [hl]
@@ -3136,7 +2971,7 @@
 	jr nz, asm_101416
 	inc hl
 
-Function101406: ; 101406
+Function101406:
 	ld c, a
 	ld b, 0
 .asm_101409
@@ -3155,9 +2990,8 @@
 asm_101416
 	scf
 	ret
-; 101418
 
-Function101418: ; 101418
+Function101418:
 	call GetJoypad
 	ld a, [hJoyDown]
 	and SELECT + A_BUTTON
@@ -3171,16 +3005,14 @@
 	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,14 +3027,12 @@
 	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]
@@ -3209,7 +3039,7 @@
 	inc a
 	ld [wcd26], a
 
-Function101467: ; 101467
+Function101467:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -3217,9 +3047,8 @@
 	set 7, a
 	ld [wcd26], a
 	ret
-; 101475
 
-Function101475: ; 101475
+Function101475:
 	ld hl, wcd29
 	set 6, [hl]
 	ld a, [wcd26]
@@ -3234,15 +3063,13 @@
 	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]
@@ -3249,7 +3076,7 @@
 	inc a
 	ld [wcd26], a
 
-Function1014a6: ; 1014a6
+Function1014a6:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -3259,7 +3086,7 @@
 	inc a
 	ld [wcd26], a
 
-Function1014b7: ; 1014b7
+Function1014b7:
 	call GetJoypad
 	ld a, [hJoyPressed]
 	and $03
@@ -3273,9 +3100,8 @@
 	set 7, a
 	ld [wcd26], a
 	ret
-; 1014ce
 
-Function1014ce: ; 1014ce
+Function1014ce:
 	farcall Function100720
 	farcall StartMobileInactivityTimer
 	ld a, [wMobileCommsJumptableIndex]
@@ -3282,9 +3108,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1014e2
 
-Function1014e2: ; 1014e2
+Function1014e2:
 	ld hl, wcd29
 	set 6, [hl]
 	ld a, 0
@@ -3293,9 +3118,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1014f4
 
-Function1014f4: ; 1014f4
+Function1014f4:
 	farcall EnableMobile
 	ld hl, wcd29
 	set 6, [hl]
@@ -3303,9 +3127,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101507
 
-Function101507: ; 101507
+Function101507:
 	ld de, wcd30
 	ld hl, $40
 	ld bc, $40
@@ -3315,9 +3138,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10151d
 
-Unreferenced_Function10151d: ; 10151d
+Unreferenced_Function10151d:
 	ld a, $34
 	call Function3e32
 	ld a, [wMobileCommsJumptableIndex]
@@ -3324,9 +3146,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10152a
 
-Function10152a: ; 10152a
+Function10152a:
 	ld a, $36
 	call Function3e32
 	ld a, [wMobileCommsJumptableIndex]
@@ -3333,9 +3154,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101537
 
-Function101537: ; 101537
+Function101537:
 	ld a, $0a
 	call Function3e32
 	ld a, [wMobileCommsJumptableIndex]
@@ -3342,9 +3162,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101544
 
-Function101544: ; 101544
+Function101544:
 	farcall StartMobileInactivityTimer
 	ld a, $12
 	call Function3e32
@@ -3352,9 +3171,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101557
 
-Function101557: ; 101557
+Function101557:
 	farcall StartMobileInactivityTimer
 	ld hl, wcd53
 	ld a, $08
@@ -3363,13 +3181,12 @@
 	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 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10158a
 
-Function10158a: ; 10158a
+Function10158a:
 	farcall IncrementMobileInactivityTimerBy1Frame
 	ld a, [wMobileInactivityTimerMinutes]
 	cp $0a
@@ -3394,9 +3210,8 @@
 	ld a, $fb
 	ld [wcd2b], a
 	ret
-; 10159d
 
-Function10159d: ; 10159d
+Function10159d:
 	ld de, wc608
 	farcall Function100edf
 	ld de, wc608
@@ -3409,9 +3224,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1015be
 
-Function1015be: ; 1015be
+Function1015be:
 	ld de, wc608
 	farcall Function100eed
 	ld de, wc608
@@ -3424,9 +3238,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1015df
 
-Function1015df: ; 1015df
+Function1015df:
 	ld de, wc608
 	farcall Function100ef4
 	ld de, wc608
@@ -3439,9 +3252,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101600
 
-Function101600: ; 101600
+Function101600:
 	ld hl, w5_d800
 	ld de, wc608
 	ld bc, $1e0
@@ -3453,39 +3265,34 @@
 	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 @@
 	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,16 +3315,14 @@
 	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]
@@ -3526,13 +3329,12 @@
 	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,9 +3357,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1016c3
 
-Jumptable_1016c3: ; 1016c3
+Jumptable_1016c3:
 	dw Function1016cf
 	dw Function1016de
 	dw Function1016f8
@@ -3564,9 +3365,8 @@
 	dw Function101705
 	dw Function101719
 	dw Function101724
-; 1016cf
 
-Function1016cf: ; 1016cf
+Function1016cf:
 	ld hl, wcd3a
 	inc [hl]
 	call Function10176f
@@ -3574,9 +3374,8 @@
 	inc a
 	ld [wcd26], a
 	ret
-; 1016de
 
-Function1016de: ; 1016de
+Function1016de:
 	call Function10177b
 	jr nc, .asm_1016eb
 	ld a, [wcd26]
@@ -3591,9 +3390,8 @@
 	inc a
 	ld [wcd26], a
 	ret
-; 1016f8
 
-Function1016f8: ; 1016f8
+Function1016f8:
 	ld a, 0
 	ld [wcd27], a
 	ld a, [wcd26]
@@ -3600,9 +3398,8 @@
 	inc a
 	ld [wcd26], a
 	ret
-; 101705
 
-Function101705: ; 101705
+Function101705:
 	farcall Function100382
 	ld a, [wcd27]
 	bit 7, a
@@ -3611,17 +3408,15 @@
 	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 @@
 	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 @@
 	call AddNTimes
 	pop bc
 	ret
-; 10174c
 
-Function10174c: ; 10174c
+Function10174c:
 	ld [wcd3d], a
 	ld a, l
 	ld [wcd3e], a
@@ -3672,17 +3465,15 @@
 	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 @@
 	call Function1017b0
 	xor a
 	ret
-; 1017b0
 
-Function1017b0: ; 1017b0
+Function1017b0:
 	ld a, c
 	ld [wccb4], a
 	push bc
@@ -3733,9 +3523,8 @@
 	ld de, wccb5
 	call CopyBytes
 	ret
-; 1017c7
 
-Function1017c7: ; 1017c7
+Function1017c7:
 	ld a, [wcc60]
 	ld c, a
 	ld b, 0
@@ -3750,9 +3539,8 @@
 	call FarCopyWRAM
 	and a
 	ret
-; 1017e4
 
-Function1017e4: ; 1017e4
+Function1017e4:
 	ld a, 0
 	ld [wcd27], a
 	ld a, [wMobileCommsJumptableIndex]
@@ -3759,13 +3547,12 @@
 	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 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101826
 
-Function101826: ; 101826
+Function101826:
 	ld a, [wcd21]
 	cp $02
 	jr z, .asm_101833
@@ -3829,7 +3615,6 @@
 	ld a, $fe
 	ld [wcd2b], a
 	ret
-; 10186f
 
 
 SECTION "ascii 10186f", ROMX
@@ -3850,12 +3635,11 @@
 	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 @@
 	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 @@
 	dec c
 	jr nz, .asm_1018f3
 	ret
-; 1018fb
 
-Function1018fb: ; 1018fb
+Function1018fb:
 	ld a, [wcd2f]
 	and a
 	jr z, .asm_101906
@@ -3926,9 +3706,8 @@
 	ld bc, 10
 	call CopyBytes
 	ret
-; 101913
 
-Function101913: ; 101913
+Function101913:
 	ld hl, wcd2a
 	set 0, [hl]
 	xor a
@@ -3959,9 +3738,8 @@
 	ld a, $65
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10194b
 
-Function10194b: ; 10194b
+Function10194b:
 	call DisableSpriteUpdates
 	call ClearSprites
 	farcall Function1021f9
@@ -3977,9 +3755,8 @@
 	ld a, $60
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 10196d
 
-_SelectMonsForMobileBattle: ; 10196d
+_SelectMonsForMobileBattle:
 	farcall BlankScreen
 	farcall Mobile_CommunicationStandby
 	ld hl, wcd29
@@ -4003,9 +3780,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1019ab
 
-_StartMobileBattle: ; 1019ab
+_StartMobileBattle:
 	call CopyOtherPlayersBattleMonSelection
 	farcall Function100754
 	xor a
@@ -4029,9 +3805,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1019ee
 
-.CopyOTDetails: ; 1019ee
+.CopyOTDetails:
 	ld a, [rSVBK]
 	push af
 	ld a, 5
@@ -4058,9 +3833,8 @@
 .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 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 101a4f
 
-Function101a4f: ; 101a4f
+Function101a4f:
 	ld a, 1
 	ld [wDisableTextAcceleration], a
 	farcall DisplayLinkBattleResult
@@ -4095,9 +3868,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101a75
 
-CopyOtherPlayersBattleMonSelection: ; 101a75
+CopyOtherPlayersBattleMonSelection:
 	ld hl, wcc61
 	ld de, wOTMonSelection
 	ld bc, 3
@@ -4107,9 +3879,8 @@
 	farcall Function101050
 	farcall LoadSelectedPartiesForColosseum
 	ret
-; 101a97
 
-Function101a97: ; 101a97
+Function101a97:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4121,9 +3892,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101ab4
 
-Function101ab4: ; 101ab4
+Function101ab4:
 	ld e, $01
 	call Function101ee4
 	ld hl, wcd29
@@ -4132,9 +3902,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101ac6
 
-Function101ac6: ; 101ac6
+Function101ac6:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4150,9 +3919,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101aed
 
-Function101aed: ; 101aed
+Function101aed:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4166,9 +3934,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101b0f
 
-Function101b0f: ; 101b0f
+Function101b0f:
 	ld c, 0
 	call Function10142c
 	ld e, $03
@@ -4181,9 +3948,8 @@
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101b2b
 
-Function101b2b: ; 101b2b
+Function101b2b:
 	farcall Function100579
 	ld hl, wcd29
 	set 2, [hl]
@@ -4205,9 +3971,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101b59
 
-Function101b59: ; 101b59
+Function101b59:
 	ld c, $02
 	call Function10142c
 	ld e, $02
@@ -4218,9 +3983,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101b70
 
-Function101b70: ; 101b70
+Function101b70:
 	ld c, $02
 	call Function10142c
 	ld e, $04
@@ -4234,9 +3998,8 @@
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101b8f
 
-Function101b8f: ; 101b8f
+Function101b8f:
 	farcall Function1005c3
 	ld hl, wcd29
 	set 2, [hl]
@@ -4263,9 +4026,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101bc8
 
-Function101bc8: ; 101bc8
+Function101bc8:
 	ld c, $02
 	call Function10142c
 	ld e, $08
@@ -4278,9 +4040,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101be5
 
-Function101be5: ; 101be5
+Function101be5:
 	farcall Function100579
 	ld hl, wcd29
 	set 2, [hl]
@@ -4301,9 +4062,8 @@
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101c11
 
-Function101c11: ; 101c11
+Function101c11:
 	ld a, $01
 	ld [wdc5f], a
 	ld e, $09
@@ -4315,9 +4075,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c2b
 
-Function101c2b: ; 101c2b
+Function101c2b:
 	ld a, $02
 	ld [wdc5f], a
 	ld e, $07
@@ -4328,9 +4087,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c42
 
-Function101c42: ; 101c42
+Function101c42:
 	ld hl, wcd2a
 	set 1, [hl]
 	call Function100665
@@ -4337,9 +4095,8 @@
 	ld a, $47
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c50
 
-Function101c50: ; 101c50
+Function101c50:
 	ld e, $0a
 	call Function101ee4
 	ld hl, wcd29
@@ -4348,9 +4105,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101c62
 
-Function101c62: ; 101c62
+Function101c62:
 	farcall Function115d99
 	ld hl, wcd29
 	set 7, [hl]
@@ -4370,17 +4126,15 @@
 	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 @@
 	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 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101cdf
 
-Function101cdf: ; 101cdf
+Function101cdf:
 	ld a, $06
 	ld [wc314], a
 	ld a, $01
@@ -4431,9 +4181,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101cf6
 
-Function101cf6: ; 101cf6
+Function101cf6:
 	ld a, $0b
 	ld [wc314 + 1], a
 	ld a, [wMobileCommsJumptableIndex]
@@ -4440,9 +4189,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d03
 
-Function101d03: ; 101d03
+Function101d03:
 	ld a, $0e
 	ld [wc314 + 1], a
 	ld a, [wMobileCommsJumptableIndex]
@@ -4449,9 +4197,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d10
 
-Function101d10: ; 101d10
+Function101d10:
 	ld c, $01
 	call Function10142c
 	ld a, [wMobileCommsJumptableIndex]
@@ -4459,7 +4206,7 @@
 	ld [wMobileCommsJumptableIndex], a
 	jr Function101d2a
 
-Function101d1e: ; 101d1e
+Function101d1e:
 	ld c, $03
 	call Function10142c
 	ld a, [wMobileCommsJumptableIndex]
@@ -4466,7 +4213,7 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 
-Function101d2a: ; 101d2a
+Function101d2a:
 	call Function101418
 	ret c
 	ld hl, wcd29
@@ -4483,14 +4230,12 @@
 	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]
@@ -4497,7 +4242,7 @@
 	inc a
 	ld [wcd26], a
 
-Function101d5d: ; 101d5d
+Function101d5d:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -4505,9 +4250,8 @@
 	set 7, a
 	ld [wcd26], a
 	ret
-; 101d6b
 
-Function101d6b: ; 101d6b
+Function101d6b:
 	ld a, [wc30d]
 	and a
 	ret nz
@@ -4516,9 +4260,8 @@
 	ld a, $64
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101d7b
 
-Function101d7b: ; 101d7b
+Function101d7b:
 	farcall Function10138b
 	ld b, 0
 	ld hl, Unknown_101d8d
@@ -4527,13 +4270,11 @@
 	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 LoadStandardMenuHeader
 	ld e, $0e
@@ -4546,9 +4287,8 @@
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101db2
 
-Function101db2: ; 101db2
+Function101db2:
 	farcall Function103302
 	call ExitMenu
 	ld hl, wcd29
@@ -4563,9 +4303,8 @@
 	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 @@
 	ld a, $1b
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 101de3
 
-Function101de3: ; 101de3
+Function101de3:
 	call Function101ecc
 	call Function101ead
 	jr c, .asm_101df3
@@ -4601,9 +4339,8 @@
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101e09
 
-Function101e09: ; 101e09
+Function101e09:
 	call Function101ead
 	jr c, .asm_101e16
 	ld a, [wMobileCommsJumptableIndex]
@@ -4627,15 +4364,13 @@
 	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 @@
 	ld a, $02
 	ld [wcd2b], a
 	ret
-; 101e4f
 
-Function101e4f: ; 101e4f
+Function101e4f:
 	ld e, $06
 	call Function101ee4
 	call Function1013d6
@@ -4661,9 +4395,8 @@
 	ld a, 0
 	ld [wcd26], a
 	ret
-; 101e64
 
-Function101e64: ; 101e64
+Function101e64:
 	call Function101ecc
 	call Function1020a8
 	push af
@@ -4680,25 +4413,22 @@
 	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
@@ -4707,9 +4437,8 @@
 	ld hl, wdc41
 	set 4, [hl]
 	ret
-; 101ead
 
-Function101ead: ; 101ead
+Function101ead:
 	ld hl, wGameTimerPause
 	bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
 	jr nz, .asm_101ec8
@@ -4730,26 +4459,23 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 
 .asm_102067
 	ret
-; 102068
 
-Function102068: ; 102068
+Function102068:
 	ld hl, wcd53
 	ld c, $08
 .asm_10206d
@@ -4890,9 +4611,8 @@
 
 .asm_10207f
 	ret
-; 102080
 
-Function102080: ; 102080
+Function102080:
 	and $0f
 	cp $0f
 	jr z, .asm_10208a
@@ -4904,9 +4624,8 @@
 	ld [hl], 0
 	scf
 	ret
-; 10208e
 
-Function10208e: ; 10208e
+Function10208e:
 	push de
 	ld h, d
 	ld l, e
@@ -4915,17 +4634,15 @@
 	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 @@
 	call Function102068
 	xor a
 	ret
-; 1020bf
 
-Function1020bf: ; 1020bf
+Function1020bf:
 	call ClearSprites
 	farcall Function8aba9
 	ld a, c
@@ -4960,9 +4676,8 @@
 .asm_1020e8
 	scf
 	ret
-; 1020ea
 
-Function1020ea: ; 1020ea
+Function1020ea:
 	ld hl, wdc41
 	bit 4, [hl]
 	jr z, .quit
@@ -4984,9 +4699,8 @@
 .quit
 	scf
 	ret
-; 102112
 
-Function102112: ; 102112
+Function102112:
 	ld a, $04
 	call GetSRAMBank
 	ld hl, $a041
@@ -5022,9 +4736,8 @@
 	call CloseSRAM
 	pop af
 	ret
-; 102142
 
-Function102142: ; 102142
+Function102142:
 	call Function10218d
 	call Function102180
 	ld hl, UnknownText_0x1021d1
@@ -5049,17 +4762,15 @@
 .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 @@
 	call FarCopyWRAM
 	ld de, wc608 + 1 ; useless
 	ret
-; 10219f
 
-Function10219f: ; 10219f
+Function10219f:
 	call FadeToMenu
 	call Function10218d
 	ld de, wc608 + 1
@@ -5078,9 +4788,8 @@
 	call PlayClickSFX
 	call Function1013aa
 	ret
-; 1021b8
 
-Function1021b8: ; 1021b8
+Function1021b8:
 	call FadeToMenu
 	call Function10218d
 	ld de, wPlayerMoveStruct
@@ -5091,29 +4800,26 @@
 	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_0x1021f4:
 	text_jump UnknownText_0x1bd223
 	db "@"
-; 1021f9
 
-Function1021f9: ; 1021f9
+Function1021f9:
 	call Function102233
 	ld a, $0 ; Function10234b
 	ld [wcd49], a
@@ -5158,9 +4863,8 @@
 .asm_102231
 	xor a
 	ret
-; 102233
 
-Function102233: ; 102233
+Function102233:
 	ld hl, wcd49
 	ld bc, 10
 	xor a
@@ -5167,16 +4871,14 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .asm_1022f3
 	scf
 	ret
-; 1022f5
 
-Jumptable_1022f5: ; 1022f5
+Jumptable_1022f5:
 	dw Function10234b ; 00
 	dw Function102361 ; 01
 	dw Function10236e ; 02
@@ -5331,9 +5025,8 @@
 	dw Function1028da ; 28
 	dw Function1024a8 ; 29
 	dw Function10248d ; 2a
-; 10234b
 
-Function10234b: ; 10234b
+Function10234b:
 	call Function102d9a
 	call Function102dd3
 	call Function102dec
@@ -5343,9 +5036,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 102361
 
-Function102361: ; 102361
+Function102361:
 	ld a, $cc
 	call Function1028e8
 	ld a, [wcd49]
@@ -5352,9 +5044,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 10236e
 
-Function10236e: ; 10236e
+Function10236e:
 	call Function1028fc
 	ret nc
 	ld a, [wcd51]
@@ -5369,9 +5060,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 102387
 
-Function102387: ; 102387
+Function102387:
 	ld hl, wcd4b
 	set 6, [hl]
 	xor a
@@ -5383,7 +5073,7 @@
 	ld a, $01
 	ld [wMenuCursorY], a
 
-Function1023a1: ; 1023a1
+Function1023a1:
 	call Function102283
 	call Function102db7
 	call Function102dec
@@ -5392,9 +5082,8 @@
 	ld a, $1d
 	ld [wcd49], a
 	ret
-; 1023b5
 
-Function1023b5: ; 1023b5
+Function1023b5:
 	call Function10228e
 	call Function102a3b
 	call Function102b12
@@ -5402,9 +5091,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 1023c6
 
-Function1023c6: ; 1023c6
+Function1023c6:
 	call Function102c48
 	call Function102c87
 	ld a, [wcd4c]
@@ -5438,9 +5126,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 102416
 
-Function102416: ; 102416
+Function102416:
 	ld a, $aa
 	call Function1028e8
 	ld a, [wcd49]
@@ -5447,9 +5134,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 102423
 
-Function102423: ; 102423
+Function102423:
 	call Function102921
 	ret nc
 	farcall SaveAfterLinkTrade
@@ -5463,9 +5149,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 10244b
 
-Function10244b: ; 10244b
+Function10244b:
 	call Function102f32
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5479,9 +5164,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 10246a
 
-Function10246a: ; 10246a
+Function10246a:
 	call Function102d9a
 	ld hl, wcd29
 	set 3, [hl]
@@ -5491,9 +5175,8 @@
 	ld a, $2a
 	ld [wcd49], a
 	ret
-; 102480
 
-Function102480: ; 102480
+Function102480:
 	ld c, $32
 	call DelayFrames
 	ld a, [wcd49]
@@ -5500,16 +5183,14 @@
 	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,27 +5200,24 @@
 	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]
@@ -5546,7 +5224,7 @@
 	inc a
 	ld [wcd4a], a
 
-Function1024cb: ; 1024cb
+Function1024cb:
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
@@ -5557,7 +5235,7 @@
 	inc a
 	ld [wcd4a], a
 
-Function1024de: ; 1024de
+Function1024de:
 	ld hl, wcd4e
 	dec [hl]
 	jr z, .asm_1024e9
@@ -5572,9 +5250,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 1024f6
 
-Function1024f6: ; 1024f6
+Function1024f6:
 	call PlaceHollowCursor
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5584,9 +5261,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 10250c
 
-Function10250c: ; 10250c
+Function10250c:
 	call Function1028fc
 	ret nc
 	ld a, [wcd51]
@@ -5653,9 +5329,8 @@
 	ld a, $09
 	ld [wcd49], a
 	ret
-; 102591
 
-Function102591: ; 102591
+Function102591:
 	call Function102ee7
 	ld hl, wcd4b
 	set 1, [hl]
@@ -5669,9 +5344,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 1025b0
 
-Function1025b0: ; 1025b0
+Function1025b0:
 	ld a, $09
 	call Function1028e8
 	ld a, [wcd49]
@@ -5678,17 +5352,15 @@
 	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,9 +5370,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 1025dc
 
-Function1025dc: ; 1025dc
+Function1025dc:
 	call Function1028fc
 	ret nc
 	ld a, [wcd49]
@@ -5707,9 +5378,8 @@
 	set 7, a
 	ld [wcd49], a
 	ret
-; 1025e9
 
-Function1025e9: ; 1025e9
+Function1025e9:
 	nop
 	ld hl, wcd4b
 	set 6, [hl]
@@ -5720,9 +5390,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 1025ff
 
-Function1025ff: ; 1025ff
+Function1025ff:
 	ld hl, wcd4b
 	set 2, [hl]
 	farcall Function1009f3
@@ -5766,9 +5435,8 @@
 	ld a, $23 ; Function1026b7
 	ld [wcd49], a
 	ret
-; 102652
 
-Function102652: ; 102652
+Function102652:
 	nop
 	ld hl, wcd4b
 	set 6, [hl]
@@ -5782,9 +5450,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 10266b
 
-Function10266b: ; 10266b
+Function10266b:
 	ld hl, wcd4b
 	set 2, [hl]
 	farcall Function1009f3
@@ -5826,9 +5493,8 @@
 	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 @@
 	ld a, 0
 	ld [wcd4a], a
 
-Function1026c8: ; 1026c8
+Function1026c8:
 	call GetJoypad
 	farcall Function1009f3
 	ret c
@@ -5845,14 +5511,12 @@
 	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 @@
 	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 @@
 	ld a, $5 ; Function1025c7
 	ld [wcd49], a
 	ret
-; 102738
 
-Function102738: ; 102738
+Function102738:
 	ld hl, wcd4b
 	set 6, [hl]
 	call PlaceHollowCursor
@@ -5917,7 +5579,7 @@
 	ld a, 0
 	ld [wcd4a], a
 
-Function102754: ; 102754
+Function102754:
 	call GetJoypad
 	farcall Function1009f3
 	ret c
@@ -5925,21 +5587,19 @@
 	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 @@
 	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 @@
 .asm_10279b
 	ld a, $03
 	ld [wcd4a], a
-Function1027a0: ; 1027a0
+Function1027a0:
 	hlcoord 1, 16
 	ld [hl], " "
 	hlcoord 11, 16
@@ -5977,7 +5636,7 @@
 	ld [wcd4a], a
 	ret
 
-Function1027b7: ; 1027b7
+Function1027b7:
 	ld a, [hJoyPressed]
 	bit A_BUTTON_F, a
 	jr nz, asm_1027d1
@@ -6008,9 +5667,8 @@
 	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 @@
 	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 @@
 	ld hl, wcd4b
 	set 1, [hl]
 
-Function10283c: ; 10283c
+Function10283c:
 	ld hl, wcd4b
 	set 2, [hl]
 	call Function1029c3
@@ -6065,9 +5721,8 @@
 	ld hl, wcd4b
 	set 1, [hl]
 	ret
-; 102862
 
-Function102862: ; 102862
+Function102862:
 	ld a, $08
 	call Function1028e8
 	ld a, [wcd49]
@@ -6074,9 +5729,8 @@
 	inc a
 	ld [wcd49], a
 	ret
-; 10286f
 
-Function10286f: ; 10286f
+Function10286f:
 	call Function1028fc
 	ret nc
 	ld a, [wcd52]
@@ -6102,15 +5756,13 @@
 	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,14 +5771,13 @@
 	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
@@ -6133,14 +5784,13 @@
 	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
@@ -6147,9 +5797,8 @@
 	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 @@
 	ld a, 0
 	ld [wcd4a], a
 	ret
-; 1028fc
 
-Function1028fc: ; 1028fc
+Function1028fc:
 	call GetJoypad
 	farcall Function1009f3
 	jr nc, .asm_102909
@@ -6174,17 +5822,15 @@
 	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,14 +5838,12 @@
 	ld a, 0
 	ld [wcd4a], a
 	ret
-; 10292f
 
-Jumptable_10292f: ; 10292f
+Jumptable_10292f:
 	dw Function10295d
 	dw Function102984
-; 102933
 
-Function102933: ; 102933
+Function102933:
 	ld hl, MenuHeader_1029bb
 	call LoadMenuHeader
 	call Function102e07
@@ -6212,9 +5856,8 @@
 	ld [wcd4a], a
 	and a
 	ret
-; 10294f
 
-Function10294f: ; 10294f
+Function10294f:
 	ld a, [wTextDelayFrames]
 	and a
 	ret nz
@@ -6223,9 +5866,8 @@
 	ld [wcd4a], a
 	and a
 	ret
-; 10295d
 
-Function10295d: ; 10295d
+Function10295d:
 	call Function10299e
 	ld a, 0
 	ld [wcd27], a
@@ -6234,9 +5876,8 @@
 	ld [wcd4a], a
 	and a
 	ret
-; 10296e
 
-Function10296e: ; 10296e
+Function10296e:
 	farcall Function100382
 	and a
 	ld a, [wcd27]
@@ -6247,9 +5888,8 @@
 	ld [wcd4a], a
 	and a
 	ret
-; 102984
 
-Function102984: ; 102984
+Function102984:
 	farcall Function100382
 	and a
 	ld a, [wcd27]
@@ -6258,16 +5898,14 @@
 	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,36 +5913,31 @@
 	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
 
-MenuHeader_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
+Function1029cf:
 	call LoadStandardMenuHeader
 	hlcoord 10, 7
 	ld b, 3
@@ -6324,9 +5957,8 @@
 	ld [wcd4a], a
 	xor a
 	ret
-; 1029fe
 
-Function1029fe: ; 1029fe
+Function1029fe:
 	farcall Function1009f3
 	ret c
 	farcall MobileMenuJoypad
@@ -6349,13 +5981,11 @@
 	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 @@
 	dn 2, 0
 	db A_BUTTON
 
-Function102a3b: ; 102a3b
+Function102a3b:
 	ld a, [wcd30]
 	ld [wc74e], a
 	ld hl, wPlayerName
@@ -6457,9 +6087,8 @@
 	ld a, c
 	ld [wOTTrademonCaughtData], a
 	ret
-; 102b12
 
-Function102b12: ; 102b12
+Function102b12:
 	ld c, 100
 	call DelayFrames
 	call Function102d9a
@@ -6475,9 +6104,8 @@
 
 .asm_102b31
 	ret
-; 102b32
 
-Function102b32: ; 102b32
+Function102b32:
 	ld a, [wcd4c]
 	dec a
 	ld [wCurPartyMon], a
@@ -6488,9 +6116,8 @@
 	call Function102dd3
 	call Function102dec
 	ret
-; 102b4e
 
-Function102b4e: ; 102b4e
+Function102b4e:
 	ld a, OTPARTYMON
 	ld [wMonType], a
 	ld a, [wMenuCursorY]
@@ -6502,15 +6129,13 @@
 	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 @@
 	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 @@
 	ld a, [wPartyCount]
 	ld [w2DMenuNumRows], a
 	ret
-; 102b94
 
 Unknown_102b94:
 	db 1, 6
@@ -6540,7 +6164,7 @@
 	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 @@
 	call AddNTimes
 	ld [hl], $ec
 	ret
-; 102bac
 
-Function102bac: ; 102bac
+Function102bac:
 	ld a, [wMenuCursorY]
 	dec a
 	ld [wCurPartyMon], a
@@ -6568,9 +6191,8 @@
 	call Function102dec
 	call Function102db7
 	ret
-; 102bdc
 
-Function102bdc: ; 102bdc
+Function102bdc:
 	ld a, [wcd4d]
 	dec a
 	ld hl, wOTPartyMon1Species
@@ -6600,49 +6222,43 @@
 .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 @@
 	ld a, $05
 	call FarCopyWRAM
 	ret
-; 102c71
 
-Function102c71: ; 102c71
+Function102c71:
 	ld a, [wcd4c]
 	dec a
 	call AddNTimes
@@ -6672,9 +6287,8 @@
 	pop de
 	call SwapBytes
 	ret
-; 102c87
 
-Function102c87: ; 102c87
+Function102c87:
 	ld a, [wJumptableIndex]
 	push af
 	ld a, [wcf64]
@@ -6714,9 +6328,8 @@
 	pop af
 	ld [wJumptableIndex], a
 	ret
-; 102cee
 
-Function102cee: ; 102cee
+Function102cee:
 	ld a, [wJumptableIndex]
 	dec a
 	call Function102d34
@@ -6750,23 +6363,20 @@
 	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 @@
 .asm_102d98
 	and a
 	ret
-; 102d9a
 
-Function102d9a: ; 102d9a
+Function102d9a:
 	ld a, " "
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -6818,17 +6427,15 @@
 	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 @@
 	ld e, l
 	farcall _LinkTextbox
 	ret
-; 102dd3
 
-Function102dd3: ; 102dd3
+Function102dd3:
 	call DisableLCD
 	ld de, GFX_1032a2
 	ld hl, vTiles0
@@ -6847,9 +6453,8 @@
 	farcall __LoadTradeScreenBorder
 	call EnableLCD
 	ret
-; 102dec
 
-Function102dec: ; 102dec
+Function102dec:
 	ld hl, Palettes_1032e2
 	ld de, wOBPals1
 	ld bc, 4 palettes
@@ -6859,9 +6464,8 @@
 	call SetPalettes
 	call DelayFrame
 	ret
-; 102e07
 
-Function102e07: ; 102e07
+Function102e07:
 	hlcoord 3, 10
 	ld b,  1
 	ld c, 11
@@ -6885,24 +6489,20 @@
 	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 @@
 	ld de, wOTPartySpecies
 	call .PlaceSpeciesNames
 	ret
-; 102e86
 
-.PlaceSpeciesNames: ; 102e86
+.PlaceSpeciesNames:
 	ld c, 0
 .count_loop
 	ld a, [de]
@@ -6948,9 +6547,8 @@
 	pop bc
 	inc c
 	jr .count_loop
-; 102ea8
 
-Function102ea8: ; 102ea8
+Function102ea8:
 	call Function102dc3
 	ld a, [wcd4c]
 	dec a
@@ -6977,75 +6575,64 @@
 	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,61 +6651,52 @@
 	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
@@ -7125,9 +6703,8 @@
 	ld [wcf44], a
 	ld [wcf45], a
 	ret
-; 10305d
 
-Function10305d: ; 10305d
+Function10305d:
 	nop
 	ld a, [wAttrMapEnd]
 	and a
@@ -7137,9 +6714,8 @@
 	call Function103094
 	call Function10306e
 	ret
-; 10306e
 
-Function10306e: ; 10306e
+Function10306e:
 	ld a, $01
 	ld [hOAMUpdate], a
 	call ClearSprites
@@ -7148,9 +6724,8 @@
 	xor a
 	ld [hOAMUpdate], a
 	ret
-; 10307f
 
-Function10307f: ; 10307f
+Function10307f:
 	ld c, $02
 	ld hl, wcd4b
 	bit 7, [hl]
@@ -7166,9 +6741,8 @@
 	xor a
 	ld [hl], a
 	ret
-; 103094
 
-Function103094: ; 103094
+Function103094:
 	ld hl, wcd4b
 	bit 7, [hl]
 	jr nz, .asm_1030c0
@@ -7205,9 +6779,8 @@
 .asm_1030ca
 	ld [hl], $2c
 	ret
-; 1030cd
 
-Function1030cd: ; 1030cd
+Function1030cd:
 	ld a, [wcf44]
 	ld l, a
 	ld h, 0
@@ -7264,9 +6837,8 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wd1f0], a
 	call Function10339a
 	ret
-; 103362
 
-Function103362: ; 103362
+Function103362:
 .asm_103362
 	ld a, [wd1f0]
 	ld [wd1f1], a
@@ -7430,9 +6997,8 @@
 .asm_103398
 	scf
 	ret
-; 10339a
 
-Function10339a: ; 10339a
+Function10339a:
 	ld a, [wd1f0]
 	ld [wd1f2], a
 	ld c, a
@@ -7445,9 +7011,8 @@
 	ld a, [hl]
 	ld [wd1f3], a
 	ret
-; 1033af
 
-Function1033af: ; 1033af
+Function1033af:
 	call GetJoypad
 	ld a, [hJoyPressed]
 	bit D_LEFT_F, a
@@ -7518,9 +7083,8 @@
 	xor e
 	ld [wBuffer1], a
 	ret
-; 10342c
 
-Function10342c: ; 10342c
+Function10342c:
 	ld a, [wd1f0]
 	ld [wd1f2], a
 	call Function103490
@@ -7527,9 +7091,8 @@
 	call Function10343c
 	call Function1034a7
 	ret
-; 10343c
 
-Function10343c: ; 10343c
+Function10343c:
 	ld a, [wd1f3]
 	cp $02
 	jr nz, .asm_103452
@@ -7565,17 +7128,15 @@
 	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 @@
 	hlcoord 1, 16
 	call PlaceString
 	ret
-; 1034a7
 
-Function1034a7: ; 1034a7
+Function1034a7:
 	ld a, [wd1f1]
 	ld [wd1f2], a
 	ld bc, 10
@@ -7597,9 +7157,8 @@
 	call Function1034f1
 	ld [hl], $ed
 	ret
-; 1034be
 
-Function1034be: ; 1034be
+Function1034be:
 	ld a, $01
 	ld [wd1f2], a
 	ld hl, wd1ec
@@ -7621,9 +7180,8 @@
 	jr nz, .asm_1034ca
 	call Function103490
 	ret
-; 1034e0
 
-Function1034e0: ; 1034e0
+Function1034e0:
 	push bc
 	push hl
 	call ClearBox
@@ -7634,13 +7192,12 @@
 	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 @@
 	ld bc, 40
 	call AddNTimes
 	ret
-; 10350f
 
-Function10350f: ; 10350f
+Function10350f:
 	ld a, [wd1f3]
 	push bc
 	ld hl, Unknown_103522
@@ -7665,9 +7221,8 @@
 	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_1035ba: db "する@"
 String_1035bd: db "しない@"
 String_1035c1: db "けってい@"
-; 1035c6
 
-Function1035c6: ; 1035c6
+Function1035c6:
 	farcall Function10138b
 	ld b, 0
 	ld hl, Unknown_1035d7
@@ -7714,9 +7268,8 @@
 	ld h, [hl]
 	ld l, a
 	ret
-; 1035d7
 
-Unknown_1035d7: ; 1035d7
+Unknown_1035d7:
 	dw Unknown_1035e7
 	dw Unknown_1035f3
 	dw Unknown_103608
@@ -7726,7 +7279,7 @@
 	dw AskMobileOrCable
 	dw AskMobileOrCable
 
-Unknown_1035e7: ; 1035e7
+Unknown_1035e7:
 	dwcoord 0, 6
 	db $12, $07, $07
 	dw .this
@@ -7733,7 +7286,7 @@
 .this
 	db 4, 2, 1, 0, 3
 
-Unknown_1035f3: ; 1035f3
+Unknown_1035f3:
 	dwcoord 0, 7
 	db $12, $06, $09
 	dw .this
@@ -7740,7 +7293,7 @@
 .this
 	db 3, 2, 1, 3
 
-Unknown_1035fe: ; 1035fe
+Unknown_1035fe:
 	dwcoord 0, 9
 	db $12, $04, $0b
 	dw .this
@@ -7747,15 +7300,14 @@
 .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
 
-AskMobileOrCable: ; 103612
+AskMobileOrCable:
 	ld hl, MenuHeader_103640
 	call LoadMenuHeader
 	ld a, [wMobileOrCable_LastSelection]
@@ -7780,22 +7332,20 @@
 	xor a
 	ld [wScriptVar], a
 	ret
-; 103640
 
-MenuHeader_103640: ; 103640
+MenuHeader_103640:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw MenuData_103648
 	db 1 ; default option
 
-MenuData_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 @@
 	set 5, [hl]
 	ld c, $01
 	ret
-; 10366e
 
-Mobile_SelectThreeMons: ; 10366e
+Mobile_SelectThreeMons:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	jr z, .asm_10369b
@@ -7883,15 +7432,13 @@
 	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 SWARMFLAGS_MOBILE_4_F, [hl]
@@ -7934,52 +7481,43 @@
 	call JoyWaitAorB
 	scf
 	ret
-; 103747
 
-MenuHeader_103747: ; 103747
+MenuHeader_103747:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw MenuData_10374f
 	db 1 ; default option
 
-MenuData_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
 
-Function103780: ; 103780
+Function103780:
 	ld a, [wd265]
 	push af
 	call Function10378c
@@ -7986,9 +7524,8 @@
 	pop af
 	ld [wd265], a
 	ret
-; 10378c
 
-Function10378c: ; 10378c
+Function10378c:
 	ld c, 0
 	ld hl, wSwarmFlags
 	bit SWARMFLAGS_MOBILE_4_F, [hl]
@@ -8019,9 +7556,8 @@
 	ld hl, wSwarmFlags
 	res SWARMFLAGS_MOBILE_4_F, [hl]
 	ret
-; 1037c2
 
-Function1037c2: ; 1037c2
+Function1037c2:
 	call Function103823
 	jr c, .nope
 	ld a, [wdc5f]
@@ -8040,14 +7576,12 @@
 	ld [wdc5f], a
 	ld [wScriptVar], a
 	ret
-; 1037e6
 
-UnknownText_0x1037e6: ; 0x1037e6
+UnknownText_0x1037e6:
 	text_jump UnknownText_0x1c449c
 	db "@"
-; 0x1037eb
 
-Function1037eb: ; 1037eb
+Function1037eb:
 	call Function103823
 	jr nc, .asm_103807
 	ld hl, UnknownText_0x103819
@@ -8072,19 +7606,16 @@
 	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 @@
 .asm_10383a
 	scf
 	ret
-; 10383c
 
-Function10383c: ; 10383c
+Function10383c:
 	ld a, $01
 	ld [wdc60], a
 	xor a
@@ -8128,14 +7658,12 @@
 	ld a, $01
 	ld [wScriptVar], a
 	ret
-; 103876
 
-UnknownText_0x103876: ; 0x103876
+UnknownText_0x103876:
 	text_jump UnknownText_0x1c4508
 	db "@"
-; 0x10387b
 
-Function10387b: ; 10387b
+Function10387b:
 	farcall Mobile_AlwaysReturnNotCarry
 	bit 7, c
 	ret nz
@@ -8146,9 +7674,7 @@
 	call PrintText
 	call JoyWaitAorB
 	ret
-; 103898
 
-UnknownText_0x103898: ; 0x103898
+UnknownText_0x103898:
 	text_jump UnknownText_0x1c4525
 	db "@"
-; 0x10389d
--- 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 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105f33
 
-StubbedTrainerRankings_MagikarpLength: ; 105f33
+StubbedTrainerRankings_MagikarpLength:
 	ret
 	ld a, BANK(sTrainerRankingLongestMagikarp)
 	call GetSRAMBank
@@ -101,9 +100,8 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105f79
 
-StubbedTrainerRankings_BugContestScore: ; 105f79
+StubbedTrainerRankings_BugContestScore:
 	ret
 	ld a, BANK(sTrainerRankingBugContestScore)
 	call GetSRAMBank
@@ -131,9 +129,8 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105f9f
 
-StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f
+StubbedTrainerRankings_AddToSlotsWinStreak:
 	ret
 	ld a, BANK(sTrainerRankingCurrentSlotsStreak)
 	call GetSRAMBank
@@ -172,9 +169,8 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105fd0
 
-StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0
+StubbedTrainerRankings_EndSlotsWinStreak:
 	ret
 	ld a, BANK(sTrainerRankingCurrentSlotsStreak)
 	call GetSRAMBank
@@ -185,9 +181,8 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 105fe3
 
-StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3
+StubbedTrainerRankings_AddToSlotsPayouts:
 	ret
 	ld a, BANK(sTrainerRankingTotalSlotsPayouts)
 	call GetSRAMBank
@@ -214,9 +209,8 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 106008
 
-StubbedTrainerRankings_AddToBattlePayouts: ; 106008
+StubbedTrainerRankings_AddToBattlePayouts:
 	ret
 	ld a, BANK(sTrainerRankingTotalBattlePayouts)
 	call GetSRAMBank
@@ -245,14 +239,13 @@
 	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 @@
 	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 @@
 	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 @@
 	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
 
-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 @@
 	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 @@
 	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 @@
 	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,10 +471,9 @@
 	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
@@ -494,9 +480,8 @@
 	call UpdateTrainerRankingsChecksum
 	call CloseSRAM
 	ret
-; 106162
 
-UpdateTrainerRankingsChecksum: ; 106162
+UpdateTrainerRankingsChecksum:
 	push de
 	call CalculateTrainerRankingsChecksum
 	ld hl, sTrainerRankingsChecksum
@@ -505,9 +490,8 @@
 	ld [hl], e
 	pop de
 	ret
-; 10616e
 
-CalculateTrainerRankingsChecksum: ; 10616e
+CalculateTrainerRankingsChecksum:
 	push bc
 	ld hl, sTrainerRankings
 	ld bc, sTrainerRankingsChecksum - sTrainerRankings
@@ -528,10 +512,8 @@
 	jr nz, .asm_106179
 	pop bc
 	ret
-; 106187
 
-
-BackupMobileEventIndex: ; 106187
+BackupMobileEventIndex:
 	ld a, BANK(sMobileEventIndex)
 	call GetSRAMBank
 	ld a, [sMobileEventIndex]
@@ -542,10 +524,8 @@
 	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 @@
 	ld [sMobileEventIndex], a
 	call CloseSRAM
 	ret
-; 1061b3 (41:61b3)
 
-Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3
+Unreferenced_VerifyTrainerRankingsChecksum:
 	call CalculateTrainerRankingsChecksum
 	ld hl, sTrainerRankingsChecksum
 	ld a, d
@@ -568,9 +547,8 @@
 	ld a, e
 	cp [hl]
 	ret
-; 1061c0
 
-DeleteMobileEventIndex: ; 1061c0 (41:61c0)
+DeleteMobileEventIndex:
 	ld a, BANK(sMobileEventIndex)
 	call GetSRAMBank
 	xor a
@@ -577,7 +555,6 @@
 	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 @@
 	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 @@
 	pop de
 	pop bc
 	ret
-; 106292
 
 ._9	dd 1000000000
 ._8	dd 100000000
@@ -733,9 +707,8 @@
 ._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 @@
 
 	ld [hl], -10
 	ret
-; 1062ff
 
-.Function1062ff: ; 1062ff
+.Function1062ff:
 	ld a, [hPrintNum10]
 	bit 7, a
 	jr nz, .asm_10630d
@@ -808,17 +780,15 @@
 .asm_10630d
 	inc hl
 	ret
-; 10630f
 
 ; functions related to the cable club and various NPC scripts referencing communications
 
-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 @@
 	ld [$a800], a
 	call CloseSRAM
 	ret
-; 10632f
 
-Mobile_AlwaysReturnNotCarry: ; 10632f
+Mobile_AlwaysReturnNotCarry:
 	or a
 	ret
 
-Function106331: ; 106331 - called by 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 @@
 	xor a
 	ld c, a
 	ret
-; 10635c
 
-Function10635c: ; 10635c
+Function10635c:
 	ld a, [wMobileCommsJumptableIndex]
 	bit 7, a
 	ret nz
@@ -882,9 +851,8 @@
 	ld hl, .Jumptable
 	rst JumpTable
 	ret
-; 10636a
 
-.Jumptable: ; 10636a
+.Jumptable:
 	dw .init
 	dw Function106392
 	dw Function1063cc
@@ -894,9 +862,8 @@
 	dw Function106403
 	dw Function106442
 	dw Function106453
-; 10637c
 
-.init: ; 10637c
+.init:
 	ld de, wcd30
 	ld hl, $41
 	ld bc, $41
@@ -906,9 +873,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 106392
 
-Function106392: ; 106392
+Function106392:
 	xor a
 	ld [wcf64], a
 	ld a, [wc821]
@@ -943,9 +909,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1063cc
 
-Function1063cc: ; 1063cc
+Function1063cc:
 	ld a, $78
 	ld [wcd42], a
 	ld a, [wMobileCommsJumptableIndex]
@@ -952,7 +917,7 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 
-Function1063d8: ; 1063d8
+Function1063d8:
 	ld hl, wcd42
 	dec [hl]
 	ret nz
@@ -960,9 +925,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1063e5
 
-Function1063e5: ; 1063e5
+Function1063e5:
 	ld a, [wcf64]
 	cp $3
 	ret nz
@@ -970,9 +934,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 1063f3
 
-Function1063f3: ; 1063f3
+Function1063f3:
 	ld de, wcd31
 	ld a, $32
 	call Function3e32
@@ -980,9 +943,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 106403
 
-Function106403: ; 106403
+Function106403:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_106426
@@ -1021,9 +983,8 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 	ret
-; 106442
 
-Function106442: ; 106442
+Function106442:
 	ld a, $36
 	call Function3e32
 	xor a
@@ -1033,7 +994,7 @@
 	inc a
 	ld [wMobileCommsJumptableIndex], a
 
-Function106453: ; 106453
+Function106453:
 	ld a, [wMobileCommsJumptableIndex]
 	set 7, a
 	ld [wMobileCommsJumptableIndex], a
@@ -1041,14 +1002,12 @@
 	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 @@
 	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 @@
 	ld b, BANK(TextBoxSpaceGFX)
 	call Function1064c3
 	ret
-; 1064c3
 
-Function1064c3: ; 1064c3
+Function1064c3:
 	ld a, [rSVBK]
 	push af
 	ld a, $6
@@ -1106,7 +1063,7 @@
 	ld [rSVBK], a
 	jr asm_1064ed
 
-Function1064d8: ; 1064d8
+Function1064d8:
 	ld a, [rSVBK]
 	push af
 	ld a, $6
@@ -1139,14 +1096,12 @@
 	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"
--- 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 @@
 	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,11 +31,11 @@
 	mobiletradeanim_showgtsgetmon
 	mobiletradeanim_end
 
-Function108026: ; 108026
+Function108026:
 	ld a, $0
 	jr asm_10802c
 
-Function10802a: ; 10802a
+Function10802a:
 	ld a, $1
 
 asm_10802c:
@@ -44,7 +42,6 @@
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_Frontpics
-; 108035
 
 .TradeAnimScript: ; trade
 	mobiletradeanim_showgivemon
@@ -56,12 +53,11 @@
 	mobiletradeanim_showgetmon
 	mobiletradeanim_end
 
-Function10803d: ; 10803d
+Function10803d:
 	ld a, $0
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
-; 108048
 
 .TradeAnimScript:
 	mobiletradeanim_11
@@ -70,12 +66,11 @@
 	mobiletradeanim_showoddegg
 	mobiletradeanim_end
 
-Function10804d: ; 10804d
+Function10804d:
 	ld a, $0
 	ld [wcf65], a
 	ld de, .TradeAnimScript
 	jp RunMobileTradeAnim_NoFrontpics
-; 108058
 
 .TradeAnimScript:
 	mobiletradeanim_11
@@ -82,7 +77,7 @@
 	mobiletradeanim_showgtsgetmon
 	mobiletradeanim_end
 
-RunMobileTradeAnim_Frontpics: ; 10805b
+RunMobileTradeAnim_Frontpics:
 	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
@@ -110,9 +105,8 @@
 	pop af
 	ld [hMapAnims], a
 	ret
-; 108089
 
-RunMobileTradeAnim_NoFrontpics: ; 108089
+RunMobileTradeAnim_NoFrontpics:
 	ld hl, wTradeAnimAddress
 	ld [hl], e
 	inc hl
@@ -140,9 +134,8 @@
 	pop af
 	ld [hMapAnims], a
 	ret
-; 1080b7
 
-Function1080b7: ; 1080b7
+Function1080b7:
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -216,9 +209,8 @@
 	call Function108b98
 	call Function108af4
 	ret
-; 108157
 
-Function108157: ; 108157
+Function108157:
 	xor a
 	ld [wJumptableIndex], a
 	call ClearBGPalettes
@@ -253,9 +245,8 @@
 	call Function108b98
 	call Function108af4
 	ret
-; 1081ad
 
-MobileTradeAnim_ClearTiles: ; 1081ad
+MobileTradeAnim_ClearTiles:
 	ld a, $1
 	ld [rVBK], a
 	ld hl, vTiles0
@@ -269,9 +260,8 @@
 	xor a
 	call ByteFill
 	ret
-; 1081ca
 
-MobileTradeAnim_ClearBGMap: ; 1081ca
+MobileTradeAnim_ClearBGMap:
 	ld a, $1
 	ld [rVBK], a
 	hlbgcoord 0, 0
@@ -285,9 +275,8 @@
 	ld a, $7f
 	call ByteFill
 	ret
-; 1081e9
 
-MobileTradeAnim_GetFrontpic: ; 1081e9
+MobileTradeAnim_GetFrontpic:
 	push de
 	push af
 	predef GetUnownLetter
@@ -298,9 +287,8 @@
 	pop de
 	predef GetMonFrontpic
 	ret
-; 108201
 
-Function108201: ; 108201
+Function108201:
 	push de
 	push af
 	predef GetUnownLetter
@@ -311,9 +299,8 @@
 	pop de
 	predef GetAnimatedFrontpic
 	ret
-; 108219
 
-Function108219: ; 108219
+Function108219:
 	ld [wCurPartySpecies], a
 	hlcoord 7, 2
 	ld d, $0
@@ -320,9 +307,8 @@
 	ld e, ANIM_MON_TRADE
 	predef AnimateFrontpic
 	ret
-; 108229
 
-Function108229: ; 108229
+Function108229:
 	ld [wCurPartySpecies], a
 	hlcoord 7, 2
 	ld d, $0
@@ -329,9 +315,8 @@
 	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 @@
 	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 @@
 	farcall Function106464
 	scf
 	ret
-; 10827b
 
-.ExecuteMobileTradeAnimCommand: ; 10827b
+.ExecuteMobileTradeAnimCommand:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -378,9 +361,8 @@
 	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 @@
 	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 @@
 	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,9 +416,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 1082db
 
-Function1082db: ; 1082db
+Function1082db:
 .loop
 	farcall PlaySpriteAnimations
 	farcall SetUpPokeAnim
@@ -447,9 +424,8 @@
 	farcall HDMATransferTileMapToWRAMBank3
 	jr nc, .loop
 	ret
-; 1082f0
 
-Function1082f0: ; 1082f0
+Function1082f0:
 .loop
 	call Function108b78
 	call DelayFrame
@@ -456,9 +432,8 @@
 	dec c
 	jr nz, .loop
 	ret
-; 1082fa
 
-Function1082fa: ; 1082fa
+Function1082fa:
 .loop
 	call Function108b78
 	push hl
@@ -470,9 +445,8 @@
 	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 @@
 	call WaitMobileTradeSpriteAnims
 	call GetMobileTradeAnimByte
 	ret
-; 10839b
 
-MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
+MobileTradeAnim_ShowOTMonFromTrade:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -595,9 +568,8 @@
 	call Function108c16
 	call GetMobileTradeAnimByte
 	ret
-; 10842c
 
-MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
+MobileTradeAnim_ShowPlayerMonForGTS:
 	ld de, MUSIC_EVOLUTION
 	call PlayMusic2
 	ld a, $80
@@ -672,9 +644,8 @@
 	call WaitMobileTradeSpriteAnims
 	call GetMobileTradeAnimByte
 	ret
-; 1084d7
 
-MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
+MobileTradeAnim_ShowOTMonFromGTS:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -741,9 +712,8 @@
 	call Function108c40
 	call GetMobileTradeAnimByte
 	ret
-; 108589
 
-MobileTradeAnim_GetOddEgg: ; 108589
+MobileTradeAnim_GetOddEgg:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -809,9 +779,8 @@
 	call Function1082db
 	call GetMobileTradeAnimByte
 	ret
-; 108638
 
-MobileTradeAnim_02: ; 108638
+MobileTradeAnim_02:
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
@@ -845,9 +814,8 @@
 	call Function108af4
 	call GetMobileTradeAnimByte
 	ret
-; 108689
 
-MobileTradeAnim_10: ; 108689
+MobileTradeAnim_10:
 	farcall DeinitializeAllSprites
 	call ClearBGPalettes
 	call ClearSprites
@@ -891,9 +859,8 @@
 	call Function108af4
 	call GetMobileTradeAnimByte
 	ret
-; 1086f4
 
-MobileTradeAnim_11: ; 1086f4
+MobileTradeAnim_11:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -940,9 +907,8 @@
 	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 @@
 .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 @@
 .done
 	call GetMobileTradeAnimByte
 	ret
-; 108811
 
-MobileTradeAnim_05: ; 108811
+MobileTradeAnim_05:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 	ld a, $1
@@ -1057,9 +1021,8 @@
 	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 @@
 	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 @@
 	ld de, SFX_THROW_BALL
 	call PlaySFX
 	ret
-; 108863
 
-MobileTradeAnim_GetTrademon1: ; 108863
+MobileTradeAnim_GetTrademon1:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 .loop
@@ -1105,9 +1066,8 @@
 	call Function108af4
 	call MobileTradeAnim_Next
 	ret
-; 108894
 
-MobileTradeAnim_GetTrademon2: ; 108894
+MobileTradeAnim_GetTrademon2:
 	ld c, 20
 	ld hl, wBGPals2 + 1 palettes
 	call Function1082fa
@@ -1174,9 +1134,8 @@
 .asm_108906
 	call MobileTradeAnim_Next
 	ret
-; 10890a
 
-MobileTradeAnim_GetTrademon3: ; 10890a
+MobileTradeAnim_GetTrademon3:
 	ld c, 40
 	ld hl, wBGPals2 palette 6
 	call Function1082f0
@@ -1183,9 +1142,8 @@
 	call Function108af4
 	call GetMobileTradeAnimByte
 	ret
-; 108919
 
-MobileTradeAnim_0f: ; 108919
+MobileTradeAnim_0f:
 	ld c, 40
 	call WaitMobileTradeSpriteAnims
 	farcall DeinitializeAllSprites
@@ -1198,9 +1156,8 @@
 	call EnableLCD
 	call GetMobileTradeAnimByte
 	ret
-; 10893d
 
-MobileTradeAnim_FadeToBlack: ; 10893d
+MobileTradeAnim_FadeToBlack:
 .loop
 	ld a, [rBGP]
 	and a
@@ -1219,9 +1176,8 @@
 	call DmgToCgbObjPal0
 	call GetMobileTradeAnimByte
 	ret
-; 10895e
 
-Function10895e: ; 10895e
+Function10895e:
 	ld de, vTiles0 tile $30
 	jr asm_108966
 
@@ -1241,9 +1197,8 @@
 	predef PlaceGraphic
 	call WaitBGMap
 	ret
-; 10898a
 
-Function10898a: ; 10898a
+Function10898a:
 	ld de, vTiles2
 	call MobileTradeAnim_GetFrontpic
 	call WaitTop
@@ -1255,9 +1210,8 @@
 	predef PlaceGraphic
 	call WaitBGMap
 	ret
-; 1089a8
 
-MobileTradeAnim_DisplayMonToBeSent: ; 1089a8
+MobileTradeAnim_DisplayMonToBeSent:
 	ld de, wPlayerTrademonSpecies
 	ld a, [de]
 	cp EGG
@@ -1307,16 +1261,14 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $0
 	ld [rVBK], a
 	ret
-; 108af4
 
-Function108af4: ; 108af4
+Function108af4:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1477,9 +1417,8 @@
 	call DmgToCgbBGPals
 	call DelayFrame
 	ret
-; 108b45
 
-Function108b45: ; 108b45
+Function108b45:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1493,9 +1432,8 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 108b5a
 
-Function108b5a: ; 108b5a
+Function108b5a:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1515,9 +1453,8 @@
 	ld a, $1
 	ld [hCGBPalUpdate], a
 	ret
-; 108b78
 
-Function108b78: ; 108b78
+Function108b78:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -1540,12 +1477,11 @@
 	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 @@
 	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 @@
 	farcall DeinitializeSprite
 	ret
 
-Function108be0: ; 108be0 (42:4be0)
+Function108be0:
 	ld hl, SPRITEANIMSTRUCT_YCOORD
 	add hl, bc
 	ld a, [hl]
@@ -1601,9 +1535,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	jr nz, .their_ot_loop
 
 	ret
-; 108ce9
 
 .DebugTradeData:
 	db VENUSAUR
@@ -1792,9 +1711,8 @@
 	db "クりーチャ@"
 	dw $0456
 	db "マツミヤ@@"
-; 108d07
 
-Function108d07: ; 108d07
+Function108d07:
 	ld a, [wc74e]
 	and $7f
 	cp $8
@@ -1810,7 +1728,6 @@
 	ld bc, 1 palettes
 	call FarCopyWRAM
 	ret
-; 108d27
 
 LZ_108d27:
 INCBIN "gfx/unknown/108d27.2bpp.lz"
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -7,7 +7,7 @@
 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 @@
 	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 @@
 	dw Function1154d4
 	dw Function1156cc
 	dw Function1159fb
-; 11417f
 
-Unknown_11417f: ; 11417f
+Unknown_11417f:
 	dw .From
 	dw .Sender
 	dw .ReplyTo
@@ -91,45 +89,43 @@
 	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 @@
 	pop de
 	jp hl
 
-; 11425c
-
-Function11425c: ; 11425c
+Function11425c:
 	ld [$dc02], a
 	pop af
 	ld [hFF8C], a
@@ -157,14 +151,10 @@
 	ld [MBC3SRamBank], a
 	ret
 
-; 114268
-
 Stubbed_Function114268:
 	ret
 
-; 114269
-
-Function114269: ; 114269
+Function114269:
 	ld h, d
 	ld l, e
 	xor a
@@ -303,9 +293,7 @@
 	ld [$dc02], a
 	jp .asm_11429b
 
-; 114333
-
-Function114333: ; 114333
+Function114333:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -312,9 +300,7 @@
 	pop bc
 	ret
 
-; 11433c
-
-Function11433c: ; 11433c
+Function11433c:
 	push de
 	ld h, d
 	ld l, e
@@ -406,9 +392,7 @@
 	ld b, $1
 	jp Function11425c
 
-; 1143b7
-
-Function1143b7: ; 1143b7
+Function1143b7:
 	ld a, [de]
 	ld b, a
 	inc de
@@ -458,9 +442,7 @@
 	pop hl
 	jp Function11425c
 
-; 1143f3
-
-Function1143f3: ; 1143f3
+Function1143f3:
 	call Function114412
 	and a
 	jr nz, .asm_11440d
@@ -487,9 +469,7 @@
 	ld b, $84
 	ret
 
-; 114412
-
-Function114412: ; 114412
+Function114412:
 	ld a, c
 	ld [$dc00], a
 	ld [hFF8C], a
@@ -618,9 +598,7 @@
 	ld a, $1
 	ret
 
-; 1144c8
-
-Function1144c8: ; 1144c8
+Function1144c8:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -627,9 +605,7 @@
 	pop bc
 	ret
 
-; 1144d1
-
-Function1144d1: ; 1144d1
+Function1144d1:
 	call Function114561
 	dec de
 	dec de
@@ -726,9 +702,7 @@
 	ld a, $1
 	jp Function11425c
 
-; 114561
-
-Function114561: ; 114561
+Function114561:
 	ld hl, $dc03
 	ld a, [de]
 	ld [hli], a
@@ -749,9 +723,7 @@
 	ld [hl], a
 	ret
 
-; 114576
-
-Function114576: ; 114576
+Function114576:
 	xor a
 	ld [wDecoBed], a
 	ld b, $7
@@ -805,9 +777,7 @@
 	ld [wDecoBed], a
 	ret
 
-; 1145c5
-
-Function1145c5: ; 1145c5
+Function1145c5:
 	ld hl, $dc24
 	ld de, String_11421e
 	ld c, $0
@@ -899,9 +869,7 @@
 	xor a
 	ret
 
-; 11463c
-
-Function11463c: ; 11463c
+Function11463c:
 	ld a, [$dc00]
 	push af
 	push de
@@ -963,9 +931,7 @@
 	ld a, $1
 	ret
 
-; 11469b
-
-Function11469b: ; 11469b
+Function11469b:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -972,9 +938,7 @@
 	pop bc
 	ret
 
-; 1146a4
-
-Function1146a4: ; 1146a4
+Function1146a4:
 	call Function114867
 	and a
 	jr nz, .asm_1146e4
@@ -1031,9 +995,7 @@
 	ld a, $1
 	ret
 
-; 1146fa
-
-Function1146fa: ; 1146fa
+Function1146fa:
 	call Function114867
 	and a
 	jp nz, .asm_11478a
@@ -1158,9 +1120,7 @@
 	xor a
 	ret
 
-; 1147cd
-
-Function1147cd: ; 1147cd
+Function1147cd:
 	ld bc, NULL
 	ld a, [wDecoRightOrnament]
 	and a
@@ -1236,9 +1196,7 @@
 	ld a, $1
 	ret
 
-; 11483a
-
-Function11483a: ; 11483a
+Function11483a:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -1245,9 +1203,7 @@
 	pop bc
 	ret
 
-; 114843
-
-Function114843: ; 114843
+Function114843:
 	ld a, [$dc00]
 	push af
 	push de
@@ -1270,9 +1226,7 @@
 	ld a, $1
 	ret
 
-; 114867
-
-Function114867: ; 114867
+Function114867:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -1330,9 +1284,7 @@
 	ld a, $1
 	ret
 
-; 1148b9
-
-Function1148b9: ; 1148b9
+Function1148b9:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -1339,9 +1291,7 @@
 	pop bc
 	ret
 
-; 1148c2
-
-Function1148c2: ; 1148c2
+Function1148c2:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -1432,9 +1382,7 @@
 	ld a, $1
 	ret
 
-; 114944
-
-Function114944: ; 114944
+Function114944:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -1441,9 +1389,7 @@
 	pop bc
 	ret
 
-; 11494d
-
-Function11494d: ; 11494d
+Function11494d:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -1526,9 +1472,7 @@
 	ld a, $1
 	ret
 
-; 1149c3
-
-Function1149c3: ; 1149c3
+Function1149c3:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -1535,9 +1479,7 @@
 	pop bc
 	ret
 
-; 1149cc
-
-Function1149cc: ; 1149cc
+Function1149cc:
 	ld hl, $dc06
 	ld a, [hl]
 	ld [wCurrMapBGEventCount], a
@@ -1586,9 +1528,7 @@
 	ld a, $1
 	ret
 
-; 114a0f
-
-Function114a0f: ; 114a0f
+Function114a0f:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -1595,9 +1535,7 @@
 	pop bc
 	ret
 
-; 114a18
-
-Function114a18: ; 114a18
+Function114a18:
 	ld bc, NULL
 	ld h, b
 .asm_114a1c
@@ -1663,9 +1601,7 @@
 	ld a, $1
 	ret
 
-; 114a71
-
-Function114a71: ; 114a71
+Function114a71:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -1672,9 +1608,7 @@
 	pop bc
 	ret
 
-; 114a7a
-
-Function114a7a: ; 114a7a
+Function114a7a:
 	ld bc, NULL
 .asm_114a7d
 	inc bc
@@ -1725,9 +1659,7 @@
 	ld a, $1
 	ret
 
-; 114ac6
-
-Function114ac6: ; 114ac6
+Function114ac6:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -1734,9 +1666,7 @@
 	pop bc
 	ret
 
-; 114acf
-
-Function114acf: ; 114acf
+Function114acf:
 .asm_114acf
 	push hl
 	push bc
@@ -1838,9 +1768,7 @@
 	xor a
 	ret
 
-; 114b4c
-
-Function114b4c: ; 114b4c
+Function114b4c:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -1847,9 +1775,7 @@
 	pop bc
 	ret
 
-; 114b55
-
-Function114b55: ; 114b55
+Function114b55:
 	call Function114561
 	ld b, $0
 	ld hl, $dc03
@@ -1923,9 +1849,7 @@
 	ld b, $82
 	jp Function11425c
 
-; 114bbc
-
-Function114bbc: ; 114bbc
+Function114bbc:
 	ld h, d
 	ld l, e
 	ld a, [hli]
@@ -1978,9 +1902,7 @@
 	pop hl
 	jp Function11425c
 
-; 114c0b
-
-Function114c0b: ; 114c0b
+Function114c0b:
 	ld hl, $dc24
 	push bc
 	call Function115d53
@@ -2038,9 +1960,7 @@
 	jr z, .asm_114c24
 	jr .asm_114c18
 
-; 114c55
-
-Function114c55: ; 114c55
+Function114c55:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -2047,9 +1967,7 @@
 	pop bc
 	ret
 
-; 114c5e
-
-Function114c5e: ; 114c5e
+Function114c5e:
 	ld de, wPartyMon5Defense
 	push hl
 .asm_114c62
@@ -2148,9 +2066,7 @@
 	dec bc
 	ret
 
-; 114cd9
-
-Function114cd9: ; 114cd9
+Function114cd9:
 	ld h, d
 	ld l, e
 	ld b, [hl]
@@ -2215,9 +2131,7 @@
 	ld a, $1
 	jp Function11425c
 
-; 114d39
-
-Function114d39: ; 114d39
+Function114d39:
 .asm_114d39
 	ld a, [$dc04]
 	and a
@@ -2284,9 +2198,7 @@
 	ld [hli], a
 	ret
 
-; 114d99
-
-Function114d99: ; 114d99
+Function114d99:
 	ld de, wPartyMon5Defense
 	xor a
 	ld [de], a
@@ -2359,9 +2271,7 @@
 	xor a
 	ret
 
-; 114df1
-
-Function114df1: ; 114df1
+Function114df1:
 	cp $1b
 	ret nz
 	ld a, [hli]
@@ -2410,9 +2320,7 @@
 	xor a
 	ret
 
-; 114e2d
-
-Function114e2d: ; 114e2d
+Function114e2d:
 	cp $30
 	jr c, .asm_114e45
 	cp $40
@@ -2447,9 +2355,7 @@
 	xor a
 	ret
 
-; 114e62
-
-Function114e62: ; 114e62
+Function114e62:
 	ld a, c
 	and a
 	jr nz, .asm_114e6f
@@ -2492,9 +2398,7 @@
 	ld b, $83
 	jp Function11425c
 
-; 114ea0
-
-Function114ea0: ; 114ea0
+Function114ea0:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -2540,9 +2444,7 @@
 	ld b, $83
 	ret
 
-; 114ee0
-
-Function114ee0: ; 114ee0
+Function114ee0:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -2549,9 +2451,7 @@
 	pop bc
 	ret
 
-; 114ee9
-
-Function114ee9: ; 114ee9
+Function114ee9:
 	ld hl, $dc03
 	ld a, b
 	ld [hli], a
@@ -2584,9 +2484,7 @@
 	ld [hl], d
 	ret
 
-; 114f0a
-
-Function114f0a: ; 114f0a
+Function114f0a:
 	call Function114f39
 	and a
 	jr nz, .asm_114f26
@@ -2621,9 +2519,7 @@
 	ld a, $ff
 	ret
 
-; 114f39
-
-Function114f39: ; 114f39
+Function114f39:
 	ld hl, $dc0d
 	ld e, [hl]
 	inc hl
@@ -2653,9 +2549,7 @@
 .asm_114f58
 	ret
 
-; 114f59
-
-Function114f59: ; 114f59
+Function114f59:
 	ld a, [wTimerEventStartDay]
 	and a
 	jr nz, .asm_114f7c
@@ -2781,9 +2675,7 @@
 	xor a
 	ret
 
-; 115020
-
-Function115020: ; 115020
+Function115020:
 	push hl
 	ld hl, $dc06
 	ld a, [hli]
@@ -2830,9 +2722,7 @@
 	ld a, $1
 	ret
 
-; 115059
-
-Function115059: ; 115059
+Function115059:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -2839,9 +2729,7 @@
 	pop bc
 	ret
 
-; 115062
-
-Function115062: ; 115062
+Function115062:
 	ld hl, wDecoBed
 	ld a, [hli]
 	and a
@@ -2894,9 +2782,7 @@
 .asm_1150b2
 	ret
 
-; 1150b3
-
-Function1150b3: ; 1150b3
+Function1150b3:
 	ld hl, $dc24
 	ld de, wPartyMon5Defense
 	ld b, $0
@@ -2998,9 +2884,7 @@
 	ld [de], a
 	ret
 
-; 115136
-
-Function115136: ; 115136
+Function115136:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -3046,9 +2930,7 @@
 	ld a, $1
 	ret
 
-; 115170
-
-Function115170: ; 115170
+Function115170:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -3055,9 +2937,7 @@
 	pop bc
 	ret
 
-; 115179
-
-Function115179: ; 115179
+Function115179:
 	ld hl, $dc06
 	ld a, [hli]
 	ld [wCurrMapBGEventCount], a
@@ -3167,9 +3047,7 @@
 	xor a
 	ret
 
-; 11520e
-
-Function11520e: ; 11520e
+Function11520e:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -3176,9 +3054,7 @@
 	pop bc
 	ret
 
-; 115217
-
-Function115217: ; 115217
+Function115217:
 	push hl
 	ld hl, $dc06
 	ld a, [hli]
@@ -3263,9 +3139,7 @@
 	call z, Function115286
 	jr .asm_115252
 
-; 115286
-
-Function115286: ; 115286
+Function115286:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -3272,9 +3146,7 @@
 	pop bc
 	ret
 
-; 11528f
-
-Function11528f: ; 11528f
+Function11528f:
 	ld hl, wDecoBed
 	ld c, [hl]
 	inc hl
@@ -3297,9 +3169,7 @@
 	ld [hl], c
 	ret
 
-; 1152af
-
-Function1152af: ; 1152af
+Function1152af:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -3306,9 +3176,7 @@
 	pop bc
 	ret
 
-; 1152b8
-
-Function1152b8: ; 1152b8
+Function1152b8:
 	push bc
 	call Function11537d
 	push de
@@ -3433,9 +3301,7 @@
 	xor a
 	jp Function11425c
 
-; 11537d
-
-Function11537d: ; 11537d
+Function11537d:
 	ld hl, $dc06
 	ld a, [de]
 	ld [hli], a
@@ -3483,9 +3349,7 @@
 	ld [wTimerEventStartDay], a
 	ret
 
-; 1153b5
-
-Function1153b5: ; 1153b5
+Function1153b5:
 	ld hl, $dc0d
 	ld e, [hl]
 	inc hl
@@ -3510,9 +3374,7 @@
 	ld [hl], d
 	ret
 
-; 1153d2
-
-Function1153d2: ; 1153d2
+Function1153d2:
 	ld a, [$dc03]
 	ld d, a
 	ld a, [$dc04]
@@ -3698,9 +3560,7 @@
 	xor a
 	ret
 
-; 1154d4
-
-Function1154d4: ; 1154d4
+Function1154d4:
 	xor a
 	ld [wTimerEventStartDay], a
 	call Function1155af
@@ -3830,9 +3690,7 @@
 	call Function1155d1
 	jr .asm_115547
 
-; 1155af
-
-Function1155af: ; 1155af
+Function1155af:
 	ld hl, $dc06
 	ld a, [de]
 	ld [hli], a
@@ -3862,9 +3720,7 @@
 	call Function1155d1
 	ret
 
-; 1155d1
-
-Function1155d1: ; 1155d1
+Function1155d1:
 	ld a, [$dc0d]
 	ld l, a
 	ld a, [$dc0e]
@@ -3907,9 +3763,7 @@
 	ld [$dc0e], a
 	ret
 
-; 11560a
-
-Function11560a: ; 11560a
+Function11560a:
 	ld a, [$dc06]
 	ld [wCurrMapBGEventCount], a
 	ld a, [$dc17]
@@ -4035,9 +3889,7 @@
 	ld bc, $03db
 	jr .asm_115659
 
-; 1156cc
-
-Function1156cc: ; 1156cc
+Function1156cc:
 	ld a, [wTimerEventStartDay]
 	and a
 	jp z, Function11425c
@@ -4099,9 +3951,7 @@
 	ld b, $83
 	jp Function11425c
 
-; 115732
-
-Function115732: ; 115732
+Function115732:
 	ld hl, $dc02
 	ld a, [de]
 	ld [hli], a
@@ -4143,9 +3993,7 @@
 	ld [hl], b
 	ret
 
-; 11575c
-
-Function11575c: ; 11575c
+Function11575c:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4231,9 +4079,7 @@
 	ld [wTimerEventStartDay], a
 	ret
 
-; 1157d0
-
-Function1157d0: ; 1157d0
+Function1157d0:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4290,9 +4136,7 @@
 	ld [wTimerEventStartDay], a
 	ret
 
-; 11581e
-
-Function11581e: ; 11581e
+Function11581e:
 	ld a, [wTimerEventStartDay]
 	and a
 	ret z
@@ -4398,9 +4242,7 @@
 	ld [wTimerEventStartDay], a
 	ret
 
-; 1158c2
-
-Function1158c2: ; 1158c2
+Function1158c2:
 	ld a, e
 	ld [wSwarmFlags], a
 	ld a, d
@@ -4608,9 +4450,7 @@
 	ld [hl], a
 	ret
 
-; 1159dc
-
-Function1159dc: ; 1159dc
+Function1159dc:
 	cp $1a
 	jr c, .asm_1159ef
 	cp $34
@@ -4638,9 +4478,7 @@
 	ld a, $2b
 	ret
 
-; 1159fb
-
-Function1159fb: ; 1159fb
+Function1159fb:
 	ld a, [wTimerEventStartDay]
 	and a
 	jp z, Function11425c
@@ -4701,9 +4539,7 @@
 	ld a, $1
 	jp Function11425c
 
-; 115a5f
-
-Function115a5f: ; 115a5f
+Function115a5f:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4762,9 +4598,7 @@
 	ld [wTimerEventStartDay], a
 	ret
 
-; 115ab0
-
-Function115ab0: ; 115ab0
+Function115ab0:
 	ld hl, $dc05
 	ld a, [hli]
 	ld h, [hl]
@@ -4823,9 +4657,7 @@
 	xor a
 	ret
 
-; 115b00
-
-Function115b00: ; 115b00
+Function115b00:
 	ld a, [wTimerEventStartDay]
 	and a
 	ret z
@@ -4957,9 +4789,7 @@
 	xor a
 	ret
 
-; 115bc8
-
-Function115bc8: ; 115bc8
+Function115bc8:
 	xor a
 	ld [wDecoCarpet], a
 .asm_115bcc
@@ -5058,9 +4888,7 @@
 	ld a, $2
 	ret
 
-; 115c49
-
-Function115c49: ; 115c49
+Function115c49:
 	ld a, e
 	ld [wWeeklyFlags], a
 	ld a, d
@@ -5197,9 +5025,7 @@
 	jp nz, .asm_115c64
 	ret
 
-; 115cfd
-
-Function115cfd: ; 115cfd
+Function115cfd:
 	cp $2b
 	jr c, .asm_115d27
 	jr z, .asm_115d2f
@@ -5268,9 +5094,7 @@
 	sub $47
 	ret
 
-; 115d53
-
-Function115d53: ; 115d53
+Function115d53:
 .asm_115d53
 	ld a, [de]
 	ld [hli], a
@@ -5284,9 +5108,7 @@
 	ld [hl], a
 	ret
 
-; 115d61
-
-Function115d61: ; 115d61
+Function115d61:
 	push bc
 	ld bc, $dc00
 	call Function115d80
@@ -5293,9 +5115,7 @@
 	pop bc
 	ret
 
-; 115d6a
-
-Function115d6a: ; 115d6a
+Function115d6a:
 .asm_115d6a
 	ld a, [hli]
 	ld [de], a
@@ -5308,9 +5128,7 @@
 	xor a
 	ret
 
-; 115d77
-
-Function115d77: ; 115d77
+Function115d77:
 	push bc
 	ld bc, wCurrMapBGEventCount
 	call Function115d80
@@ -5317,9 +5135,7 @@
 	pop bc
 	ret
 
-; 115d80
-
-Function115d80: ; 115d80
+Function115d80:
 	ld e, a
 	ld a, d
 	cp $bf
@@ -5340,13 +5156,9 @@
 	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 @@
 	ld [wc3f7], a
 	ret
 
-; 11659d
-
-Function11659d: ; 11659d
+Function11659d:
 	ld a, [wc314]
 	cp $12
 	ret nc
@@ -5399,9 +5209,7 @@
 	ld l, a
 	jp hl
 
-; 1165af
-
-Jumptable_1165af: ; 1165af
+Jumptable_1165af:
 	dw Function11677e
 	dw Function1165d5
 	dw Function1165d8
@@ -5421,9 +5229,8 @@
 	dw Function1166c4
 	dw Function1166d6
 	dw Function1166d6
-; 1165d5
 
-Function1165d5: ; 1165d5
+Function1165d5:
 	call Function11678e
 
 Function1165d8:
@@ -5444,9 +5251,7 @@
 	ret c
 	jp Function116797
 
-; 1165f5
-
-Function1165f5: ; 1165f5
+Function1165f5:
 	ld a, $1
 	ld c, a
 	ld a, $1
@@ -5466,9 +5271,7 @@
 	ld [wc314], a
 	ret
 
-; 116615
-
-Function116615: ; 116615
+Function116615:
 	call Function11678e
 
 Function116618:
@@ -5489,9 +5292,7 @@
 	ret c
 	jp Function116797
 
-; 116635
-
-Function116635: ; 116635
+Function116635:
 	ld a, $2
 	ld c, a
 	ld a, $ff
@@ -5511,9 +5312,7 @@
 	ld [wc314], a
 	ret
 
-; 116655
-
-Function116655: ; 116655
+Function116655:
 	xor a
 	ld [wc314 + 3], a
 	call Function11678e
@@ -5558,9 +5357,7 @@
 	ld [wc314], a
 	ret
 
-; 11669f
-
-Function11669f: ; 11669f
+Function11669f:
 	call Function11678e
 
 Function1166a2:
@@ -5607,9 +5404,7 @@
 	ld [wc314], a
 	ret
 
-; 1166f4
-
-Function1166f4: ; 1166f4
+Function1166f4:
 	ld [wc30e], a
 	ld a, b
 	ld [wc314 + 2], a
@@ -5635,9 +5430,7 @@
 	call Function116797
 	ret
 
-; 11671f
-
-Function11671f: ; 11671f
+Function11671f:
 	ld [wc30f], a
 	ld a, b
 	ld [wc314 + 3], a
@@ -5659,9 +5452,7 @@
 	call Function116797
 	ret
 
-; 116747
-
-Function116747: ; 116747
+Function116747:
 	ld hl, wc30e
 	ld a, [wc314 + 2]
 	add [hl]
@@ -5672,9 +5463,7 @@
 	ld [hl], a
 	ret
 
-; 116758
-
-Function116758: ; 116758
+Function116758:
 	ld a, [wc30f]
 	cp $30
 	jr c, .asm_116770
@@ -5703,9 +5492,7 @@
 	ld [wc314 + 4], a
 	ret
 
-; 11677e
-
-Function11677e: ; 11677e
+Function11677e:
 	ld a, $0
 
 Function116780:
@@ -5721,9 +5508,7 @@
 	and a
 	ret
 
-; 11678e
-
-Function11678e: ; 11678e
+Function11678e:
 	ld hl, wc314
 	ld a, [hl]
 	ld [wc314 + 1], a
@@ -5730,15 +5515,11 @@
 	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 @@
 	ld [wc312], a
 	jr asm_1167af
 
-Function1167a6: ; 1167a6
+Function1167a6:
 	ld hl, wc313
 	dec [hl]
 	ret nz
@@ -5794,8 +5575,6 @@
 	ld [wc313], a
 	ret
 
-; 1167eb
-
 Unknown_1167eb:
 	dw Unknown_1167fb
 	dw Unknown_116808
@@ -5806,7 +5585,7 @@
 	dw Unknown_116881
 	dw Unknown_1168ae
 
-Unknown_1167fb: ; 1167fb
+Unknown_1167fb:
 	db $0, $6
 	db $1, $4
 	db $2, $4
@@ -5815,7 +5594,7 @@
 	db $1, $4
 	db $fe
 
-Unknown_116808: ; 116808
+Unknown_116808:
 	db $4, $6
 	db $5, $4
 	db $6, $4
@@ -5824,7 +5603,7 @@
 	db $5, $4
 	db $fe
 
-Unknown_116815: ; 116815
+Unknown_116815:
 	db $fd, $20
 	db $8, $c
 	db $9, $24
@@ -5847,7 +5626,7 @@
 	db $8, $4
 	db -1 ; end
 
-Unknown_11683e: ; 11683e
+Unknown_11683e:
 	db $fd, $20
 	db $e, $c
 	db $f, $24
@@ -5870,7 +5649,7 @@
 	db $e, $4
 	db -1 ; end
 
-Unknown_116867: ; 116867
+Unknown_116867:
 	db $14, $8
 	db $15, $8
 	db $16, $8
@@ -5877,7 +5656,7 @@
 	db $15, $8
 	db $fe
 
-Unknown_116870: ; 116870
+Unknown_116870:
 	db $17, $5
 	db $18, $5
 	db $19, $5
@@ -5888,7 +5667,7 @@
 	db $18, $5
 	db $fe
 
-Unknown_116881: ; 116881
+Unknown_116881:
 	db $1c, $7
 	db $1d, $7
 	db $1e, $a
@@ -5913,7 +5692,7 @@
 	db $fd, $40
 	db -1 ; end
 
-Unknown_1168ae: ; 1168ae
+Unknown_1168ae:
 	db $24, $4
 	db $25, $4
 	db $26, $4
@@ -5926,7 +5705,6 @@
 	db $2d, $4
 	db $2e, $4
 	db $fe
-; 1168c5
 
 Unknown_1168c5:
 	dw Unknown_116923
@@ -5977,7 +5755,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
 
-GiveOddEgg: ; 117656
+GiveOddEgg:
 	farcall _GiveOddEgg
 	ret
 
-; 11765d
-
-Function11765d: ; 11765d (45:765d)
+Function11765d:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -6853,7 +6627,7 @@
 	ld [hInMenu], a
 	ret
 
-Function11766b: ; 11766b (45:766b)
+Function11766b:
 	call Function117699
 	ld a, [rSVBK]
 	push af
@@ -6874,7 +6648,7 @@
 	ld [rSVBK], a
 	ret
 
-Function117699: ; 117699 (45:7699)
+Function117699:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, wcd49
@@ -6903,7 +6677,7 @@
 	farcall ClearSpriteAnims
 	ret
 
-Function1176ee: ; 1176ee (45:76ee)
+Function1176ee:
 .loop
 	call JoyTextDelay
 	ld a, [wcd49]
@@ -6921,7 +6695,7 @@
 	call ClearSprites
 	ret
 
-Function117719: ; 117719 (45:7719)
+Function117719:
 	ld a, [wcd49]
 	ld e, a
 	ld d, 0
@@ -6933,7 +6707,7 @@
 	ld l, a
 	jp hl
 
-Jumptable_117728: ; 117728 (45:7728)
+Jumptable_117728:
 	dw Function117738
 	dw Function117764
 	dw Function1178aa
@@ -6943,8 +6717,7 @@
 	dw Function117984
 	dw Function1179a7
 
-
-Function117738: ; 117738 (45:7738)
+Function117738:
 	farcall Function171ccd
 	depixel 6, 3
 	ld a, $1d
@@ -6964,7 +6737,7 @@
 	ld [wcd23], a
 	jp MobilePassword_IncrementJumptable
 
-Function117764: ; 117764 (45:7764)
+Function117764:
 	ld a, [wcd4a]
 	cp $10
 	jr nz, .asm_11776f
@@ -7003,11 +6776,11 @@
 	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
@@ -7014,7 +6787,7 @@
 	ld [wcd4d], a
 	ret
 
-Function1177b7: ; 1177b7 (45:77b7)
+Function1177b7:
 	ld a, $3
 	ld [wcd24], a
 	ld a, [wcd4a]
@@ -7027,13 +6800,13 @@
 	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 @@
 	ld [hl], a
 	ret
 
-Function117764_d_up: ; 1177f1 (45:77f1)
+Function117764_d_up:
 	ld a, [wcd4d]
 	and a
 	ret z
@@ -7064,11 +6837,11 @@
 	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 @@
 	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 @@
 	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 @@
 	ld [wcd4c], a
 	ret
 
-Function117764_a_button: ; 11784c (45:784c)
+Function117764_a_button:
 	call PlayClickSFX
 	ld a, [wcd4d]
 	cp $4
@@ -7167,7 +6940,7 @@
 	ret nz
 	jp Function117764_start
 
-Function1178aa: ; 1178aa (45:78aa)
+Function1178aa:
 	ld hl, MenuHeader_1179b5
 	call LoadMenuHeader
 	call MenuBox
@@ -7190,7 +6963,7 @@
 	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 @@
 	call ExitMenu
 	jp MobilePassword_IncrementJumptable
 
-Function117942: ; 117942 (45:7942)
+Function117942:
 	call SpeechTextBox
 	hlcoord 1, 14
 	ld de, SavedPasswordString
@@ -7263,17 +7036,17 @@
 	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)
+Function117984:
 	ld hl, MenuHeader_1179b5
 	call LoadMenuHeader
 	call MenuBox
@@ -7286,7 +7059,7 @@
 	ld [wcd4e], a
 	call MobilePassword_IncrementJumptable
 
-Function1179a7: ; 1179a7 (45:79a7)
+Function1179a7:
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
@@ -7295,62 +7068,49 @@
 	ld [wcd49], a
 	ret
 
-; 1179b5 (45:79b5)
-
-MenuHeader_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
 
-MenuHeader_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 @@
 	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 @@
 	farcall HDMATransferAttrMapAndTileMapToWRAMBank3
 	ret
 
-; 0x117ab4
-
-Function117ab4: ; 0x117ab4
+Function117ab4:
 	call ClearBGPalettes
 	call ClearSprites
 	farcall Function172e78
@@ -7391,9 +7145,7 @@
 	farcall ReloadMapPart
 	ret
 
-; 0x117acd
-
-Function117acd: ; 0x117acd
+Function117acd:
 	call JoyTextDelay
 	ld a, [wJumptableIndex]
 	bit 7, a
@@ -7407,7 +7159,7 @@
 	call ClearSprites
 	ret
 
-Function117ae9: ; 0x117ae9
+Function117ae9:
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, $0
@@ -7419,7 +7171,7 @@
 	ld l, a
 	jp hl
 
-.Jumptable: ; 0x117af8
+.Jumptable:
 	dw Function117b06
 	dw Function117b14
 	dw Function117b28
@@ -7656,31 +7408,31 @@
 	call CloseSRAM
 	ret
 
-MenuHeader_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
 
-MenuHeader_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
--- 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 @@
 	ld [wc308], a
 	ret
 
-; 115dc3
-
-Function115dc3: ; 115dc3
+Function115dc3:
 	xor a
 	ld [wc305], a
 	ld a, $a0
@@ -27,9 +25,7 @@
 	call ByteFill
 	ret
 
-; 115dd3
-
-Function115dd3: ; 115dd3
+Function115dd3:
 	ld a, [wc305]
 	and a
 	ret z
@@ -77,9 +73,7 @@
 	jr nz, .asm_115e04
 	ret
 
-; 115e18
-
-Function115e18: ; 115e18
+Function115e18:
 	ld a, c
 	ld [wc30a], a
 	xor a
@@ -86,9 +80,7 @@
 	ld [wc30b], a
 	jr Function115e2b
 
-; 115e22
-
-Function115e22: ; 115e22
+Function115e22:
 	ld hl, wc30c
 	dec [hl]
 	ret nz
@@ -95,7 +87,7 @@
 	ld hl, wc30b
 	inc [hl]
 
-Function115e2b: ; 115e2b
+Function115e2b:
 	ld a, [wc30a]
 	sla a
 	ld c, a
@@ -126,8 +118,6 @@
 	ld [wc30c], a
 	ret
 
-; 115e59
-
 Unknown_115e59:
 	dw Unknown_115e61
 	dw Unknown_115e6c
@@ -135,7 +125,7 @@
 	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 @@
 	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 @@
 	db $0f, $08
 	db $00, $08
 	db -1
-; 115e86
 
 Unknown_115e86:
 	dw Unknown_115ea6
@@ -181,7 +170,7 @@
 	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
@@ -188,7 +177,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,7 +299,7 @@
 	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
@@ -317,13 +306,11 @@
 	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 @@
 	ld [wc3f3], a
 	ret
 
-; 11619d
-
-Function11619d: ; 11619d
+Function11619d:
 	ld a, [wc30d]
 	and a
 	ret z
@@ -368,9 +353,7 @@
 	call Function1161b8
 	ret
 
-; 1161b8
-
-Function1161b8: ; 1161b8
+Function1161b8:
 	ld a, [$c319]
 	ld e, a
 	ld d, 0
@@ -382,9 +365,7 @@
 	ld l, a
 	jp hl
 
-; 1161c7
-
-.Jumptable: ; 1161c7
+.Jumptable:
 	dw Function1161d5
 	dw Function116294
 	dw Function1162cb
@@ -392,9 +373,8 @@
 	dw Function1163c0
 	dw Function11636e
 	dw Function116441
-; 1161d5
 
-Function1161d5: ; 1161d5
+Function1161d5:
 	ld a, [rSVBK]
 	push af
 
@@ -504,16 +484,13 @@
 	ld [$c319], a
 	ret
 
-; 11628c
-
-MenuHeader_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 @@
 	ld [hWY], a
 	ret
 
-; 1162cb
-
-Function1162cb: ; 1162cb
+Function1162cb:
 	farcall Function170cc6
 	ld a, [$c319]
 	inc a
@@ -557,9 +532,7 @@
 	ld [rSVBK], a
 	ret
 
-; 1162f2
-
-Function1162f2: ; 1162f2
+Function1162f2:
 	call Function11659d
 	call Function116758
 	call Function1167a6
@@ -648,9 +621,7 @@
 	jr nz, .asm_11635a
 	ret
 
-; 11636e
-
-Function11636e: ; 11636e
+Function11636e:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -687,9 +658,7 @@
 	ld [wc30d], a
 	ret
 
-; 1163c0
-
-Function1163c0: ; 1163c0
+Function1163c0:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -746,9 +715,7 @@
 	ld [wc30d], a
 	ret
 
-; 116441
-
-Function116441: ; 116441
+Function116441:
 	farcall Function17d405
 	ld a, $90
 	ld [hWY], a
@@ -764,9 +731,7 @@
 	ld [wc30d], a
 	ret
 
-; 116468
-
-Function116468: ; 116468
+Function116468:
 	call Function116567
 	ld a, [wc314]
 	cp $d
--- 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 @@
 	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 @@
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 1180b8
 
-Function1180b8: ; 1180b8
+Function1180b8:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $22
 	ld [wcd33], a
@@ -132,17 +130,16 @@
 	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 @@
 	call Function118180
 	call ReturnToMapFromSubmenu
 	ret
-; 118180
 
-Function118180: ; 118180
+Function118180:
 	ld a, [wScriptVar]
 	and a
 	ret nz
@@ -226,9 +222,8 @@
 	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 @@
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 118233
 
-Function118233: ; 118233
+Function118233:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $1b
 	ld [wcd33], a
@@ -303,9 +297,8 @@
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 118284
 
-Function118284: ; 118284
+Function118284:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $19
 	ld [wcd33], a
@@ -339,10 +332,8 @@
 	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 @@
 	call BattleTowerRoomMenu_Cleanup
 	call ReturnToMapFromSubmenu
 	ret
-; 118329
 
-Function118329: ; 118329
+Function118329:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $15
 	ld [wcd33], a
@@ -415,9 +405,8 @@
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 11837a
 
-Function11837a: ; 11837a
+Function11837a:
 	call BattleTowerRoomMenu_InitRAM
 	ld a, $16
 	ld [wcd33], a
@@ -452,9 +441,8 @@
 	ld [rSVBK], a
 	call BattleTowerRoomMenu_Cleanup
 	ret
-; 1183cb
 
-BattleTowerRoomMenu_InitRAM: ; 1183cb
+BattleTowerRoomMenu_InitRAM:
 	di
 	ld a, [rIE]
 	ld [wcd32], a
@@ -497,9 +485,8 @@
 	ld [$bfff], a
 	call CloseSRAM
 	ret
-; 118440
 
-Function118440: ; 118440
+Function118440:
 	push af
 	ld a, $5
 	call GetSRAMBank
@@ -509,9 +496,8 @@
 	call CloseSRAM
 	pop af
 	ret
-; 118452
 
-BattleTowerRoomMenu_Cleanup: ; 118452
+BattleTowerRoomMenu_Cleanup:
 	di
 	xor a
 	ld [hMobileReceive], a
@@ -528,9 +514,8 @@
 	ld a, [wc300]
 	ld [wScriptVar], a
 	ret
-; 118473
 
-Function118473: ; 118473
+Function118473:
 	ld a, [wcd65]
 	and a
 	ret z
@@ -559,13 +544,11 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .asm_118803
 	ld a, $d3
 
-Function118805: ; 118805 (46:4805)
+Function118805:
 	ld [wc300], a
 	xor a
 	ld [wc301], a
@@ -1007,7 +971,7 @@
 	ld [wcf66], a
 	ret
 
-Function118821: ; 118821 (46:4821)
+Function118821:
 	ld a, [$c319]
 	cp $3
 	jr c, .asm_11884a
@@ -1029,9 +993,8 @@
 .asm_11884a
 	and a
 	ret
-; 11884c (46:484c)
 
-Function11884c: ; 11884c
+Function11884c:
 	ld a, [hJoyDown]
 	cp $5
 	jr nz, .asm_118864
@@ -1047,16 +1010,14 @@
 .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 @@
 	ld a, [wcd33]
 	ld [wMobileInactivityTimerSeconds], a
 
-Function118880: ; 118880 (46:4880)
+Function118880:
 	call BattleTowerRoomMenu2
 	ret c
 	xor a
@@ -1079,9 +1040,8 @@
 	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 @@
 .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 @@
 	ld a, $6
 	jp Function119e2b
 
-Function1188e7: ; 1188e7 (46:48e7)
+Function1188e7:
 	ld de, $c346
 	ld a, $5
 	call GetSRAMBank
@@ -1150,7 +1109,7 @@
 	jr nz, .asm_1188fa
 	ret
 
-Function118903: ; 118903 (46:4903)
+Function118903:
 	ld a, [wc3f0]
 	ld [$c319], a
 	ld c, $1
@@ -1160,13 +1119,11 @@
 	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
@@ -1347,9 +1304,7 @@
 	ld [wMobileInactivityTimerFrames], a
 	ret
 
-
-
-Function118a54: ; 118a54
+Function118a54:
 	ld a, [wcd55]
 	ld l, a
 	ld a, [wcd56]
@@ -1357,9 +1312,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld de, w3_d000
 	ld bc, $1000
 	jr Function118b10
-; 118ad0 (46:4ad0)
 
 Function118ad0:
 	ld hl, IndexDownloadURL
@@ -1449,7 +1398,6 @@
 	pop bc
 	ld a, $2a
 	jp Function119e2b
-; 118b10
 
 Function118b10:
 	push de
@@ -1463,7 +1411,7 @@
 	ld a, $2a
 	jp Function119e2b
 
-Function118b24: ; 118b24 (46:4b24)
+Function118b24:
 	ld hl, $c346
 	ld a, $8
 	ld [hli], a
@@ -1479,9 +1427,8 @@
 	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 @@
 	ld a, h
 	ld [wcd60], a
 	ret
-; 118b8c
 
-Function118b8c: ; 118b8c
+Function118b8c:
 .asm_118b8c
 	call Function118b9a
 	ret nc
@@ -1528,9 +1474,8 @@
 	ld [hli], a
 	ld [hli], a
 	ret
-; 118b9a
 
-Function118b9a: ; 118b9a
+Function118b9a:
 	ld a, h
 	cp $e0
 	ret c
@@ -1538,28 +1483,25 @@
 	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 @@
 .asm_118d7b
 	ld a, $d3
 	jp Function118805
-; 118d80
 
-Function118d80: ; 118d80
+Function118d80:
 	call Function118e06
 	ld a, [wcd38]
 	and a
@@ -1662,9 +1603,8 @@
 	ld bc, $0200
 	ld a, $2c
 	jp Function119e2b
-; 118ded
 
-Function118ded: ; 118ded
+Function118ded:
 	ld a, [wcd38]
 	and a
 	jr z, .asm_118e03
@@ -1678,9 +1618,8 @@
 
 .asm_118e03
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118e06
 
-Function118e06: ; 118e06
+Function118e06:
 	ld hl, wd002
 	ld a, [wcd38]
 	and a
@@ -1715,7 +1654,7 @@
 	ld [hl], a
 	jr asm_118e3e
 
-Function118e39: ; 118e39 (46:4e39)
+Function118e39:
 .asm_118e39
 	ld a, [hli]
 	and a
@@ -1755,33 +1694,32 @@
 	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 @@
 	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 @@
 	call Function1192cc
 	ret c
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118ec6
 
-Function118ec6: ; 118ec6
+Function118ec6:
 	call Function118440
 	call SpeechTextBox
 	ld hl, $d80e
@@ -1836,9 +1772,8 @@
 	ld a, $1c
 	ld [wcd47], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118f0d
 
-Function118f0d: ; 118f0d
+Function118f0d:
 	call BattleTowerRoomMenu2
 	ret c
 	call Function118440
@@ -1877,9 +1812,8 @@
 	ld a, $1c
 	ld [wcd47], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118f5e
 
-Function118f5e: ; 118f5e
+Function118f5e:
 	call BattleTowerRoomMenu2
 	ret c
 	call Function118440
@@ -1929,9 +1863,8 @@
 .asm_118fba
 	call BattleTowerRoomMenu_IncrementJumptable
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 118fc0
 
-Function118fc0: ; 118fc0
+Function118fc0:
 	call Function118440
 	ld a, [wcd55]
 	ld l, a
@@ -2006,9 +1939,8 @@
 	ld bc, $1000
 	ld a, $2c
 	jp Function119e2b
-; 119054
 
-Function119054: ; 119054
+Function119054:
 	ld a, $6
 	call GetSRAMBank
 	ld hl, wd002
@@ -2063,9 +1995,8 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $a
 	ld [wc300], a
 	ret
-; 11915d
 
-Function11915d: ; 11915d
+Function11915d:
 	ld hl, $d802
 	ld de, wBGMapBuffer
 	ld bc, $000c
@@ -2165,9 +2093,8 @@
 .asm_11918e
 	call CloseSRAM
 	ret
-; 119192
 
-Function119192: ; 119192
+Function119192:
 	inc b
 	inc c
 	jr .asm_11919e
@@ -2193,9 +2120,8 @@
 	call Function118805
 	scf
 	ret
-; 1191ad
 
-Function1191ad: ; 1191ad
+Function1191ad:
 	push bc
 	ld c, $0
 	ld a, $5
@@ -2224,9 +2150,8 @@
 	pop bc
 	and a
 	ret
-; 1191d3
 
-Function1191d3: ; 1191d3
+Function1191d3:
 	ld hl, w3_d100 + 2
 	ld a, l
 	ld [wcd53], a
@@ -2253,9 +2178,8 @@
 	ld [wcd58], a
 	call Function11920f
 	ret
-; 11920f
 
-Function11920f: ; 11920f
+Function11920f:
 .asm_11920f
 	call Function118b9a
 	ret nc
@@ -2271,9 +2195,8 @@
 	ld [hli], a
 	inc hl
 	ret
-; 119223
 
-Function119223: ; 119223
+Function119223:
 	xor a
 	ld [wcd4b], a
 	ld [wcd4c], a
@@ -2382,9 +2305,8 @@
 	ld [wcd4e], a
 	and a
 	ret
-; 1192cc
 
-Function1192cc: ; 1192cc
+Function1192cc:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $aa73
@@ -2414,9 +2336,8 @@
 .asm_1192fe
 	and a
 	ret
-; 119300
 
-Function119300: ; 119300
+Function119300:
 	xor a
 	ld [wcd4b], a
 	ld [wcd4c], a
@@ -2501,15 +2422,13 @@
 
 .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 @@
 	ld bc, $0200
 	ld a, $2c
 	jp Function119e2b
-; 1193e3
 
-Function1193e3: ; 1193e3
+Function1193e3:
 	ld hl, wcd49
 	dec [hl]
 	ret nz
@@ -2578,9 +2496,8 @@
 	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 @@
 	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 @@
 	ld a, [wd002]
 	ld hl, wd003
 
-Function119471: ; 119471 (46:5471)
+Function119471:
 	push af
 	ld a, [hli]
 	ld [$c608], a
@@ -2813,7 +2729,7 @@
 	call Function1195c4
 	ret
 
-Function119584: ; 119584 (46:5584)
+Function119584:
 	ld a, [$c608]
 	ld b, a
 	ld a, [$c608 + 3]
@@ -2858,7 +2774,7 @@
 	and a
 	ret
 
-Function1195c4: ; 1195c4 (46:55c4)
+Function1195c4:
 	ld a, [hli]
 	ld c, a
 	ld a, [hli]
@@ -2891,7 +2807,7 @@
 	ld a, $d8
 	jp Function118805
 
-Function1195f8: ; 1195f8 (46:55f8)
+Function1195f8:
 	ld a, $11
 	ld [wcd3c], a
 	ld a, $1c
@@ -2903,7 +2819,7 @@
 	call BattleTowerRoomMenu_IncrementJumptable
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-Function119612: ; 119612 (46:5612)
+Function119612:
 	ld a, $14
 	ld [wcd3c], a
 	ld a, $1c
@@ -2914,7 +2830,7 @@
 	ld [wcd47], a
 	jp BattleTowerRoomMenu_IncrementJumptable
 
-Function119629: ; 119629 (46:5629)
+Function119629:
 	call BattleTowerRoomMenu2
 	ret c
 	ld a, $60
@@ -2930,7 +2846,7 @@
 	ld [wcd47], a
 	call BattleTowerRoomMenu_IncrementJumptable
 
-Function119648: ; 119648 (46:5648)
+Function119648:
 	call BattleTowerRoomMenu2
 	ret c
 	call DelayFrame
@@ -2943,12 +2859,12 @@
 	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 @@
 	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 @@
 	ld [wc300], a
 	ret
 
-Function119694: ; 119694 (46:5694)
+Function119694:
 	ld b, 0
 	ld hl, Unknown_1196b8
 .asm_119699
@@ -3002,9 +2918,8 @@
 	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 @@
 	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 @@
 	ld [wcd4b], a
 	ret
 
-Function1196de: ; 1196de (46:56de)
+Function1196de:
 	ld a, [de]
 	inc de
 	; b = ([de] - 48) * 2
@@ -3045,9 +2959,8 @@
 	sub $30
 	add c
 	ret
-; 1196f2 (46:56f2)
 
-Function1196f2: ; 1196f2
+Function1196f2:
 	ld hl, wd002
 .asm_1196f5
 	call Function118b9a
@@ -3169,9 +3082,8 @@
 	call Function1197bf
 	ld [hli], a
 	jp BattleTowerRoomMenu_IncrementJumptable
-; 119798
 
-Function119798: ; 119798
+Function119798:
 	ld d, $0
 	ld e, d
 	call Function1197b4
@@ -3189,9 +3101,8 @@
 	or e
 	ld e, a
 	ret
-; 1197b4
 
-Function1197b4: ; 1197b4
+Function1197b4:
 	ld a, [hli]
 	cp $61
 	jr nc, .asm_1197bc
@@ -3201,9 +3112,8 @@
 .asm_1197bc
 	sub $57
 	ret
-; 1197bf
 
-Function1197bf: ; 1197bf
+Function1197bf:
 	cp $a
 	jr nc, .asm_1197c6
 	add $30
@@ -3212,9 +3122,8 @@
 .asm_1197c6
 	add $57
 	ret
-; 1197c9
 
-Function1197c9: ; 1197c9
+Function1197c9:
 	ld hl, wd002
 	call Function118e39
 	ld a, $9
@@ -3239,9 +3148,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 
 .asm_119953
 	ret
-; 119954
 
-Function119954: ; 119954
+Function119954:
 	ld a, $1c
 	ld [wcd3c], a
 	call BattleTowerRoomMenu2
@@ -3426,9 +3329,8 @@
 	ld hl, $c608
 	ld a, $1e
 	jp Function119e2b
-; 119973
 
-Function119973: ; 119973
+Function119973:
 	ld a, $1
 	ld [wcf64], a
 	xor a
@@ -3437,9 +3339,8 @@
 	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 @@
 	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 @@
 
 .asm_1199c7
 	jp Function119ac9
-; 1199ca
 
-Function1199ca: ; 1199ca
+Function1199ca:
 	ld a, $20
 	ld [wcd89], a
 	ld a, [wcf64]
@@ -3491,9 +3390,8 @@
 	ld bc, $0700
 	ld a, $28
 	jp Function119e2b
-; 1199e2
 
-Function1199e2: ; 1199e2
+Function1199e2:
 	ld c, $c
 	ld de, XGameCodePrefix
 	call Function119e4f
@@ -3624,15 +3522,13 @@
 	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 @@
 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 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, [wMobileInactivityTimerFrames]
 	ld [wcf66], a
 	ret
-; 119cf7
 
-MenuHeader_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 @@
 	db " L:100@@"
 	db "CANCEL@@"
 
-Strings_Ll0ToL40: ; 119d64
+Strings_Ll0ToL40:
 	db " L:10 @@"
 	db " L:20 @@"
 	db " L:30 @@"
@@ -3992,9 +3880,8 @@
 
 String_119d8c:
 	db "CANCEL@"
-; 119d93
 
-BattleTower_LevelCheck: ; 119d93 (46:5d93)
+BattleTower_LevelCheck:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -4038,7 +3925,7 @@
 	scf
 	ret
 
-BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
+BattleTower_UbersCheck:
 	ld a, [rSVBK]
 	push af
 	ld a, [wcd4f]
@@ -4092,26 +3979,22 @@
 	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"
-;119e40
 
-XGameResultPrefix: ; 119e40
+XGameResultPrefix:
 INCBIN "data/mobile/x-game-result-prefix.txt"
-; 119e4f
 
-Function119e4f: ; 119e4f
+Function119e4f:
 	push bc
 	ld hl, w3_d100
 	ld a, [hli]
@@ -4173,9 +4056,8 @@
 .finish
 	and a
 	ret
-; 119e8e
 
-Function119e8e: ; 119e8e
+Function119e8e:
 	cp $60
 	jr c, .less_than_0x60
 	sub $57
@@ -4184,9 +4066,8 @@
 .less_than_0x60
 	sub $30
 	ret
-; 119e98
 
-Function119e98: ; 119e98
+Function119e98:
 	ld a, $2
 .loop
 	push af
@@ -4210,9 +4091,8 @@
 	and a
 	jr nz, .loop
 	ret
-; 119eb4
 
-Function119eb4: ; 119eb4 (46:5eb4)
+Function119eb4:
 	xor a
 	ld [wc3cc], a
 	ld de, wc3ac
@@ -4224,7 +4104,7 @@
 	jr nz, .loop
 	ret
 
-Function119ec2: ; 119ec2 (46:5ec2)
+Function119ec2:
 	ld a, BANK(sMobileLoginPassword)
 	call GetSRAMBank
 	xor a
@@ -4239,7 +4119,7 @@
 	call CloseSRAM
 	ret
 
-BattleTowerRoomMenu2: ; 119ed8 (46:5ed8)
+BattleTowerRoomMenu2:
 	ld a, [rSVBK]
 	ld [wcd8c], a
 	ld a, $1
@@ -4290,14 +4170,12 @@
 	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
@@ -4304,9 +4182,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f56
 
-Function119f56: ; 119f56
+Function119f56:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_119f62
@@ -4323,9 +4200,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f76
 
-Function119f76: ; 119f76
+Function119f76:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_119f82
@@ -4343,9 +4219,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 119f98
 
-Function119f98: ; 119f98
+Function119f98:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4393,9 +4268,8 @@
 	ld [wc300], a
 	scf
 	ret
-; 11a00e
 
-Function11a00e: ; 11a00e
+Function11a00e:
 	ld a, BANK(sMobileLoginPassword)
 	call GetSRAMBank
 	ld a, [sMobileLoginPassword]
@@ -4467,9 +4341,8 @@
 	ld a, $1
 	ld [wc305], a
 	ret
-; 11a0ca
 
-Function11a0ca: ; 11a0ca
+Function11a0ca:
 	xor a
 	ld [wMenuBorderLeftCoord], a
 	ld [wMenuBorderTopCoord], a
@@ -4490,9 +4363,8 @@
 	ld a, $1
 	ld [wc305], a
 	ret
-; 11a113
 
-Function11a113: ; 11a113
+Function11a113:
 	call Function11a63c
 	ld c, $1
 	farcall Function115e18
@@ -4501,15 +4373,13 @@
 	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
@@ -4524,9 +4394,8 @@
 	call PlaceString
 	and a
 	ret
-; 11a14b
 
-Function11a14b: ; 11a14b
+Function11a14b:
 	ld hl, wcd85
 	ld a, [hl]
 	cp $f3
@@ -4544,9 +4413,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a16d
 
-Function11a16d: ; 11a16d
+Function11a16d:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a179
@@ -4565,9 +4433,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a192
 
-Function11a192: ; 11a192
+Function11a192:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4595,9 +4462,8 @@
 	call PlaceString
 	scf
 	ret
-; 11a1d6
 
-Function11a1d6: ; 11a1d6
+Function11a1d6:
 	ld a, [wcd85]
 	cp $50
 	jr nz, .asm_11a1e4
@@ -4609,9 +4475,8 @@
 .asm_11a1e4
 	and a
 	ret
-; 11a1e6
 
-Function11a1e6: ; 11a1e6
+Function11a1e6:
 	ld hl, String_11a706
 	ld de, $c346
 	call Function11a1ff
@@ -4622,9 +4487,8 @@
 	ld a, $50
 	ld [de], a
 	ret
-; 11a1ff
 
-Function11a1ff: ; 11a1ff
+Function11a1ff:
 .asm_11a1ff
 	ld a, [hli]
 	cp $50
@@ -4632,9 +4496,8 @@
 	ld [de], a
 	inc de
 	jr .asm_11a1ff
-; 11a207
 
-BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207
+BattleTowerRoomMenu2_PlaceYesNoMenu:
 	ld hl, MenuHeader_11a2de
 	call LoadMenuHeader
 	call MenuBox
@@ -4652,9 +4515,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a235
 
-BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235
+BattleTowerRoomMenu2_UpdateYesNoMenu:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and A_BUTTON
@@ -4741,31 +4603,26 @@
 	farcall ReloadMapPart
 	and a
 	ret
-; 11a2cf
 
-String_11a2cf: ; 11a2cf
+String_11a2cf:
 	db "YES@"
-; 11a2d3
 
-String_11a2d3: ; 11a2d3
+String_11a2d3:
 	db "NO@"
-; 11a2d6
 
-MenuHeader_11a2d6: ; 11a2d6
+MenuHeader_11a2d6:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 6, SCREEN_WIDTH - 1, 10
 	dw NULL
 	db 0 ; default option
-; 11a2de
 
-MenuHeader_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
@@ -4775,9 +4632,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a302
 
-Function11a302: ; 11a302
+Function11a302:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a30e
@@ -4802,9 +4658,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a33a
 
-Function11a33a: ; 11a33a
+Function11a33a:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a346
@@ -4819,9 +4674,8 @@
 	farcall Function115dc3
 	and a
 	ret
-; 11a357
 
-Function11a357: ; 11a357
+Function11a357:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a743
@@ -4829,9 +4683,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a36b
 
-Function11a36b: ; 11a36b
+Function11a36b:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a377
@@ -4849,9 +4702,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a38d
 
-Function11a38d: ; 11a38d
+Function11a38d:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4875,9 +4727,8 @@
 	ld [wcd80], a
 	scf
 	ret
-; 11a3c5
 
-Function11a3c5: ; 11a3c5
+Function11a3c5:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a762
@@ -4885,9 +4736,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a3d9
 
-Function11a3d9: ; 11a3d9
+Function11a3d9:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a3e5
@@ -4904,9 +4754,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a3f9
 
-Function11a3f9: ; 11a3f9
+Function11a3f9:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a405
@@ -4924,9 +4773,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a41b
 
-Function11a41b: ; 11a41b
+Function11a41b:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -4950,9 +4798,8 @@
 	ld [wcd80], a
 	scf
 	ret
-; 11a452
 
-Function11a452: ; 11a452
+Function11a452:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a791
@@ -4960,9 +4807,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a466
 
-Function11a466: ; 11a466
+Function11a466:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a7c1
@@ -4970,9 +4816,8 @@
 	ld a, $80
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a47a
 
-Function11a47a: ; 11a47a
+Function11a47a:
 	ld a, [wMobileInactivityTimerMinutes]
 	and a
 	jr z, .asm_11a486
@@ -4984,9 +4829,8 @@
 .asm_11a486
 	and a
 	ret
-; 11a488
 
-Function11a488: ; 11a488
+Function11a488:
 	call Function11a63c
 	hlcoord 4, 2
 	ld de, String_11a7ac
@@ -4995,9 +4839,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a49e
 
-Function11a49e: ; 11a49e
+Function11a49e:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -5023,17 +4866,15 @@
 	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
@@ -5042,9 +4883,8 @@
 	xor a
 	ld [wMobileInactivityTimerMinutes], a
 	jp BattleTowerRoomMenu2_IncrementJumptable
-; 11a4fe
 
-Function11a4fe: ; 11a4fe
+Function11a4fe:
 	call Function11a536
 	ret c
 	call PlayClickSFX
@@ -5068,9 +4908,8 @@
 	ld [wcd80], a
 	scf
 	ret
-; 11a536
 
-Function11a536: ; 11a536
+Function11a536:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and $1
@@ -5141,17 +4980,15 @@
 	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
@@ -5174,9 +5011,8 @@
 	ld a, $1
 	ld [wc305], a
 	ret
-; 11a5f5
 
-Function11a5f5: ; 11a5f5
+Function11a5f5:
 	ld a, $e
 	ld [wMenuBorderLeftCoord], a
 	ld a, $13
@@ -5204,9 +5040,8 @@
 	ld [hl], a
 	farcall ReloadMapPart
 	ret
-; 11a63c
 
-Function11a63c: ; 11a63c
+Function11a63c:
 	hlcoord 4, 1
 	ld de, String_11a7f4
 	call PlaceString
@@ -5220,115 +5055,92 @@
 	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
 
-MenuHeader_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
@@ -5386,9 +5198,8 @@
 	call Function11a884
 	ld [wcd64], a
 	ret
-; 11a884
 
-Function11a884: ; 11a884
+Function11a884:
 	add e
 	cp $a
 	ret c
@@ -5395,9 +5206,8 @@
 	sub $a
 	inc b
 	ret
-; 11a88c
 
-Function11a88c: ; 11a88c
+Function11a88c:
 	ld a, [bc]
 	sla a
 	ld c, a
@@ -5411,9 +5221,8 @@
 	ld [de], a
 	inc de
 	ret
-; 11a89a
 
-Unknown_11a89a: ; 11a89a
+Unknown_11a89a:
 x = 0
 rept 16
 	bcd x % 100, x / 100
@@ -5420,7 +5229,7 @@
 x = x + 1
 endr
 
-Unknown_11a8ba: ; 11a8ba
+Unknown_11a8ba:
 x = 0
 rept 16
 	bcd x % 100, x / 100
@@ -5427,25 +5236,22 @@
 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
@@ -5505,9 +5311,8 @@
 
 BattleTowerRoomMenu_WriteMessage_DoNothing:
 	ret
-; 11a971
 
-Function11a971: ; 11a971
+Function11a971:
 	ld hl, $c31f
 	ld a, [hJoyDown]
 	and a
@@ -5554,9 +5359,8 @@
 
 .asm_11a9bf
 	ret
-; 11a9c0
 
-BattleTowerRoomMenu_SetMessage: ; 11a9c0
+BattleTowerRoomMenu_SetMessage:
 	ld a, l
 	ld [$c31b], a
 	ld a, h
@@ -5564,9 +5368,8 @@
 	ld a, $1
 	ld [$c31a], a
 	ret
-; 11a9ce
 
-Function11a9ce: ; 11a9ce
+Function11a9ce:
 	call ClearBGPalettes
 	call ReloadTilesetAndPalettes
 	call Call_ExitMenu
@@ -5576,15 +5379,13 @@
 	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]
@@ -5602,66 +5403,55 @@
 	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"
@@ -5669,50 +5459,42 @@
 	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 "@"
@@ -5720,9 +5502,8 @@
 	text "?"
 	cont "Please wait…"
 	done
-; 0x11ac3e
 
-Function11ac3e: ; 11ac3e
+Function11ac3e:
 	call SpeechTextBox
 	call FadeToMenu
 	callfar ClearSpriteAnims2
@@ -5729,9 +5510,8 @@
 	call Function11ac51
 	call CloseSubmenu
 	ret
-; 11ac51
 
-Function11ac51: ; 11ac51
+Function11ac51:
 	xor a
 	ld [hBGMapMode], a
 	ld hl, wOptions
@@ -5763,7 +5543,7 @@
 	call Function11b314
 	call Function11acb7
 	call Function11ad6e
-	ld a, 30 * 4
+	ld a, 30 * SPRITEOAMSTRUCT_LENGTH
 	ld [wCurrSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	farcall ReloadMapPart
@@ -5778,9 +5558,8 @@
 	pop af
 	ld [wOptions], a
 	ret
-; 11acb7
 
-Function11acb7: ; 11acb7
+Function11acb7:
 	ld hl, TilemapPack_11ba44
 	ld a, [wcd49]
 	ld c, a
@@ -5831,9 +5610,8 @@
 	xor a
 	ld [wcd4a], a
 	ret
-; 11ad1b
 
-Function11ad1b: ; 11ad1b
+Function11ad1b:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearTileMap
@@ -5866,16 +5644,14 @@
 	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
@@ -5885,21 +5661,18 @@
 	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
+Function11ad95:
 	ld hl, MenuHeader_11ae38
 	call LoadMenuHeader
 	call MenuBox
@@ -5990,23 +5763,20 @@
 	call ExitMenu
 	farcall ReloadMapPart
 	ret
-; 11ae38
 
-MenuHeader_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
+Function11ae4e:
 	ld hl, MenuHeader_11afe8
 	call LoadMenuHeader
 	call MenuBox
@@ -6095,9 +5865,8 @@
 	call ExitMenu
 	farcall ReloadMapPart
 	ret
-; 11af04
 
-Function11af04: ; 11af04
+Function11af04:
 	ld hl, MenuHeader_11afe8
 	call LoadMenuHeader
 	call MenuBox
@@ -6186,9 +5955,8 @@
 	call ExitMenu
 	farcall ReloadMapPart
 	ret
-; 11afb7
 
-Function11afb7: ; 11afb7
+Function11afb7:
 	ld e, $ed
 	jr asm_11afbd
 
@@ -6208,7 +5976,6 @@
 	ld d, [hl]
 	ld [de], a
 	ret
-; 11afcc
 
 Unknown_11afcc:
 	dwcoord 11, 12
@@ -6218,9 +5985,8 @@
 Unknown_11afd2:
 	dwcoord 15,  8
 	dwcoord 15, 10
-; 11afd6
 
-Function11afd6: ; 11afd6
+Function11afd6:
 	ld de, SCREEN_WIDTH
 	ld a, $3
 .row
@@ -6236,38 +6002,32 @@
 	dec b
 	jr nz, .row
 	ret
-; 11afe8
 
-MenuHeader_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
 
-MenuHeader_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
@@ -6283,9 +6043,8 @@
 	ld hl, wStringBuffer4
 	call Function11b03d
 	ret
-; 11b03d
 
-Function11b03d: ; 11b03d
+Function11b03d:
 	push hl
 	push af
 	ld c, $1
@@ -6334,12 +6093,11 @@
 	ld bc, 4 ; string length
 	call CopyBytes
 	ret
-; 11b07a
 
 .MaleString: db "オスの　"
 .FemaleString: db "メスの　"
 
-Function11b082: ; 11b082
+Function11b082:
 	call Function11b242
 	ld a, $7
 	ld [wc7d3], a
@@ -6348,9 +6106,8 @@
 	call Function11b275
 	call SetPalettes
 	jp Function11ad8a
-; 11b099
 
-Function11b099: ; 11b099
+Function11b099:
 	ld c, $6
 	hlcoord 11, 1
 	ld a, [wc7d3]
@@ -6383,9 +6140,8 @@
 	dec a
 	jr nz, .loop
 	ret
-; 11b0cf
 
-.PlaceMonNameOrPlaceholderString: ; 11b0cf
+.PlaceMonNameOrPlaceholderString:
 	and a
 	ret z
 
@@ -6398,9 +6154,8 @@
 	pop hl
 	call PlaceString
 	ret
-; 11b0e1
 
-.SetCaughtFlag: ; 11b0e1
+.SetCaughtFlag:
 	call CheckCaughtMemMon
 	jr nz, .okay
 	inc hl
@@ -6410,9 +6165,8 @@
 	ld a, $1
 	ld [hli], a
 	ret
-; 11b0ec
 
-.CheckSeenFlag: ; 11b0ec
+.CheckSeenFlag:
 	call CheckSeenMemMon
 	ret nz
 
@@ -6421,13 +6175,11 @@
 	call PlaceString
 	scf
 	ret
-; 11b0f9
 
-.EmptySlot: ; 11b0f9
+.EmptySlot:
 	db "ーーーーー@"
-; 11b0ff
 
-Function11b0ff: ; 11b0ff
+Function11b0ff:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and $2
@@ -6504,9 +6256,8 @@
 	ld a, $4
 	ld [wJumptableIndex], a
 	ret
-; 11b175
 
-Function11b175: ; 11b175
+Function11b175:
 	ld a, [wc7d3]
 	ld d, a
 	ld a, [wc7d2]
@@ -6610,17 +6361,15 @@
 	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
@@ -6628,9 +6377,8 @@
 	inc de
 	ld [hli], a
 	jr .asm_11b203
-; 11b20b
 
-Function11b20b: ; 11b20b
+Function11b20b:
 	ld a, [wc7d1]
 	ld hl, wc7d0
 	add [hl]
@@ -6641,9 +6389,8 @@
 	ld a, [hl]
 	ld [wd265], a
 	ret
-; 11b21e
 
-CheckCaughtMemMon: ; 11b21e
+CheckCaughtMemMon:
 	push de
 	push hl
 	ld a, [wd265]
@@ -6652,9 +6399,8 @@
 	pop hl
 	pop de
 	ret
-; 11b22a
 
-CheckSeenMemMon: ; 11b22a
+CheckSeenMemMon:
 	push de
 	push hl
 	ld a, [wd265]
@@ -6663,13 +6409,11 @@
 	pop hl
 	pop de
 	ret
-; 11b236
 
-Function11b236: ; 11b236
+Function11b236:
 	jp FillBoxWithByte
-; 11b239
 
-Function11b239: ; 11b239
+Function11b239:
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -6678,9 +6422,8 @@
 	ld h, [hl]
 	ld l, a
 	ret
-; 11b242
 
-Function11b242: ; 11b242
+Function11b242:
 	hlcoord 3, 4
 	ld de, wStringBuffer3
 	call PlaceString
@@ -6714,14 +6457,12 @@
 Function11b272:
 	ld [hl], $f5
 	ret
-; 11b275
 
-Function11b275: ; 11b275
+Function11b275:
 	call Function11b279
 	ret
-; 11b279
 
-Function11b279: ; 11b279
+Function11b279:
 	ld a, [wd265]
 	ld [wCurSpecies], a
 	call CheckSeenMemMon
@@ -6737,9 +6478,8 @@
 
 .asm_11b294
 	ret
-; 11b295
 
-Function11b295: ; 11b295
+Function11b295:
 	hlcoord 4, 13
 	ld de, String_11b308
 	call PlaceString
@@ -6796,31 +6536,25 @@
 	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
@@ -6851,7 +6585,6 @@
 .load_sprites
 	call Function11b397
 	ret
-; 11b350
 
 .Coords:
 	dbpixel 3, 11, 2, 6 ;  0
@@ -6918,7 +6651,7 @@
 	db $39 ; 12
 	db $39 ; 13
 
-Function11b397: ; 11b397
+Function11b397:
 	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
@@ -6944,9 +6677,8 @@
 	ld [de], a ; attributes
 	inc de
 	jr .loop
-; 11b3b6
 
-Unreferenced_Function11b3b6: ; 11b3b6
+Unreferenced_Function11b3b6:
 .loop
 	ld a, [hl]
 	cp -1
@@ -6974,9 +6706,8 @@
 	ld [de], a
 	inc de
 	jr .loop
-; 11b3d9
 
-Function11b3d9: ; 11b3d9
+Function11b3d9:
 	ld de, wVirtualOAMSprite28
 	push de
 	ld a, [wc7d2]
@@ -7048,16 +6779,14 @@
 	xor a
 	ld [hl], a
 	ret
-; 11b444
 
-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
@@ -7065,9 +6794,8 @@
 	ld [wcf66], a
 	call UpdateTime
 	ret
-; 11b45c
 
-Mobile46_RunJumptable: ; 11b45c
+Mobile46_RunJumptable:
 .loop
 	call .IterateJumptable
 	call DelayFrame
@@ -7075,9 +6803,8 @@
 	cp 4
 	jr nz, .loop
 	ret
-; 11b46a
 
-.IterateJumptable: ; 11b46a
+.IterateJumptable:
 	jumptable .Jumptable, wJumptableIndex
 
 .Jumptable:
@@ -7086,9 +6813,8 @@
 	dw Function11b5c0
 	dw Function11b5e0
 	dw Function11b5e7 ; unused
-; 11b483
 
-Function11b483: ; 11b483
+Function11b483:
 	call .InitRAM
 	ld hl, wPlayerName
 	ld a, NAME_LENGTH_JAPANESE - 1
@@ -7264,9 +6990,8 @@
 	ld [bc], a
 	inc bc
 	ret
-; 11b570
 
-Function11b570: ; 11b570
+Function11b570:
 	call Function118007
 	ld a, [wScriptVar]
 	and a
@@ -7315,9 +7040,8 @@
 
 	call CloseSRAM
 	ret
-; 11b5c0
 
-Function11b5c0: ; 11b5c0
+Function11b5c0:
 	ld a, [wcd82]
 	dec a
 	ld [wCurPartyMon], a
@@ -7327,19 +7051,16 @@
 	farcall Function170807
 	farcall SaveAfterLinkTrade
 	jp Function11ad8a
-; 11b5e0
 
-Function11b5e0: ; 11b5e0
+Function11b5e0:
 	xor a
 	ld [wScriptVar], a
 	jp Function11ad8a
-; 11b5e7
 
-Function11b5e7: ; 11b5e7
+Function11b5e7:
 	ret
-; 11b5e8
 
-Function11b5e8: ; 11b5e8
+Function11b5e8:
 	ld a, $0
 	call GetSRAMBank
 	ld hl, wRTC
@@ -7390,9 +7111,8 @@
 .Jumptable:
 	dw Function11b66d
 	dw Function11b6b3
-; 11b66d
 
-Function11b66d: ; 11b66d
+Function11b66d:
 	call Function1180b8
 	ld a, [wScriptVar]
 	and a
@@ -7431,13 +7151,11 @@
 
 .asm_11b6b0
 	jp Function11ad8a
-; 11b6b3
 
-Function11b6b3: ; 11b6b3
+Function11b6b3:
 	ret
-; 11b6b4
 
-Function11b6b4: ; 11b6b4
+Function11b6b4:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [wcd30]
@@ -7573,9 +7291,8 @@
 	ld [hl], a
 	call AddMobileMonToParty
 	ret
-; 11b7e5
 
-Function11b7e5: ; 11b7e5
+Function11b7e5:
 	ld a, [$c60d] ; species
 	ld [wOTTrademonSpecies], a
 	ld [wCurPartySpecies], a
@@ -7632,9 +7349,8 @@
 	call CloseSubmenu
 	call RestartMapMusic
 	ret
-; 11b879
 
-Function11b879: ; 11b879
+Function11b879:
 	farcall BattleTower_CheckSaveFileExistsAndIsYours
 	ld a, [wScriptVar]
 	and a
@@ -7725,9 +7441,8 @@
 	ld a, $2
 	ld [wScriptVar], a
 	ret
-; 11b920
 
-Function11b920: ; 11b920
+Function11b920:
 	call Mobile46_InitJumptable
 	ld a, $5
 	call GetSRAMBank
@@ -7738,9 +7453,8 @@
 	call CloseSRAM
 	call Function118000
 	ret
-; 11b93b
 
-Function11b93b: ; 11b93b
+Function11b93b:
 	ld a, $5
 	call GetSRAMBank
 	xor a
@@ -7778,9 +7492,8 @@
 	call AddMobileMonToParty
 	farcall SaveAfterLinkTrade
 	ret
-; 11b98f
 
-AddMobileMonToParty: ; 11b98f
+AddMobileMonToParty:
 	ld hl, wPartyCount
 	ld a, [hl]
 	ld e, a
@@ -7882,15 +7595,13 @@
 
 	call CloseSRAM
 	ret
-; 11ba38
 
-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
@@ -7972,5 +7683,3 @@
 	db $2e, $0a, $85, $0a, $0a, $0a, $8d, $00 ; 22
 	db $2e, $0a, $0a, $84, $0a, $0a, $8e, $00 ; 23
 	db -1
-
-
--- 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 @@
 	pop af
 	ld [wcfbe], a
 	ret
-; 16c031
 
-.RunJumptable: ; 16c031
+.RunJumptable:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -46,9 +45,8 @@
 	cp $ff
 	jr nz, .loop
 	ret
-; 16c05c
 
-.Jumptable: ; 16c05c
+.Jumptable:
 	dw .init
 	dw Function16c0ba
 	dw Function16c089
@@ -61,9 +59,8 @@
 	dw Function16c0dc
 	dw Function16c0ec
 	dw .quit
-; 16c074
 
-.init ; 16c074
+.init
 	ld a, [wcf64]
 	and a
 	ret z
@@ -71,17 +68,15 @@
 	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 @@
 	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 @@
 	ld [hWY], a
 	call Function16c0fa
 	ret
-; 16c0ba
 
-Function16c0ba: ; 16c0ba
+Function16c0ba:
 	call Function16c943
 	push af
 	ld a, [wd003]
@@ -121,9 +113,8 @@
 	pop af
 	call c, Function16c0fa
 	ret
-; 16c0ca
 
-Function16c0ca: ; 16c0ca
+Function16c0ca:
 	ld a, [wd003]
 	cp $28
 	push af
@@ -133,9 +124,8 @@
 	pop af
 	call z, Function16c0fa
 	ret
-; 16c0dc
 
-Function16c0dc: ; 16c0dc
+Function16c0dc:
 	call Function16ca11
 	push af
 	ld a, [wd003]
@@ -144,9 +134,8 @@
 	pop af
 	call c, Function16c0fa
 	ret
-; 16c0ec
 
-Function16c0ec: ; 16c0ec
+Function16c0ec:
 	call ClearBGPalettes
 	call ClearScreen
 	push af
@@ -154,9 +143,8 @@
 	ld [wd002], a
 	pop af
 	ret
-; 16c0fa
 
-Function16c0fa: ; 16c0fa
+Function16c0fa:
 	push af
 	ld a, [wd002]
 	inc a
@@ -165,9 +153,8 @@
 	ld [wd003], a
 	pop af
 	ret
-; 16c108
 
-MobileSystemSplashScreen_InitGFX: ; 16c108
+MobileSystemSplashScreen_InitGFX:
 	call DisableLCD
 	ld hl, vTiles2
 	ld de, .Tiles
@@ -183,9 +170,8 @@
 	ld [hBGMapMode], a
 	call EnableLCD
 	ret
-; 16c130
 
-.LoadPals: ; 16c130
+.LoadPals:
 	ld de, wBGPals1
 	ld hl, UnknownMobilePalettes_16c903
 	ld bc, 8
@@ -193,9 +179,8 @@
 	call FarCopyWRAM
 	farcall ApplyPals
 	ret
-; 16c145
 
-.LoadTileMap: ; 16c145
+.LoadTileMap:
 	hlcoord 0, 0
 	ld bc, 20
 	xor a
@@ -205,9 +190,8 @@
 	ld bc, $0154
 	call CopyBytes
 	ret
-; 16c15c
 
-.LoadAttrMap: ; 16c15c
+.LoadAttrMap:
 	hlcoord 0, 0, wAttrMap
 	ld bc, SCREEN_WIDTH
 	xor a
@@ -217,7 +201,6 @@
 	ld bc, 17 * SCREEN_WIDTH
 	call CopyBytes
 	ret
-; 16c173
 
 .Tiles:
 INCBIN "gfx/mobile/mobile_splash.2bpp"
@@ -228,12 +211,10 @@
 .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 @@
 	ld [rSVBK], a
 	scf
 	ret
-; 16ca11
 
-Function16ca11: ; 16ca11
+Function16ca11:
 	ld a, [wd003]
 	and a
 	jr nz, .asm_16ca1d
@@ -455,16 +435,14 @@
 	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
@@ -471,9 +449,8 @@
 	srl a
 	and $1f
 	ret
-; 16cac4
 
-Function16cac4: ; 16cac4
+Function16cac4:
 	inc hl
 	ld a, [hld]
 	and $3
@@ -487,15 +464,13 @@
 	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 @@
 	or b
 	ld [hl], a
 	ret
-; 16cae8
 
-Function16cae8: ; 16cae8
+Function16cae8:
 	ld c, a
 	srl a
 	srl a
@@ -530,9 +504,8 @@
 	or b
 	ld [hl], a
 	ret
-; 16cb08
 
-Function16cb08: ; 16cb08
+Function16cb08:
 	ld b, a
 	ld a, [hl]
 	and $e0
@@ -539,9 +512,8 @@
 	or b
 	ld [hl], a
 	ret
-; 16cb0f
 
-Function16cb0f: ; 16cb0f
+Function16cb0f:
 	xor a
 	ld [wBuffer1], a
 	ld [wBuffer2], a
@@ -556,9 +528,8 @@
 	xor a
 	ld [wd1f0], a
 	ret
-; 16cb2e
 
-Function16cb2e: ; 16cb2e
+Function16cb2e:
 	ld a, [wBuffer2]
 	and a
 	ret z
@@ -567,9 +538,8 @@
 	ld de, wVirtualOAM
 	call Function16cb5d
 	ret
-; 16cb40
 
-Function16cb40: ; 16cb40
+Function16cb40:
 	ld hl, wd1ec
 	inc [hl]
 	ld a, [hl]
@@ -588,9 +558,8 @@
 	ld a, $a0
 	ld [wd1ef], a
 	ret
-; 16cb5d
 
-Function16cb5d: ; 16cb5d
+Function16cb5d:
 	ld a, [hli]
 	and a
 	ret z
@@ -622,7 +591,6 @@
 	dec a
 	jr nz, .asm_16cb60
 	ret
-; 16cb86
 
 Unknown_16cb86:
 	db 7
@@ -633,17 +601,15 @@
 	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
@@ -650,9 +616,8 @@
 	call Function16cbba
 	call Function16cbd1
 	ret
-; 16cbba
 
-Function16cbba: ; 16cbba
+Function16cbba:
 	ld hl, wd1f2
 	inc [hl]
 	ld a, [hl]
@@ -669,9 +634,8 @@
 .asm_16cbcd
 	ld [wd1f3], a
 	ret
-; 16cbd1
 
-Function16cbd1: ; 16cbd1
+Function16cbd1:
 	ld a, [wd1f3]
 	ld c, a
 	ld b, 0
@@ -689,13 +653,11 @@
 	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 @@
 	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 @@
 	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 @@
 	ld a, $90
 	call Function16cc5a
 	ret
-; 16cc5a
 
-Function16cc5a: ; 16cc5a
+Function16cc5a:
 	ld c, $10
 .asm_16cc5c
 	ld [hli], a
@@ -751,17 +708,15 @@
 	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 @@
 	pop af
 	ld [rVBK], a
 	ret
-; 16cc90
 
-Function16cc90: ; 16cc90
+Function16cc90:
 	ld bc, $1214
 .asm_16cc93
 	push bc
@@ -799,7 +753,6 @@
 	dec b
 	jr nz, .asm_16cc93
 	ret
-; 16cca3
 
 GFX_16cca3:
 INCBIN "gfx/unknown/16cca3.2bpp"
@@ -815,7 +768,6 @@
 	RGB 31, 31, 31
 	RGB 07, 07, 07
 
-
 Unknown_16cfb1:
 	RGB 31, 31, 31
 	RGB 13, 09, 18
@@ -822,11 +774,8 @@
 	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
--- 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 @@
 	call CopyBytes
 	ret
 
-; 17005a
-
-Function17005a: ; 17005a
+Function17005a:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$a824]
@@ -73,11 +71,9 @@
 	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 @@
 	call CloseSRAM
 	ret
 
-; 170bf7
-
-Clears5_a89a: ; 170bf7
+Clears5_a89a:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a89a
@@ -99,9 +93,7 @@
 	call CloseSRAM
 	ret
 
-; 170c06
-
-Function170c06: ; 170c06
+Function170c06:
 	ld a, $5
 	call GetSRAMBank
 	ld hl, $a894
@@ -203,9 +195,7 @@
 	call CloseSRAM
 	ret
 
-; 170c8b
-
-Function170c8b: ; 170c8b
+Function170c8b:
 	ld hl, wLastEnemyCounterMove
 	ld b, $5
 .asm_170c90
@@ -216,9 +206,7 @@
 	jr nz, .asm_170c90
 	ret
 
-; 170c98
-
-CheckBTMonMovesForErrors: ; 170c98
+CheckBTMonMovesForErrors:
 	ld c, BATTLETOWER_PARTY_LENGTH
 	ld hl, wBT_OTTempMon1Moves
 .loop
@@ -260,9 +248,7 @@
 	jr nz, .loop
 	ret
 
-; 170cc6
-
-Function170cc6: ; 170cc6
+Function170cc6:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wDecompressScratch)
@@ -289,13 +275,11 @@
 	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
@@ -302,8 +286,6 @@
 	ld [rVBK], a
 	ret
 
-; 170d16
-
 PichuAnimatedMobileGFX:
 INCBIN "gfx/mobile/pichu_animated.2bpp.lz"
 
@@ -313,7 +295,7 @@
 GFX_171848:
 INCBIN "gfx/unknown/171848.2bpp"
 
-Function1719c8: ; 1719c8 (5c:59c8)
+Function1719c8:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -323,7 +305,7 @@
 	ld [hInMenu], a
 	ret
 
-Function1719d6: ; 1719d6 (5c:59d6)
+Function1719d6:
 	farcall BattleTowerRoomMenu_InitRAM
 	call Function1719ed
 	ld a, [rSVBK]
@@ -335,7 +317,7 @@
 	ld [rSVBK], a
 	ret
 
-Function1719ed: ; 1719ed (5c:59ed)
+Function1719ed:
 	xor a
 	ld [wcd49], a
 	ld [wcd4a], a
@@ -348,7 +330,7 @@
 	farcall ClearSpriteAnims
 	ret
 
-Function171a11: ; 171a11 (5c:5a11)
+Function171a11:
 .loop
 	call JoyTextDelay
 	ld a, [wcd49]
@@ -363,7 +345,7 @@
 	call ClearSprites
 	ret
 
-Function171a36: ; 171a36 (5c:5a36)
+Function171a36:
 	ld a, [wcd49]
 	ld e, a
 	ld d, 0
@@ -375,7 +357,7 @@
 	ld l, a
 	jp hl
 
-Jumptable_171a45: ; 171a45 (5c:5a45)
+Jumptable_171a45:
 	dw Function171a95
 	dw Function171ac9
 	dw Function171a5d
@@ -389,8 +371,7 @@
 	dw Function171c39
 	dw Function171c41
 
-
-Function171a5d: ; 171a5d (5c:5a5d)
+Function171a5d:
 	ld a, [wc821]
 	bit 1, a
 	jr nz, .asm_171a6a
@@ -419,7 +400,7 @@
 	ld [wcd49], a
 	ret
 
-Function171a95: ; 171a95 (5c:5a95)
+Function171a95:
 	farcall Function171ccd
 	hlcoord 2, 8
 	ld de, String_171aa7
@@ -426,16 +407,13 @@
 	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
@@ -442,7 +420,7 @@
 	call Function3e32
 	jp Function171c66
 
-Function171ad7: ; 171ad7 (5c:5ad7)
+Function171ad7:
 	xor a
 	ld hl, $c608
 	ld bc, $66
@@ -452,7 +430,7 @@
 	call Function3e32
 	jp Function171c66
 
-Function171aec: ; 171aec (5c:5aec)
+Function171aec:
 	ld a, [rSVBK]
 	push af
 	ld a, $1
@@ -503,7 +481,7 @@
 	jr nz, .asm_171b1b
 	jp Function171c66
 
-Function171b42: ; 171b42 (5c:5b42)
+Function171b42:
 	ld a, [de]
 	inc de
 	and a
@@ -512,7 +490,7 @@
 	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 @@
 	ld [wcd24], a
 	jp Function171c66
 
-Function171b85: ; 171b85 (5c:5b85)
+Function171b85:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and $2
@@ -559,12 +537,12 @@
 	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 @@
 	ld [wcd4a], a
 	ret
 
-asm_171baf: ; 171baf (5c:5baf)
+asm_171baf:
 	ld a, [wcd4b]
 	ld c, a
 	ld a, [wcd4a]
@@ -582,7 +560,7 @@
 	ld [wcd4a], a
 	ret
 
-Function171bbd: ; 171bbd (5c:5bbd)
+Function171bbd:
 	call PlayClickSFX
 	ld a, $8
 	ld [wcd23], a
@@ -590,7 +568,7 @@
 	ld [wcd24], a
 	jp Function171c66
 
-Function171bcc: ; 171bcc (5c:5bcc)
+Function171bcc:
 	ld hl, hJoyPressed ; $ffa7
 	ld a, [hl]
 	and $2
@@ -600,7 +578,7 @@
 	jp nz, Function171beb
 	ret
 
-Function171bdc: ; 171bdc (5c:5bdc)
+Function171bdc:
 	ld a, $4
 	ld [wcd23], a
 	ld a, $8
@@ -609,7 +587,7 @@
 	dec [hl]
 	ret
 
-Function171beb: ; 171beb (5c:5beb)
+Function171beb:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [wcd4a]
@@ -636,7 +614,7 @@
 	ld [wcd4c], a
 	call Function171c66
 
-Function171c2c: ; 171c2c (5c:5c2c)
+Function171c2c:
 	ld hl, wcd4c
 	dec [hl]
 	ret nz
@@ -644,12 +622,12 @@
 	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 @@
 	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)
-
-MenuHeader_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 @@
 	call PlaceString
 	ret
 
-Function171ccd: ; 171ccd (5c:5ccd)
+Function171ccd:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -728,7 +702,7 @@
 	ld [rSVBK], a
 	ret
 
-Function171cf0: ; 171cf0 (5c:5cf0)
+Function171cf0:
 	xor a
 	hlcoord 4, 15
 	ld [hli], a
@@ -755,7 +729,7 @@
 	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 @@
 	call PlaceString
 	ret
 
-; 171d71 (5c:5d71)
-
 Palette_171d71:
 	RGB  0,  0,  0
 	RGB  3,  0,  0
@@ -836,21 +808,19 @@
 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 @@
 	call CopyBytes
 	ret
 
-; 172eb9 (5c:6eb9)
-
 Function172eb9:
 	ld a, [rSVBK]
 	push af
@@ -894,8 +862,6 @@
 	pop af
 	ld [rSVBK], a
 	ret
-
-; 172edf (5c:6edf)
 
 Palette_172edf:
 	RGB  5, 12, 17
--- 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 @@
 	scf
 	ret
 
-Function17a6a8: ; 17a6a8 (5e:66a8)
+Function17a6a8:
 	push de
 	push bc
 	ld hl, wStringBuffer2 ; $d086
@@ -49,7 +49,7 @@
 	call DelayFrame
 	ret
 
-Function17a6f5: ; 17a6f5 (5e:66f5)
+Function17a6f5:
 	ld hl, wBuffer1
 	ld c, $0
 	ld b, $8
@@ -69,7 +69,7 @@
 	ld [$d08c], a
 	ret
 
-Function17a713: ; 17a713 (5e:6713)
+Function17a713:
 	and $f
 	cp $a
 	jr nc, .asm_17a71d
@@ -83,7 +83,7 @@
 	scf
 	ret
 
-Function17a721: ; 17a721 (5e:6721)
+Function17a721:
 	push de
 	ld h, d
 	ld l, e
@@ -121,7 +121,7 @@
 	ld [de], a
 	ret
 
-Function17a751: ; 17a751 (5e:6751)
+Function17a751:
 	xor a
 	ld [$d087], a
 .asm_17a755
@@ -137,7 +137,7 @@
 	jr z, .asm_17a755
 	ret
 
-Function17a770: ; 17a770 (5e:6770)
+Function17a770:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -148,7 +148,7 @@
 	ld [hOAMUpdate], a
 	ret
 
-Function17a781: ; 17a781 (5e:6781)
+Function17a781:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -158,7 +158,7 @@
 	ld [hInMenu], a
 	ret
 
-Function17a78f: ; 17a78f (5e:678f)
+Function17a78f:
 	ld hl, $d088
 	bit 7, [hl]
 	res 7, [hl]
@@ -169,21 +169,20 @@
 .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,8 +190,7 @@
 	dw Function17a81a
 	dw Function17a7f4
 
-
-Function17a7c2: ; 17a7c2 (5e:67c2)
+Function17a7c2:
 	ld a, $4
 	call Function17aad3
 	ld a, $1
@@ -199,7 +197,7 @@
 	ld [$d087], a
 	ret
 
-Function17a7cd: ; 17a7cd (5e:67cd)
+Function17a7cd:
 	call Function17a83c
 	call Function17a8ae
 	ret c
@@ -206,7 +204,7 @@
 	call Function17a848
 	ret
 
-Function17a7d8: ; 17a7d8 (5e:67d8)
+Function17a7d8:
 	call Function17a83c
 	call Function17a848
 	ld hl, $d08b
@@ -220,7 +218,7 @@
 	ld [$d087], a
 	ret
 
-Function17a7f4: ; 17a7f4 (5e:67f4)
+Function17a7f4:
 	ld hl, $d08b
 	dec [hl]
 	ret nz
@@ -228,7 +226,7 @@
 	set 7, [hl]
 	ret
 
-Function17a7ff: ; 17a7ff (5e:67ff)
+Function17a7ff:
 	ld hl, $d08b
 	dec [hl]
 	ret nz
@@ -242,7 +240,7 @@
 	set 7, [hl]
 	ret
 
-Function17a81a: ; 17a81a (5e:681a)
+Function17a81a:
 	call IsSFXPlaying
 	ret nc
 	ld a, [hJoyPressed]
@@ -259,7 +257,7 @@
 	ld [$d087], a
 	ret
 
-Function17a83c: ; 17a83c (5e:683c)
+Function17a83c:
 	ld a, [hJoyLast]
 	and $f0
 	ld c, a
@@ -269,7 +267,7 @@
 	ld c, a
 	ret
 
-Function17a848: ; 17a848 (5e:6848)
+Function17a848:
 	ld a, c
 	and $60
 	cp $60
@@ -345,7 +343,7 @@
 	scf
 	ret
 
-Function17a8ae: ; 17a8ae (5e:68ae)
+Function17a8ae:
 	bit 1, c
 	jr nz, .asm_17a8bc
 	bit 0, c
@@ -377,7 +375,7 @@
 	scf
 	ret
 
-Function17a8de: ; 17a8de (5e:68de)
+Function17a8de:
 	ld a, $2
 	call Function17aae0
 	ld a, [hl]
@@ -414,7 +412,7 @@
 	call Function17aa88
 	ret
 
-Function17a91e: ; 17a91e (5e:691e)
+Function17a91e:
 	ld a, [$d08c]
 	cp $7
 	jr c, .asm_17a92c
@@ -435,7 +433,7 @@
 	scf
 	ret
 
-Function17a943: ; 17a943 (5e:6943)
+Function17a943:
 	ld a, [$d08c]
 	and a
 	jr z, .asm_17a95d
@@ -457,7 +455,7 @@
 	xor a
 	ret
 
-Function17a964: ; 17a964 (5e:6964)
+Function17a964:
 	ld a, [$d08c]
 	cp $10
 	jr nc, .asm_17a979
@@ -475,7 +473,7 @@
 	scf
 	ret
 
-Function17a97b: ; 17a97b (5e:697b)
+Function17a97b:
 	hlcoord 1, 1
 	lb bc, 2, 18
 	call ClearBox
@@ -499,7 +497,7 @@
 .asm_17a99d
 	ret
 
-Function17a99e: ; 17a99e (5e:699e)
+Function17a99e:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
@@ -508,15 +506,13 @@
 	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 @@
 	call Function17a9e3
 	ret
 
-Function17a9e3: ; 17a9e3 (5e:69e3)
+Function17a9e3:
 	ld a, $3
 	ld [$d08e], a
 	ld hl, Unknown_17aa77
@@ -540,7 +536,7 @@
 	call Function17aa4a
 	ret
 
-Function17a9f5: ; 17a9f5 (5e:69f5)
+Function17a9f5:
 	ld a, [$d08c]
 	cp $10
 	ret nc
@@ -564,7 +560,7 @@
 	call Function17aa4a
 	ret
 
-Function17aa22: ; 17aa22 (5e:6a22)
+Function17aa22:
 	ld a, $0
 	ld [$d08e], a
 	push de
@@ -590,7 +586,7 @@
 	call Function17aa4a
 	ret
 
-Function17aa4a: ; 17aa4a (5e:6a4a)
+Function17aa4a:
 	ld [$d08d], a
 	ld a, b
 	add $8
@@ -623,33 +619,30 @@
 	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 @@
 	set 7, [hl]
 	ret
 
-Function17aaa9: ; 17aaa9 (5e:6aa9)
+Function17aaa9:
 	ld a, $3
 	call Function17aae3
 	ld c, a
@@ -673,7 +666,7 @@
 	call AddNTimes
 	ret
 
-Function17aac3: ; 17aac3 (5e:6ac3)
+Function17aac3:
 	ld a, $b
 	push hl
 	ld [hli], a
@@ -685,14 +678,14 @@
 	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
@@ -699,10 +692,10 @@
 	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 @@
 	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 @@
 	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 @@
 	call Get2bpp
 	ret
 
-Function17abcf: ; 17abcf (5e:6bcf)
+Function17abcf:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -788,7 +779,7 @@
 	ld [rSVBK], a
 	ret
 
-Function17ac0c: ; 17ac0c (5e:6c0c)
+Function17ac0c:
 	call Function17ac1d
 	call Function17ac2a
 	hlcoord 0, 0
@@ -797,7 +788,7 @@
 	call Function17ac46
 	ret
 
-Function17ac1d: ; 17ac1d (5e:6c1d)
+Function17ac1d:
 	ld hl, Tilemap_17acd5
 	decoord 0, 4
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
@@ -804,7 +795,7 @@
 	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 @@
 	jr nz, .loop
 	ret
 
-Function17ac46: ; 17ac46 (5e:6c46)
+Function17ac46:
 	ld a, [$d088]
 	bit 4, a
 	jr nz, .bit_4_set
@@ -831,9 +822,8 @@
 .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 @@
 	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 @@
 	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"
--- 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 @@
 	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 @@
 	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 @@
 .Done:
 	and a
 	ret
-; 17d0b3
 
-CheckStringForErrors_IgnoreTerminator: ; 17d0b3
+CheckStringForErrors_IgnoreTerminator:
 ; Find control chars
 .loop
 	ld a, [de]
@@ -266,30 +263,29 @@
 	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 @@
 	call CloseSubmenu
 	call RestartMapMusic
 	ret
-; 17d187
 
-Mobile_CopyDefaultOTName: ; 17d187
+Mobile_CopyDefaultOTName:
 	ld hl, Mobile5F_PlayersName
-	ld de, $c63d
+	ld de, wc63d
 	ld bc, 5
 	call CopyBytes
 	ret
-; 17d194
 
 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_PlayersName
-	ld de, $c668
+	ld de, wc668
 	ld bc, 5
 	call CopyBytes
 	ret
-; 17d1e1
 
-CheckStringContainsLessThanBNextCharacters: ; 17d1e1
+CheckStringContainsLessThanBNextCharacters:
 .loop
 	ld a, [de]
 	inc de
@@ -396,9 +385,8 @@
 .done
 	scf
 	ret
-; 17d1f1
 
-Function17d1f1: ; 17d1f1
+Function17d1f1:
 	ld a, [wCurPartySpecies]
 	dec a
 	call SetSeenAndCaughtMon
@@ -423,9 +411,7 @@
 
 .asm_17d223
 	ret
-; 17d224
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Parameter: [wScriptVar] = 0..1
 ;
@@ -435,7 +421,7 @@
 ; if [wScriptVar] == TRUE
 ;    Show BattleTower-Menu with 3 options in english language
 ;    - Challenge - Explanation - Cancel
-Menu_ChallengeExplanationCancel: ; 17d224
+Menu_ChallengeExplanationCancel:
 	ld a, [wScriptVar]
 	and a
 	jr nz, .English
@@ -454,9 +440,8 @@
 	call Function17d246
 	call CloseWindow
 	ret
-; 17d246
 
-Function17d246: ; 17d246
+Function17d246:
 	call VerticalMenu
 	jr c, .Exit
 	ld a, [wScriptVar]
@@ -480,15 +465,14 @@
 	ld a, $4
 	ld [wScriptVar], a
 	ret
-; 17d26a
 
-MenuHeader_17d26a: ; 17d26a
+MenuHeader_17d26a:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 14, 9
 	dw MenuData_17d272
 	db 1 ; default option
 
-MenuData_17d272: ; 17d272
+MenuData_17d272:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 4
 	db "ニュース¯よみこむ@"
@@ -495,29 +479,26 @@
 	db "ニュース¯みる@"
 	db "せつめい@"
 	db "やめる@"
-; 17d28f
 
-MenuHeader_ChallengeExplanationCancel: ; 17d28f
+MenuHeader_ChallengeExplanationCancel:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 0, 0, 14, 7
 	dw MenuData_ChallengeExplanationCancel
 	db 1 ; default option
 
-MenuData_ChallengeExplanationCancel: ; 17d297
+MenuData_ChallengeExplanationCancel:
 	db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
 	db 3
 	db "Challenge@"
 	db "Explanation@"
 	db "Cancel@"
-; 17d2b6
 
-Function17d2b6: ; 17d2b6
+Function17d2b6:
 	call Function17d2c0
 	farcall Function1181da
 	ret
-; 17d2c0
 
-Function17d2c0: ; 17d2c0
+Function17d2c0:
 	xor a
 	ld [wJumptableIndex], a
 	ld [wcf64], a
@@ -524,9 +505,8 @@
 	ld [wcf65], a
 	ld [wcf66], a
 	ret
-; 17d2ce
 
-Function17d2ce: ; 17d2ce
+Function17d2ce:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$aa72]
@@ -560,9 +540,8 @@
 	call ReturnToMapFromSubmenu
 	call CloseSubmenu
 	ret
-; 17d314
 
-Function17d314: ; 17d314
+Function17d314:
 	ld a, $5
 	call GetSRAMBank
 	ld a, [$b1b1]
@@ -613,9 +592,8 @@
 	ld [wScriptVar], a
 	scf
 	ret
-; 17d370
 
-Function17d370: ; 17d370
+Function17d370:
 	xor a
 	ld [wcd77], a
 	ld [wMobileCrashCheckPointer], a
@@ -627,8 +605,8 @@
 	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 @@
 	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 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17d3f6
 
-Function17d3f6: ; 17d3f6
+Function17d3f6:
 	call ClearBGPalettes
 	call ClearSprites
 	call ClearScreen
@@ -675,8 +652,8 @@
 
 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 @@
 	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 @@
 	pop af
 	ld [rSVBK], a
 	ret
-; 17d45a
 
-Function17d45a: ; 17d45a
+Function17d45a:
 .asm_17d45a
 	call JoyTextDelay
 	ld a, [wcd77]
@@ -724,23 +700,20 @@
 	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 @@
 
 .asm_17d4e0
 	ld a, [hli]
-	ld de, $c608
+	ld de, wc608
 	ld c, $8
 .asm_17d4e6
 	srl a
@@ -921,9 +894,8 @@
 	call Function17e5af
 	farcall ReloadMapPart
 	jp Function17e438
-; 17d5be
 
-Function17d5be: ; 17d5be
+Function17d5be:
 	call SetPalettes
 	call Function17e438
 
@@ -962,12 +934,11 @@
 	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
@@ -974,13 +945,12 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17d6a1
 
-
-Function17d6a1: ; 17d6a1
+Function17d6a1:
 	push hl
 	ld a, [wcd6e]
 	ld c, a
@@ -1114,9 +1082,8 @@
 	call CloseSRAM
 	pop hl
 	ret
-; 17d6fd
 
-Function17d6fd: ; 17d6fd
+Function17d6fd:
 	ld a, [wcd77]
 	bit 7, a
 	jr nz, asm_17d721
@@ -1147,9 +1114,8 @@
 	ld a, $2
 	ld [wcd77], a
 	ret
-; 17d72a
 
-Jumptable17d72a: ; 17d72a
+Jumptable17d72a:
 	dw Function17d78c
 	dw Function17d78d
 	dw Function17d7b4
@@ -1199,13 +1165,11 @@
 	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 @@
 	ld [wcd77], a
 	call ClearBGPalettes
 	ret
-; 17d7b4
 
-Function17d7b4: ; 17d7b4
+Function17d7b4:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1234,9 +1197,8 @@
 	call PlayMusic2
 	call HlToCrashCheckPointer
 	ret
-; 17d7c2
 
-Function17d7c2: ; 17d7c2
+Function17d7c2:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1245,9 +1207,8 @@
 	call WaitSFX
 	call HlToCrashCheckPointer
 	ret
-; 17d7d3
 
-Function17d7d3: ; 17d7d3
+Function17d7d3:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	dec a
@@ -1257,9 +1218,8 @@
 	call WaitSFX
 	call HlToCrashCheckPointer
 	ret
-; 17d7e5
 
-Function17d7e5: ; 17d7e5
+Function17d7e5:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld [wcd4f], a
@@ -1283,9 +1243,8 @@
 	call Function17e691
 	call HlToCrashCheckPointer
 	ret
-; 17d818
 
-Function17d818: ; 17d818
+Function17d818:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld c, a
@@ -1303,9 +1262,8 @@
 	add hl, bc
 	call PlaceString
 	ret
-; 17d833
 
-Function17d833: ; 17d833
+Function17d833:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1331,9 +1289,8 @@
 	farcall Function11c08f
 	call Function17e349
 	ret
-; 17d85d
 
-Function17d85d: ; 17d85d
+Function17d85d:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1350,7 +1307,7 @@
 	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 @@
 	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 @@
 .asm_17d8fe
 	call Function17e349
 	ret
-; 17d902
 
-Function17d902: ; 17d902
+Function17d902:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -1467,11 +1423,10 @@
 .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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 
 .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,7 +1599,6 @@
 
 .asm_17da8b
 	ret
-; 17da8c
 
 Unknown_17da8c:
 x = 0
@@ -1662,9 +1613,8 @@
 	db (1 << x) ^ $ff
 x = x + 1
 endr
-; 17da9c
 
-Function17da9c: ; 17da9c
+Function17da9c:
 	ld a, [wcd31]
 	dec a
 	jr z, .asm_17dabd
@@ -1695,9 +1645,8 @@
 	call Function17e55b
 	call Function17e5af
 	jr .asm_17daba
-; 17dadc
 
-Function17dadc: ; 17dadc
+Function17dadc:
 	ld a, [wcd2e]
 	ld hl, wcd24
 	add [hl]
@@ -1735,9 +1684,8 @@
 	call Function17e55b
 	call Function17e5af
 	jr .asm_17db0e
-; 17db2d
 
-Function17db2d: ; 17db2d
+Function17db2d:
 	ld a, [wcd30]
 	ld hl, wcd24
 	cp [hl]
@@ -1757,9 +1705,8 @@
 
 .asm_17db53
 	jp IncCrashCheckPointer
-; 17db56
 
-Function17db56: ; 17db56
+Function17db56:
 	ld a, [wcd30]
 	cp $1
 	jr z, .asm_17db74
@@ -1775,9 +1722,8 @@
 
 .asm_17db74
 	jp IncCrashCheckPointer
-; 17db77
 
-Function17db77: ; 17db77
+Function17db77:
 	ld hl, wcd2d
 	ld a, [wcd2f]
 	add [hl]
@@ -1807,9 +1753,8 @@
 
 .asm_17dbae
 	jp IncCrashCheckPointer
-; 17dbb1
 
-Function17dbb1: ; 17dbb1
+Function17dbb1:
 	ld hl, wcd2f
 	ld a, [wcd42]
 	sub [hl]
@@ -1843,9 +1788,8 @@
 	pop af
 	dec a
 	jr .asm_17dbd4
-; 17dbe9
 
-Function17dbe9: ; 17dbe9
+Function17dbe9:
 	ld hl, wcd2d
 	ld a, [wcd2f]
 	sub [hl]
@@ -1877,11 +1821,10 @@
 	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,24 +1832,24 @@
 	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
+	ld [wc70f], a
+	ld hl, wc708
 	call LoadMenuHeader
 	call VerticalMenu
 	jr nc, .asm_17dc6e
@@ -1920,16 +1863,16 @@
 	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,7 +1881,6 @@
 	pop hl
 	call Function17e40f
 	ret
-; 17dc96
 
 MenuData_17dc96:
 	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
@@ -1945,16 +1887,14 @@
 	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 @@
 	ld a, $4
 	ld [rSVBK], a
 	ret
-; 17dccf
 
-Function17dccf: ; 17dccf
+Function17dccf:
 	call IncCrashCheckPointer
 	push hl
 	ld a, [wcd4b]
@@ -2024,9 +1963,8 @@
 .asm_17dd11
 	pop hl
 	ret
-; 17dd13
 
-Function17dd13: ; 17dd13
+Function17dd13:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld c, a
@@ -2046,9 +1984,8 @@
 	pop hl
 	call PlaceHLTextAtBC
 	ret
-; 17dd30
 
-Function17dd30: ; 17dd30
+Function17dd30:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2065,39 +2002,38 @@
 	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 @@
 	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 @@
 .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,33 +2124,32 @@
 	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
@@ -2222,16 +2156,16 @@
 	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,23 +2178,23 @@
 .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
@@ -2267,24 +2201,23 @@
 	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,16 +2227,16 @@
 	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
@@ -2310,11 +2243,10 @@
 	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 @@
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wCurPartySpecies], a
 	ld [wTempEnemyMonSpecies], a
@@ -2517,9 +2449,8 @@
 	ld de, $4
 	add hl, de
 	jp asm_17e0ee
-; 17e026
 
-Function17e026: ; 17e026
+Function17e026:
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld a, [sBoxCount]
@@ -2651,11 +2582,10 @@
 	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]
@@ -2662,7 +2592,7 @@
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wCurItem], a
 	ld a, [hli]
@@ -2685,11 +2615,10 @@
 	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]
@@ -2696,7 +2625,7 @@
 	push af
 	ld a, $1
 	ld [rSVBK], a
-	ld hl, $c708
+	ld hl, wc708
 	ld a, [hli]
 	ld [wScriptVar], a
 	push hl
@@ -2716,11 +2645,10 @@
 	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]
@@ -2727,7 +2655,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 .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 @@
 	ld [de], a
 	call HlToCrashCheckPointer
 	ret
-; 17e261
 
-Function17e261: ; 17e261
+Function17e261:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2888,9 +2813,8 @@
 	inc hl
 	call HlToCrashCheckPointer
 	ret
-; 17e270
 
-Function17e270: ; 17e270
+Function17e270:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2902,9 +2826,8 @@
 	inc hl
 	call HlToCrashCheckPointer
 	ret
-; 17e27f
 
-Function17e27f: ; 17e27f
+Function17e27f:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2921,9 +2844,8 @@
 	add [hl]
 	ld [de], a
 	ret
-; 17e293
 
-Function17e293: ; 17e293
+Function17e293:
 	call IncCrashCheckPointer
 	ld a, [hli]
 	ld e, a
@@ -2940,9 +2862,8 @@
 	sub [hl]
 	ld [de], a
 	ret
-; 17e2a7
 
-Function17e2a7: ; 17e2a7
+Function17e2a7:
 	call IncCrashCheckPointer
 	call HlToCrashCheckPointer
 	call Function17e32b
@@ -2988,9 +2909,8 @@
 	ld a, $2
 	ld [wcd7a], a
 	ret
-; 17e309
 
-Function17e309: ; 17e309
+Function17e309:
 	ld a, $2
 	ld [wc303], a
 	call Function17dcaf
@@ -3003,12 +2923,11 @@
 	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 @@
 	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 @@
 	call CopyBytes
 	call CloseSRAM
 	ret
-; 17e367
 
 inc_crash_check_pointer_farcall: MACRO
 	call IncCrashCheckPointer
@@ -3049,26 +2966,22 @@
 	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 @@
 	ld [hBGMapMode], a
 	call DelayFrames
 	ret
-; 17e3f0
 
-Function17e3f0: ; 17e3f0
+Function17e3f0:
 	call IncCrashCheckPointer
 	call HlToCrashCheckPointer
 .asm_17e3f6
@@ -3093,15 +3005,13 @@
 	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 @@
 	ld a, h
 	ld [wMobileCrashCheckPointer + 1], a
 	ret
-; 17e427
 
-Function17e427: ; 17e427
+Function17e427:
 	ld hl, hJoyPressed
 	ld a, [hl]
 	and $1
@@ -3133,15 +3042,13 @@
 	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]
@@ -3148,9 +3055,8 @@
 	ld h, a
 	add hl, bc
 	ret
-; 17e447
 
-Function17e447: ; 17e447
+Function17e447:
 	ld a, [wBGMapBuffer]
 	ld l, a
 	ld a, [wcd21]
@@ -3157,9 +3063,8 @@
 	ld h, a
 	add hl, de
 	ret
-; 17e451
 
-Function17e451: ; 17e451
+Function17e451:
 	ld a, [wcd42]
 	and a
 	ret z
@@ -3249,9 +3154,8 @@
 	pop af
 	ld [wcd2e], a
 	ret
-; 17e4dd
 
-Function17e4dd: ; 17e4dd
+Function17e4dd:
 	ld a, [wcd2c]
 	and $1
 	ret z
@@ -3285,9 +3189,8 @@
 	ld a, $ee
 	ld [hl], a
 	ret
-; 17e51b
 
-Function17e51b: ; 17e51b
+Function17e51b:
 	ld a, [wcd28]
 	ld hl, wCreditsTimer
 	sub [hl]
@@ -3321,9 +3224,8 @@
 	dec a
 	jr nz, .asm_17e544
 	ret
-; 17e55b
 
-Function17e55b: ; 17e55b
+Function17e55b:
 	ld a, [wcd42]
 	and a
 	ret z
@@ -3330,9 +3232,8 @@
 	ld a, $ed
 	call Function17e571
 	ret
-; 17e566
 
-Function17e566: ; 17e566
+Function17e566:
 	ld a, [wcd42]
 	and a
 	ret z
@@ -3339,9 +3240,8 @@
 	ld a, $7f
 	call Function17e571
 	ret
-; 17e571
 
-Function17e571: ; 17e571
+Function17e571:
 	push af
 	hlcoord 0, 0
 	ld bc, $14
@@ -3375,9 +3275,8 @@
 	pop af
 	ld [hl], a
 	ret
-; 17e5af
 
-Function17e5af: ; 17e5af
+Function17e5af:
 	ld a, [wcd2c]
 	and $2
 	ret z
@@ -3387,7 +3286,7 @@
 	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 @@
 	add hl, bc
 	call PlaceString
 	ret
-; 17e600
 
-Function17e600: ; 17e600
+Function17e600:
 .asm_17e600
 	push af
 	push hl
@@ -3439,9 +3337,8 @@
 	dec a
 	jr nz, .asm_17e600
 	ret
-; 17e613
 
-Function17e613: ; 17e613
+Function17e613:
 	push hl
 	hlcoord 0, 0
 	ld bc, $14
@@ -3541,9 +3438,8 @@
 	ld [hl], a
 	pop hl
 	ret
-; 17e691
 
-Function17e691: ; 17e691
+Function17e691:
 	push hl
 	ld hl, NULL
 	ld bc, $14
@@ -3606,13 +3502,12 @@
 	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 @@
 	dec b
 	jr nz, .asm_17e6ee
 	ret
-; 17e6fe
 
-
-PokemonNewsGFX: ; 17e6fe
+PokemonNewsGFX:
 INCBIN "gfx/mobile/pokemon_news.2bpp"
 
 GFX_17eb7e:
@@ -3677,27 +3570,25 @@
 	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 @@
 .finished
 	scf
 	ret
-; 17f061
 
-.Jumptable: ; 17f061
+.Jumptable:
 	dw Function17f081 ; 0
 	dw Function17f0f8 ; 1
 	dw Function17f154 ; 2
@@ -3733,9 +3623,8 @@
 	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 @@
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f09d
 	and a
 	ret
@@ -3821,9 +3710,8 @@
 	pop de
 	and a
 	ret
-; 17f0f8
 
-Function17f0f8: ; 17f0f8
+Function17f0f8:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f114
@@ -3838,7 +3726,7 @@
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f112
 	and a
 	ret
@@ -3861,15 +3749,15 @@
 	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 @@
 	pop de
 	and a
 	ret
-; 17f154
 
-Function17f154: ; 17f154
+Function17f154:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f167
@@ -3891,7 +3778,7 @@
 	ld e, l
 	ld d, h
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f165
 	and a
 	ret
@@ -3920,9 +3807,8 @@
 	pop de
 	and a
 	ret
-; 17f181
 
-Function17f181: ; 17f181
+Function17f181:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f19d
@@ -3937,7 +3823,7 @@
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f19b
 	and a
 	ret
@@ -3961,10 +3847,10 @@
 	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 @@
 	pop de
 	and a
 	ret
-; 17f1d0
 
-Function17f1d0: ; 17f1d0
+Function17f1d0:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f1ec
@@ -3992,7 +3877,7 @@
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f1ea
 	and a
 	ret
@@ -4032,9 +3917,8 @@
 	pop de
 	and a
 	ret
-; 17f220
 
-Function17f220: ; 17f220
+Function17f220:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f23c
@@ -4049,7 +3933,7 @@
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f23a
 	and a
 	ret
@@ -4092,13 +3976,12 @@
 	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 @@
 	ld b, $0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f295
 	and a
 	ret
@@ -4153,9 +4036,8 @@
 	pop de
 	and a
 	ret
-; 17f2cb
 
-Function17f2cb: ; 17f2cb
+Function17f2cb:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4185,9 +4067,8 @@
 	pop de
 	and a
 	ret
-; 17f2ff
 
-Function17f2ff: ; 17f2ff
+Function17f2ff:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4198,13 +4079,13 @@
 	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 @@
 	pop de
 	and a
 	ret
-; 17f334
 
-Function17f334: ; 17f334
+Function17f334:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4245,10 +4125,10 @@
 .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 @@
 	pop de
 	and a
 	ret
-; 17f382
 
-Function17f382: ; 17f382
+Function17f382:
 	pop hl
 	push bc
 	ld a, [hli]
@@ -4303,12 +4182,11 @@
 	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
@@ -4315,7 +4193,7 @@
 	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 @@
 	pop de
 	and a
 	ret
-; 17f3f0
 
-Function17f3f0: ; 17f3f0
+Function17f3f0:
 	pop hl
 	push hl
 	ld a, [hli]
@@ -4365,9 +4242,8 @@
 	ld h, b
 	scf
 	ret
-; 17f41d
 
-Function17f41d: ; 17f41d
+Function17f41d:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -4410,9 +4286,8 @@
 	pop de
 	and a
 	ret
-; 17f44f
 
-Function17f44f: ; 17f44f
+Function17f44f:
 	pop hl
 	call Function17f524
 	jr c, .asm_17f46d
@@ -4429,7 +4304,7 @@
 	ld b, 0
 	add hl, bc
 	ld a, [de]
-	cp $50
+	cp "@"
 	jr z, .asm_17f46b
 	and a
 	ret
@@ -4462,7 +4337,7 @@
 	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 @@
 	call GetSRAMBank
 
 .asm_17f4b7
-	ld de, $c608
+	ld de, wc608
 	pop hl
 	push hl
 	ld a, [wcd57]
@@ -4523,9 +4398,8 @@
 	pop de
 	and a
 	ret
-; 17f4f6
 
-Function17f4f6: ; 17f4f6
+Function17f4f6:
 	ld a, [wcd6a]
 	ld l, a
 	ld a, [wcd6b]
@@ -4541,9 +4415,8 @@
 	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 @@
 	ld b, a
 	ld h, a
 	ret
-; 17f524
 
-Function17f524: ; 17f524
+Function17f524:
 	push hl
 	push bc
 	push de
@@ -4584,9 +4456,8 @@
 .asm_17f53a
 	scf
 	jr .asm_17f536
-; 17f53d
 
-BattleTowerMobileError: ; 17f53d
+BattleTowerMobileError:
 	call FadeToMenu
 	xor a
 	ld [wc303], a
@@ -4601,9 +4472,8 @@
 	ld [rSVBK], a
 	call ExitAllMenus
 	ret
-; 17f555
 
-DisplayMobileError: ; 17f555
+DisplayMobileError:
 .loop
 	call JoyTextDelay
 	call .RunJumptable
@@ -4657,27 +4527,23 @@
 	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
@@ -4684,9 +4550,8 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	dbbw $4, $4, String_17fa49
 	dbbw $ff, $ff, String_17fa49
 
-String_17f891: ; 17f891
+String_17f891:
 	db   "モバイルアダプタが　ただしく"
 	next "さしこまれていません"
 	next "とりあつかいせつめいしょを"
@@ -5017,7 +4875,7 @@
 	next "さしこんで　ください"
 	db   "@"
 
-String_17f8d1: ; 17f8d1
+String_17f8d1:
 	db   "でんわが　うまく　かけられないか"
 	next "でんわかいせんが　こんでいるので"
 	next "つうしん　できません"
@@ -5025,7 +4883,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17f913: ; 17f913
+String_17f913:
 	db   "でんわかいせんが　こんでいるため"
 	next "でんわが　かけられません"
 	next "しばらく　まって"
@@ -5032,7 +4890,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17f946: ; 17f946
+String_17f946:
 	db   "モバイルアダプタの　エラーです"
 	next "しばらく　まって"
 	next "かけなおして　ください"
@@ -5041,7 +4899,7 @@
 	next "おといあわせください"
 	db   "@"
 
-String_17f98e: ; 17f98e
+String_17f98e:
 	db   "つうしんエラーです"
 	next "しばらく　まって"
 	next "かけなおして　ください"
@@ -5050,7 +4908,7 @@
 	next "おといあわせください"
 	db   "@"
 
-String_17f9d0: ; 17f9d0
+String_17f9d0:
 	db   "ログインパスワードか"
 	next "ログイン　アイディーに"
 	next "まちがいがあります"
@@ -5059,7 +4917,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fa14: ; 17fa14
+String_17fa14:
 	db   "でんわが　きれました"
 	next "とりあつかいせつめいしょを"
 	next "ごらんのうえ"
@@ -5067,7 +4925,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fa49: ; 17fa49
+String_17fa49:
 	db   "モバイルセンターの"
 	next "つうしんエラーです"
 	next "しばらくまって"
@@ -5074,7 +4932,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fa71: ; 17fa71
+String_17fa71:
 	db   "モバイルアダプタに"
 	next "とうろくされた　じょうほうが"
 	next "ただしく　ありません"
@@ -5082,7 +4940,7 @@
 	next "しょきとうろくを　してください"
 	db   "@"
 
-String_17fab0: ; 17fab0
+String_17fab0:
 	db   "モバイルセンターが"
 	next "こんでいて　つながりません"
 	next "しばらくまって"
@@ -5091,7 +4949,7 @@
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17faf9: ; 17faf9
+String_17faf9:
 	db   "あてさき　メールアドレスに"
 	next "まちがいがあります"
 	next "ただしい　メールアドレスを"
@@ -5098,7 +4956,7 @@
 	next "いれなおしてください"
 	db   "@"
 
-String_17fb2a: ; 17fb2a
+String_17fb2a:
 	db   "メールアドレスに"
 	next "まちがいが　あります"
 	next "とりあつかいせつめいしょを"
@@ -5107,7 +4965,7 @@
 	next "しょきとうろくを　してください"
 	db   "@"
 
-String_17fb6e: ; 17fb6e
+String_17fb6e:
 	db   "ログインパスワードに"
 	next "まちがいが　あるか"
 	next "モバイルセンターの　エラーです"
@@ -5116,7 +4974,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fbb6: ; 17fbb6
+String_17fbb6:
 	db   "データの　よみこみが　できません"
 	next "しばらくまって"
 	next "かけなおして　ください"
@@ -5125,7 +4983,7 @@
 	next "おといあわせください"
 	db   "@"
 
-String_17fbfe: ; 17fbfe
+String_17fbfe:
 	db   "じかんぎれです"
 	next "でんわが　きれました"
 	next "でんわを　かけなおしてください"
@@ -5133,7 +4991,7 @@
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fc3e: ; 17fc3e
+String_17fc3e:
 	db   "ごりよう　りょうきんの　"
 	next "おしはらいが　おくれたばあいには"
 	next "ごりようが　できなくなります"
@@ -5141,7 +4999,7 @@
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fc88: ; 17fc88
+String_17fc88:
 	db   "おきゃくさまの　ごつごうにより"
 	next "ごりようできません"
 	next "くわしくは　とりあつかい"
@@ -5148,7 +5006,7 @@
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fcbf: ; 17fcbf
+String_17fcbf:
 	db   "でんわかいせんが　こんでいるか"
 	next "モバイルセンターの　エラーで"
 	next "つうしんが　できません"
@@ -5156,7 +5014,7 @@
 	next "かけなおして　ください"
 	db   "@"
 
-String_17fcff: ; 17fcff
+String_17fcff:
 	db   "ごりよう　りょうきんが"
 	next "じょうげんを　こえているため"
 	next "こんげつは　ごりようできません"
@@ -5164,7 +5022,7 @@
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fd47: ; 17fd47
+String_17fd47:
 	db   "げんざい　モバイルセンターの"
 	next "てんけんを　しているので"
 	next "つうしんが　できません"
@@ -5172,20 +5030,19 @@
 	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 "もういちど　はじめから"
@@ -5192,7 +5049,7 @@
 	next "やりなおしてください"
 	db   "@"
 
-String_17fe03: ; 17fe03
+String_17fe03:
 	db   "データの　よみこみが　できません"
 	next "しばらくまって"
 	next "かけなおして　ください"
@@ -5201,12 +5058,12 @@
 	next "おといあわせください"
 	db   "@"
 
-String_17fe4b: ; 17fe4b
+String_17fe4b:
 	db   "まちじかんが　ながいので"
 	next "でんわが　きれました"
 	db   "@"
 
-String_17fe63: ; 17fe63
+String_17fe63:
 	db   "あいての　モバイルアダプタと"
 	next "タイプが　ちがいます"
 	next "くわしくは　とりあつかい"
@@ -5213,7 +5070,7 @@
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fe9a: ; 17fe9a ; unused
+String_17fe9a: ; unused
 	db   "ポケモンニュースが"
 	next "あたらしくなっているので"
 	next "レポートを　おくれません"
@@ -5221,7 +5078,7 @@
 	next "よみこみを　さきに　してください"
 	db   "@"
 
-String_17fedf: ; 17fedf
+String_17fedf:
 	db   "つうしんの　じょうきょうが"
 	next "よくないか　かけるあいてが"
 	next "まちがっています"
@@ -5228,9 +5085,8 @@
 	next "もういちど　かくにんをして"
 	next "でんわを　かけなおして　ください"
 	db   "@"
-; 17ff23
 
-Function17ff23: ; 17ff23
+Function17ff23:
 	ld a, [hJoyPressed]
 	and a
 	ret z
@@ -5243,9 +5099,8 @@
 	ld hl, wc303
 	set 7, [hl]
 	ret
-; 17ff3c
 
-Function17ff3c: ; 17ff3c
+Function17ff3c:
 	nop
 	ld a, [wc300]
 	cp $d0
@@ -5266,8 +5121,6 @@
 	ld [wc300], a
 	and a
 	ret
-; 17ff68
 
-String_17ff68: ; 17ff68
+String_17ff68:
 	db "１０１@"
-; 17ff6c
--- 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,10 +98,8 @@
 	hlcoord 5, 1
 	call ClearBox
 	jp .joy_loop
-; 49fcc
 
-
-MobileString1: ; 49fcc
+MobileString1:
 	db   "めいしフォルダー"
 	next "あいさつ"
 	next "プロフィール"
@@ -108,37 +106,30 @@
 	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,7 +157,7 @@
 	ld [hli], a ; wMenuCursorY, wMenuCursorX
 	ret
 
-Function4a098: ; 4a098 (12:6098)
+Function4a098:
 	ld a, 2
 	call MenuClickSound
 	call PlaceHollowCursor
@@ -179,13 +170,13 @@
 	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 @@
 	call DelayFrames
 	jr asm_4a111
 
-Function4a100: ; 4a100 (12:6100)
+Function4a100:
 	ld a, 2
 	call MenuClickSound
 	call ClearBGPalettes
@@ -219,12 +210,12 @@
 	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,7 +240,7 @@
 	ld [hli], a
 	ret
 
-Function4a13b: ; 4a13b (12:613b)
+Function4a13b:
 	call Function4a3a7
 	call Function4a492
 	call Function4a373
@@ -256,7 +247,7 @@
 	ld c, 10
 	call DelayFrames
 
-Function4a149: ; 4a149 (12:6149)
+Function4a149:
 	hlcoord 1, 2
 	ld b, $6
 	ld c, $10
@@ -288,13 +279,13 @@
 	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 @@
 	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 @@
 	call DelayFrame
 	jr Function4a239
 
-Function4a221: ; 4a221 (12:6221)
+Function4a221:
 	ld a, $1
 	call MenuClickSound
 	call Function4a28a
@@ -365,12 +354,11 @@
 	pop bc
 	jp Function4a149
 
-Function4a239: ; 4a239 (12:6239)
+Function4a239:
 	pop bc
 	jp Function4a13b
-; 4a23d (12:623d)
 
-Strings_4a23d: ; 4a23d
+Strings_4a23d:
 	db   "いつも　せつぞく¯する"
 	next "モバイルセンター¯えらびます@"
 
@@ -380,9 +368,8 @@
 	db   "まえ<NO>がめん　<NI>もどります@"
 
 	db   "@"
-; 4a28a
 
-Function4a28a: ; 4a28a (12:628a)
+Function4a28a:
 	hlcoord 2, 3
 	lb bc, 6, 1
 	ld a, " "
@@ -458,45 +445,39 @@
 	farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
 	xor a
 	ret
-; 4a346 (12:6346)
 
-MenuHeader_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_MenuHeader: ; 0x4a362
+DeletePassword_YesNo_MenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
 	dw MenuData_0x4a36a
 	db 2 ; default option
-; 0x4a36a
 
-MenuData_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 @@
 	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 @@
 	ld a, " "
 	call Function4a6d8
 	ret
-; 4a449 (12:6449)
 
-Function4a449: ; 4a449
+Function4a449:
 	ld bc, 3 * SCREEN_WIDTH
 	ld a, $0
 	hlcoord 0, 0
@@ -622,9 +600,8 @@
 	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
@@ -631,12 +608,11 @@
 	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 @@
 	ld a, e
 	ld [wStartSecond], a
 	ret
-; 4a4c4
 
-
-Function4a4c4: ; 4a4c4 (12:64c4)
+Function4a4c4:
 	call ClearBGPalettes
 	call Function4a3a7
 	call Function4a492
@@ -715,13 +689,13 @@
 	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 @@
 	call PlaceString
 	jp Function4a5b0
 
-Function4a5b0: ; 4a5b0 (12:65b0)
+Function4a5b0:
 	call Function4a680
 	pop bc
 	ld hl, wMenuCursorY
@@ -781,21 +755,19 @@
 	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 @@
 	db "あいて<NI>みえる　あいさつです@"
 	db "まえ<NO>がめん　<NI>もどります@"
 	db "@"
-; 4a680
 
-Function4a680: ; 4a680 (12:6680)
+Function4a680:
 	ld hl, w2DMenuCursorInitY
 	ld a, $2
 	ld [hli], a
@@ -839,7 +810,7 @@
 	ld [hli], a
 	ret
 
-Function4a6ab: ; 4a6ab (12:66ab)
+Function4a6ab:
 	ld a, $2
 	call MenuClickSound
 	call ClearBGPalettes
@@ -850,7 +821,7 @@
 	call LoadFontsExtra
 	jp Function4a4c4
 
-Function4a6c5: ; 4a6c5 (12:66c5)
+Function4a6c5:
 	ld a, $5
 	ld [wMusicFade], a
 	ld a, e
@@ -861,7 +832,7 @@
 	call DelayFrames
 	ret
 
-Function4a6d8: ; 4a6d8 (12:66d8)
+Function4a6d8:
 	push bc
 	push hl
 .asm_4a6da
--- 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 @@
 .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 @@
 .news_data
 INCBIN "mobile/news/news_2.bin"
 
-Function1f5d9f: ; 1f5d9f
+Function1f5d9f:
 	ld a, $6
 	call GetSRAMBank
 	ld hl, .news_data
--- 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
--- a/sram.asm
+++ b/sram.asm
@@ -208,7 +208,7 @@
 sBattleTowerReward:: db
 
 ; team of previous trainer
-sBTMonOfTrainers:: ; 0xbe51
+sBTMonOfTrainers:: ; be51
 sBTMonPrevTrainer1:: db
 sBTMonPrevTrainer2:: db
 sBTMonPrevTrainer3:: db
--- a/tools/lzcomp.c
+++ b/tools/lzcomp.c
@@ -310,6 +310,7 @@
         break;
       case 1:
         if (commands -> value != next -> value) break;
+        // falls through
       case 3:
         if ((commands -> count + next -> count) <= 1024) {
           commands -> count += next -> count;
--- a/wram.asm
+++ b/wram.asm
@@ -1,4 +1,5 @@
 INCLUDE "constants.asm"
+
 INCLUDE "macros/wram.asm"
 
 
@@ -358,7 +359,13 @@
 
 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
 ; surrounding tiles
@@ -867,7 +874,18 @@
 
 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
@@ -1629,7 +1647,6 @@
 wMartItem8BCD:: ds 3
 wMartItem9BCD:: ds 3
 wMartItem10BCD:: ds 3
-wMartItemBCDEnd::
 
 NEXTU ; d002
 ; town map data
@@ -2112,7 +2129,6 @@
 wEnemyMonBaseExp::   db ; d22c
 wEnemyMonEnd::
 
-
 wBattleMode:: ; d22d
 ; 0: overworld
 ; 1: wild battle
@@ -2361,7 +2377,7 @@
 ; bit 7: dst
 	db
 
-wGameTime::
+wGameTime:: ; used only for BANK(wGameTime)
 wGameTimeCap::     db ; d4c3
 wGameTimeHours::   dw ; d4c4
 wGameTimeMinutes:: db ; d4c6
@@ -2472,7 +2488,6 @@
 wJohtoBadges:: flag_array NUM_JOHTO_BADGES ; d857
 wKantoBadges:: flag_array NUM_KANTO_BADGES ; d858
 
-
 wTMsHMs:: ds NUM_TMS + NUM_HMS ; d859
 wTMsHMsEnd::
 
@@ -2509,7 +2524,7 @@
 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
@@ -2751,7 +2766,6 @@
 
 wPlayerDataEnd::
 
-
 wCurrMapData::
 
 wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5
@@ -2972,7 +2986,7 @@
 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
@@ -2983,7 +2997,7 @@
 
 	ds 1
 
-wMagnetTrain::
+wMagnetTrain:: ; used only for BANK(wMagnetTrain)
 wMagnetTrainDirection:: db
 wMagnetTrainInitPosition:: db
 wMagnetTrainHoldPosition:: db