From 5c7d04ac84743d16bff16f0297744eb31d5e9e65 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 23 Jun 2018 21:12:37 -0400
Subject: [PATCH 01/13] =?UTF-8?q?Use=20direct=20tile=20IDs,=20not=20charma?=
 =?UTF-8?q?p=20entries,=20since=20they=20don't=20correspond=20correctly=20?=
 =?UTF-8?q?(e.g.=20"=E2=94=8C"=20is=20not=20the=20top-right=20corner)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 engine/link/link_2.asm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/engine/link/link_2.asm b/engine/link/link_2.asm
index e2fe47dc5..3922df404 100644
--- a/engine/link/link_2.asm
+++ b/engine/link/link_2.asm
@@ -67,22 +67,22 @@ LinkTextbox2: ; 4d35b
 	add hl, de
 .loop
 	push hl
-	ld a, "┌"
+	ld a, $79
 	ld [hli], a
 	ld a, " "
 	call .PlaceRow
-	ld [hl], "─"
+	ld [hl], $7a
 	pop hl
 	ld de, SCREEN_WIDTH
 	add hl, de
 	dec b
 	jr nz, .loop
 
-	ld a, "┐"
+	ld a, $7b
 	ld [hli], a
-	ld a, "│"
+	ld a, $7c
 	call .PlaceRow
-	ld [hl], "└"
+	ld [hl], $7d
 	ret
 ; 4d3ab
 

From e36a5059065abf67b878dcec41bb019bab32e613 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 23 Jun 2018 22:24:46 -0400
Subject: [PATCH 02/13] Separate Mart constants from item data constants

---
 constants.asm                     |  1 +
 constants/item_data_constants.asm | 46 -------------------------------
 constants/mart_constants.asm      | 44 +++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 46 deletions(-)
 create mode 100644 constants/mart_constants.asm

diff --git a/constants.asm b/constants.asm
index 5dcbc57be..28736a1a9 100644
--- a/constants.asm
+++ b/constants.asm
@@ -28,6 +28,7 @@ INCLUDE "constants/map_constants.asm"
 INCLUDE "constants/map_data_constants.asm"
 INCLUDE "constants/map_object_constants.asm"
 INCLUDE "constants/map_setup_constants.asm"
+INCLUDE "constants/mart_constants.asm"
 INCLUDE "constants/menu_constants.asm"
 INCLUDE "constants/mobile_constants.asm"
 INCLUDE "constants/move_constants.asm"
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index e503f3057..9d463d7d4 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -129,49 +129,3 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	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
diff --git a/constants/mart_constants.asm b/constants/mart_constants.asm
new file mode 100644
index 000000000..c4834f524
--- /dev/null
+++ b/constants/mart_constants.asm
@@ -0,0 +1,44 @@
+; mart types (see engine/items/mart.asm)
+	const_def
+	const MARTTYPE_STANDARD
+	const MARTTYPE_BITTER
+	const MARTTYPE_BARGAIN
+	const MARTTYPE_PHARMACY
+	const MARTTYPE_ROOFTOP
+
+; Marts indexes (see data/items/marts.asm)
+	const_def
+	const MART_CHERRYGROVE
+	const MART_CHERRYGROVE_DEX
+	const MART_VIOLET
+	const MART_AZALEA
+	const MART_CIANWOOD
+	const MART_GOLDENROD_2F_1
+	const MART_GOLDENROD_2F_2
+	const MART_GOLDENROD_3F
+	const MART_GOLDENROD_4F
+	const MART_GOLDENROD_5F_1
+	const MART_GOLDENROD_5F_2
+	const MART_GOLDENROD_5F_3
+	const MART_GOLDENROD_5F_4
+	const MART_OLIVINE
+	const MART_ECRUTEAK
+	const MART_MAHOGANY_1
+	const MART_MAHOGANY_2
+	const MART_BLACKTHORN
+	const MART_VIRIDIAN
+	const MART_PEWTER
+	const MART_CERULEAN
+	const MART_LAVENDER
+	const MART_VERMILION
+	const MART_CELADON_2F_1
+	const MART_CELADON_2F_2
+	const MART_CELADON_3F
+	const MART_CELADON_4F
+	const MART_CELADON_5F_1
+	const MART_CELADON_5F_2
+	const MART_FUCHSIA
+	const MART_SAFFRON
+	const MART_MT_MOON
+	const MART_INDIGO_PLATEAU
+	const MART_UNDERGROUND

