Remove more address comments

constants/pokemon_constants.asm

@@ -192,8 +192,3 @@
 	const MON_MADATSUBOMI ; bc BELLSPROUT
 	const MON_UTSUDON     ; bd WEEPINBELL
 	const MON_UTSUBOT     ; be VICTREEBEL
-
-; LEAFY isn't in the table at 10:4B70
-; and its ID 0xFB will be found at
-; 10:4117 (index 0x4A7 + 1 % 0x100 = 0xA8)
-MON_LEAFY EQU MON_NIDORINA

data/pokemon/evos_attacks_pointers.inc

@@ -252,4 +252,3 @@ EvosAttacksPointers::
 	dw BuluEvosAttacks
 	dw TailEvosAttacks
 	dw LeafyEvosAttacks
-; 42689

data/types/type_matchups.asm

@@ -110,4 +110,3 @@ TypeMatchups:
 	db TYPE_NORMAL,  TYPE_GHOST,   NO_EFFECT
 
 	db -1 ; end
-; 3519b

data/wild.asm

@@ -642,4 +642,3 @@ endc
 	db 5, DEX_PIKACHU
 
 	db -1 ; end
-; f:6e3e

engine/battle_anims/bg_effects.asm

@@ -174,7 +174,6 @@ BattleBGEffect_FlashInverted:
 .inverted
 	db %11100100
 	db %00011011
-; c80f3
 
 BattleBGEffect_FlashWhite:
 	ld de, .white
@@ -184,7 +183,6 @@ BattleBGEffect_FlashWhite:
 .white
 	db %11100100
 	db %00000000
-; c80fb
 
 BattleBGEffect_FlashContinue:
 ; current timer, flash duration, number of flashes
@@ -240,7 +238,6 @@ BattleBGEffect_WhiteHues:
 	db %11100000
 	db %11010000
 	db -1
-; c8141
 
 BattleBGEffect_BlackHues:
 	ld de, .Pals
@@ -258,7 +255,6 @@ BattleBGEffect_BlackHues:
 	db %11110100
 	db %11111000
 	db -1
-; c8155
 
 BattleBGEffect_AlternateHues:
 	ld de, .Pals
@@ -282,7 +278,6 @@ BattleBGEffect_AlternateHues:
 	db %01000000
 	db %10010000
 	db -2
-; c8171
 
 BattleBGEffect_06:
 	call BattleBGEffects_CheckSGB
@@ -306,7 +301,6 @@ BattleBGEffect_06:
 	db %11110000
 	db %11000000
 	db -2
-; c818b
 
 BattleBGEffect_07:
 	call BattleBGEffects_CheckSGB
@@ -330,7 +324,6 @@ BattleBGEffect_07:
 	db %11110000
 	db %11001100
 	db -2
-; c81a5
 
 BattleBGEffect_08:
 	ld de, .Pals
@@ -343,7 +336,6 @@ BattleBGEffect_08:
 	db %01100011
 	db %10000111
 	db -2
-; c81b3
 
 BattleBGEffect_HideMon:
 	call BattleBGEffects_AnonJumptable
@@ -409,7 +401,6 @@ BattleBGEffect_ShowMon:
 .EnemyData:
 	db  3, $00, 3
 	db -1
-; c8214
 
 BattleBGEffect_FeetFollow:
 	call BattleBGEffects_AnonJumptable
@@ -664,7 +655,6 @@ BattleBGEffect_EnterMon:
 	db  4, $00, 4
 	db  3, $00, 3
 	db -1
-; c83a8
 
 BattleBGEffect_ReturnMon:
 	call BGEffect_CheckBattleTurn
@@ -700,7 +690,6 @@ BattleBGEffect_ReturnMon:
 	db -2, $33, 5
 	db -3, $00, 0
 	db -1
-; c83ed
 
 BattleBGEffect_RunPicResizeScript:
 	call BattleBGEffects_AnonJumptable
@@ -903,7 +892,6 @@ ENDM
 	db $00, $15, $2a
 	db $03, $18, $2d
 	db $06, $1b, $30
-; c8545
 
 BattleBGEffect_Surf:
 	call BattleBGEffects_AnonJumptable
@@ -1764,7 +1752,6 @@ BattleBGEffect_2a:
 .data
 	db $00, $40, $90, $e4
 	db -1
-; c8acc
 
 BattleBGEffect_2b:
 	call BattleBGEffects_AnonJumptable
@@ -1892,7 +1879,6 @@ BattleBGEffect_1c:
 	db $90, $f8
 	db $40, $fc
 	db $90, $f8
-; c8be8
 
 BattleBGEffect_RapidFlash:
 	ld de, .FlashPals
