Remove all address comments

1 files changed, 57 insertions, 66 deletions

diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index 850096705..969baf34b 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -1,7 +1,7 @@
 MobileAdapterGFX::
 INCBIN "gfx/mobile/mobile_adapter.2bpp"
 
-Function17a68f:: ; 17a68f (5e:668f)
+Function17a68f::
 	call Function17a6a8
 	call Function17a751
 	ld hl, $d088
@@ -18,7 +18,7 @@ Function17a68f:: ; 17a68f (5e:668f)
 	scf
 	ret
 
-Function17a6a8: ; 17a6a8 (5e:66a8)
+Function17a6a8:
 	push de
 	push bc
 	ld hl, wStringBuffer2 ; $d086
@@ -49,7 +49,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
 	call DelayFrame
 	ret
 
-Function17a6f5: ; 17a6f5 (5e:66f5)
+Function17a6f5:
 	ld hl, wBuffer1
 	ld c, $0
 	ld b, $8
@@ -69,7 +69,7 @@ Function17a6f5: ; 17a6f5 (5e:66f5)
 	ld [$d08c], a
 	ret
 
-Function17a713: ; 17a713 (5e:6713)
+Function17a713:
 	and $f
 	cp $a
 	jr nc, .asm_17a71d
@@ -83,7 +83,7 @@ Function17a713: ; 17a713 (5e:6713)
 	scf
 	ret
 
-Function17a721: ; 17a721 (5e:6721)
+Function17a721:
 	push de
 	ld h, d
 	ld l, e
@@ -121,7 +121,7 @@ Function17a721: ; 17a721 (5e:6721)
 	ld [de], a
 	ret
 
-Function17a751: ; 17a751 (5e:6751)
+Function17a751:
 	xor a
 	ld [$d087], a
 .asm_17a755
@@ -137,7 +137,7 @@ Function17a751: ; 17a751 (5e:6751)
 	jr z, .asm_17a755
 	ret
 
-Function17a770: ; 17a770 (5e:6770)
+Function17a770:
 	ld a, [hOAMUpdate]
 	push af
 	ld a, $1
@@ -148,7 +148,7 @@ Function17a770: ; 17a770 (5e:6770)
 	ld [hOAMUpdate], a
 	ret
 
-Function17a781: ; 17a781 (5e:6781)
+Function17a781:
 	ld a, [hInMenu]
 	push af
 	ld a, $1
@@ -158,7 +158,7 @@ Function17a781: ; 17a781 (5e:6781)
 	ld [hInMenu], a
 	ret
 
-Function17a78f: ; 17a78f (5e:678f)
+Function17a78f:
 	ld hl, $d088
 	bit 7, [hl]
 	res 7, [hl]
@@ -169,21 +169,20 @@ Function17a78f: ; 17a78f (5e:678f)
 .asm_17a79f
 	farcall ReloadMapPart
 	ret
-; 17a7a6 (5e:67a6)
 
-Function17a7a6: ; 17a7a6
+Function17a7a6:
 	ld a, [$d087]
 	inc a
 	ld [$d087], a
 	ret
 
-Function17a7ae: ; 17a7ae (5e:67ae)
+Function17a7ae:
 	ld a, [$d087]
 	ld hl, Jumptable_17a7b6
 	rst JumpTable
 	ret
 
-Jumptable_17a7b6: ; 17a7b6 (5e:67b6)
+Jumptable_17a7b6:
 	dw Function17a7c2
 	dw Function17a7cd
 	dw Function17a7d8
@@ -192,21 +191,21 @@ Jumptable_17a7b6: ; 17a7b6 (5e:67b6)
 	dw Function17a7f4
 
 
-Function17a7c2: ; 17a7c2 (5e:67c2)
+Function17a7c2:
 	ld a, $4
 	call Function17aad3
 	ld a, $1
 	ld [$d087], a
 	ret
 
-Function17a7cd: ; 17a7cd (5e:67cd)
+Function17a7cd:
 	call Function17a83c
 	call Function17a8ae
 	ret c
 	call Function17a848
 	ret
 