From f6ef0952847e8ee6d2e17da062c899af445087a0 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 23 Jun 2018 22:35:46 -0400
Subject: [PATCH 03/13] Add STANDARDMART_* jumptable index constants

---
 engine/items/mart.asm | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/engine/items/mart.asm b/engine/items/mart.asm
index 911251f65..a38cf3fdd 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -28,7 +28,7 @@ OpenMartDialog:: ; 15a45
 MartDialog: ; 15a61
 	ld a, 0
 	ld [wEngineBuffer1], a
-	xor a
+	xor a ; STANDARDMART_HOWMAYIHELPYOU
 	ld [wEngineBuffer5], a
 	call StandardMart
 	ret
@@ -138,17 +138,27 @@ GetMart: ; 15b31
 	ret
 ; 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: ; 15b47
 .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
@@ -161,7 +171,7 @@ StandardMart: ; 15b47
 	call LoadStandardMenuHeader
 	ld hl, Text_Mart_HowMayIHelpYou
 	call PrintText
-	ld a, $1 ; top menu
+	ld a, STANDARDMART_TOPMENU
 	ret
 ; 15b6e
 
@@ -176,13 +186,13 @@ StandardMart: ; 15b47
 	cp $2
 	jr z, .sell
 .quit
-	ld a, $4 ;  Come again!
+	ld a, STANDARDMART_QUIT
 	ret
 .buy
-	ld a, $2 ; buy
+	ld a, STANDARDMART_BUY
 	ret
 .sell
-	ld a, $3 ; sell
+	ld a, STANDARDMART_SELL
 	ret
 ; 15b8d
 
@@ -191,14 +201,14 @@ StandardMart: ; 15b47
 	call FarReadMart
 	call BuyMenu
 	and a
-	ld a, $5 ; Anything else?
+	ld a, STANDARDMART_ANYTHINGELSE
 	ret
 ; 15b9a
 
 .Sell: ; 15b9a
 	call ExitMenu
 	call SellMenu
-	ld a, $5 ; Anything else?
+	ld a, STANDARDMART_ANYTHINGELSE
 	ret
 ; 15ba3
 
@@ -206,7 +216,7 @@ StandardMart: ; 15b47
 	call ExitMenu
 	ld hl, Text_Mart_ComeAgain
 	call MartTextBox
-	ld a, $ff ; exit
+	ld a, -1
 	ret
 ; 15baf
 
@@ -214,7 +224,7 @@ StandardMart: ; 15b47
 	call LoadStandardMenuHeader
 	ld hl, Text_Mart_AnythingElse
 	call PrintText
-	ld a, $1 ; top menu
+	ld a, STANDARDMART_TOPMENU
 	ret
 ; 15bbb
 
@@ -470,7 +480,7 @@ BuyMenuLoop: ; 15cef
 	jr c, .cancel
 	ld de, wMoney
 	ld bc, hMoneyTemp
-	ld a, $3 ; useless load
+	ld a, 3 ; useless load
 	call CompareMoney
 	jr c, .insufficient_funds
 	ld hl, wNumItems
@@ -478,7 +488,7 @@ BuyMenuLoop: ; 15cef
 	jr nc, .insufficient_bag_space
 	ld a, [wMartItemID]
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld b, SET_FLAG
 	ld hl, wBargainShopFlags
 	call FlagAction
@@ -537,7 +547,7 @@ BargainShopAskPurchaseQuantity:
 	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 +556,7 @@ BargainShopAskPurchaseQuantity:
 	jr nz, .SoldOut
 	ld a, [wMartItemID]
 	ld e, a
-	ld d, $0
+	ld d, 0
 	ld hl, wMartPointer
 	ld a, [hli]
 	ld h, [hl]

From a4bf94e1d770cadb9a52b94142fd7eb517e4b1df Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 23 Jun 2018 23:15:13 -0400
Subject: [PATCH 04/13] wCurMartEnd - wCurMart = 16

---
 engine/items/mart.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/items/mart.asm b/engine/items/mart.asm
index a38cf3fdd..159a63a29 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -110,7 +110,7 @@ LoadMartPointer: ; 15b10
 	ld [wMartPointer + 1], a
 	ld hl, wCurMart
 	xor a
