ref: 48e0125bd68054f81e97a5eec14f145dc3c921d7
parent: 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef
author: dannye <corrnondacqb@yahoo.com>
date: Sat Jun 11 21:42:19 EDT 2016
Remove some leftover address comments
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -265,6 +265,6 @@
INCLUDE "text/credits_text.asm"
-TheEndGfx: ; 7473e (1d:473e) (7473f on blue)
+TheEndGfx:
INCBIN "gfx/theend.interleave.2bpp"
TheEndGfxEnd:
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1944,7 +1944,7 @@
; 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 ; 79633 (1e:5633)
+.PlayerNextTile
ld a, [hl]
add 7
; This is a bug. The lower right corner tile of the mon back pic is blanked
@@ -1955,7 +1955,7 @@
ld a, " "
ret
-.EnemyNextTile ; 7963c (1e:563c)
+.EnemyNextTile
ld a, [hl]
sub 7
; This has the same problem as above, but it has no visible effect because
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -240,7 +240,7 @@
ld [hl], $6f ; ← (halfarrow ending)
ret
-PTile: ; 12adc (4:6adc) ; This is a single 1bpp "P" tile
+PTile: ; This is a single 1bpp "P" tile
INCBIN "gfx/p_tile.1bpp"
PTileEnd:
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -350,7 +350,7 @@
ld [wMonPartySpriteSpecies], a
jr WriteMonPartySpriteOAMBySpecies
-.LoadTilePatterns ; 718ac (1c:58ac)
+.LoadTilePatterns
push hl
add a
ld c, a
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -184,7 +184,7 @@
ld [wMaxMenuItem], a
jp HandleMenuInput
-.namestring ; 6aa3 (1:6aa3)
+.namestring
db "NAME@"
IF DEF(_RED)
--- a/engine/predefs12.asm
+++ b/engine/predefs12.asm
@@ -29,7 +29,7 @@
ld [wDisableVBlankWYUpdate], a
ret
-.MutateWY ; 48119 (12:4119)
+.MutateWY
ld a, [$ff96]
xor b
ld [$ff96], a
@@ -57,7 +57,7 @@
ld [rWX], a
ret
-.MutateWX ; 4813f (12:413f)
+.MutateWX
ld a, [$ff97]
xor b
ld [$ff97], a
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -110,7 +110,7 @@
jr .next
-.tileScreenCopyrightTiles ; 437f (1:437f)
+.tileScreenCopyrightTiles
db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc.
.next
--- a/engine/titlescreen2.asm
+++ b/engine/titlescreen2.asm
@@ -67,7 +67,7 @@
pop bc
jr _TitleScroll
-.ScrollBetween ; 37292 (d:7292)
+.ScrollBetween
.wait
ld a, [rLY] ; rLY
cp l
--- a/home/text.asm
+++ b/home/text.asm
@@ -144,42 +144,42 @@
ld de,wPlayerName
jr FinishDTE
-Char53:: ; 19ff (0:19ff) ; rival’s name
+Char53:: ; rival’s name
push de
ld de,wRivalName
jr FinishDTE
-Char5D:: ; 1a05 (0:1a05) ; TRAINER
+Char5D:: ; TRAINER
push de
ld de,Char5DText
jr FinishDTE
-Char5C:: ; 1a0b (0:1a0b) ; TM
+Char5C:: ; TM
push de
ld de,Char5CText
jr FinishDTE
-Char5B:: ; 1a11 (0:1a11) ; PC
+Char5B:: ; PC
push de
ld de,Char5BText
jr FinishDTE
-Char5E:: ; 1a17 (0:1a17) ; ROCKET
+Char5E:: ; ROCKET
push de
ld de,Char5EText
jr FinishDTE
-Char54:: ; 1a1d (0:1a1d) ; POKé
+Char54:: ; POKé
push de
ld de,Char54Text
jr FinishDTE
-Char56:: ; 1a23 (0:1a23) ; ……
+Char56:: ; ……
push de
ld de,Char56Text
jr FinishDTE
-Char4A:: ; 1a29 (0:1a29) ; PKMN
+Char4A:: ; PKMN
push de
ld de,Char4AText
jr FinishDTE
--- a/main.asm
+++ b/main.asm
@@ -204,7 +204,7 @@
cp $e ; test for overflow (back at $0e)
jr nz, .spriteLoop
ret
-.updateCurrentSprite ; 4c54 (1:4c54)
+.updateCurrentSprite
cp $1
jp nz, UpdateNonPlayerSprite
jp UpdatePlayerSprite
@@ -1701,19 +1701,19 @@
db 4,3,0
dw .NoYesMenu
-.NoYesMenu ; 7699 (1:3699)
+.NoYesMenu
db "NO",$4E,"YES@"
-.YesNoMenu ; 76a0 (1:36a0)
+.YesNoMenu
db "YES",$4E,"NO@"
-.NorthWestMenu ; 76a7 (1:36a7)
+.NorthWestMenu
db "NORTH",$4E,"WEST@"
-.SouthEastMenu ; 76b2 (1:36b2)
+.SouthEastMenu
db "SOUTH",$4E,"EAST@"
-.NorthEastMenu ; 76bd (1:36bd)
+.NorthEastMenu
db "NORTH",$4E,"EAST@"
-.TradeCancelMenu ; 76c8 (1:36c8)
+.TradeCancelMenu
db "TRADE",$4E,"CANCEL@"
-.HealCancelMenu ; 76d5 (1:36d5)
+.HealCancelMenu
db "HEAL",$4E,"CANCEL@"
DisplayFieldMoveMonMenu:
@@ -3032,7 +3032,7 @@
; call .DrawBadgeRow
; ret
-.DrawBadgeRow ; ea4c (3:6a4c)
+.DrawBadgeRow
; Draw 4 badges.
ld c, 4
--- a/scripts/celadonmansion3.asm
+++ b/scripts/celadonmansion3.asm
@@ -41,7 +41,7 @@
call PrintText
jp TextScriptEnd
-.GameDesigner ; 487d0 (12:47d0)
+.GameDesigner
TX_FAR _GameDesignerText
db "@"
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -5,7 +5,7 @@
dw RedsHouse1FText1
dw RedsHouse1FText2
-RedsHouse1FText1: ; 4816f (12:416f) Mom
+RedsHouse1FText1: ; Mom
TX_ASM
ld a, [wd72e]
bit 3, a
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -37,7 +37,7 @@
ld [wCurMapScript], a
ret
-RocketHideout4ScriptPointers: ; 454ae (11:54ae)c
+RocketHideout4ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
--- a/text/credits_text.asm
+++ b/text/credits_text.asm
@@ -64,7 +64,7 @@
dw CredClub
dw CredPAAD
-CredVersion: ; 74343 (1d:4343) ; this 1 byte difference makes all bank addresses offset by 1 in the blue version
+CredVersion: ; this 1 byte difference makes all bank addresses offset by 1 in the blue version
IF DEF(_RED)
db -8, "RED VERSION STAFF@"
ENDC