-Function17a7d8: ; 17a7d8 (5e:67d8)
+Function17a7d8:
 	call Function17a83c
 	call Function17a848
 	ld hl, $d08b
@@ -220,7 +219,7 @@ Function17a7d8: ; 17a7d8 (5e:67d8)
 	ld [$d087], a
 	ret
 
-Function17a7f4: ; 17a7f4 (5e:67f4)
+Function17a7f4:
 	ld hl, $d08b
 	dec [hl]
 	ret nz
@@ -228,7 +227,7 @@ Function17a7f4: ; 17a7f4 (5e:67f4)
 	set 7, [hl]
 	ret
 
-Function17a7ff: ; 17a7ff (5e:67ff)
+Function17a7ff:
 	ld hl, $d08b
 	dec [hl]
 	ret nz
@@ -242,7 +241,7 @@ Function17a7ff: ; 17a7ff (5e:67ff)
 	set 7, [hl]
 	ret
 
-Function17a81a: ; 17a81a (5e:681a)
+Function17a81a:
 	call IsSFXPlaying
 	ret nc
 	ld a, [hJoyPressed]
@@ -259,7 +258,7 @@ Function17a81a: ; 17a81a (5e:681a)
 	ld [$d087], a
 	ret
 
-Function17a83c: ; 17a83c (5e:683c)
+Function17a83c:
 	ld a, [hJoyLast]
 	and $f0
 	ld c, a
@@ -269,7 +268,7 @@ Function17a83c: ; 17a83c (5e:683c)
 	ld c, a
 	ret
 
-Function17a848: ; 17a848 (5e:6848)
+Function17a848:
 	ld a, c
 	and $60
 	cp $60
@@ -345,7 +344,7 @@ Function17a848: ; 17a848 (5e:6848)
 	scf
 	ret
 
-Function17a8ae: ; 17a8ae (5e:68ae)
+Function17a8ae:
 	bit 1, c
 	jr nz, .asm_17a8bc
 	bit 0, c
@@ -377,7 +376,7 @@ Function17a8ae: ; 17a8ae (5e:68ae)
 	scf
 	ret
 
-Function17a8de: ; 17a8de (5e:68de)
+Function17a8de:
 	ld a, $2
 	call Function17aae0
 	ld a, [hl]
@@ -414,7 +413,7 @@ Function17a8de: ; 17a8de (5e:68de)
 	call Function17aa88
 	ret
 
-Function17a91e: ; 17a91e (5e:691e)
+Function17a91e:
 	ld a, [$d08c]
 	cp $7
 	jr c, .asm_17a92c
@@ -435,7 +434,7 @@ Function17a91e: ; 17a91e (5e:691e)
 	scf
 	ret
 
-Function17a943: ; 17a943 (5e:6943)
+Function17a943:
 	ld a, [$d08c]
 	and a
 	jr z, .asm_17a95d
@@ -457,7 +456,7 @@ Function17a943: ; 17a943 (5e:6943)
 	xor a
 	ret
 
-Function17a964: ; 17a964 (5e:6964)
+Function17a964:
 	ld a, [$d08c]
 	cp $10
 	jr nc, .asm_17a979
@@ -475,7 +474,7 @@ Function17a964: ; 17a964 (5e:6964)
 	scf
 	ret
 
-Function17a97b: ; 17a97b (5e:697b)
+Function17a97b:
 	hlcoord 1, 1
 	lb bc, 2, 18
 	call ClearBox
@@ -499,7 +498,7 @@ Function17a97b: ; 17a97b (5e:697b)
 .asm_17a99d
 	ret
 
-Function17a99e: ; 17a99e (5e:699e)
+Function17a99e:
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
@@ -508,15 +507,13 @@ Function17a99e: ; 17a99e (5e:699e)
 	ld de, String_17a9b2
 	call PlaceString
 	ret
-; 17a9b2 (5e:69b2)
 
-String_17a9b2: ; 17a9b2
+String_17a9b2:
 	db   "でんわばんごうが　ただしく"
 	next "はいって　いません！"
 	db   "@"
-; 17a9cb
 