-	ld bc, 16
+	ld bc, wCurMartEnd - wCurMart
 	call ByteFill
 	xor a
 	ld [wEngineBuffer5], a

From ff4cfffe14639da5682d561f1c3b4140566bc0fd Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 23 Jun 2018 23:27:43 -0400
Subject: [PATCH 05/13] wMartItemBCDEnd is unused

---
 wram.asm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wram.asm b/wram.asm
index 6cf4d037b..723a293ff 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1629,7 +1629,6 @@ wMartItem7BCD:: ds 3
 wMartItem8BCD:: ds 3
 wMartItem9BCD:: ds 3
 wMartItem10BCD:: ds 3
-wMartItemBCDEnd::
 
 NEXTU ; d002
 ; town map data

From 5cbff21a0dc8f1bbf8c9de289506d25d5ee8c78e Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 01:13:59 -0400
Subject: [PATCH 06/13] =?UTF-8?q?Unreferenced=5F53d84=20=E2=86=92=20Unrefe?=
 =?UTF-8?q?renced=5FMonPicBanks=20from=20pokegold-spaceworld?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/pokemon/unused_pic_banks.asm | 17 +++++++++++++++++
 data/unused_53d84.asm             | 13 -------------
 main.asm                          |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 data/pokemon/unused_pic_banks.asm
 delete mode 100644 data/unused_53d84.asm

diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm
new file mode 100644
index 000000000..85ac223f1
--- /dev/null
+++ b/data/pokemon/unused_pic_banks.asm
@@ -0,0 +1,17 @@
+; This was a table of Pokémon sprite banks in the 1997 G/S prototype.
+; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm.
+
+Unreferenced_MonPicBanks: ; 53d84
+	; last mon in bank, bank #
+	db RAICHU,    $15 + 0
+	db DUGTRIO,   $15 + 1
+	db GRAVELER,  $15 + 2
+	db KRABBY,    $15 + 3
+	db STARMIE,   $15 + 4
+	db ARTICUNO,  $15 + 5
+	db ARIADOS,   $15 + 6 ; JARANRA in pokegold-spaceworld
+	db ESPEON,    $15 + 7 ; KOUNYA in pokegold-spaceworld
+	db OCTILLERY, $15 + 8 ; BOMBSEEKER in pokegold-spaceworld
+	db LARVITAR,  $15 + 9 ; NYULA in pokegold-spaceworld
+	db $ff,       $15 + 10
+	db $ff,       $15 + 11
diff --git a/data/unused_53d84.asm b/data/unused_53d84.asm
deleted file mode 100644
index 026ec5275..000000000
--- a/data/unused_53d84.asm
+++ /dev/null
@@ -1,13 +0,0 @@
-Unreferenced_53d84:
-	db $1a, $15
-	db $33, $16
-	db $4b, $17
-	db $62, $18
-	db $79, $19
-	db $90, $1a
-	db $a8, $1b
-	db $c4, $1c
-	db $e0, $1d
-	db $f6, $1e
-	db $ff, $1f
-	db $ff, $20
diff --git a/main.asm b/main.asm
index 93a530079..9ab191cb6 100644
--- a/main.asm
+++ b/main.asm
@@ -264,7 +264,7 @@ INCLUDE "engine/gfx/load_pics.asm"
 INCLUDE "engine/pokemon/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/names.asm"
-INCLUDE "data/unused_53d84.asm"
+INCLUDE "data/pokemon/unused_pic_banks.asm"
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.

From 5a58f90ec6221906991fdf7a61aaa3f84513b714 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 11:46:55 -0400
Subject: [PATCH 07/13] FISHGROUP_DATA_LENGTH

---
 constants/pokemon_data_constants.asm | 1 +
 engine/events/fish.asm               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 3d27e5877..379546c45 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -158,6 +158,7 @@ NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
 
 GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
 WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
+FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
 
 NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
 
diff --git a/engine/events/fish.asm b/engine/events/fish.asm
index 09de8f2b7..63c48b4ee 100644
--- a/engine/events/fish.asm
+++ b/engine/events/fish.asm
@@ -11,7 +11,7 @@ Fish: ; 92402
 	call GetFishGroupIndex
 
 	ld hl, FishGroups
-rept 7
+rept FISHGROUP_DATA_LENGTH
 	add hl, de
 endr
 	call .Fish