@@ -1901,7 +1887,6 @@ BattleBGEffect_RapidFlash:
 
 .FlashPals:
 	db $e4, $6c, $fe
-; c8bf2
 
 BattleBGEffect_16:
 	ld de, .Pals
@@ -1910,7 +1895,6 @@ BattleBGEffect_16:
 
 .Pals:
 	db $e4, $90, $40, $ff
-; c8bfd
 
 BattleBGEffect_17:
 	ld de, .Pals
@@ -1919,7 +1903,6 @@ BattleBGEffect_17:
 
 .Pals:
 	db $e4, $f8, $fc, $ff
-; c8c08
 
 BattleBGEffect_18:
 	ld de, .Pals
@@ -1928,7 +1911,6 @@ BattleBGEffect_18:
 
 .Pals:
 	db $e4, $90, $40, $90, $fe
-; c8c14
 
 BattleBGEffect_19:
 	ld de, .Pals
@@ -1937,7 +1919,6 @@ BattleBGEffect_19:
 
 .Pals:
 	db $e4, $f8, $fc, $f8, $fe
-; c8c20
 
 BattleBGEffect_1a:
 	ld de, .Pals
@@ -1946,7 +1927,6 @@ BattleBGEffect_1a:
 
 .Pals:
 	db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
-; c8c30
 
 BattleBGEffect_1b:
 	ld de, .Pals
@@ -1955,7 +1935,6 @@ BattleBGEffect_1b:
 
 .Pals:
 	db $e4, $fc, $e4, $00, $fe
-; c8c3c
 
 BattleBGEffect_1d:
 	ld de, .Pals
@@ -1964,7 +1943,6 @@ BattleBGEffect_1d:
 
 .Pals:
 	db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
-; c8c55
 
 BattleBGEffect_1e:
 	ld de, .Pals
@@ -1973,7 +1951,6 @@ BattleBGEffect_1e:
 
 .Pals:
 	db $00, $40, $90, $e4, $ff
-; c8c61
 
 BattleBGEffect_2e:
 	call Functionc8d0b
@@ -2372,5 +2349,3 @@ BattleBGEffects_Cosine:
 	callab BattleAnim_Cosine_e
 	ld a, e
 	ret
-
-; c906f (32:506f)

engine/dumps/bank03.asm

@@ -17,8 +17,6 @@ Functionc77d:
 	ld e, a
 	ret
 
-; 03:4791
-
 SECTION "engine/dumps/bank03.asm@SpawnPoints", ROMX
 ; Map, Warp ID
 SpawnPoints:
@@ -115,8 +113,6 @@ SpawnPoints:
 	db $ff, $ff
 	db $ff, $ff
 
-; 03:488d
-
 
 SECTION "engine/dumps/bank03.asm@Functionc9c1", ROMX
 

engine/intro.asm

@@ -796,5 +796,3 @@ GameStartSprites:
 	db $50, $50, $01
 	db $58, $48, $02
 	db $58, $50, $03
-
-; 5D8C

engine/math/math.asm

@@ -86,8 +86,6 @@ _Multiply::
 	ldh [hProduct + 0], a
 
 	ret
-; 6870
-
 
 _Divide::
 	xor a
@@ -197,4 +195,3 @@ _Divide::
 	ldh [hDividend + 0], a
 
 	ret
-; 68f3

engine/menu/debug_menu.asm

@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
 
 SECTION "engine/menu/debug_menu.asm", ROMX
 
-DebugMenu:: ; $4031
+DebugMenu::
 	call ClearTileMap
 	call ClearWindowData
 	call LoadFont
@@ -105,5 +105,3 @@ DebugMenuOptionName::
 	ld a, $e4
 	ldh [rBGP], a
 	jp DebugMenu
-
-; 40FD

engine/menu/main_menu.asm

@@ -292,5 +292,3 @@ StartNewGame::
 	jp z, DemoStart
 	call DebugSetUpPlayer
 	jp IntroCleanup
-
-; 558D

engine/menu/set_time.asm

@@ -79,5 +79,3 @@ Textdbb6c:
 	deciram wStartMinute, 1, 2
 	text "　ふん？"
 	done
-
-; 36:7b98

engine/menu/start_menu.asm

@@ -345,7 +345,6 @@ DrawBackpack:
 	call DrawTextBox
 	ret
 
-; 04:600C
 	ld hl, wVramState
 	set 0, [hl]
 	call ExitMenu
@@ -993,7 +992,7 @@ PartyHeldItem:
 	call .PartyTryRecieveItem
 	call CloseWindow
 	jr .jump
-.close; 04:65B3
+.close
 	call CloseWindow
 .jump
 	jp HandleSelectedPokemon