-Function17a9cb: ; 17a9cb (5e:69cb)
+Function17a9cb:
 	ld de, wVirtualOAM ; $c400
 	ld hl, $d088
 	bit 6, [hl]
@@ -530,7 +527,7 @@ Function17a9cb: ; 17a9cb (5e:69cb)
 	call Function17a9e3
 	ret
 
-Function17a9e3: ; 17a9e3 (5e:69e3)
+Function17a9e3:
 	ld a, $3
 	ld [$d08e], a
 	ld hl, Unknown_17aa77
@@ -540,7 +537,7 @@ Function17a9e3: ; 17a9e3 (5e:69e3)
 	call Function17aa4a
 	ret
 
-Function17a9f5: ; 17a9f5 (5e:69f5)
+Function17a9f5:
 	ld a, [$d08c]
 	cp $10
 	ret nc
@@ -564,7 +561,7 @@ Function17a9f5: ; 17a9f5 (5e:69f5)
 	call Function17aa4a
 	ret
 
-Function17aa22: ; 17aa22 (5e:6a22)
+Function17aa22:
 	ld a, $0
 	ld [$d08e], a
 	push de
@@ -590,7 +587,7 @@ Function17aa22: ; 17aa22 (5e:6a22)
 	call Function17aa4a
 	ret
 
-Function17aa4a: ; 17aa4a (5e:6a4a)
+Function17aa4a:
 	ld [$d08d], a
 	ld a, b
 	add $8
@@ -623,33 +620,30 @@ Function17aa4a: ; 17aa4a (5e:6a4a)
 	dec a
 	jr nz, .loop
 	ret
-; 17aa72 (5e:6a72)
 
-Unknown_17aa72: ; 17aa72
+Unknown_17aa72:
 	db 1
 	db 0, 0, 0, 0
-; 17aa77
 
-Unknown_17aa77: ; 17aa77
+Unknown_17aa77:
 	db 4
 	db 0, 0, 0, 0
 	db 0, 8, 1, 0
 	db 8, 0, 2, 0
 	db 8, 8, 3, 0
-; 17aa88
 
-Function17aa88: ; 17aa88 (5e:6a88)
+Function17aa88:
 	jr c, asm_17aa91
 	ld de, SFX_SWITCH_POKEMON
 	call PlaySFX
 	ret
 
-asm_17aa91: ; 17aa91 (5e:6a91)
+asm_17aa91:
 	ld de, SFX_WRONG
 	call PlaySFX
 	ret
 
-Function17aa98: ; 17aa98 (5e:6a98)
+Function17aa98:
 	ld a, $5
 	ld [$d08b], a
 	call Function17aaa9
@@ -658,7 +652,7 @@ Function17aa98: ; 17aa98 (5e:6a98)
 	set 7, [hl]
 	ret
 
-Function17aaa9: ; 17aaa9 (5e:6aa9)
+Function17aaa9:
 	ld a, $3
 	call Function17aae3
 	ld c, a
@@ -673,7 +667,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
 	call AddNTimes
 	ret
 
-Function17aac3: ; 17aac3 (5e:6ac3)
+Function17aac3:
 	ld a, $b
 	push hl
 	ld [hli], a
@@ -685,24 +679,24 @@ Function17aac3: ; 17aac3 (5e:6ac3)
 	ld [hli], a
 	ret
 
-Function17aad0: ; 17aad0 (5e:6ad0)
+Function17aad0:
 	call Function17aae0
 
-Function17aad3: ; 17aad3 (5e:6ad3)
+Function17aad3:
 	ld [$d089], a
 	ret
 
-Function17aad7: ; 17aad7 (5e:6ad7)
+Function17aad7:
 	push af
 	ld a, [$d089]
 	ld [$d08a], a
 	pop af
 	ret
 
-Function17aae0: ; 17aae0 (5e:6ae0)
+Function17aae0:
 	call Function17aad7
 
-Function17aae3: ; 17aae3 (5e:6ae3)
+Function17aae3:
 	push af
 	ld a, [$d08a]
 	ld bc, $d