From d84aabf3c1dfd71b46ead2114c2e61b8e2327ee3 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 12:30:33 -0400
Subject: [PATCH 08/13] WATER_WILDDATA_LENGTH

---
 engine/overworld/wildmons.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index 20375ba6c..53e2d3b38 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -96,7 +96,7 @@ FindNest: ; 2a01f
 
 .next_water
 	pop hl
-	ld bc, 3 * 3
+	ld bc, WATER_WILDDATA_LENGTH
 	add hl, bc
 	jr .FindWater
 ; 2a088

From ee48c7a3ed6f558810acfc2919adfde061669123 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 12:32:56 -0400
Subject: [PATCH 09/13] NUM_WATERMON

---
 engine/overworld/wildmons.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index 53e2d3b38..97930f51c 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -88,7 +88,7 @@ FindNest: ; 2a01f
 	ld a, [hli]
 	ld c, a
 	inc hl
-	ld a, 3
+	ld a, NUM_WATERMON
 	call .SearchMapForMon
 	jr nc, .next_water
 	ld [de], a

From 1a888f22004aec967d2b6049ede7e04b1815f956 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 13:00:55 -0400
Subject: [PATCH 10/13] NUM_GRASSMON * 2

---
 engine/overworld/wildmons.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index 97930f51c..757ecb017 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -276,7 +276,7 @@ ChooseWildEncounter: ; 2a14f
 	inc hl
 	inc hl
 	ld a, [wTimeOfDay]
-	ld bc, $e
+	ld bc, NUM_GRASSMON * 2
 	call AddNTimes
 	ld de, GrassMonProbTable
 
@@ -675,7 +675,7 @@ UpdateRoamMons: ; 2a30d
 	jr nc, .update_loop ; invalid index, try again
 	inc hl
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 	ld a, [wRoamMons_LastMapGroup]
@@ -819,7 +819,7 @@ RandomUnseenWildMon: ; 2a4ab
 	jr z, .randloop1
 	dec a
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 ; We now have the pointer to one of the last (rarest) three wild Pokemon found in that area.
@@ -894,7 +894,7 @@ RandomPhoneWildMon: ; 2a51f
 	call Random
 	and %11
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	add hl, bc
 	inc hl

From c7032617aa1df7aa44167551e4571a9557fe9539 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 21:28:26 -0400
Subject: [PATCH 11/13] Remove address comment

---
 data/pokemon/unused_pic_banks.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm
index 85ac223f1..2ede9c3f9 100644
--- a/data/pokemon/unused_pic_banks.asm
+++ b/data/pokemon/unused_pic_banks.asm
@@ -1,7 +1,7 @@
 ; 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: ; 53d84
+Unreferenced_MonPicBanks:
 	; last mon in bank, bank #
 	db RAICHU,    $15 + 0
 	db DUGTRIO,   $15 + 1

From 9afaed9b8fb93b6413d901f533f51a5298fb43dc Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 21:39:23 -0400
Subject: [PATCH 12/13] Remove more address comments

---
 data/collision_permissions.asm         |  3 +--
 engine/battle/move_effects/present.asm | 14 +++++++-------
 engine/gfx/crystal_layouts.asm         |  2 +-
 engine/gfx/player_gfx.asm              |  2 +-
 engine/menus/naming_screen.asm         |  2 +-
 engine/overworld/map_object_action.asm |  2 +-
 engine/overworld/map_objects.asm       |  3 ++-
 engine/pokemon/bills_pc.asm            |  7 +++----
 engine/printer/printer_serial.asm      |  2 +-
 home/menu_window.asm                   |  6 +++---
 home/scrolling_menu.asm                |  2 +-
 mobile/mobile_22.asm                   |  2 +-
 mobile/mobile_41.asm                   |  3 ++-
 mobile/mobile_46.asm                   |  2 +-
 mobile/mobile_5f.asm                   |  2 +-
 sram.asm                               |  2 +-
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm
index 867bacbb0..2307ec98a 100644
--- a/data/collision_permissions.asm
+++ b/data/collision_permissions.asm
@@ -1,7 +1,7 @@
 NONTALKABLE EQUS "db"
 TALKABLE    EQUS "db TALK +"
 
-TileCollisionTable:: ; 4ce1f
+TileCollisionTable::
 ; entries correspond to COLL_* constants
 	NONTALKABLE  LANDTILE ; COLL_FLOOR
 	NONTALKABLE  LANDTILE ; COLL_01