@@ -1175,7 +1174,7 @@ ItemPrompt6753:
 	dw wcd11
 	text "は　@"
 
-.UnusedText5; 04:675A
+.UnusedText5:
 	db 1
 	dw wStringBuffer1
 	text "を"

engine/menu/text_entry.asm

@@ -206,8 +206,8 @@ GetNamingScreenSetup:
 	ret
 
 NamingScreen_InitText:
-; fills the tilemap with ■, then clears a 12x17 box at 1,1
-; next it places the tiles at 04:58B3 onto the screen at 2,9 (tiles form an 11x8 box)
+; fills the tilemap with "■", then clears a 12x17 box at 1,1
+; next it places the tiles at TextEntryChars in a 11x8 box at 2,9
 	call WaitForAutoBgMapTransfer
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -437,7 +437,7 @@ NamingScreenJoypadLoop:
 LetterOffsetsTable1:
 	db $00, $08, $10, $18, $20, $30, $38, $40, $48, $50, $60, $68, $70, $78, $80
 
-LetterOffsetsTable2:; 04:56ED
+LetterOffsetsTable2:
 	db $00, $08, $10, $18, $20, $28, $30, $38
 
 NamingScreenTryAddCharacter:
@@ -701,7 +701,7 @@ ComposeMailMessage:
 	ldh [hMapAnims], a
 	ret
 
-.firstruncheck; 04:5A1B
+.firstruncheck
 	ld hl, wFlyDestination
 	ld a, [hl]
 	and 1
@@ -863,7 +863,7 @@ DoMailEntry:
 	inc [hl]
 	ret
 
-.processjoypad; 04:5B51
+.processjoypad
 	ld hl, hJoypadSum
 	ld a, [hl]
 	and A_BUTTON

engine/title.asm

@@ -3,22 +3,22 @@ INCLUDE "constants.asm"
 SECTION "engine/title.asm@Title screen", ROMX
 
 IntroSequence::
-	callab GameFreakIntro	; Bank $39
+	callab GameFreakIntro
 	jr c, TitleSequenceStart
 	ld a, [wTitleSequenceOpeningType]
 	and a
 	jr z, .opening_sequence
 
 .pikachu_minigame
-	callab PikachuMiniGame	; Bank $38
+	callab PikachuMiniGame
 	jr TitleSequenceStart
 
 .opening_sequence
-	callab OpeningCutscene	; Bank $39
+	callab OpeningCutscene
 
 TitleSequenceStart::
 	call TitleSequenceInit
-	callab SetTitleBGDecorationBorder	; Bank $02
+	callab SetTitleBGDecorationBorder
 
 .loop
 	call TitleScreenMain
@@ -57,14 +57,14 @@ TitleSequenceInit::
 	ldh [hSCY], a
 	ldh [hSCX], a
 
-	ld de, MUSIC_NONE	; Stop the music.
+	ld de, MUSIC_NONE
 	call PlayMusic
 
 	call ClearTileMap
 	call DisableLCD
 	call ClearSprites
 
-	callba InitEffectObject	; Bank $23
+	callba InitEffectObject
 	ld hl, vChars0
 	ld bc, vBGMap0 - vChars0
 
@@ -127,10 +127,10 @@ TitleSequenceInit::
 	xor a
 	ldh [hBGMapMode], a
 	ld hl, wJumptableIndex
-	ld [hli], a	; (Possibly wJumptableIndex from Crystal)
-	ld [hli], a	; (Possibly wIntroSceneFrameCounter from Crystal)
-	ld [hli], a	; (Possibly wTitleScreenTimer from Crystal)
-	ld [hl], a	; (Possibly wTitleScreenTimer + 1 from Crystal)
+	ld [hli], a ; (Possibly wJumptableIndex from Crystal)
+	ld [hli], a ; (Possibly wIntroSceneFrameCounter from Crystal)
+	ld [hli], a ; (Possibly wTitleScreenTimer from Crystal)
+	ld [hl], a  ; (Possibly wTitleScreenTimer + 1 from Crystal)
 
 	call .load_position_table
 
@@ -143,7 +143,7 @@ TitleSequenceInit::
 
 .load_position_table:
 	ld hl, FirePositionTable
-	ld c, 6	; Load 6 flying objects on the screen.
+	ld c, 6 ; Load 6 flying objects on the screen.
 
 .set_fire_note_loop
 	push bc
@@ -152,7 +152,7 @@ TitleSequenceInit::
 	ld d, [hl]
 	inc hl
 	push hl
-	ld a, $2E	; Title fire/note object effect type?
+	ld a, $2E ; Title fire/note object effect type?
 	call InitSpriteAnimStruct
 	pop hl
 	pop bc