@@ -714,9 +708,8 @@ Function17aae3: ; 17aae3 (5e:6ae3)
 	add hl, bc
 	ld a, [hl]
 	ret
-; 17aaf7 (5e:6af7)
 
-Unknown_17aaf7: ; 17aaf7
+Unknown_17aaf7:
 	db $0, $0, $1, $6, $5, $9, $3, $2, $1, $2, $1, $2, $4
 	db $0, $0, $2, $9, $5, $a, $4, $0, $2, $a, $a, $3, $5
 	db $0, $0, $3, $c, $5, $b, $5, $1, $0, $1, $0, $4, $0
@@ -730,9 +723,8 @@ Unknown_17aaf7: ; 17aaf7
 	db $0, $0, $0, $9, $e, $7, $1, $9, $b, $6, $8, $1, $1
 	db $0, $0,$f1, $c, $e, $8, $2, $a, $c, $7, $c, $2, $c
 	db $0, $0,$f0,$10, $e, $c, $c, $b, $9, $b, $9, $b, $9
-; 17aba0
 
-Function17aba0: ; 17aba0 (5e:6ba0)
+Function17aba0:
 	ld a, [rVBK]
 	push af
 	ld a, $1
@@ -757,7 +749,7 @@ Function17aba0: ; 17aba0 (5e:6ba0)
 	call Get2bpp
 	ret
 
-Function17abcf: ; 17abcf (5e:6bcf)
+Function17abcf:
 	ld a, [rSVBK]
 	push af
 	ld a, BANK(wBGPals1)
@@ -788,7 +780,7 @@ Function17abcf: ; 17abcf (5e:6bcf)
 	ld [rSVBK], a
 	ret
 
-Function17ac0c: ; 17ac0c (5e:6c0c)
+Function17ac0c:
 	call Function17ac1d
 	call Function17ac2a
 	hlcoord 0, 0
@@ -797,14 +789,14 @@ Function17ac0c: ; 17ac0c (5e:6c0c)
 	call Function17ac46
 	ret
 
-Function17ac1d: ; 17ac1d (5e:6c1d)
+Function17ac1d:
 	ld hl, Tilemap_17acd5
 	decoord 0, 4
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
 	call CopyBytes
 	ret
 
-Function17ac2a: ; 17ac2a (5e:6c2a)
+Function17ac2a:
 	ld hl, Tilemap_17ae3d
 	decoord 0, 4, wAttrMap
 	ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
@@ -821,7 +813,7 @@ Function17ac2a: ; 17ac2a (5e:6c2a)
 	jr nz, .loop
 	ret
 
-Function17ac46: ; 17ac46 (5e:6c46)
+Function17ac46:
 	ld a, [$d088]
 	bit 4, a
 	jr nz, .bit_4_set
@@ -831,9 +823,8 @@ Function17ac46: ; 17ac46 (5e:6c46)
 .bit_4_set
 	call Function3eea
 	ret
-; 17ac55 (5e:6c55)
 
-Palette_17ac55: ; 17ac55
+Palette_17ac55:
 	RGB  0,  0,  0
 	RGB  9, 10, 25
 	RGB 16, 19, 31
@@ -874,7 +865,7 @@ Palette_17ac55: ; 17ac55
 	RGB  0,  0,  0
 	RGB  0,  0,  0
 
-Palette_17ac95: ; 17ac95
+Palette_17ac95:
 	RGB 31, 31, 31
 	RGB  4,  3,  3
 	RGB 31, 13,  0
@@ -915,11 +906,11 @@ Palette_17ac95: ; 17ac95
 	RGB 27, 31,  0
 	RGB 31, 31,  0
 
-Tilemap_17acd5: ; 17acd5
+Tilemap_17acd5:
 INCBIN "gfx/unknown/17acd5.tilemap"
 
-Tilemap_17ae3d: ; 17ae3d
+Tilemap_17ae3d:
 INCBIN "gfx/unknown/17ae3d.tilemap"
 
-GFX_17afa5:: ; 17afa5
+GFX_17afa5::
 INCBIN "gfx/unknown/17afa5.2bpp"