@@ -259,4 +259,3 @@ TileCollisionTable:: ; 4ce1f
 	NONTALKABLE  LANDTILE ; fd
 	NONTALKABLE  LANDTILE ; fe
 	NONTALKABLE  WALLTILE ; COLL_FF
-; 4cf1f
diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm
index 2bbea8028..f0949558f 100644
--- a/engine/battle/move_effects/present.asm
+++ b/engine/battle/move_effects/present.asm
@@ -32,12 +32,12 @@ BattleCommand_Present:
 .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 @@ BattleCommand_Present:
 	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 @@ BattleCommand_Present:
 	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
diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index bc7aa3292..b9686701c 100644
--- 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
diff --git a/engine/gfx/player_gfx.asm b/engine/gfx/player_gfx.asm
index 04208905a..9954143a8 100644
--- a/engine/gfx/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
@@ -72,7 +72,7 @@ ShowPlayerNamingChoices:
 
 INCLUDE "data/player_names.asm"
 
-GetPlayerNameArray: ; 88318 This Function is never called
+Unreferenced_GetPlayerNameArray:
 	ld hl, wPlayerName
 	ld de, MalePlayerNameArray
 	ld a, [wPlayerGender]
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 9d633bb3f..f269e32ad 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -925,7 +925,7 @@ INCBIN "gfx/naming_screen/middle_line.1bpp"
 NamingScreenGFX_UnderLine:
 INCBIN "gfx/naming_screen/underline.1bpp"
 
-_ComposeMailMessage: ; 11e75 (mail?)
+_ComposeMailMessage:
 	ld hl, wNamingScreenDestinationPointer
 	ld [hl], e
 	inc hl
diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm
index 613e3b099..2c4834a3d 100644
--- a/engine/overworld/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
@@ -190,7 +190,7 @@ SetFacingShadow:
 	ld [hl], FACING_SHADOW
 	ret
 
-SetFacingEmote: ; 4582 emote
+SetFacingEmote:
 	ld hl, OBJECT_FACING_STEP
 	add hl, bc
 	ld [hl], FACING_EMOTE
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 0846f01b1..d0cfd8741 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2159,7 +2159,8 @@ Function55e0::
 	jr nz, .loop
 	ret
 
-Function5602: ; 5602, called at battle start
+Function5602:
+; called at battle start
 	call Function5645 ; clear sprites
 	ld a, PLAYER
 	call Function5629 ; respawn player
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index d2de035ae..c5904e9b0 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -226,20 +226,19 @@ BillsPCDepositFuncCancel:
 	ld [wJumptableIndex], a
 	ret
 
-BillsPCDepositMenuHeader: ; 0xe253d (38:653d)
+BillsPCDepositMenuHeader:
 	db MENU_BACKUP_TILES ; flags
 	menu_coords 9, 4, SCREEN_WIDTH - 1, 13
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData: ; 0xe2545 (38:6545)
+.MenuData:
 	db STATICMENU_CURSOR ; flags
 	db 4 ; items
 	db "DEPOSIT@"
 	db "STATS@"
 	db "RELEASE@"
 	db "CANCEL@"
-; 0xe2564 (38:6564)
 
 Unreferenced_BillsPCClearThreeBoxes:
 	hlcoord 0, 0
@@ -405,7 +404,7 @@ BillsPC_Withdraw:
 	ld l, a
 	jp hl
 
-.dw ; e2699 (38:6699) #mark
+.dw
 	dw .withdraw ; Withdraw
 	dw .stats ; Stats
 	dw .release ; Release
diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm
index b7422cac4..e8f106ac4 100644
--- a/engine/printer/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
@@ -27,7 +27,7 @@ PrinterJumptableIteration:
 	ld l, a
 	jp hl
 
-.Jumptable: ; 84031 (21:4031)
+.Jumptable:
 	dw Print_InitPrinterHandshake ; 00
 	dw Printer_CheckConnectionStatus ; 01
 	dw Printer_WaitSerial ; 02
diff --git a/home/menu_window.asm b/home/menu_window.asm
index c279b8c56..49536d5f0 100644
--- a/home/menu_window.asm
+++ b/home/menu_window.asm
@@ -41,14 +41,14 @@ RestoreTileBackup::
 	ld [hli], a
 	dec de
 	dec c