@@ -168,15 +168,15 @@ FirePositionTable::
 	dw $7CB0
 	dw $8800
 
-TitleFireGFX:: INCBIN "gfx/title/fire.2bpp"	; 5EB8-5F37
-TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp"	; 5F38=5FB7
+TitleFireGFX:: INCBIN "gfx/title/fire.2bpp"
+TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp"
 
 TitleScreenMain::
 	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .exit
 	call TitleScreenSequence
-	callba EffectObjectJumpNoDelay	; Bank $23
+	callba EffectObjectJumpNoDelay
 	call DelayFrame
 	and a
 	ret
@@ -267,8 +267,8 @@ TitleSeq_LoadPokemonLogo::
 TitleSeq_Start::
 	call TitleSeq_IncreaseJumpTableIndex
 	push de
-	ld de, $002D
-	call PlaySFX	; Play "Swish" sound
+	ld de, $2D ; "swish" sound
+	call PlaySFX
 	pop de
 	ld a, $80
 	ld [wJumptableIndex + 2], a
@@ -304,7 +304,7 @@ TitleSeq_MoveTitleEnd::
 	ldh [hLCDCPointer], a
 	call TitleSeq_IncreaseJumpTableIndex
 	ld de, MUSIC_TITLE
-	call PlayMusic	; Play "Title Theme"
+	call PlayMusic
 	ret
 
 TitleSeq_InitFlashTitle::
@@ -384,7 +384,7 @@ TitleSeq_PressButtonInit::
 	ld hl, wJumptableIndex
 	inc [hl]
 	ld hl, wJumptableIndex + 2
-	ld de, DecodeNybble0Table - 3	; DecodeNybble0Table - 3 = $0C00
+	ld de, DecodeNybble0Table - 3
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -404,23 +404,25 @@ TitleSeq_TitleScreenInputAndTimeout::
 	ld [hl], e
 	call GetJoypad
 	ld hl, hJoyState
+; UP + B + SELECT opens the SRAM clear screen
 	ld a, [hl]
-	and D_UP | B_BUTTON | SELECT	; UP + B + SELECT brings you to the SRAM clear screen.
+	and D_UP | B_BUTTON | SELECT
 	cp D_UP | B_BUTTON | SELECT
 	jr z, .psbtn_sramclear
+; SELECT opens the debug menu
 	ld a, [hl]
-	and SELECT	; SELECT will bring you to the debug menu.
+	and SELECT
 	jr nz, .psbtn_gotodebug
 	ld a, [hl]
 	and $09
 	ret z
 
 .psbtn_play
-	ld a, $00	; MainMenu
+	ld a, $00 ; MainMenu
 	jr .psbtn_nextseq
 
 .psbtn_gotodebug
-	ld a, $01	; DebugMenu
+	ld a, $01 ; DebugMenu
 	jr .psbtn_nextseq
 
 .psbtn_sramclear
@@ -538,7 +540,7 @@ SRAMClearMenu::
 	cp $01
 	jp z, Init
 
-	callab InitAllSRAMBanks	; Bank $05
+	callab InitAllSRAMBanks
 	jp Init
 
 SRAMClear_Message::
@@ -570,9 +572,9 @@ IntroCopyRightInfo::
 	jp PlaceString
 
 IntroCopyRightInfo_Text::
-	db $60, $61, $62, $63, $6D, $6E, $6F, $70, $71, $72, $4E	; "(C)1997 Nintendo\n"
-	db $60, $61, $62, $63, $73, $74, $75, $76, $77, $78, $6B, $6C, $4E	; "(C)1997 Creatures Inc.\n"
-	db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6A, $6B, $6C, $50	; "(C)1997 GAME FREAK Inc.{EOL}"
+	db $60, $61, $62, $63, $6D, $6E, $6F, $70, $71, $72, $4E                ; "ⓒ1997 Nintendo\n"
+	db $60, $61, $62, $63, $73, $74, $75, $76, $77, $78, $6B, $6C, $4E      ; "ⓒ1997 Creatures Inc.\n"
+	db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6A, $6B, $6C, $50 ; "ⓒ1997 GAME FREAK Inc.\0"
 
 Set_HoOh::
 	coord hl, 7, 9

engine/unknown11d32.asm

@@ -18,7 +18,7 @@ Unknown11d32:
 	jr nz, .rightJump
 	ret
 
-.rightJump; 04:5D4A
+.rightJump
 	ld hl, $000C
 	add hl, bc
 	ld a, [hl]

home/map.asm

@@ -1498,7 +1498,6 @@ FillSouthConnectionStrip::
 	dec c
 	jr nz, .y
 	ret
