Merge branch 'master' of https://github.com/pret/pokered into merge-pokered

8 files changed, 17 insertions, 17 deletions

diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 31d11677..d18ebca5 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -319,7 +319,7 @@ INCLUDE "data/credits_order.asm"
 
 INCLUDE "text/credits_text.asm"
 
-TheEndGfx: ; 7473e (1d:473e) (7473f on blue)
+TheEndGfx:
 	INCBIN "gfx/theend.interleave.2bpp"
 TheEndGfxEnd:
 
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 31148392..0d93b295 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -2040,7 +2040,7 @@ _AnimationSlideMonOff:
 ; functions below catch it by checking if the tile number is within the valid
 ; range and if not, replacing it with a blank tile.
 
-.PlayerNextTile ; 79702 (1e:5702)
+.PlayerNextTile
 	ld a, [hl]
 	add 7
 ; bugfix: compares against the max tile + 1 as opposed to the max tile
@@ -2049,7 +2049,7 @@ _AnimationSlideMonOff:
 	ld a, " "
 	ret
 
-.EnemyNextTile ; 7970b (1e:570b)
+.EnemyNextTile
 	ld a, [hl]
 	sub 7
 ; This has the same problem as above, but it has no visible effect because
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 932d206a..9a007fb1 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -257,7 +257,7 @@ DrawLineBox:
 	ld [hl], $6f ; ← (halfarrow ending)
 	ret
 
-PTile: ; 11682 (4:5682) ; This is a single 1bpp "P" tile
+PTile: ; This is a single 1bpp "P" tile
 	INCBIN "gfx/p_tile.1bpp"
 PTileEnd:
 
diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm
index 2e588aa4..6f17f876 100755
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -372,7 +372,7 @@ UnusedPartyMonSpriteFunction:
 	ld [wMonPartySpriteSpecies], a
 	jr WriteMonPartySpriteOAMBySpecies
 
-.LoadTilePatterns ; 71959 (1c:5959)
+.LoadTilePatterns
 	push hl
 	add a
 	ld c, a
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 122803fa..80f1bafc 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -184,7 +184,7 @@ DisplayIntroNameTextBox:
 	ld [wMaxMenuItem], a
 	jp HandleMenuInput
 
-.namestring ; 6822 (1:6822)
+.namestring
 	db "NAME@"
 
 DefaultNamesPlayer:
diff --git a/engine/predefsA.asm b/engine/predefsA.asm
index b8384150..eb28b646 100644
--- a/engine/predefsA.asm
+++ b/engine/predefsA.asm
@@ -31,7 +31,7 @@ PredefShakeScreenVertically:
 	ld [wDisableVBlankWYUpdate], a
 	ret
 
-.MutateWY ; 2bd81 (a:7d81)
+.MutateWY
 	ld a, [$ff96]
 	xor b
 	ld [$ff96], a
@@ -59,7 +59,7 @@ PredefShakeScreenHorizontally:
 	ld [rWX], a
 	ret
 
-.MutateWX ; 2bda7 (a:4da7)
+.MutateWX
 	ld a, [$ff97]
 	xor b
 	ld [$ff97], a
diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm
index 92282b83..2a1bf0dc 100755
--- a/engine/titlescreen2.asm
+++ b/engine/titlescreen2.asm
@@ -69,7 +69,7 @@ _TitleScroll:
 	pop bc
 	jr _TitleScroll
 
-.ScrollBetween ; 374ec (d:74ec)
+.ScrollBetween
 .wait
 	ld a, [rLY] ; rLY
 	cp l
diff --git a/home/text.asm b/home/text.asm
index 43c1631a..629032d5 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -134,42 +134,42 @@ Char52:: ; 17c7 (0:17c7) ; player’s name
 	ld de, wPlayerName
 	jr FinishDTE
 
-Char53:: ; 17cd (0:17cd) ; rival’s name
+Char53:: ; rival’s name
 	push de
 	ld de, wRivalName
 	jr FinishDTE
 
-Char5D:: ; 17d3 (0:17d3) ; TRAINER
+Char5D:: ; TRAINER
 	push de
 	ld de, Char5DText
 	jr FinishDTE
 
-Char5C:: ; 17d9 (0:17d9) ; TM
+Char5C:: ; TM
 	push de
 	ld de, Char5CText
 	jr FinishDTE
 
-Char5B:: ; 17df (0:17df) ; PC
+Char5B:: ; PC
 	push de
 	ld de, Char5BText
 	jr FinishDTE
 
-Char5E:: ; 17e5 (0:17e5) ; ROCKET
+Char5E:: ; ROCKET
 	push de
 	ld de, Char5EText
 	jr FinishDTE
 
-Char54:: ; 17eb (0:17eb) ; POKé
+Char54:: ; POKé
 	push de
 	ld de, Char54Text
 	jr FinishDTE
 
-Char56:: ; 17f1 (0:17f1) ; ……
+Char56:: ; ……
 	push de
 	ld de, Char56Text
 	jr FinishDTE
 
-Char4A:: ; 17f7 (0:17f7) ; PKMN
+Char4A:: ; PKMN
 	push de
 	ld de, Char4AText
 	jr FinishDTE