-	jr nz, .col ; 0x1c3b $fa
+	jr nz, .col
 
 	pop hl
 	ld bc, SCREEN_WIDTH
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .row ; 0x1c44 $ef
+	jr nz, .row
 
 	ret
 
@@ -60,7 +60,7 @@ PopWindow::
 	ld [de], a
 	inc de
 	dec b
-	jr nz, .loop ; 0x1c50 $fa
+	jr nz, .loop
 	ret
 
 GetMenuBoxDims::
diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm
index 1662f8113..cf8e02fa8 100644
--- a/home/scrolling_menu.asm
+++ b/home/scrolling_menu.asm
@@ -40,7 +40,7 @@ InitScrollingMenu::
 	pop bc
 	jp TextBox
 
-JoyTextDelay_ForcehJoyDown:: ; 354b joypad
+JoyTextDelay_ForcehJoyDown::
 	call DelayFrame
 
 	ld a, [hInMenu]
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index f556a6291..54d79efe0 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -1035,7 +1035,7 @@ ClearScreenArea:
 	ld a, $18
 	ld [hli], a
 	dec c
-	jr nz, .asm_89713 ; 0x8971c $f5
+	jr nz, .asm_89713
 	ret
 
 Function8971f:
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index 98dfe5ebd..b96a145ad 100644
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -810,7 +810,8 @@ 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
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index 534835ac2..1f7ab27d0 100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -5130,7 +5130,7 @@ String_11a7ac:
 	db   "データ<NO>よみこみを"
 	next "ちゅうし　しますか？@"
 
-String_11a7c1: ; 11a7c1 ; new news?
+String_11a7c1:
 	db   "あたらしい　ニュースは"
 	next "ありません　でした@"
 
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index 13cb091da..675dfebc4 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -5076,7 +5076,7 @@ String_17fe63:
 	next "せつめいしょを　ごらんください"
 	db   "@"
 
-String_17fe9a: ; 17fe9a ; unused
+String_17fe9a: ; unused
 	db   "ポケモンニュースが"
 	next "あたらしくなっているので"
 	next "レポートを　おくれません"
diff --git a/sram.asm b/sram.asm
index 6e8ed950e..2cd457e61 100644
--- a/sram.asm
+++ b/sram.asm
@@ -208,7 +208,7 @@ sBattleTowerSaveFileFlags:: db
 sBattleTowerReward:: db
 
 ; team of previous trainer
-sBTMonOfTrainers:: ; 0xbe51
+sBTMonOfTrainers:: ; be51
 sBTMonPrevTrainer1:: db
 sBTMonPrevTrainer2:: db
 sBTMonPrevTrainer3:: db

From 6e44095c2aadd2f07a716db6dacfc3ce2fa83658 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 24 Jun 2018 21:45:12 -0400
Subject: [PATCH 13/13] Remove address comments in docs