-; 25f6
 
 FillWestConnectionStrip::
 FillEastConnectionStrip::

home/map_objects.asm

@@ -574,8 +574,6 @@ Function191d::
 	ld [wCenteredObject], a
 	ret
 
-; 1932
-
 StartFollow::
 	push bc
 	ld a, b

home/text.asm

@@ -72,7 +72,6 @@ DrawTextBox::
 	ld [hl], "┘"
 
 	ret
-; e6a
 
 .PlaceChars:
 ; Place char a c times.
@@ -82,7 +81,6 @@ DrawTextBox::
 	dec d
 	jr nz, .loop
 	ret
-; e70
 
 PrintText::
 	push hl
@@ -668,7 +666,7 @@ Text_PlaySound::
 	dbw TX_SOUND_10, $0068
 	dbw TX_SOUND_11, $0069
 	dbw TX_SOUND_13, $0027
-	dbw TX_CRY_14,   MON_NIDORINA ; or MON_LEAFY?
+	dbw TX_CRY_14,   MON_NIDORINA
 	dbw TX_CRY_15,   MON_PIGEOT
 	dbw TX_CRY_16,   MON_JUGON
 

home/vcopy.asm

@@ -75,10 +75,10 @@ RedrawRowOrColumn::
 	ld a, e
 	inc a
 ; the following 6 lines wrap us from the right edge to the left edge if necessary
-	and BG_MAP_WIDTH - 1            ; mask lower address bits
+	and BG_MAP_WIDTH - 1 ; mask lower address bits
 	ld b, a
 	ld a, e
-	and ($FF ^ (BG_MAP_WIDTH - 1))  ; mask upper address bits
+	and ($FF ^ (BG_MAP_WIDTH - 1)) ; mask upper address bits
 	or b
 	ld e, a
 	dec c
@@ -99,27 +99,27 @@ RedrawRowOrColumn::
 	jp hl
 
 .flashlight_effect_table
-	dw RedrawFlashlightRow0    ; $1310
-	dw RedrawFlashlightRow0    ; $1310
-	dw RedrawFlashlightColumn0 ; $12C3
-	dw RedrawFlashlightColumn0 ; $12C3
-	dw RedrawFlashlightRow1    ; $1329
-	dw RedrawFlashlightRow1    ; $1329
-	dw RedrawFlashlightColumn1 ; $12DC
-	dw RedrawFlashlightColumn1 ; $12DC
-	dw RedrawFlashlightRow2    ; $1335
-	dw RedrawFlashlightRow2    ; $1335
-	dw RedrawFlashlightColumn2 ; $12E8
-	dw RedrawFlashlightColumn2 ; $12E8
-	dw RedrawFlashlightRow3    ; $134E
-	dw RedrawFlashlightRow3    ; $134E
-	dw RedrawFlashlightColumn3 ; $1301
-	dw RedrawFlashlightColumn3 ; $1301
+	dw RedrawFlashlightRow0
+	dw RedrawFlashlightRow0
+	dw RedrawFlashlightColumn0
+	dw RedrawFlashlightColumn0
+	dw RedrawFlashlightRow1
+	dw RedrawFlashlightRow1
+	dw RedrawFlashlightColumn1
+	dw RedrawFlashlightColumn1
+	dw RedrawFlashlightRow2
+	dw RedrawFlashlightRow2
+	dw RedrawFlashlightColumn2
+	dw RedrawFlashlightColumn2
+	dw RedrawFlashlightRow3
+	dw RedrawFlashlightRow3
+	dw RedrawFlashlightColumn3
+	dw RedrawFlashlightColumn3
 
 RedrawFlashlightColumn0::
 	ldh a, [hSCX]
 	and $07
-	ret nz        ; wait till we moved one complete tile in X
+	ret nz ; wait till we moved one complete tile in X
 	ld a, [wRedrawFlashlightDst0]
 	ld e, a
 	ld a, [wRedrawFlashlightDst0 + 1]
@@ -143,7 +143,7 @@ RedrawFlashlightColumn1::
 RedrawFlashlightColumn2::
 	ldh a, [hSCX]
 	and $0f
-	ret nz        ; wait till we moved two complete tiles in X
+	ret nz ; wait till we moved two complete tiles in X
 	ld a, [wRedrawFlashlightDst1]
 	ld e, a
 	ld a, [wRedrawFlashlightDst1 + 1]
@@ -168,7 +168,7 @@ RedrawFlashlightColumn3::
 RedrawFlashlightRow0::
 	ldh a, [hSCY]
 	and $07
-	ret nz        ; wait till we moved one complete tile in Y
+	ret nz ; wait till we moved one complete tile in Y
 	ld a, [wRedrawFlashlightDst0]
 	ld e, a
 	ld a, [wRedrawFlashlightDst0 + 1]
@@ -192,7 +192,7 @@ RedrawFlashlightRow1::
 RedrawFlashlightRow2::
 	ldh a, [hSCY]
 	and $0f
-	ret nz        ; wait till we moved two complete tiles in Y
+	ret nz ; wait till we moved two complete tiles in Y
 	ld a, [wRedrawFlashlightDst1]
 	ld e, a
 	ld a, [wRedrawFlashlightDst1 + 1]
@@ -241,8 +241,8 @@ _RedrawFlashlightColumn::
 	dec c
 	jr nz, .loop
 	ldh a, [hRedrawRowOrColumnMode]
-	add $04                         ; inc by 4, because flashlight redraw
-	ldh [hRedrawRowOrColumnMode], a ; has four directions
+	add $04 ; inc by 4, because flashlight redraw has four directions
+	ldh [hRedrawRowOrColumnMode], a
 	ret
 
 _RedrawFlashlightRow::
@@ -257,17 +257,17 @@ _RedrawFlashlightRow::
 	ld a, e
 	inc a
 ; the following 6 lines wrap us from the right edge to the left edge if necessary
-	and BG_MAP_WIDTH - 1            ; mask lower address bits
+	and BG_MAP_WIDTH - 1 ; mask lower address bits
 	ld b, a
 	ld a, e
-	and ($FF ^ (BG_MAP_WIDTH - 1))  ; mask upper address bits
+	and ($FF ^ (BG_MAP_WIDTH - 1)) ; mask upper address bits
 	or b
 	ld e, a
 	dec c
 	jr nz, .loop
 	ldh a, [hRedrawRowOrColumnMode]
-	add $04                         ; inc by 4, because flashlight redraw
-	ldh [hRedrawRowOrColumnMode], a ; has four directions
+	add $04 ; inc by 4, because flashlight redraw has four directions
+	ldh [hRedrawRowOrColumnMode], a
 	ret
 
 _RedrawFlashlightColumnBlack::
@@ -289,8 +289,8 @@ _RedrawFlashlightColumnBlack::
 	dec c
 	jr nz, .loop
 	ldh a, [hRedrawRowOrColumnMode]
-	add $04                         ; inc by 4, because flashlight redraw
-	ldh [hRedrawRowOrColumnMode], a ; has four directions
+	add $04 ; inc by 4, because flashlight redraw has four directions
+	ldh [hRedrawRowOrColumnMode], a
 	ret
 
 _RedrawFlashlightRowBlack::
@@ -306,17 +306,17 @@ _RedrawFlashlightRowBlack::
 	ld a, l
 	inc a
 ; the following 6 lines wrap us from the right edge to the left edge if necessary
-	and BG_MAP_WIDTH - 1            ; mask lower address bits
+	and BG_MAP_WIDTH - 1 ; mask lower address bits
 	ld d, a
 	ld a, l
-	and ($FF ^ (BG_MAP_WIDTH - 1))  ; mask upper address bits
+	and ($FF ^ (BG_MAP_WIDTH - 1)) ; mask upper address bits
 	or d
 	ld l, a
 	dec c
 	jr nz, .loop
 	ldh a, [hRedrawRowOrColumnMode]
-	add $04                         ; inc by 4, because flashlight redraw
-	ldh [hRedrawRowOrColumnMode], a ; has four directions
+	add $04 ; inc by 4, because flashlight redraw has four directions
+	ldh [hRedrawRowOrColumnMode], a
 	ret
 
 WaitForAutoBgMapTransfer::
@@ -383,20 +383,20 @@ AutoBgMapTransfer::
 	ld a, $02
 .doTransfer
 	ldh [hBGMapTransferPosition], a
-	ld a, $06                 ; 6 rows of SCREEN_WIDTH each
+	ld a, $06 ; 6 rows of SCREEN_WIDTH each
 	; fallthrough
 
 TransferBgRows::
 	ld bc, BG_MAP_WIDTH - SCREEN_WIDTH + 1
 .loop
 
-	rept SCREEN_WIDTH / 2 - 1 ; two bytes per pop minus last block
+rept SCREEN_WIDTH / 2 - 1 ; two bytes per pop minus last block
 	pop de
 	ld [hl], e
 	inc l
 	ld [hl], d
 	inc l
-	endr
+endr
 
 	pop de
 	ld [hl], e
@@ -439,8 +439,8 @@ VBlankCopyDouble::
 	ld [wVBCopyDoubleSize], a
 .loop
 