---
 docs/bugs_and_glitches.md | 59 +++++++++++++++++----------------------
 docs/design_flaws.md      | 39 +++++++++++---------------
 docs/menu.md              |  8 +++---
 3 files changed, 47 insertions(+), 59 deletions(-)

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 9133923ab..786c51ab3 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -162,7 +162,7 @@ This is a bug with `DittoMetalPowder` in [engine/battle/effect_commands.asm](/en
 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 @@ BattleCommand_BellyDrum: ; 37c1a
 **Fix:**
 
 ```asm
-BattleCommand_BellyDrum: ; 37c1a
+BattleCommand_BellyDrum:
 ; bellydrum
 	callfar GetHalfMaxHP
 	callfar CheckUserHasEnoughHP
@@ -293,7 +293,7 @@ This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider
 This is a bug with `CheckHiddenOpponent` in [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
-CheckHiddenOpponent: ; 37daa
+CheckHiddenOpponent:
 ; BUG: This routine should account for Lock-On and Mind Reader.
 	ld a, BATTLE_VARS_SUBSTATUS3_OPP
 	call GetBattleVar
@@ -390,7 +390,7 @@ This is a bug in how `wAttackMissed` is never set by BeatUp, even when none of t
 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 @@ BattleCommand_BeatUpFailText: ; 355b5
 **Fix:**
 
 ```asm
-BattleCommand_BeatUpFailText: ; 355b5
+BattleCommand_BeatUpFailText:
 ; beatupfailtext
 
 	ld a, [wBeatUpHitAtLeastOnce]
@@ -428,7 +428,7 @@ This bug existed for all battles in Gold and Silver, and was only fixed for sing
 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 @@ BattleCommand_Present: ; 37874
 **Fix:**
 
 ```asm
-BattleCommand_Present: ; 37874
+BattleCommand_Present:
 ; present
 
 	push bc
@@ -484,13 +484,13 @@ This is a bug with `AI_Smart_MeanLook` in [engine/battle/ai/scoring.asm](/engine
 In [engine/battle/effect_commands.asm](/engine/battle/effect_commands.asm):
 
 ```asm
-BattleCheckTypeMatchup: ; 347c8
+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 @@ CheckTypeMatchup: ; 347d3
 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 @@ AI_HealStatus: ; 384e0
 	ld hl, wEnemySubStatus5
 	res SUBSTATUS_TOXIC, [hl]
 	ret
-; 384f7
 ```
 
 **Fix:** Uncomment `ld hl, wEnemySubStatus1` and `res SUBSTATUS_NIGHTMARE, [hl]`.
@@ -600,7 +599,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
 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 @@ CalcExpAtLevel: ; 50e47
 **Fix:**
 
 ```asm
-CalcExpAtLevel: ; 50e47
+CalcExpAtLevel:
 ; (a/b)*n**3 + c*n**2 + d*n - e
 	ld a, d
 	cp 1
@@ -821,7 +820,7 @@ This is a bug with `HaircutOrGrooming` in [engine/events/haircut.asm](/engine/ev
 
 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,14 +830,14 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e
 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
 ```
 
 **Fix:**
 
 ```asm
-HappinessData_DaisysGrooming: ; 746b
+HappinessData_DaisysGrooming:
 	db $80, 2, HAPPINESS_GROOMING ; 50% chance
 	db $ff, 2, HAPPINESS_GROOMING ; 50% chance
 ```
@@ -916,7 +915,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
 This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.asm](/engine/events/magikarp.asm):
 
 ```asm
-.BCLessThanDE: ; fbc9a
+.BCLessThanDE:
 ; Intention: Return bc < de.
 ; Reality: Return b < d.
 	ld a, b
@@ -926,7 +925,6 @@ This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.
 	ld a, c
 	cp e
 	ret
-; fbca1
 ```
 
 **Fix:** Delete `ret nc`.
@@ -939,7 +937,7 @@ This is a bug with `CalcMagikarpLength.BCLessThanDE` in [engine/events/magikarp.
 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
@@ -966,15 +964,13 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
 	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.
@@ -1108,7 +1104,7 @@ This is a bug with `DoPlayerMovement.CheckWarp` in [engine/overworld/player_move
 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
@@ -1121,7 +1117,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
 **Workaround:**
 
 ```asm
-.Cry: ; 40340
+.Cry:
 	ld a, [wCurPartySpecies]
 	call PlayMonCry
 	ret
@@ -1365,7 +1361,7 @@ This is a bug with `PokeBallEffect` in [engine/items/item_effects.asm](/engine/i
 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
@@ -1461,7 +1457,7 @@ ScriptCall:
 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.
 
@@ -1487,7 +1483,6 @@ LoadSpriteGFX: ; 14306
 	; pop bc
 	ld a, l
 	ret
-; 1431e
 ```
 
 **Fix:** Uncomment `push bc` and `pop bc`.
@@ -1498,7 +1493,7 @@ LoadSpriteGFX: ; 14306
 In [engine/overworld/wildmons.asm](/engine/overworld/wildmons.asm):
 
 ```asm
-ChooseWildEncounter: ; 2a14f
+ChooseWildEncounter:
 ...
 	ld a, b
 	ld [wCurPartyLevel], a
@@ -1513,7 +1508,7 @@ ChooseWildEncounter: ; 2a14f
 
 ...
 
-ValidateTempWildMonSpecies: ; 2a4a0
+ValidateTempWildMonSpecies:
 ; Due to a development oversight, this function is called with the wild Pokemon's level, not its species, in a.
 ```
 
@@ -1564,7 +1559,7 @@ In [engine/overworld/events.asm](/engine/overworld/events.asm):
 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,
@@ -1581,7 +1576,6 @@ CheckBugContestContestantFlag: ; 139ed
 	ld b, CHECK_FLAG
 	call EventFlagAction
 	ret
-; 139fe
 
 INCLUDE "data/events/bug_contest_flags.asm"
 ```
@@ -1594,7 +1588,7 @@ However, `a < NUM_BUG_CONTESTANTS` should always be true, so in practice this is
 In [home/init.asm](/home/init.asm):
 
 ```asm
-ClearWRAM:: ; 25a
+ClearWRAM::
 ; Wipe swappable WRAM banks (1-7)
 ; Assumes CGB or AGB
 
@@ -1611,7 +1605,6 @@ ClearWRAM:: ; 25a
 	cp 8
 	jr nc, .bank_loop ; Should be jr c
 	ret
-; 270
 ```
 
 **Fix:** Change `jr nc, .bank_loop` to `jr c, .bank_loop`.
diff --git a/docs/design_flaws.md b/docs/design_flaws.md
index 7494d5d68..3536acd9f 100644
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -28,7 +28,7 @@ ENDM
 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 @@ GLOBAL PICS_FIX
 	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
@@ -298,7 +298,7 @@ NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC
 `GetTMHMNumber` and `GetNumberedTMHM` in [engine/items/items.asm](/engine/items/items.asm) have to compensate for this:
 
 ```asm
-GetTMHMNumber:: ; d407
+GetTMHMNumber::
 ; Return the number of a TM/HM by item id c.
 	ld a, c
 ; Skip any dummy items.
@@ -315,7 +315,7 @@ GetTMHMNumber:: ; d407
 	ld c, a
 	ret
 
-GetNumberedTMHM: ; d417
+GetNumberedTMHM:
 ; Return the item id of a TM/HM by number c.
 	ld a, c
 ; Skip any gaps.
@@ -341,7 +341,7 @@ Move `ITEM_C3` and `ITEM_DC` above all the TMs in every table of item data.
 Modify engine/items/items.asm:
 
 ```asm
-GetTMHMNumber:: ; d407
+GetTMHMNumber::
 ; Return the number of a TM/HM by item id c.
 	ld a, c
 	sub TM01
@@ -349,7 +349,7 @@ GetTMHMNumber:: ; d407
 	ld c, a
 	ret
 
-GetNumberedTMHM: ; d417
+GetNumberedTMHM:
 ; Return the item id of a TM/HM by number c.
 	ld a, c
 	add TM01
@@ -366,7 +366,7 @@ GetNumberedTMHM: ; d417
 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
@@ -460,7 +460,7 @@ PokedexShow_GetDexEntryBank:
 `_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
@@ -469,11 +469,11 @@ _Sine:: ; 84d9
 `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
 ```
@@ -481,37 +481,34 @@ Sprites_Sine: ; 8e72c
 `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):
@@ -586,7 +583,7 @@ ENDM
 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
@@ -609,16 +606,14 @@ GetForestTreeFrame: ; fc54c
 .even
 	xor a
 	ret
-; fc56d
 ```
 
 **Fix:**
 
 ```asm
-GetForestTreeFrame: ; fc54c
+GetForestTreeFrame:
 ; Return 0 if a is even, or 2 if odd.
 	and 1
 	add a
 	ret
-; fc56d
 ```
diff --git a/docs/menu.md b/docs/menu.md
index 80d64ada1..67403bf15 100644
--- a/docs/menu.md
+++ b/docs/menu.md
@@ -54,8 +54,8 @@ Call state for functions in `MenuData` of `ScrollingMenu`:
 
 ```
 All of them:
-[MenuSelection] = Current item. -1 is the CANCEL item.
-[MenuSelectionQuantity] = Quantity of the current item.
+[wMenuSelection] = Current item. -1 is the CANCEL item.
+[wMenuSelectionQuantity] = Quantity of the current item.
 
 Function1: Called to display a menu entry.
 de = Cursor position in TileMap
@@ -90,7 +90,7 @@ db -1 ; cancel
 ...
 ```
 
-In case it's 1, `[MenuSelectionQuantity]` will simply contain the next entry.
+In case it's 1, `[wMenuSelectionQuantity]` will simply contain the next entry.
 
 ## `_2DMenu`
 
@@ -208,7 +208,7 @@ StringPointers:
 
 Call state for `DisplayFunction`:
 ```
-[MenuSelection] = Current item. -1 is the CANCEL item.
+[wMenuSelection] = Current item. -1 is the CANCEL item.
 de = Cursor position in TileMap
 ```