-	rept 16/4 - 1 ; 16 bytes per 2bpp tile at 2 bytes per pop
-	pop de        ; copied twice minus last block
+rept 16/4 - 1 ; 16 bytes per 2bpp tile at 2 bytes per pop, copied twice minus last block
+	pop de
 	ld [hl], e
 	inc l
 	ld [hl], e
@@ -449,7 +449,7 @@ VBlankCopyDouble::
 	inc l
 	ld [hl], d
 	inc l
-	endr
+endr
 
 	pop de
 	ld [hl], e
@@ -500,13 +500,13 @@ VBlankCopy::
 	ld [wVBCopySize], a
 .loop
 
-	rept 16/2 - 1 ; 16 bytes per transfer at 2 bytes per pop
-	pop de        ; minus last block
+rept 16/2 - 1 ; 16 bytes per transfer at 2 bytes per pop minus last block
+	pop de
 	ld [hl], e
 	inc l
 	ld [hl], d
 	inc l
-	endr
+endr
 
 	pop de
 	ld [hl], e
@@ -590,13 +590,13 @@ VBlankCopyFar::
 	xor a
 	ld [wVBCopyFarSize], a
 .loop
-	rept 16/2 - 1 ; 16 bytes per transfer at 2 bytes per pop
+rept 16/2 - 1 ; 16 bytes per transfer at 2 bytes per pop
 	pop de
 	ld [hl], e
 	inc l
 	ld [hl], d
 	inc l
-	endr
+endr
 
 	pop de
 	ld [hl], e

hram.asm

@@ -67,7 +67,7 @@ hTextBoxCursorBlinkInterval:: ds 2
 
 NEXTU
 hEventCollisionException:: db
-hEventID:: db ;; ffb0
+hEventID:: db
 
 NEXTU
 
@@ -96,24 +96,20 @@ hSpriteOffset::
 
 UNION
 
-; ffb3
 hProduct::
 hDividend::
 	; ds 4
 	db
 
-; ffb4
 hMultiplicand::
 hQuotient::
 	ds 3
 
-; ffb7
 hMultiplier::
 hDivisor::
 hRemainder::
 	db
 
-; ffb8
 hMathBuffer::
 	ds 5
 

maps/OldCityPokecenter2F.asm

@@ -82,7 +82,6 @@ OldCityPokecenter2FTextString4:
 	line "タイムマシンです"
 	done
 
-; 25:4820
 	db $05, $25, $24, $48
 
 Data14824: ; movement data

maps/OldCityPokecenterBattle.asm

@@ -41,5 +41,3 @@ OldCityPokecenterBattleTextString1:
 	text "ちょっとまってね！@"
 	text_exit
 	db "@"
-
-; 25:492f

maps/OldCityPokecenterTimeMachine.asm

@@ -33,5 +33,3 @@ OldCityPokecenterTimeMachineText1:
 	ld [wce37], a
 	callab Function29abf
 	ret
-
-; 25:49ac

maps/OldCityPokecenterTrade.asm

@@ -43,5 +43,3 @@ OldCityPokecenterTradeTextString1:
 	text_exit
 	text_exit
 	db "@"
-
-; 25:48ac

maps/PlayerHouse1F.asm

@@ -57,5 +57,3 @@ PlayerHouse1FTextString1:
 	line "わたしも　ポケモン　きらいって"
 	cont "わけじゃないし　がんばるのよ！"
 	done
-
-; 4132

maps/PlayerHouse2F.asm

@@ -119,7 +119,6 @@ PlayerHouse2FComputerText:
 	ret
 
 .jump
-; 4244
 	call RefreshScreen
 	callab Function1477D
 	call Function1fea
@@ -135,7 +134,6 @@ PlayerHouse2FCheckEmail:
 	ret
 
 .jump2
-; 4264
 	ld hl, PlayerHouse2FTextString7
 	call PrintText
 	ret
@@ -195,7 +193,6 @@ PlayerHouse2FTextString5:
 
 	db $08
 
-; 43F3
 	call PlayerHouse2FCheckEmail
 	call Function3036
 	ret
@@ -261,5 +258,3 @@ PlayerHouse2FTextString9:
 	line "それでは　ひきつづき"
 	cont "おんがくを　おたのしみ　ください"
 	done
-
-; 45FF

maps/Route1Gate2F.asm

@@ -83,5 +83,3 @@ Route1Gate2FTextString4:
 	para "むむ？"
 	line "ながーい　かわ　が　みえる"
 	done
-
-; 4224

maps/Route1P1.asm

@@ -80,9 +80,7 @@ Route1P1TextString3:
 	line "やせいの　ポケモンに　ちゅうい"
 	done
 
-Route1P1TextString4:; 7C48
+Route1P1TextString4:
 	text "ここは　１ばん　どうろ"
 	line "サイレントヒル　⋯⋯　オールドシティ"
 	done
-
-; 7C68

maps/Route1P2.asm

@@ -115,5 +115,3 @@ Route1P2TextString5:
 	text "ここは　１ばん　どうろ"
 	line "サイレントヒル　⋯⋯　オールドシティ"
 	done
-
-;7DDD

maps/SilentHill.asm

@@ -416,5 +416,3 @@ SilentHillTextPokemonHateString:
 	text "よのなかに　ポケモンが　きらいな"
 	line "ひとは　いるのかな？"
 	done
-
-; 7AE4

maps/SilentHillHouse.asm

@@ -60,7 +60,6 @@ SilentHillHouseNPCText1:
 	ret
 
 .jump
-; 488C
 	call RefreshScreen
 	callab Function1477D
 	call Function1fea
@@ -167,5 +166,3 @@ SilentHillHouseTextString7:
 	cont "ポケモンずかんを　つくるんだって？"
 	cont "すごいじゃないか　がんばれよ"
 	done
-
-; 4AAC

maps/SilentHillLabBack.asm

@@ -356,5 +356,3 @@ SilentHillLabBackTextPointers2:
 	dw Function3899
 	dw Function3899
 	dw MapDefaultText
-
-; 605D

maps/SilentHillLabFront.asm

@@ -546,7 +546,7 @@ SilentHillLabFrontMoveRivalLeave:
 	call ClearAccumulator
 	ret
 
-Movememt12:; 4F93
+Movememt12:
 	db $07, $07, $07, $05, $32
 
 SilentHillLabFrontScript17:
@@ -1104,5 +1104,3 @@ SilentHillLabFrontTextString31:
 	line "おあい　することに"
 	cont "なるような　きがします"
 	done
-
-; 5BE6

maps/SilentHillPokecenter.asm

@@ -18,7 +18,6 @@ SilentHillPokecenterScript:
 	call CallMapTextSubroutine
 	ret
 
-; 469A
 	dw SilentHillPokecenterNPCIDs
 
 SilentHillPokecenterNPCIDs:
@@ -109,5 +108,3 @@ SilentHillPokecenterNPCText5:
 SilentHillPokecenterTextString6:
 	text "へルガー『ぐるるうー"
 	done
-
-; 47D5

maps/placeholder/dummy_text_pointers.asm

@@ -1,7 +1,6 @@
 INCLUDE "constants.asm"
 
 SECTION "maps/placeholder/dummy_text_pointers.asm", ROMX
-; d8000 (36:4000)
 OldCityTextPointers::
 WestTextPointers::
 HaitekuTextPointers::

wram.asm

@@ -64,7 +64,6 @@ wIncrementTempo: dw
 wMapMusic:: db
 wCryPitch:: dw
 wCryLength:: dw
-; c1b2
 	ds 7 ; TODO
 
 wc1b9:: db
@@ -157,7 +156,6 @@ NEXTU
 
 wLYOverrides::
 	ds SCREEN_HEIGHT_PX
-; c690
 	ds $10
 wLYOverrides2::
 
@@ -166,7 +164,6 @@ NEXTU
 
 	ds $1ea
 
-; c7ea
 wActiveBGEffects::
 wBGEffect1:: battle_bg_effect wBGEffect1
 wBGEffect2:: battle_bg_effect wBGEffect2
@@ -208,7 +205,6 @@ ENDU
 
 	ds $32
 wBattleAnimEnd::
-; c845
 
 	ds $1aa ; TODO
 
@@ -375,7 +371,6 @@ wScreenSave::
 SECTION "CBB2", WRAM0[$CBB2]
 wToolgearBuffer::
 	ds $40
-	; cbe2
 
 SECTION "CBF2", WRAM0[$CBF2]
 
@@ -399,7 +394,6 @@ wMenuBorderBottomCoord:: db
 wMenuBorderRightCoord:: db
 wMenuDataPointer:: dw
 wMenuCursorBuffer:: db
-; cc0a
 	ds 8 ; TODO
 wMenuDataHeaderEnd::
 
@@ -569,7 +563,7 @@ wcd47:: ds 1
 wSelectedSwapPosition:: db
 wMenuScrollPosition:: db
 
-wTextDest:: ds 2; cd4a
+wTextDest:: ds 2
 
 wQueuedScriptBank:: db
 wQueuedScriptAddr:: dw
@@ -656,7 +650,7 @@ wPrevWarp:: db
 	ds 1
 
 UNION
-wFieldMoveScriptID:: db; cdc3
+wFieldMoveScriptID:: db
 wMapBlocksAddress:: dw
 wReplacementBlock:: db