shithub: pokered

Download patch

ref: a51037eeeedb03e29d8675626018cf02750882fa
parent: 48e0125bd68054f81e97a5eec14f145dc3c921d7
author: dannye <corrnondacqb@yahoo.com>
date: Sat Jun 11 22:19:19 EDT 2016 

Remove the last address comments
except for wram.asm and sram.asm
also delete unused yellow file


--- a/audio.asm
+++ b/audio.asm
@@ -362,7 +362,7 @@
 
 SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
 
-PlayBattleMusic:: ; 0x90c6
+PlayBattleMusic::
 	xor a
 	ld [wAudioFadeOutControl], a
 	ld [wLowHealthAlarm], a
@@ -402,7 +402,7 @@
 
 
 ; an alternate start for MeetRival which has a different first measure
-Music_RivalAlternateStart:: ; 0x9b47
+Music_RivalAlternateStart::
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
@@ -413,7 +413,7 @@
 	call Audio1_OverwriteChannelPointer
 	ld de, Music_MeetRival_branch_b2b5
 
-Audio1_OverwriteChannelPointer: ; 0x9b60
+Audio1_OverwriteChannelPointer:
 	ld a, e
 	ld [hli], a
 	ld a, d
@@ -421,7 +421,7 @@
 	ret
 
 ; an alternate tempo for MeetRival which is slightly slower
-Music_RivalAlternateTempo:: ; 0x9b65
+Music_RivalAlternateTempo::
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
@@ -430,7 +430,7 @@
 	jp Audio1_OverwriteChannelPointer
 
 ; applies both the alternate start and alternate tempo
-Music_RivalAlternateStartAndTempo:: ; 0x9b75
+Music_RivalAlternateStartAndTempo::
 	call Music_RivalAlternateStart
 	ld hl, wChannelCommandPointers
 	ld de, Music_MeetRival_branch_b19b
@@ -437,7 +437,7 @@
 	jp Audio1_OverwriteChannelPointer
 
 ; an alternate tempo for Cities1 which is used for the Hall of Fame room
-Music_Cities1AlternateTempo:: ; 0x9b81
+Music_Cities1AlternateTempo::
 	ld a, 10
 	ld [wAudioFadeOutCounterReloadValue], a
 	ld [wAudioFadeOutCounter], a
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1,6 +1,6 @@
 ; The first of three duplicated sound engines.
 
-Audio1_UpdateMusic:: ; 0x9103
+Audio1_UpdateMusic::
 	ld c, CH0
 .loop
 	ld b, 0
@@ -36,7 +36,7 @@
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
-Audio1_ApplyMusicAffects: ; 0x9138
+Audio1_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
@@ -144,7 +144,7 @@
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Audio1_PlayNextNote: ; 0x91d0
+Audio1_PlayNextNote:
 ; reload the vibrato delay counter
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
@@ -160,7 +160,7 @@
 	call Audio1_endchannel
 	ret
 
-Audio1_endchannel: ; 0x91e6
+Audio1_endchannel:
 	call Audio1_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
@@ -250,7 +250,7 @@
 	ld [hl], b
 	ret
 
-Audio1_callchannel: ; 0x9274
+Audio1_callchannel:
 	cp $fd ; is this command a callchannel?
 	jp nz, Audio1_loopchannel ; no
 	call Audio1_GetNextMusicByte
@@ -287,7 +287,7 @@
 	set BIT_CHANNEL_CALL, [hl] ; set the call flag
 	jp Audio1_endchannel
 
-Audio1_loopchannel: ; 0x92a9
+Audio1_loopchannel:
 	cp $fe ; is this command a loopchannel?
 	jp nz, Audio1_notetype ; no
 	call Audio1_GetNextMusicByte
@@ -325,7 +325,7 @@
 	ld [hl], b
 	jp Audio1_endchannel
 
-Audio1_notetype: ; 0x92e4
+Audio1_notetype:
 	and $f0
 	cp $d0 ; is this command a notetype?
 	jp nz, Audio1_toggleperfectpitch ; no
@@ -369,7 +369,7 @@
 .noiseChannel
 	jp Audio1_endchannel
 
-Audio1_toggleperfectpitch: ; 0x9323
+Audio1_toggleperfectpitch:
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Audio1_vibrato ; no
@@ -381,7 +381,7 @@
 	ld [hl], a ; flip bit 0 of wChannelFlags1
 	jp Audio1_endchannel
 
-Audio1_vibrato: ; 0x9335
+Audio1_vibrato:
 	cp $ea ; is this command a vibrato?
 	jr nz, Audio1_pitchbend ; no
 	call Audio1_GetNextMusicByte
@@ -429,7 +429,7 @@
 
 	jp Audio1_endchannel
 
-Audio1_pitchbend: ; 0x936d
+Audio1_pitchbend:
 	cp $eb ; is this command a pitchbend?
 	jr nz, Audio1_duty ; no
 	call Audio1_GetNextMusicByte
@@ -460,8 +460,8 @@
 	ld d, a
 	jp Audio1_notelength
 
-Audio1_duty: ; 0x93a5
-	cp $ec ; is this command a duty?
+Audio1_duty:
+	cp $ec ; is this command a duty?
 	jr nz, Audio1_tempo ; no
 	call Audio1_GetNextMusicByte
 	rrca
@@ -473,7 +473,7 @@
 	ld [hl], a ; store duty
 	jp Audio1_endchannel
 
-Audio1_tempo: ; 0x93ba
+Audio1_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio1_stereopanning ; no
 	ld a, c
@@ -502,7 +502,7 @@
 .musicChannelDone
 	jp Audio1_endchannel
 
-Audio1_stereopanning: ; 0x93fa
+Audio1_stereopanning:
 	cp $ee ; is this command a stereopanning?
 	jr nz, Audio1_unknownmusic0xef ; no
 	call Audio1_GetNextMusicByte
@@ -510,7 +510,7 @@
 	jp Audio1_endchannel
 
 ; this appears to never be used
-Audio1_unknownmusic0xef: ; 0x9407
+Audio1_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
 	jr nz, Audio1_dutycycle ; no
 	call Audio1_GetNextMusicByte
@@ -527,7 +527,7 @@
 .skip
 	jp Audio1_endchannel
 
-Audio1_dutycycle: ; 0x9426
+Audio1_dutycycle:
 	cp $fc ; is this command a dutycycle?
 	jr nz, Audio1_volume ; no
 	call Audio1_GetNextMusicByte
@@ -544,7 +544,7 @@
 	set BIT_ROTATE_DUTY, [hl]
 	jp Audio1_endchannel
 
-Audio1_volume: ; 0x9444
+Audio1_volume:
 	cp $f0 ; is this command a volume?
 	jr nz, Audio1_executemusic ; no
 	call Audio1_GetNextMusicByte
@@ -551,7 +551,7 @@
 	ld [rNR50], a ; store volume
 	jp Audio1_endchannel
 
-Audio1_executemusic: ; 0x9450
+Audio1_executemusic:
 	cp $f8 ; is this command an executemusic?
 	jr nz, Audio1_octave ; no
 	ld b, $0
@@ -560,7 +560,7 @@
 	set BIT_EXECUTE_MUSIC, [hl]
 	jp Audio1_endchannel
 
-Audio1_octave: ; 0x945f
+Audio1_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
 	jr nz, Audio1_unknownsfx0x20 ; no
@@ -572,7 +572,7 @@
 	ld [hl], a ; store low nibble as octave
 	jp Audio1_endchannel
 
-Audio1_unknownsfx0x20: ; 0x9472
+Audio1_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio1_unknownsfx0x10
 	ld a, c
@@ -676,7 +676,7 @@
 	pop bc
 	pop de
 
-Audio1_notelength: ; 0x950a
+Audio1_notelength:
 	ld a, d
 	push af
 	and $f
@@ -734,7 +734,7 @@
 	pop hl
 	ret
 
-Audio1_notepitch: ; 0x9568
+Audio1_notepitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -829,7 +829,7 @@
 	call Audio1_ApplyWavePatternAndFrequency
 	ret
 
-Audio1_EnableChannelOutput: ; 0x95f8
+Audio1_EnableChannelOutput:
 	ld b, 0
 	ld hl, Audio1_HWChannelEnableMasks
 	add hl, bc
@@ -866,7 +866,7 @@
 	ld [rNR51], a
 	ret
 
-Audio1_ApplyDutyAndSoundLength: ; 0x9629
+Audio1_ApplyDutyAndSoundLength:
 	ld b, 0
 	ld hl, wChannelNoteDelayCounters ; use the note delay as sound length
 	add hl, bc
@@ -891,7 +891,7 @@
 	ld [hl], d
 	ret
 
-Audio1_ApplyWavePatternAndFrequency: ; 0x964b
+Audio1_ApplyWavePatternAndFrequency:
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -942,7 +942,7 @@
 	call Audio1_ApplyFrequencyModifier
 	ret
 
-Audio1_SetSfxTempo: ; 0x9693
+Audio1_SetSfxTempo:
 	call Audio1_IsCry
 	jr nc, .notCry
 	ld d, 0
@@ -963,7 +963,7 @@
 .done
 	ret
 
-Audio1_ApplyFrequencyModifier: ; 0x96b5
+Audio1_ApplyFrequencyModifier:
 	call Audio1_IsCry
 	jr nc, .done
 ; if playing a cry, add the cry's frequency modifier
@@ -980,7 +980,7 @@
 .done
 	ret
 
-Audio1_GoBackOneCommandIfCry: ; 0x96c7
+Audio1_GoBackOneCommandIfCry:
 	call Audio1_IsCry
 	jr nc, .done
 	ld hl, wChannelCommandPointers
@@ -1003,7 +1003,7 @@
 	ccf
 	ret
 
-Audio1_IsCry: ; 0x96e5
+Audio1_IsCry:
 ; Returns whether the currently playing audio is a cry in carry.
 	ld a, [wChannelSoundIDs + CH4]
 	cp CRY_SFX_START
@@ -1021,7 +1021,7 @@
 	scf
 	ret
 
-Audio1_ApplyPitchBend: ; 0x96f9
+Audio1_ApplyPitchBend:
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit BIT_PITCH_BEND_DECREASING, [hl]
@@ -1125,7 +1125,7 @@
 	res BIT_PITCH_BEND_DECREASING, [hl]
 	ret
 
-Audio1_InitPitchBendVars: ; 0x978f
+Audio1_InitPitchBendVars:
 	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
@@ -1224,7 +1224,7 @@
 	ld [hl], a ; store remainder - dividend
 	ret
 
-Audio1_ApplyDutyCycle: ; 0x980d
+Audio1_ApplyDutyCycle:
 	ld b, 0
 	ld hl, wChannelDutyCycles
 	add hl, bc
@@ -1242,7 +1242,7 @@
 	ld [hl], a
 	ret
 
-Audio1_GetNextMusicByte: ; 0x9825
+Audio1_GetNextMusicByte:
 	ld d, 0
 	ld a, c
 	add a
@@ -1260,7 +1260,7 @@
 	ld [hl], d
 	ret
 
-Audio1_GetRegisterPointer: ; 0x9838
+Audio1_GetRegisterPointer:
 ; hl = address of hardware sound register b for software channel c
 	ld a, c
 	ld hl, Audio1_HWChannelBaseAddresses
@@ -1275,7 +1275,7 @@
 	ld h, $ff
 	ret
 
-Audio1_MultiplyAdd: ; 0x9847
+Audio1_MultiplyAdd:
 ; hl = l + (a * de)
 	ld h, 0
 .loop
@@ -1291,7 +1291,7 @@
 .done
 	ret
 
-Audio1_CalculateFrequency: ; 0x9858
+Audio1_CalculateFrequency:
 ; return the frequency for note a, octave b in de
 	ld h, 0
 	ld l, a
@@ -1317,7 +1317,7 @@
 	ld d, a
 	ret
 
-Audio1_PlaySound:: ; 0x9876
+Audio1_PlaySound::
 	ld [wSoundID], a
 	cp $ff
 	jp z, .stopAllAudio
@@ -1695,23 +1695,23 @@
 .done
 	ret
 
-Audio1_CryEndchannel: ; 0x9b16
+Audio1_CryEndchannel:
 	endchannel
 
-Audio1_HWChannelBaseAddresses: ; 0x9b17
+Audio1_HWChannelBaseAddresses:
 ; the low bytes of each HW channel's base address
 	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3
 	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7
 
-Audio1_HWChannelDisableMasks: ; 0x9b1f
+Audio1_HWChannelDisableMasks:
 	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3
 	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7
 
-Audio1_HWChannelEnableMasks: ; 0x9b27
+Audio1_HWChannelEnableMasks:
 	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3
 	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
 
-Audio1_Pitches: ; 0x9b2f
+Audio1_Pitches:
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -566,7 +566,7 @@
 	ld [hl], a ; store low nibble as octave
 	jp Audio2_endchannel
 
-Audio2_unknownsfx0x20: ; 21bf3
+Audio2_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio2_unknownsfx0x10 ; no
 	ld a, c
--- a/audio/headers/musicheaders2.asm
+++ b/audio/headers/musicheaders2.asm
@@ -53,5 +53,3 @@
 	dw Music_DefeatedGymLeader_Ch2
 	db CH2
 	dw Music_DefeatedGymLeader_Ch3
-
-; 202fd
--- a/data/mapHeaders/agatha.asm
+++ b/data/mapHeaders/agatha.asm
@@ -1,4 +1,4 @@
-Agatha_h: ; 0x76421 to 0x7642d (12 bytes) (id=247)
+Agatha_h:
 	db CEMETERY ; tileset
 	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
 	dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
--- a/data/mapHeaders/bikeshop.asm
+++ b/data/mapHeaders/bikeshop.asm
@@ -1,4 +1,4 @@
-BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
+BikeShop_h:
 	db CLUB ; tileset
 	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
 	dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
--- a/data/mapHeaders/billshouse.asm
+++ b/data/mapHeaders/billshouse.asm
@@ -1,4 +1,4 @@
-BillsHouse_h: ; 0x1e75e to 0x1e76a (12 bytes) (bank=7) (id=88)
+BillsHouse_h:
 	db INTERIOR ; tileset
 	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
 	dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/blueshouse.asm
+++ b/data/mapHeaders/blueshouse.asm
@@ -1,4 +1,4 @@
-BluesHouse_h: ; 0x19b2f id=39
+BluesHouse_h:
 	db HOUSE ; tileset
 	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions
 	dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript
--- a/data/mapHeaders/bruno.asm
+++ b/data/mapHeaders/bruno.asm
@@ -1,4 +1,4 @@
-Bruno_h: ; 0x762ca to 0x762d6 (12 bytes) (id=246)
+Bruno_h:
 	db GYM ; tileset
 	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
 	dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadondiner.asm
+++ b/data/mapHeaders/celadondiner.asm
@@ -1,4 +1,4 @@
-CeladonDiner_h: ; 0x49145 to 0x49151 (12 bytes) (bank=12) (id=138)
+CeladonDiner_h:
 	db LOBBY ; tileset
 	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
 	dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadongamecorner.asm
+++ b/data/mapHeaders/celadongamecorner.asm
@@ -1,4 +1,4 @@
-CeladonGameCorner_h: ; 0x48bb1 to 0x48bbd (12 bytes) (bank=12) (id=135)
+CeladonGameCorner_h:
 	db LOBBY ; tileset
 	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
 	dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadongym.asm
+++ b/data/mapHeaders/celadongym.asm
@@ -1,4 +1,4 @@
-CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
+CeladonGym_h:
 	db GYM ; tileset
 	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
 	dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadonhotel.asm
+++ b/data/mapHeaders/celadonhotel.asm
@@ -1,4 +1,4 @@
-CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
+CeladonHotel_h:
 	db POKECENTER ; tileset
 	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
 	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadonhouse.asm
+++ b/data/mapHeaders/celadonhouse.asm
@@ -1,4 +1,4 @@
-CeladonHouse_h: ; 0x49202 to 0x4920e (12 bytes) (bank=12) (id=139)
+CeladonHouse_h:
 	db MANSION ; tileset
 	db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmansion1.asm
+++ b/data/mapHeaders/celadonmansion1.asm
@@ -1,4 +1,4 @@
-CeladonMansion1_h: ; 0x48688 to 0x48694 (12 bytes) (bank=12) (id=128)
+CeladonMansion1_h:
 	db MANSION ; tileset
 	db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
 	dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmansion2.asm
+++ b/data/mapHeaders/celadonmansion2.asm
@@ -1,4 +1,4 @@
-CeladonMansion2_h: ; 0x4872e to 0x4873a (12 bytes) (bank=12) (id=129)
+CeladonMansion2_h:
 	db MANSION ; tileset
 	db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
 	dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmansion3.asm
+++ b/data/mapHeaders/celadonmansion3.asm
@@ -1,4 +1,4 @@
-CeladonMansion3_h: ; 0x48784 to 0x48790 (12 bytes) (bank=12) (id=130)
+CeladonMansion3_h:
 	db MANSION ; tileset
 	db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
 	dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmansion4.asm
+++ b/data/mapHeaders/celadonmansion4.asm
@@ -1,4 +1,4 @@
-CeladonMansion4_h: ; 0x4885f to 0x4886b (12 bytes) (bank=12) (id=131)
+CeladonMansion4_h:
 	db MANSION ; tileset
 	db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
 	dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmansion5.asm
+++ b/data/mapHeaders/celadonmansion5.asm
@@ -1,4 +1,4 @@
-CeladonMansion5_h: ; 0x1dd2e to 0x1dd3a (12 bytes) (bank=7) (id=132)
+CeladonMansion5_h:
 	db HOUSE ; tileset
 	db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
 	dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmart1.asm
+++ b/data/mapHeaders/celadonmart1.asm
@@ -1,4 +1,4 @@
-CeladonMart1_h: ; 0x60f7a to 0x60f86 (12 bytes) (id=122)
+CeladonMart1_h:
 	db LOBBY ; tileset
 	db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
 	dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmart2.asm
+++ b/data/mapHeaders/celadonmart2.asm
@@ -1,4 +1,4 @@
-CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
+CeladonMart2_h:
 	db LOBBY ; tileset
 	db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
 	dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmart3.asm
+++ b/data/mapHeaders/celadonmart3.asm
@@ -1,4 +1,4 @@
-CeladonMart3_h: ; 0x48219 to 0x48225 (12 bytes) (bank=12) (id=124)
+CeladonMart3_h:
 	db LOBBY ; tileset
 	db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
 	dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmart4.asm
+++ b/data/mapHeaders/celadonmart4.asm
@@ -1,4 +1,4 @@
-CeladonMart4_h: ; 0x4834a to 0x48356 (12 bytes) (bank=12) (id=125)
+CeladonMart4_h:
 	db LOBBY ; tileset
 	db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
 	dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmart5.asm
+++ b/data/mapHeaders/celadonmart5.asm
@@ -1,4 +1,4 @@
-CeladonMart5_h: ; 0x4905d to 0x49069 (12 bytes) (bank=12) (id=136)
+CeladonMart5_h:
 	db LOBBY ; tileset
 	db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
 	dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmartelevator.asm
+++ b/data/mapHeaders/celadonmartelevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevator_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
+CeladonMartElevator_h:
 	db LOBBY ; tileset
 	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadonmartroof.asm
+++ b/data/mapHeaders/celadonmartroof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
+CeladonMartRoof_h:
 	db LOBBY ; tileset
 	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
 	dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadonpokecenter.asm
+++ b/data/mapHeaders/celadonpokecenter.asm
@@ -1,4 +1,4 @@
-CeladonPokecenter_h: ; 0x488ac to 0x488b8 (12 bytes) (bank=12) (id=133)
+CeladonPokecenter_h:
 	db POKECENTER ; tileset
 	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/celadonprizeroom.asm
+++ b/data/mapHeaders/celadonprizeroom.asm
@@ -1,4 +1,4 @@
-CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
+CeladonPrizeRoom_h:
 	db LOBBY ; tileset
 	db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
 	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleancity.asm
+++ b/data/mapHeaders/ceruleancity.asm
@@ -1,4 +1,4 @@
-CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3)
+CeruleanCity_h:
 	db OVERWORLD ; tileset
 	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
 	dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleangym.asm
+++ b/data/mapHeaders/ceruleangym.asm
@@ -1,4 +1,4 @@
-CeruleanGym_h: ; 0x5c6a7 to 0x5c6b3 (12 bytes) (id=65)
+CeruleanGym_h:
 	db GYM ; tileset
 	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
 	dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleanhouse1.asm
+++ b/data/mapHeaders/ceruleanhouse1.asm
@@ -1,4 +1,4 @@
-CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
+CeruleanHouse1_h:
 	db HOUSE ; tileset
 	db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleanhouse2.asm
+++ b/data/mapHeaders/ceruleanhouse2.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2_h: ; 0x74dfd to 0x74e09 (12 bytes) (id=230)
+CeruleanHouse2_h:
 	db SHIP ; tileset
 	db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleanhousetrashed.asm
+++ b/data/mapHeaders/ceruleanhousetrashed.asm
@@ -1,4 +1,4 @@
-CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
+CeruleanHouseTrashed_h:
 	db HOUSE ; tileset
 	db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
 	dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleanmart.asm
+++ b/data/mapHeaders/ceruleanmart.asm
@@ -1,4 +1,4 @@
-CeruleanMart_h: ; 0x5c889 to 0x5c895 (12 bytes) (id=67)
+CeruleanMart_h:
 	db MART ; tileset
 	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
 	dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/ceruleanpokecenter.asm
+++ b/data/mapHeaders/ceruleanpokecenter.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
+CeruleanPokecenter_h:
 	db POKECENTER ; tileset
 	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/cinnabargym.asm
+++ b/data/mapHeaders/cinnabargym.asm
@@ -1,4 +1,4 @@
-CinnabarGym_h: ; 0x7573e to 0x7574a (12 bytes) (id=166)
+CinnabarGym_h:
 	db FACILITY ; tileset
 	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
 	dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/cinnabarisland.asm
+++ b/data/mapHeaders/cinnabarisland.asm
@@ -1,4 +1,4 @@
-CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8)
+CinnabarIsland_h:
 	db OVERWORLD ; tileset
 	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
 	dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts
--- a/data/mapHeaders/cinnabarmart.asm
+++ b/data/mapHeaders/cinnabarmart.asm
@@ -1,4 +1,4 @@
-CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
+CinnabarMart_h:
 	db MART ; tileset
 	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
 	dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/cinnabarpokecenter.asm
+++ b/data/mapHeaders/cinnabarpokecenter.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenter_h: ; 0x75e20 to 0x75e2c (12 bytes) (id=171)
+CinnabarPokecenter_h:
 	db POKECENTER ; tileset
 	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
 	dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/colosseum.asm
+++ b/data/mapHeaders/colosseum.asm
@@ -1,4 +1,4 @@
-Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
+Colosseum_h:
 	db CLUB ; tileset
 	db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
 	dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts
--- a/data/mapHeaders/copycatshouse1f.asm
+++ b/data/mapHeaders/copycatshouse1f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
+CopycatsHouse1F_h:
 	db REDS_HOUSE_1 ; tileset
 	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
 	dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
--- a/data/mapHeaders/copycatshouse2f.asm
+++ b/data/mapHeaders/copycatshouse2f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
+CopycatsHouse2F_h:
 	db REDS_HOUSE_2 ; tileset
 	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
 	dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
--- a/data/mapHeaders/daycarem.asm
+++ b/data/mapHeaders/daycarem.asm
@@ -1,4 +1,4 @@
-DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
+DayCareM_h:
 	db HOUSE ; tileset
 	db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
 	dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
--- a/data/mapHeaders/diglettscave.asm
+++ b/data/mapHeaders/diglettscave.asm
@@ -1,4 +1,4 @@
-DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
+DiglettsCave_h:
 	db CAVERN ; tileset
 	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
--- a/data/mapHeaders/diglettscaveroute11.asm
+++ b/data/mapHeaders/diglettscaveroute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11_h: ; 0x1e5ae to 0x1e5ba (12 bytes) (bank=7) (id=85)
+DiglettsCaveEntranceRoute11_h:
 	db CAVERN ; tileset
 	db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
--- a/data/mapHeaders/diglettscaveroute2.asm
+++ b/data/mapHeaders/diglettscaveroute2.asm
@@ -1,4 +1,4 @@
-DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
+DiglettsCaveRoute2_h:
 	db CAVERN ; tileset
 	db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
 	dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
--- a/data/mapHeaders/fanclub.asm
+++ b/data/mapHeaders/fanclub.asm
@@ -1,4 +1,4 @@
-FanClub_h: ; 0x59b64 to 0x59b70 (12 bytes) (id=90)
+FanClub_h:
 	db INTERIOR ; tileset
 	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
 	dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
--- a/data/mapHeaders/fightingdojo.asm
+++ b/data/mapHeaders/fightingdojo.asm
@@ -1,4 +1,4 @@
-FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
+FightingDojo_h:
 	db DOJO ; tileset
 	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
 	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiacity.asm
+++ b/data/mapHeaders/fuchsiacity.asm
@@ -1,4 +1,4 @@
-FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7)
+FuchsiaCity_h:
 	db OVERWORLD ; tileset
 	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
 	dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiagym.asm
+++ b/data/mapHeaders/fuchsiagym.asm
@@ -1,4 +1,4 @@
-FuchsiaGym_h: ; 0x75431 to 0x7543d (12 bytes) (id=157)
+FuchsiaGym_h:
 	db GYM ; tileset
 	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
 	dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiahouse1.asm
+++ b/data/mapHeaders/fuchsiahouse1.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153)
+FuchsiaHouse1_h:
 	db HOUSE ; tileset
 	db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiahouse2.asm
+++ b/data/mapHeaders/fuchsiahouse2.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
+FuchsiaHouse2_h:
 	db LAB ; tileset
 	db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiahouse3.asm
+++ b/data/mapHeaders/fuchsiahouse3.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3_h: ; 0x56170 to 0x5617c (12 bytes) (id=164)
+FuchsiaHouse3_h:
 	db SHIP ; tileset
 	db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiamart.asm
+++ b/data/mapHeaders/fuchsiamart.asm
@@ -1,4 +1,4 @@
-FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
+FuchsiaMart_h:
 	db MART ; tileset
 	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
 	dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiameetingroom.asm
+++ b/data/mapHeaders/fuchsiameetingroom.asm
@@ -1,4 +1,4 @@
-FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
+FuchsiaMeetingRoom_h:
 	db LAB ; tileset
 	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
 	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
--- a/data/mapHeaders/fuchsiapokecenter.asm
+++ b/data/mapHeaders/fuchsiapokecenter.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
+FuchsiaPokecenter_h:
 	db POKECENTER ; tileset
 	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
 	dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/halloffameroom.asm
+++ b/data/mapHeaders/halloffameroom.asm
@@ -1,4 +1,4 @@
-HallofFameRoom_h: ; 0x5a492 to 0x5a49e (12 bytes) (id=118)
+HallofFameRoom_h:
 	db GYM ; tileset
 	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
 	dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
--- a/data/mapHeaders/indigoplateau.asm
+++ b/data/mapHeaders/indigoplateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9)
+IndigoPlateau_h:
 	db PLATEAU ; tileset
 	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
 	dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts
--- a/data/mapHeaders/indigoplateaulobby.asm
+++ b/data/mapHeaders/indigoplateaulobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobby_h: ; 0x19c4f to 0x19c5b (12 bytes) (bank=6) (id=174)
+IndigoPlateauLobby_h:
 	db MART ; tileset
 	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
 	dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
--- a/data/mapHeaders/lab1.asm
+++ b/data/mapHeaders/lab1.asm
@@ -1,4 +1,4 @@
-Lab1_h: ; 0x75b80 to 0x75b8c (12 bytes) (id=167)
+Lab1_h:
 	db LAB ; tileset
 	db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
 	dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
--- a/data/mapHeaders/lab2.asm
+++ b/data/mapHeaders/lab2.asm
@@ -1,4 +1,4 @@
-Lab2_h: ; 0x75c15 to 0x75c21 (12 bytes) (id=168)
+Lab2_h:
 	db LAB ; tileset
 	db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
 	dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
--- a/data/mapHeaders/lab3.asm
+++ b/data/mapHeaders/lab3.asm
@@ -1,4 +1,4 @@
-Lab3_h: ; 0x75c7b to 0x75c87 (12 bytes) (id=169)
+Lab3_h:
 	db LAB ; tileset
 	db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
 	dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
--- a/data/mapHeaders/lab4.asm
+++ b/data/mapHeaders/lab4.asm
@@ -1,4 +1,4 @@
-Lab4_h: ; 0x75d25 to 0x75d31 (12 bytes) (id=170)
+Lab4_h:
 	db LAB ; tileset
 	db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
 	dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
--- a/data/mapHeaders/lance.asm
+++ b/data/mapHeaders/lance.asm
@@ -1,4 +1,4 @@
-Lance_h: ; 0x5a2a2 to 0x5a2ae (12 bytes) (id=113)
+Lance_h:
 	db DOJO ; tileset
 	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
 	dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
--- a/data/mapHeaders/lavenderhouse1.asm
+++ b/data/mapHeaders/lavenderhouse1.asm
@@ -1,4 +1,4 @@
-LavenderHouse1_h: ; 0x1d89c to 0x1d8a8 (12 bytes) (bank=7) (id=149)
+LavenderHouse1_h:
 	db HOUSE ; tileset
 	db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/lavenderhouse2.asm
+++ b/data/mapHeaders/lavenderhouse2.asm
@@ -1,4 +1,4 @@
-LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
+LavenderHouse2_h:
 	db HOUSE ; tileset
 	db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/lavendermart.asm
+++ b/data/mapHeaders/lavendermart.asm
@@ -1,4 +1,4 @@
-LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
+LavenderMart_h:
 	db MART ; tileset
 	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
 	dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/lavenderpokecenter.asm
+++ b/data/mapHeaders/lavenderpokecenter.asm
@@ -1,4 +1,4 @@
-LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
+LavenderPokecenter_h:
 	db POKECENTER ; tileset
 	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
 	dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/lavendertown.asm
+++ b/data/mapHeaders/lavendertown.asm
@@ -1,4 +1,4 @@
-LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4)
+LavenderTown_h:
 	db OVERWORLD ; tileset
 	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
 	dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts
--- a/data/mapHeaders/lorelei.asm
+++ b/data/mapHeaders/lorelei.asm
@@ -1,4 +1,4 @@
-Lorelei_h: ; 0x7616f to 0x7617b (12 bytes) (id=245)
+Lorelei_h:
 	db GYM ; tileset
 	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
 	dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
--- a/data/mapHeaders/mansion1.asm
+++ b/data/mapHeaders/mansion1.asm
@@ -1,4 +1,4 @@
-Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
+Mansion1_h:
 	db FACILITY ; tileset
 	db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
 	dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
--- a/data/mapHeaders/mansion2.asm
+++ b/data/mapHeaders/mansion2.asm
@@ -1,4 +1,4 @@
-Mansion2_h: ; 0x51fcc to 0x51fd8 (12 bytes) (id=214)
+Mansion2_h:
 	db FACILITY ; tileset
 	db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
 	dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
--- a/data/mapHeaders/mansion3.asm
+++ b/data/mapHeaders/mansion3.asm
@@ -1,4 +1,4 @@
-Mansion3_h: ; 0x521e2 to 0x521ee (12 bytes) (id=215)
+Mansion3_h:
 	db FACILITY ; tileset
 	db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
 	dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
--- a/data/mapHeaders/mansion4.asm
+++ b/data/mapHeaders/mansion4.asm
@@ -1,4 +1,4 @@
-Mansion4_h: ; 0x523ad to 0x523b9 (12 bytes) (id=216)
+Mansion4_h:
 	db FACILITY ; tileset
 	db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
 	dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
--- a/data/mapHeaders/mtmoon1.asm
+++ b/data/mapHeaders/mtmoon1.asm
@@ -1,4 +1,4 @@
-MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
+MtMoon1_h:
 	db CAVERN ; tileset
 	db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
 	dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
--- a/data/mapHeaders/mtmoon2.asm
+++ b/data/mapHeaders/mtmoon2.asm
@@ -1,4 +1,4 @@
-MtMoon2_h: ; 0x51a36 to 0x51a42 (12 bytes) (id=60)
+MtMoon2_h:
 	db CAVERN ; tileset
 	db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
 	dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
--- a/data/mapHeaders/mtmoon3.asm
+++ b/data/mapHeaders/mtmoon3.asm
@@ -1,4 +1,4 @@
-MtMoon3_h: ; 0x49cff to 0x49d0b (12 bytes) (id=61)
+MtMoon3_h:
 	db CAVERN ; tileset
 	db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
 	dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
--- a/data/mapHeaders/mtmoonpokecenter.asm
+++ b/data/mapHeaders/mtmoonpokecenter.asm
@@ -1,4 +1,4 @@
-MtMoonPokecenter_h: ; 0x492c3 to 0x492cf (12 bytes) (bank=12) (id=68)
+MtMoonPokecenter_h:
 	db POKECENTER ; tileset
 	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/museum1f.asm
+++ b/data/mapHeaders/museum1f.asm
@@ -1,4 +1,4 @@
-Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
+Museum1F_h:
 	db MUSEUM ; tileset
 	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
 	dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
--- a/data/mapHeaders/museum2f.asm
+++ b/data/mapHeaders/museum2f.asm
@@ -1,4 +1,4 @@
-Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
+Museum2F_h:
 	db MUSEUM ; tileset
 	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
 	dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
--- a/data/mapHeaders/namerater.asm
+++ b/data/mapHeaders/namerater.asm
@@ -1,4 +1,4 @@
-NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
+NameRater_h:
 	db HOUSE ; tileset
 	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
 	dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
--- a/data/mapHeaders/oakslab.asm
+++ b/data/mapHeaders/oakslab.asm
@@ -1,4 +1,4 @@
-OaksLab_h: ; 0x1cb02 to 0x1cb0e (12 bytes) (bank=7) (id=40)
+OaksLab_h:
 	db DOJO ; tileset
 	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
 	dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
--- a/data/mapHeaders/pewtercity.asm
+++ b/data/mapHeaders/pewtercity.asm
@@ -1,4 +1,4 @@
-PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
+PewterCity_h:
 	db OVERWORLD ; tileset
 	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
 	dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/pewtergym.asm
+++ b/data/mapHeaders/pewtergym.asm
@@ -1,4 +1,4 @@
-PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
+PewterGym_h:
 	db GYM ; tileset
 	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
 	dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/pewterhouse1.asm
+++ b/data/mapHeaders/pewterhouse1.asm
@@ -1,4 +1,4 @@
-PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
+PewterHouse1_h:
 	db HOUSE ; tileset
 	db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/pewterhouse2.asm
+++ b/data/mapHeaders/pewterhouse2.asm
@@ -1,4 +1,4 @@
-PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
+PewterHouse2_h:
 	db HOUSE ; tileset
 	db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/pewtermart.asm
+++ b/data/mapHeaders/pewtermart.asm
@@ -1,4 +1,4 @@
-PewterMart_h: ; 0x74ca1 to 0x74cad (12 bytes) (id=56)
+PewterMart_h:
 	db MART ; tileset
 	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
 	dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/pewterpokecenter.asm
+++ b/data/mapHeaders/pewterpokecenter.asm
@@ -1,4 +1,4 @@
-PewterPokecenter_h: ; 0x5c57b to 0x5c587 (12 bytes) (id=58)
+PewterPokecenter_h:
 	db POKECENTER ; tileset
 	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
 	dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower1.asm
+++ b/data/mapHeaders/pokemontower1.asm
@@ -1,4 +1,4 @@
-PokemonTower1_h: ; 0x60420 to 0x6042c (12 bytes) (id=142)
+PokemonTower1_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
 	dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower2.asm
+++ b/data/mapHeaders/pokemontower2.asm
@@ -1,4 +1,4 @@
-PokemonTower2_h: ; 0x604e6 to 0x604f2 (12 bytes) (id=143)
+PokemonTower2_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
 	dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower3.asm
+++ b/data/mapHeaders/pokemontower3.asm
@@ -1,4 +1,4 @@
-PokemonTower3_h: ; 0x606c0 to 0x606cc (12 bytes) (id=144)
+PokemonTower3_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
 	dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower4.asm
+++ b/data/mapHeaders/pokemontower4.asm
@@ -1,4 +1,4 @@
-PokemonTower4_h: ; 0x607ea to 0x607f6 (12 bytes) (id=145)
+PokemonTower4_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
 	dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower5.asm
+++ b/data/mapHeaders/pokemontower5.asm
@@ -1,4 +1,4 @@
-PokemonTower5_h: ; 0x60926 to 0x60932 (12 bytes) (id=146)
+PokemonTower5_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
 	dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower6.asm
+++ b/data/mapHeaders/pokemontower6.asm
@@ -1,4 +1,4 @@
-PokemonTower6_h: ; 0x60ae3 to 0x60aef (12 bytes) (id=147)
+PokemonTower6_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
 	dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
--- a/data/mapHeaders/pokemontower7.asm
+++ b/data/mapHeaders/pokemontower7.asm
@@ -1,4 +1,4 @@
-PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148)
+PokemonTower7_h:
 	db CEMETERY ; tileset
 	db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
 	dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
--- a/data/mapHeaders/powerplant.asm
+++ b/data/mapHeaders/powerplant.asm
@@ -1,4 +1,4 @@
-PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
+PowerPlant_h:
 	db FACILITY ; tileset
 	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
 	dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
--- a/data/mapHeaders/rockethideout1.asm
+++ b/data/mapHeaders/rockethideout1.asm
@@ -1,4 +1,4 @@
-RocketHideout1_h: ; 0x44bbe to 0x44bca (12 bytes) (bank=11) (id=199)
+RocketHideout1_h:
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
 	dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
--- a/data/mapHeaders/rockethideout2.asm
+++ b/data/mapHeaders/rockethideout2.asm
@@ -1,4 +1,4 @@
-RocketHideout2_h: ; 0x44e1b to 0x44e27 (12 bytes) (bank=11) (id=200)
+RocketHideout2_h:
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
 	dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
--- a/data/mapHeaders/rockethideout3.asm
+++ b/data/mapHeaders/rockethideout3.asm
@@ -1,4 +1,4 @@
-RocketHideout3_h: ; 0x45219 to 0x45225 (12 bytes) (bank=11) (id=201)
+RocketHideout3_h:
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
 	dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
--- a/data/mapHeaders/rockethideout4.asm
+++ b/data/mapHeaders/rockethideout4.asm
@@ -1,4 +1,4 @@
-RocketHideout4_h: ; 0x45451 to 0x4545d (12 bytes) (bank=11) (id=202)
+RocketHideout4_h:
 	db FACILITY ; tileset
 	db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
 	dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
--- a/data/mapHeaders/rockethideoutelevator.asm
+++ b/data/mapHeaders/rockethideoutelevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevator_h: ; 0x45704 to 0x45710 (12 bytes) (bank=11) (id=203)
+RocketHideoutElevator_h:
 	db LOBBY ; tileset
 	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
--- a/data/mapHeaders/rocktunnel1.asm
+++ b/data/mapHeaders/rocktunnel1.asm
@@ -1,4 +1,4 @@
-RockTunnel1_h: ; 0x444d0 to 0x444dc (12 bytes) (bank=11) (id=82)
+RockTunnel1_h:
 	db CAVERN ; tileset
 	db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
 	dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
--- a/data/mapHeaders/rocktunnel2.asm
+++ b/data/mapHeaders/rocktunnel2.asm
@@ -1,4 +1,4 @@
-RockTunnel2_h: ; 0x45fdf to 0x45feb (12 bytes) (bank=11) (id=232)
+RockTunnel2_h:
 	db CAVERN ; tileset
 	db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
 	dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
--- a/data/mapHeaders/rocktunnelpokecenter.asm
+++ b/data/mapHeaders/rocktunnelpokecenter.asm
@@ -1,4 +1,4 @@
-RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
+RockTunnelPokecenter_h:
 	db POKECENTER ; tileset
 	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
 	dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/route1.asm
+++ b/data/mapHeaders/route1.asm
@@ -1,4 +1,4 @@
-Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12)
+Route1_h:
 	db OVERWORLD ; tileset
 	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
 	dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts
--- a/data/mapHeaders/route10.asm
+++ b/data/mapHeaders/route10.asm
@@ -1,4 +1,4 @@
-Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21)
+Route10_h:
 	db OVERWORLD ; tileset
 	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
 	dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts
--- a/data/mapHeaders/route11.asm
+++ b/data/mapHeaders/route11.asm
@@ -1,4 +1,4 @@
-Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22)
+Route11_h:
 	db OVERWORLD ; tileset
 	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
 	dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts
--- a/data/mapHeaders/route11gate.asm
+++ b/data/mapHeaders/route11gate.asm
@@ -1,4 +1,4 @@
-Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
+Route11Gate_h:
 	db GATE ; tileset
 	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route11gateupstairs.asm
+++ b/data/mapHeaders/route11gateupstairs.asm
@@ -1,4 +1,4 @@
-Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
+Route11GateUpstairs_h:
 	db GATE ; tileset
 	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
--- a/data/mapHeaders/route12.asm
+++ b/data/mapHeaders/route12.asm
@@ -1,4 +1,4 @@
-Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23)
+Route12_h:
 	db OVERWORLD ; tileset
 	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
 	dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
--- a/data/mapHeaders/route12gate.asm
+++ b/data/mapHeaders/route12gate.asm
@@ -1,4 +1,4 @@
-Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
+Route12Gate_h:
 	db GATE ; tileset
 	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route12gateupstairs.asm
+++ b/data/mapHeaders/route12gateupstairs.asm
@@ -1,4 +1,4 @@
-Route12GateUpstairs_h: ; 0x49554 to 0x49560 (12 bytes) (id=195)
+Route12GateUpstairs_h:
 	db GATE ; tileset
 	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
--- a/data/mapHeaders/route12house.asm
+++ b/data/mapHeaders/route12house.asm
@@ -1,4 +1,4 @@
-Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
+Route12House_h:
 	db HOUSE ; tileset
 	db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/route13.asm
+++ b/data/mapHeaders/route13.asm
@@ -1,4 +1,4 @@
-Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24)
+Route13_h:
 	db OVERWORLD ; tileset
 	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
 	dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts
--- a/data/mapHeaders/route14.asm
+++ b/data/mapHeaders/route14.asm
@@ -1,4 +1,4 @@
-Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25)
+Route14_h:
 	db OVERWORLD ; tileset
 	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
 	dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts
--- a/data/mapHeaders/route15.asm
+++ b/data/mapHeaders/route15.asm
@@ -1,4 +1,4 @@
-Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26)
+Route15_h:
 	db OVERWORLD ; tileset
 	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
 	dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts
--- a/data/mapHeaders/route15gate.asm
+++ b/data/mapHeaders/route15gate.asm
@@ -1,4 +1,4 @@
-Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
+Route15Gate_h:
 	db GATE ; tileset
 	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route16.asm
+++ b/data/mapHeaders/route16.asm
@@ -1,4 +1,4 @@
-Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27)
+Route16_h:
 	db OVERWORLD ; tileset
 	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
 	dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts
--- a/data/mapHeaders/route16gate.asm
+++ b/data/mapHeaders/route16gate.asm
@@ -1,4 +1,4 @@
-Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
+Route16Gate_h:
 	db GATE ; tileset
 	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route16gateupstairs.asm
+++ b/data/mapHeaders/route16gateupstairs.asm
@@ -1,4 +1,4 @@
-Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
+Route16GateUpstairs_h:
 	db GATE ; tileset
 	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
--- a/data/mapHeaders/route16house.asm
+++ b/data/mapHeaders/route16house.asm
@@ -1,4 +1,4 @@
-Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
+Route16House_h:
 	db HOUSE ; tileset
 	db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/route17.asm
+++ b/data/mapHeaders/route17.asm
@@ -1,4 +1,4 @@
-Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28)
+Route17_h:
 	db OVERWORLD ; tileset
 	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
 	dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts
--- a/data/mapHeaders/route18.asm
+++ b/data/mapHeaders/route18.asm
@@ -1,4 +1,4 @@
-Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29)
+Route18_h:
 	db OVERWORLD ; tileset
 	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
 	dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts
--- a/data/mapHeaders/route18gate.asm
+++ b/data/mapHeaders/route18gate.asm
@@ -1,4 +1,4 @@
-Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
+Route18Gate_h:
 	db GATE ; tileset
 	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route18gateupstairs.asm
+++ b/data/mapHeaders/route18gateupstairs.asm
@@ -1,4 +1,4 @@
-Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
+Route18GateUpstairs_h:
 	db GATE ; tileset
 	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
 	dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
--- a/data/mapHeaders/route19.asm
+++ b/data/mapHeaders/route19.asm
@@ -1,4 +1,4 @@
-Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30)
+Route19_h:
 	db OVERWORLD ; tileset
 	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
 	dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts
--- a/data/mapHeaders/route20.asm
+++ b/data/mapHeaders/route20.asm
@@ -1,4 +1,4 @@
-Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31)
+Route20_h:
 	db OVERWORLD ; tileset
 	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
 	dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts
--- a/data/mapHeaders/route21.asm
+++ b/data/mapHeaders/route21.asm
@@ -1,4 +1,4 @@
-Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32)
+Route21_h:
 	db OVERWORLD ; tileset
 	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
 	dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts
--- a/data/mapHeaders/route22.asm
+++ b/data/mapHeaders/route22.asm
@@ -1,4 +1,4 @@
-Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33)
+Route22_h:
 	db OVERWORLD ; tileset
 	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
 	dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts
--- a/data/mapHeaders/route22gate.asm
+++ b/data/mapHeaders/route22gate.asm
@@ -1,4 +1,4 @@
-Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
+Route22Gate_h:
 	db GATE ; tileset
 	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
 	dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route23.asm
+++ b/data/mapHeaders/route23.asm
@@ -1,4 +1,4 @@
-Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34)
+Route23_h:
 	db PLATEAU ; tileset
 	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
 	dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts
--- a/data/mapHeaders/route24.asm
+++ b/data/mapHeaders/route24.asm
@@ -1,4 +1,4 @@
-Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35)
+Route24_h:
 	db OVERWORLD ; tileset
 	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
 	dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts
--- a/data/mapHeaders/route25.asm
+++ b/data/mapHeaders/route25.asm
@@ -1,4 +1,4 @@
-Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36)
+Route25_h:
 	db OVERWORLD ; tileset
 	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
 	dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts
--- a/data/mapHeaders/route2gate.asm
+++ b/data/mapHeaders/route2gate.asm
@@ -1,4 +1,4 @@
-Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
+Route2Gate_h:
 	db GATE ; tileset
 	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
 	dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route2house.asm
+++ b/data/mapHeaders/route2house.asm
@@ -1,4 +1,4 @@
-Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
+Route2House_h:
 	db HOUSE ; tileset
 	db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
 	dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/route3.asm
+++ b/data/mapHeaders/route3.asm
@@ -1,4 +1,4 @@
-Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14)
+Route3_h:
 	db OVERWORLD ; tileset
 	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
 	dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts
--- a/data/mapHeaders/route4.asm
+++ b/data/mapHeaders/route4.asm
@@ -1,4 +1,4 @@
-Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15)
+Route4_h:
 	db OVERWORLD ; tileset
 	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
 	dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts
--- a/data/mapHeaders/route5.asm
+++ b/data/mapHeaders/route5.asm
@@ -1,4 +1,4 @@
-Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16)
+Route5_h:
 	db OVERWORLD ; tileset
 	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
 	dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
--- a/data/mapHeaders/route5gate.asm
+++ b/data/mapHeaders/route5gate.asm
@@ -1,4 +1,4 @@
-Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
+Route5Gate_h:
 	db GATE ; tileset
 	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
 	dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route6.asm
+++ b/data/mapHeaders/route6.asm
@@ -1,4 +1,4 @@
-Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17)
+Route6_h:
 	db OVERWORLD ; tileset
 	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
 	dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts
--- a/data/mapHeaders/route6gate.asm
+++ b/data/mapHeaders/route6gate.asm
@@ -1,4 +1,4 @@
-Route6Gate_h: ; 0x1e031 to 0x1e03d (12 bytes) (bank=7) (id=73)
+Route6Gate_h:
 	db GATE ; tileset
 	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
 	dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route7.asm
+++ b/data/mapHeaders/route7.asm
@@ -1,4 +1,4 @@
-Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18)
+Route7_h:
 	db OVERWORLD ; tileset
 	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
 	dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts
--- a/data/mapHeaders/route7gate.asm
+++ b/data/mapHeaders/route7gate.asm
@@ -1,4 +1,4 @@
-Route7Gate_h: ; 0x1e0f4 to 0x1e100 (12 bytes) (bank=7) (id=76)
+Route7Gate_h:
 	db GATE ; tileset
 	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
 	dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route8.asm
+++ b/data/mapHeaders/route8.asm
@@ -1,4 +1,4 @@
-Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19)
+Route8_h:
 	db OVERWORLD ; tileset
 	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
 	dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts
--- a/data/mapHeaders/route8gate.asm
+++ b/data/mapHeaders/route8gate.asm
@@ -1,4 +1,4 @@
-Route8Gate_h: ; 0x1e1bb to 0x1e1c7 (12 bytes) (bank=7) (id=79)
+Route8Gate_h:
 	db GATE ; tileset
 	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
 	dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
--- a/data/mapHeaders/route9.asm
+++ b/data/mapHeaders/route9.asm
@@ -1,4 +1,4 @@
-Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20)
+Route9_h:
 	db OVERWORLD ; tileset
 	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
 	dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts
--- a/data/mapHeaders/safarizonecenter.asm
+++ b/data/mapHeaders/safarizonecenter.asm
@@ -1,4 +1,4 @@
-SafariZoneCenter_h: ; 0x45ba6 to 0x45bb2 (12 bytes) (bank=11) (id=220)
+SafariZoneCenter_h:
 	db FOREST ; tileset
 	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
 	dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/safarizoneeast.asm
+++ b/data/mapHeaders/safarizoneeast.asm
@@ -1,4 +1,4 @@
-SafariZoneEast_h: ; 0x4585f to 0x4586b (12 bytes) (bank=11) (id=217)
+SafariZoneEast_h:
 	db FOREST ; tileset
 	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
 	dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
--- a/data/mapHeaders/safarizoneentrance.asm
+++ b/data/mapHeaders/safarizoneentrance.asm
@@ -1,4 +1,4 @@
-SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
+SafariZoneEntrance_h:
 	db GATE ; tileset
 	db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
--- a/data/mapHeaders/safarizonenorth.asm
+++ b/data/mapHeaders/safarizonenorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorth_h: ; 0x4599f to 0x459ab (12 bytes) (bank=11) (id=218)
+SafariZoneNorth_h:
 	db FOREST ; tileset
 	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
 	dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
--- a/data/mapHeaders/safarizoneresthouse1.asm
+++ b/data/mapHeaders/safarizoneresthouse1.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse1_h: ; 0x45ce1 to 0x45ced (12 bytes) (bank=11) (id=221)
+SafariZoneRestHouse1_h:
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/safarizoneresthouse2.asm
+++ b/data/mapHeaders/safarizoneresthouse2.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
+SafariZoneRestHouse2_h:
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/safarizoneresthouse3.asm
+++ b/data/mapHeaders/safarizoneresthouse3.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
+SafariZoneRestHouse3_h:
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
--- a/data/mapHeaders/safarizoneresthouse4.asm
+++ b/data/mapHeaders/safarizoneresthouse4.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
+SafariZoneRestHouse4_h:
 	db GATE ; tileset
 	db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
 	dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
--- a/data/mapHeaders/safarizonesecrethouse.asm
+++ b/data/mapHeaders/safarizonesecrethouse.asm
@@ -1,4 +1,4 @@
-SafariZoneSecretHouse_h: ; 0x4a30b to 0x4a317 (12 bytes) (id=222)
+SafariZoneSecretHouse_h:
 	db LAB ; tileset
 	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
 	dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/safarizonewest.asm
+++ b/data/mapHeaders/safarizonewest.asm
@@ -1,4 +1,4 @@
-SafariZoneWest_h: ; 0x4a1a9 to 0x4a1b5 (12 bytes) (id=219)
+SafariZoneWest_h:
 	db FOREST ; tileset
 	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
 	dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
--- a/data/mapHeaders/saffroncity.asm
+++ b/data/mapHeaders/saffroncity.asm
@@ -1,4 +1,4 @@
-SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10)
+SaffronCity_h:
 	db OVERWORLD ; tileset
 	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
 	dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/saffrongym.asm
+++ b/data/mapHeaders/saffrongym.asm
@@ -1,4 +1,4 @@
-SaffronGym_h: ; 0x5d001 to 0x5d00d (12 bytes) (id=178)
+SaffronGym_h:
 	db FACILITY ; tileset
 	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
 	dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/saffronhouse1.asm
+++ b/data/mapHeaders/saffronhouse1.asm
@@ -1,4 +1,4 @@
-SaffronHouse1_h: ; 0x1ddd1 to 0x1dddd (12 bytes) (bank=7) (id=179)
+SaffronHouse1_h:
 	db HOUSE ; tileset
 	db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/saffronhouse2.asm
+++ b/data/mapHeaders/saffronhouse2.asm
@@ -1,4 +1,4 @@
-SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
+SaffronHouse2_h:
 	db HOUSE ; tileset
 	db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/saffronmart.asm
+++ b/data/mapHeaders/saffronmart.asm
@@ -1,4 +1,4 @@
-SaffronMart_h: ; 0x5d3fd to 0x5d409 (12 bytes) (id=180)
+SaffronMart_h:
 	db MART ; tileset
 	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
 	dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/saffronpokecenter.asm
+++ b/data/mapHeaders/saffronpokecenter.asm
@@ -1,4 +1,4 @@
-SaffronPokecenter_h: ; 0x5d529 to 0x5d535 (12 bytes) (id=182)
+SaffronPokecenter_h:
 	db POKECENTER ; tileset
 	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
 	dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/school.asm
+++ b/data/mapHeaders/school.asm
@@ -1,4 +1,4 @@
-School_h: ; 0x1d540 to 0x1d54c (12 bytes) (bank=7) (id=43)
+School_h:
 	db HOUSE ; tileset
 	db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
 	dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
--- a/data/mapHeaders/seafoamislands1.asm
+++ b/data/mapHeaders/seafoamislands1.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1_h: ; 0x447dd to 0x447e9 (12 bytes) (bank=11) (id=192)
+SeafoamIslands1_h:
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
--- a/data/mapHeaders/seafoamislands2.asm
+++ b/data/mapHeaders/seafoamislands2.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2_h: ; 0x46309 to 0x46315 (12 bytes) (bank=11) (id=159)
+SeafoamIslands2_h:
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
--- a/data/mapHeaders/seafoamislands3.asm
+++ b/data/mapHeaders/seafoamislands3.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3_h: ; 0x46445 to 0x46451 (12 bytes) (bank=11) (id=160)
+SeafoamIslands3_h:
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
--- a/data/mapHeaders/seafoamislands4.asm
+++ b/data/mapHeaders/seafoamislands4.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4_h: ; 0x46581 to 0x4658d (12 bytes) (bank=11) (id=161)
+SeafoamIslands4_h:
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
--- a/data/mapHeaders/seafoamislands5.asm
+++ b/data/mapHeaders/seafoamislands5.asm
@@ -1,4 +1,4 @@
-SeafoamIslands5_h: ; 0x4678d to 0x46799 (12 bytes) (bank=11) (id=162)
+SeafoamIslands5_h:
 	db CAVERN ; tileset
 	db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
 	dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco1.asm
+++ b/data/mapHeaders/silphco1.asm
@@ -1,4 +1,4 @@
-SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
+SilphCo1_h:
 	db FACILITY ; tileset
 	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
 	dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco10.asm
+++ b/data/mapHeaders/silphco10.asm
@@ -1,4 +1,4 @@
-SilphCo10_h: ; 0x5a12d to 0x5a139 (12 bytes) (id=234)
+SilphCo10_h:
 	db FACILITY ; tileset
 	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
 	dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco11.asm
+++ b/data/mapHeaders/silphco11.asm
@@ -1,4 +1,4 @@
-SilphCo11_h: ; 0x620ee to 0x620fa (12 bytes) (id=235)
+SilphCo11_h:
 	db INTERIOR ; tileset
 	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
 	dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco2.asm
+++ b/data/mapHeaders/silphco2.asm
@@ -1,4 +1,4 @@
-SilphCo2_h: ; 0x59ce5 to 0x59cf1 (12 bytes) (id=207)
+SilphCo2_h:
 	db FACILITY ; tileset
 	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
 	dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco3.asm
+++ b/data/mapHeaders/silphco3.asm
@@ -1,4 +1,4 @@
-SilphCo3_h: ; 0x59f4f to 0x59f5b (12 bytes) (id=208)
+SilphCo3_h:
 	db FACILITY ; tileset
 	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
 	dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco4.asm
+++ b/data/mapHeaders/silphco4.asm
@@ -1,4 +1,4 @@
-SilphCo4_h: ; 0x19cff to 0x19d0b (12 bytes) (bank=6) (id=209)
+SilphCo4_h:
 	db FACILITY ; tileset
 	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
 	dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco5.asm
+++ b/data/mapHeaders/silphco5.asm
@@ -1,4 +1,4 @@
-SilphCo5_h: ; 0x19f2b to 0x19f37 (12 bytes) (bank=6) (id=210)
+SilphCo5_h:
 	db FACILITY ; tileset
 	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
 	dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco6.asm
+++ b/data/mapHeaders/silphco6.asm
@@ -1,4 +1,4 @@
-SilphCo6_h: ; 0x1a19d to 0x1a1a9 (12 bytes) (bank=6) (id=211)
+SilphCo6_h:
 	db FACILITY ; tileset
 	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
 	dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco7.asm
+++ b/data/mapHeaders/silphco7.asm
@@ -1,4 +1,4 @@
-SilphCo7_h: ; 0x51b55 to 0x51b61 (12 bytes) (id=212)
+SilphCo7_h:
 	db FACILITY ; tileset
 	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
 	dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco8.asm
+++ b/data/mapHeaders/silphco8.asm
@@ -1,4 +1,4 @@
-SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
+SilphCo8_h:
 	db FACILITY ; tileset
 	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
 	dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphco9.asm
+++ b/data/mapHeaders/silphco9.asm
@@ -1,4 +1,4 @@
-SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
+SilphCo9_h:
 	db FACILITY ; tileset
 	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
 	dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
--- a/data/mapHeaders/silphcoelevator.asm
+++ b/data/mapHeaders/silphcoelevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevator_h: ; 0x457b4 to 0x457c0 (12 bytes) (bank=11) (id=236)
+SilphCoElevator_h:
 	db LOBBY ; tileset
 	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
 	dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne1.asm
+++ b/data/mapHeaders/ssanne1.asm
@@ -1,4 +1,4 @@
-SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
+SSAnne1_h:
 	db SHIP ; tileset
 	db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
 	dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne10.asm
+++ b/data/mapHeaders/ssanne10.asm
@@ -1,4 +1,4 @@
-SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
+SSAnne10_h:
 	db SHIP ; tileset
 	db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
 	dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne2.asm
+++ b/data/mapHeaders/ssanne2.asm
@@ -1,4 +1,4 @@
-SSAnne2_h: ; 0x61393 to 0x6139f (12 bytes) (id=96)
+SSAnne2_h:
 	db SHIP ; tileset
 	db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
 	dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne3.asm
+++ b/data/mapHeaders/ssanne3.asm
@@ -1,4 +1,4 @@
-SSAnne3_h: ; 0x44926 to 0x44932 (12 bytes) (bank=11) (id=97)
+SSAnne3_h:
 	db SHIP ; tileset
 	db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
 	dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne4.asm
+++ b/data/mapHeaders/ssanne4.asm
@@ -1,4 +1,4 @@
-SSAnne4_h: ; 0x61622 to 0x6162e (12 bytes) (id=98)
+SSAnne4_h:
 	db SHIP ; tileset
 	db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
 	dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne5.asm
+++ b/data/mapHeaders/ssanne5.asm
@@ -1,4 +1,4 @@
-SSAnne5_h: ; 0x616a2 to 0x616ae (12 bytes) (id=99)
+SSAnne5_h:
 	db SHIP ; tileset
 	db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
 	dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne6.asm
+++ b/data/mapHeaders/ssanne6.asm
@@ -1,4 +1,4 @@
-SSAnne6_h: ; 0x617a7 to 0x617b3 (12 bytes) (id=100)
+SSAnne6_h:
 	db SHIP ; tileset
 	db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
 	dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne7.asm
+++ b/data/mapHeaders/ssanne7.asm
@@ -1,4 +1,4 @@
-SSAnne7_h: ; 0x61889 to 0x61895 (12 bytes) (id=101)
+SSAnne7_h:
 	db SHIP ; tileset
 	db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
 	dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne8.asm
+++ b/data/mapHeaders/ssanne8.asm
@@ -1,4 +1,4 @@
-SSAnne8_h: ; 0x6196a to 0x61976 (12 bytes) (id=102)
+SSAnne8_h:
 	db SHIP ; tileset
 	db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
 	dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
--- a/data/mapHeaders/ssanne9.asm
+++ b/data/mapHeaders/ssanne9.asm
@@ -1,4 +1,4 @@
-SSAnne9_h: ; 0x61b3f to 0x61b4b (12 bytes) (id=103)
+SSAnne9_h:
 	db SHIP ; tileset
 	db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
 	dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
--- a/data/mapHeaders/tradecenter.asm
+++ b/data/mapHeaders/tradecenter.asm
@@ -1,4 +1,4 @@
-TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
+TradeCenter_h:
 	db CLUB ; tileset
 	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
 	dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/undergroundpathentranceroute5.asm
+++ b/data/mapHeaders/undergroundpathentranceroute5.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
+UndergroundPathEntranceRoute5_h:
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts
--- a/data/mapHeaders/undergroundpathentranceroute6.asm
+++ b/data/mapHeaders/undergroundpathentranceroute6.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
+UndergroundPathEntranceRoute6_h:
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts
--- a/data/mapHeaders/undergroundpathentranceroute7.asm
+++ b/data/mapHeaders/undergroundpathentranceroute7.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
+UndergroundPathEntranceRoute7_h:
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
--- a/data/mapHeaders/undergroundpathentranceroute8.asm
+++ b/data/mapHeaders/undergroundpathentranceroute8.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute8_h: ; 0x1e27d to 0x1e289 (12 bytes) (bank=7) (id=80)
+UndergroundPathEntranceRoute8_h:
 	db GATE ; tileset
 	db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
 	dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
--- a/data/mapHeaders/undergroundpathns.asm
+++ b/data/mapHeaders/undergroundpathns.asm
@@ -1,4 +1,4 @@
-UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
+UndergroundPathNS_h:
 	db UNDERGROUND ; tileset
 	db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
 	dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
--- a/data/mapHeaders/undergroundpathwe.asm
+++ b/data/mapHeaders/undergroundpathwe.asm
@@ -1,4 +1,4 @@
-UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
+UndergroundPathWE_h:
 	db UNDERGROUND ; tileset
 	db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
 	dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
--- a/data/mapHeaders/unknowndungeon1.asm
+++ b/data/mapHeaders/unknowndungeon1.asm
@@ -1,4 +1,4 @@
-UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
+UnknownDungeon1_h:
 	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
--- a/data/mapHeaders/unknowndungeon2.asm
+++ b/data/mapHeaders/unknowndungeon2.asm
@@ -1,4 +1,4 @@
-UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
+UnknownDungeon2_h:
 	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
--- a/data/mapHeaders/unknowndungeon3.asm
+++ b/data/mapHeaders/unknowndungeon3.asm
@@ -1,4 +1,4 @@
-UnknownDungeon3_h: ; 0x45ee4 to 0x45ef0 (12 bytes) (bank=11) (id=227)
+UnknownDungeon3_h:
 	db CAVERN ; tileset
 	db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
 	dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
--- a/data/mapHeaders/vermilioncity.asm
+++ b/data/mapHeaders/vermilioncity.asm
@@ -1,4 +1,4 @@
-VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5)
+VermilionCity_h:
 	db OVERWORLD ; tileset
 	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
 	dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/vermiliondock.asm
+++ b/data/mapHeaders/vermiliondock.asm
@@ -1,4 +1,4 @@
-VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
+VermilionDock_h:
 	db SHIP_PORT ; tileset
 	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
 	dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
--- a/data/mapHeaders/vermiliongym.asm
+++ b/data/mapHeaders/vermiliongym.asm
@@ -1,4 +1,4 @@
-VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
+VermilionGym_h:
 	db GYM ; tileset
 	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
 	dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/vermilionhouse1.asm
+++ b/data/mapHeaders/vermilionhouse1.asm
@@ -1,4 +1,4 @@
-VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
+VermilionHouse1_h:
 	db HOUSE ; tileset
 	db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
 	dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
--- a/data/mapHeaders/vermilionhouse2.asm
+++ b/data/mapHeaders/vermilionhouse2.asm
@@ -1,4 +1,4 @@
-VermilionHouse2_h: ; 0x56064 to 0x56070 (12 bytes) (id=163)
+VermilionHouse2_h:
 	db HOUSE ; tileset
 	db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
 	dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
--- a/data/mapHeaders/vermilionhouse3.asm
+++ b/data/mapHeaders/vermilionhouse3.asm
@@ -1,4 +1,4 @@
-VermilionHouse3_h: ; 0x19c06 to 0x19c12 (12 bytes) (bank=6) (id=196)
+VermilionHouse3_h:
 	db HOUSE ; tileset
 	db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
 	dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
--- a/data/mapHeaders/vermilionmart.asm
+++ b/data/mapHeaders/vermilionmart.asm
@@ -1,4 +1,4 @@
-VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
+VermilionMart_h:
 	db MART ; tileset
 	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
 	dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/vermilionpokecenter.asm
+++ b/data/mapHeaders/vermilionpokecenter.asm
@@ -1,4 +1,4 @@
-VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
+VermilionPokecenter_h:
 	db POKECENTER ; tileset
 	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
 	dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
--- a/data/mapHeaders/victoryroad1.asm
+++ b/data/mapHeaders/victoryroad1.asm
@@ -1,4 +1,4 @@
-VictoryRoad1_h: ; 0x5d9fe to 0x5da0a (12 bytes) (id=108)
+VictoryRoad1_h:
 	db CAVERN ; tileset
 	db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
 	dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
--- a/data/mapHeaders/victoryroad2.asm
+++ b/data/mapHeaders/victoryroad2.asm
@@ -1,4 +1,4 @@
-VictoryRoad2_h: ; 0x51791 to 0x5179d (12 bytes) (id=194)
+VictoryRoad2_h:
 	db CAVERN ; tileset
 	db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
 	dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
--- a/data/mapHeaders/victoryroad3.asm
+++ b/data/mapHeaders/victoryroad3.asm
@@ -1,4 +1,4 @@
-VictoryRoad3_h: ; 0x44974 to 0x44980 (12 bytes) (bank=11) (id=198)
+VictoryRoad3_h:
 	db CAVERN ; tileset
 	db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
 	dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
--- a/data/mapHeaders/viridiancity.asm
+++ b/data/mapHeaders/viridiancity.asm
@@ -1,4 +1,4 @@
-ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1)
+ViridianCity_h:
 	db OVERWORLD ; tileset
 	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
 	dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridianforest.asm
+++ b/data/mapHeaders/viridianforest.asm
@@ -1,4 +1,4 @@
-ViridianForest_h: ; 0x61101 to 0x6110d (12 bytes) (id=51)
+ViridianForest_h:
 	db FOREST ; tileset
 	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
 	dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridianforestentrance.asm
+++ b/data/mapHeaders/viridianforestentrance.asm
@@ -1,4 +1,4 @@
-ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
+ViridianForestEntrance_h:
 	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridianforestexit.asm
+++ b/data/mapHeaders/viridianforestexit.asm
@@ -1,4 +1,4 @@
-ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
+ViridianForestExit_h:
 	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
 	dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridiangym.asm
+++ b/data/mapHeaders/viridiangym.asm
@@ -1,4 +1,4 @@
-ViridianGym_h: ; 0x74897 to 0x748a3 (12 bytes) (id=45)
+ViridianGym_h:
 	db GYM ; tileset
 	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
 	dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridianhouse.asm
+++ b/data/mapHeaders/viridianhouse.asm
@@ -1,4 +1,4 @@
-ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
+ViridianHouse_h:
 	db HOUSE ; tileset
 	db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
 	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridianmart.asm
+++ b/data/mapHeaders/viridianmart.asm
@@ -1,4 +1,4 @@
-ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
+ViridianMart_h:
 	db MART ; tileset
 	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
 	dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
--- a/data/mapHeaders/viridianpokecenter.asm
+++ b/data/mapHeaders/viridianpokecenter.asm
@@ -1,4 +1,4 @@
-ViridianPokecenter_h: ; 0x44251 to 0x4425d (12 bytes) (bank=11) (id=41)
+ViridianPokecenter_h:
 	db POKECENTER ; tileset
 	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
 	dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
--- a/data/mapObjects/agatha.asm
+++ b/data/mapObjects/agatha.asm
@@ -1,4 +1,4 @@
-AgathaObject: ; 0x76534 (size=44)
+AgathaObject:
 	db $0 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/bikeshop.asm
+++ b/data/mapObjects/bikeshop.asm
@@ -1,4 +1,4 @@
-BikeShopObject: ; 0x1d866 (size=38)
+BikeShopObject:
 	db $e ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/billshouse.asm
+++ b/data/mapObjects/billshouse.asm
@@ -1,4 +1,4 @@
-BillsHouseObject: ; 0x1e8df (size=38)
+BillsHouseObject:
 	db $d ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/bruno.asm
+++ b/data/mapObjects/bruno.asm
@@ -1,4 +1,4 @@
-BrunoObject: ; 0x763d7 (size=44)
+BrunoObject:
 	db $3 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/celadoncity.asm
+++ b/data/mapObjects/celadoncity.asm
@@ -1,4 +1,4 @@
-CeladonCityObject: ; 0x18022 (size=189)
+CeladonCityObject:
 	db $f ; border block
 
 	db $d ; warps
--- a/data/mapObjects/celadondiner.asm
+++ b/data/mapObjects/celadondiner.asm
@@ -1,4 +1,4 @@
-CeladonDinerObject: ; 0x491bc (size=50)
+CeladonDinerObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/celadongamecorner.asm
@@ -1,4 +1,4 @@
-CeladonGameCornerObject: ; 0x48fa0 (size=99)
+CeladonGameCornerObject:
 	db $f ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/celadongym.asm
@@ -1,4 +1,4 @@
-CeladonGymObject: ; 0x48b30 (size=84)
+CeladonGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadonhotel.asm
+++ b/data/mapObjects/celadonhotel.asm
@@ -1,4 +1,4 @@
-CeladonHotelObject: ; 0x49281 (size=38)
+CeladonHotelObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/celadonhouse.asm
@@ -1,4 +1,4 @@
-CeladonHouseObject: ; 0x49227 (size=38)
+CeladonHouseObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadonmansion1.asm
+++ b/data/mapObjects/celadonmansion1.asm
@@ -1,4 +1,4 @@
-CeladonMansion1Object: ; 0x486cf (size=71)
+CeladonMansion1Object:
 	db $f ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/celadonmansion2.asm
+++ b/data/mapObjects/celadonmansion2.asm
@@ -1,4 +1,4 @@
-CeladonMansion2Object: ; 0x48745 (size=39)
+CeladonMansion2Object:
 	db $f ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/celadonmansion3.asm
+++ b/data/mapObjects/celadonmansion3.asm
@@ -1,4 +1,4 @@
-CeladonMansion3Object: ; 0x487ff (size=72)
+CeladonMansion3Object:
 	db $f ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/celadonmansion4.asm
+++ b/data/mapObjects/celadonmansion4.asm
@@ -1,4 +1,4 @@
-CeladonMansion4Object: ; 0x48875 (size=31)
+CeladonMansion4Object:
 	db $9 ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/celadonmansion5.asm
+++ b/data/mapObjects/celadonmansion5.asm
@@ -1,4 +1,4 @@
-CeladonMansion5Object: ; 0x1dd5c (size=32)
+CeladonMansion5Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/celadonmart1.asm
@@ -1,4 +1,4 @@
-CeladonMart1Object: ; 0x60f9e (size=64)
+CeladonMart1Object:
 	db $f ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/celadonmart2.asm
@@ -1,4 +1,4 @@
-CeladonMart2Object: ; 0x56111 (size=55)
+CeladonMart2Object:
 	db $f ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/celadonmart3.asm
@@ -1,4 +1,4 @@
-CeladonMart3Object: ; 0x482c4 (size=94)
+CeladonMart3Object:
 	db $f ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/celadonmart4.asm
@@ -1,4 +1,4 @@
-CeladonMart4Object: ; 0x48370 (size=49)
+CeladonMart4Object:
 	db $f ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/celadonmart5.asm
@@ -1,4 +1,4 @@
-CeladonMart5Object: ; 0x49085 (size=55)
+CeladonMart5Object:
 	db $f ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/celadonmartelevator.asm
+++ b/data/mapObjects/celadonmartelevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorObject: ; 0x4866d (size=23)
+CeladonMartElevatorObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/celadonmartroof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoofObject: ; 0x485a8 (size=36)
+CeladonMartRoofObject:
 	db $42 ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/celadonpokecenter.asm
+++ b/data/mapObjects/celadonpokecenter.asm
@@ -1,4 +1,4 @@
-CeladonPokecenterObject: ; 0x488d2 (size=44)
+CeladonPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/celadonprizeroom.asm
@@ -1,4 +1,4 @@
-CeladonPrizeRoomObject: ; 0x49108 (size=41)
+CeladonPrizeRoomObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -1,4 +1,4 @@
-CeruleanCityObject: ; 0x18786 (size=170)
+CeruleanCityObject:
 	db $f ; border block
 
 	db $a ; warps
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/ceruleangym.asm
@@ -1,4 +1,4 @@
-CeruleanGymObject: ; 0x5c834 (size=50)
+CeruleanGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/ceruleanhouse1.asm
@@ -1,4 +1,4 @@
-CeruleanHouse1Object: ; 0x1d710 (size=32)
+CeruleanHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ceruleanhouse2.asm
+++ b/data/mapObjects/ceruleanhouse2.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2Object: ; 0x74ebe (size=34)
+CeruleanHouse2Object:
 	db $c ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/ceruleanhousetrashed.asm
+++ b/data/mapObjects/ceruleanhousetrashed.asm
@@ -1,4 +1,4 @@
-CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
+CeruleanHouseTrashedObject:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/ceruleanmart.asm
+++ b/data/mapObjects/ceruleanmart.asm
@@ -1,4 +1,4 @@
-CeruleanMartObject: ; 0x5c8a8 (size=38)
+CeruleanMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/ceruleanpokecenter.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenterObject: ; 0x5c65f (size=44)
+CeruleanPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/cinnabargym.asm
@@ -1,4 +1,4 @@
-CinnabarGymObject: ; 0x75acc (size=90)
+CinnabarGymObject:
 	db $2e ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/cinnabarisland.asm
@@ -1,4 +1,4 @@
-CinnabarIslandObject: ; 0x1c022 (size=71)
+CinnabarIslandObject:
 	db $43 ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/cinnabarmart.asm
+++ b/data/mapObjects/cinnabarmart.asm
@@ -1,4 +1,4 @@
-CinnabarMartObject: ; 0x75e91 (size=38)
+CinnabarMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/cinnabarpokecenter.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenterObject: ; 0x75e46 (size=44)
+CinnabarPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/colosseum.asm
+++ b/data/mapObjects/colosseum.asm
@@ -1,4 +1,4 @@
-ColosseumObject: ; 0x4fd87 (size=10)
+ColosseumObject:
 	db $e ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/copycatshouse1f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse1FObject: ; 0x75ee3 (size=46)
+CopycatsHouse1FObject:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/copycatshouse2f.asm
+++ b/data/mapObjects/copycatshouse2f.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2FObject: ; 0x5cd21 (size=48)
+CopycatsHouse2FObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/daycarem.asm
+++ b/data/mapObjects/daycarem.asm
@@ -1,4 +1,4 @@
-DayCareMObject: ; 0x56459 (size=26)
+DayCareMObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/diglettscave.asm
+++ b/data/mapObjects/diglettscave.asm
@@ -1,4 +1,4 @@
-DiglettsCaveObject: ; 0x61f72 (size=20)
+DiglettsCaveObject:
 	db $19 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/diglettscaveroute11.asm
+++ b/data/mapObjects/diglettscaveroute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
+DiglettsCaveEntranceRoute11Object:
 	db $7d ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/diglettscaveroute2.asm
+++ b/data/mapObjects/diglettscaveroute2.asm
@@ -1,4 +1,4 @@
-DiglettsCaveRoute2Object: ; 0x1debf (size=34)
+DiglettsCaveRoute2Object:
 	db $7d ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -1,4 +1,4 @@
-FanClubObject: ; 0x59c97 (size=62)
+FanClubObject:
 	db $d ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/fightingdojo.asm
@@ -1,4 +1,4 @@
-FightingDojoObject: ; 0x5cf9b (size=72)
+FightingDojoObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/fuchsiacity.asm
@@ -1,4 +1,4 @@
-FuchsiaCityObject: ; 0x18bd4 (size=178)
+FuchsiaCityObject:
 	db $f ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/fuchsiagym.asm
@@ -1,4 +1,4 @@
-FuchsiaGymObject: ; 0x75658 (size=82)
+FuchsiaGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fuchsiahouse1.asm
+++ b/data/mapObjects/fuchsiahouse1.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse1Object: ; 0x75031 (size=38)
+FuchsiaHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fuchsiahouse2.asm
+++ b/data/mapObjects/fuchsiahouse2.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse2Object: ; 0x75180 (size=45)
+FuchsiaHouse2Object:
 	db $17 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fuchsiahouse3.asm
+++ b/data/mapObjects/fuchsiahouse3.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3Object: ; 0x56221 (size=34)
+FuchsiaHouse3Object:
 	db $c ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/fuchsiamart.asm
+++ b/data/mapObjects/fuchsiamart.asm
@@ -1,4 +1,4 @@
-FuchsiaMartObject: ; 0x1dd9b (size=38)
+FuchsiaMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fuchsiameetingroom.asm
+++ b/data/mapObjects/fuchsiameetingroom.asm
@@ -1,4 +1,4 @@
-FuchsiaMeetingRoomObject: ; 0x756fc (size=38)
+FuchsiaMeetingRoomObject:
 	db $17 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/fuchsiapokecenter.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenterObject: ; 0x7507d (size=44)
+FuchsiaPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/gary.asm
+++ b/data/mapObjects/gary.asm
@@ -1,4 +1,4 @@
-GaryObject: ; 0x7612f (size=48)
+GaryObject:
 	db $3 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/halloffameroom.asm
+++ b/data/mapObjects/halloffameroom.asm
@@ -1,4 +1,4 @@
-HallofFameRoomObject: ; 0x5a571 (size=26)
+HallofFameRoomObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/indigoplateau.asm
+++ b/data/mapObjects/indigoplateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateauObject: ; 0x50936 (size=20)
+IndigoPlateauObject:
 	db $e ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/indigoplateaulobby.asm
+++ b/data/mapObjects/indigoplateaulobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
+IndigoPlateauLobbyObject:
 	db $0 ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/lab1.asm
+++ b/data/mapObjects/lab1.asm
@@ -1,4 +1,4 @@
-Lab1Object: ; 0x75bb3 (size=62)
+Lab1Object:
 	db $17 ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/lab2.asm
+++ b/data/mapObjects/lab2.asm
@@ -1,4 +1,4 @@
-Lab2Object: ; 0x75c45 (size=38)
+Lab2Object:
 	db $17 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lab3.asm
+++ b/data/mapObjects/lab3.asm
@@ -1,4 +1,4 @@
-Lab3Object: ; 0x75cec (size=41)
+Lab3Object:
 	db $17 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lab4.asm
+++ b/data/mapObjects/lab4.asm
@@ -1,4 +1,4 @@
-Lab4Object: ; 0x75df0 (size=32)
+Lab4Object:
 	db $17 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lance.asm
+++ b/data/mapObjects/lance.asm
@@ -1,4 +1,4 @@
-LanceObject: ; 0x5a3c5 (size=36)
+LanceObject:
 	db $3 ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/lavenderhouse1.asm
@@ -1,4 +1,4 @@
-LavenderHouse1Object: ; 0x1d96a (size=56)
+LavenderHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lavenderhouse2.asm
+++ b/data/mapObjects/lavenderhouse2.asm
@@ -1,4 +1,4 @@
-LavenderHouse2Object: ; 0x1d9e6 (size=32)
+LavenderHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lavendermart.asm
+++ b/data/mapObjects/lavendermart.asm
@@ -1,4 +1,4 @@
-LavenderMartObject: ; 0x5c95d (size=38)
+LavenderMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lavenderpokecenter.asm
+++ b/data/mapObjects/lavenderpokecenter.asm
@@ -1,4 +1,4 @@
-LavenderPokecenterObject: ; 0x5c8f4 (size=44)
+LavenderPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/lavendertown.asm
+++ b/data/mapObjects/lavendertown.asm
@@ -1,4 +1,4 @@
-LavenderTownObject: ; 0x4402d (size=88)
+LavenderTownObject:
 	db $2c ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/lorelei.asm
+++ b/data/mapObjects/lorelei.asm
@@ -1,4 +1,4 @@
-LoreleiObject: ; 0x76280 (size=44)
+LoreleiObject:
 	db $3 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/mansion1.asm
+++ b/data/mapObjects/mansion1.asm
@@ -1,4 +1,4 @@
-Mansion1Object: ; 0x443a4 (size=90)
+Mansion1Object:
 	db $2e ; border block
 
 	db $8 ; warps
--- a/data/mapObjects/mansion2.asm
+++ b/data/mapObjects/mansion2.asm
@@ -1,4 +1,4 @@
-Mansion2Object: ; 0x520d1 (size=63)
+Mansion2Object:
 	db $1 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/mansion3.asm
@@ -1,4 +1,4 @@
-Mansion3Object: ; 0x522e6 (size=64)
+Mansion3Object:
 	db $1 ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/mansion4.asm
@@ -1,4 +1,4 @@
-Mansion4Object: ; 0x52498 (size=69)
+Mansion4Object:
 	db $1 ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/mtmoon1.asm
+++ b/data/mapObjects/mtmoon1.asm
@@ -1,4 +1,4 @@
-MtMoon1Object: ; 0x49b06 (size=145)
+MtMoon1Object:
 	db $3 ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/mtmoon2.asm
+++ b/data/mapObjects/mtmoon2.asm
@@ -1,4 +1,4 @@
-MtMoon2Object: ; 0x51a4d (size=68)
+MtMoon2Object:
 	db $3 ; border block
 
 	db $8 ; warps
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -1,4 +1,4 @@
-MtMoon3Object: ; 0x49fdb (size=102)
+MtMoon3Object:
 	db $3 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/mtmoonpokecenter.asm
@@ -1,4 +1,4 @@
-MtMoonPokecenterObject: ; 0x49376 (size=56)
+MtMoonPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/museum1f.asm
+++ b/data/mapObjects/museum1f.asm
@@ -1,4 +1,4 @@
-Museum1FObject: ; 0x5c2c1 (size=74)
+Museum1FObject:
 	db $a ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/museum2f.asm
@@ -1,4 +1,4 @@
-Museum2FObject: ; 0x5c34b (size=48)
+Museum2FObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/namerater.asm
+++ b/data/mapObjects/namerater.asm
@@ -1,4 +1,4 @@
-NameRaterObject: ; 0x1dad6 (size=26)
+NameRaterObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -1,4 +1,4 @@
-OaksLabObject: ; 0x1d40a (size=88)
+OaksLabObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -1,4 +1,4 @@
-PalletTownObject: ; 0x182c3 (size=58)
+PalletTownObject:
 	db $b ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/pewtercity.asm
+++ b/data/mapObjects/pewtercity.asm
@@ -1,4 +1,4 @@
-PewterCityObject: ; 0x18577 (size=111)
+PewterCityObject:
 	db $a ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -1,4 +1,4 @@
-PewterGymObject: ; 0x5c52e (size=42)
+PewterGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pewterhouse1.asm
+++ b/data/mapObjects/pewterhouse1.asm
@@ -1,4 +1,4 @@
-PewterHouse1Object: ; 0x1d616 (size=38)
+PewterHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pewterhouse2.asm
+++ b/data/mapObjects/pewterhouse2.asm
@@ -1,4 +1,4 @@
-PewterHouse2Object: ; 0x1d659 (size=32)
+PewterHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pewtermart.asm
+++ b/data/mapObjects/pewtermart.asm
@@ -1,4 +1,4 @@
-PewterMartObject: ; 0x74cda (size=38)
+PewterMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/pewterpokecenter.asm
@@ -1,4 +1,4 @@
-PewterPokecenterObject: ; 0x5c60d (size=44)
+PewterPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/pokemontower1.asm
@@ -1,4 +1,4 @@
-PokemonTower1Object: ; 0x60452 (size=58)
+PokemonTower1Object:
 	db $1 ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/pokemontower2.asm
+++ b/data/mapObjects/pokemontower2.asm
@@ -1,4 +1,4 @@
-PokemonTower2Object: ; 0x60646 (size=32)
+PokemonTower2Object:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/pokemontower3.asm
@@ -1,4 +1,4 @@
-PokemonTower3Object: ; 0x6075d (size=51)
+PokemonTower3Object:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/pokemontower4.asm
@@ -1,4 +1,4 @@
-PokemonTower4Object: ; 0x6088b (size=65)
+PokemonTower4Object:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/pokemontower5.asm
@@ -1,4 +1,4 @@
-PokemonTower5Object: ; 0x60a48 (size=65)
+PokemonTower5Object:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pokemontower6.asm
+++ b/data/mapObjects/pokemontower6.asm
@@ -1,4 +1,4 @@
-PokemonTower6Object: ; 0x60c5b (size=58)
+PokemonTower6Object:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/pokemontower7.asm
@@ -1,4 +1,4 @@
-PokemonTower7Object: ; 0x60ef6 (size=42)
+PokemonTower7Object:
 	db $1 ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/powerplant.asm
@@ -1,4 +1,4 @@
-PowerPlantObject: ; 0x1e3bf (size=135)
+PowerPlantObject:
 	db $2e ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/redshouse2f.asm
+++ b/data/mapObjects/redshouse2f.asm
@@ -1,4 +1,4 @@
-RedsHouse2FObject: ; 0x5c0d0
+RedsHouse2FObject:
 	db $0A ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/rockethideout1.asm
+++ b/data/mapObjects/rockethideout1.asm
@@ -1,4 +1,4 @@
-RocketHideout1Object: ; 0x44ce7 (size=98)
+RocketHideout1Object:
 	db $2e ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/rockethideout2.asm
+++ b/data/mapObjects/rockethideout2.asm
@@ -1,4 +1,4 @@
-RocketHideout2Object: ; 0x450f7 (size=80)
+RocketHideout2Object:
 	db $2e ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/rockethideout3.asm
@@ -1,4 +1,4 @@
-RocketHideout3Object: ; 0x4534d (size=50)
+RocketHideout3Object:
 	db $2e ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/rockethideout4.asm
@@ -1,4 +1,4 @@
-RocketHideout4Object: ; 0x455f1 (size=95)
+RocketHideout4Object:
 	db $2e ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/rockethideoutelevator.asm
+++ b/data/mapObjects/rockethideoutelevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevatorObject: ; 0x45791 (size=23)
+RocketHideoutElevatorObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/rocktunnel1.asm
@@ -1,4 +1,4 @@
-RockTunnel1Object: ; 0x445f6 (size=127)
+RockTunnel1Object:
 	db $3 ; border block
 
 	db $8 ; warps
--- a/data/mapObjects/rocktunnel2.asm
+++ b/data/mapObjects/rocktunnel2.asm
@@ -1,4 +1,4 @@
-RockTunnel2Object: ; 0x4613d (size=100)
+RockTunnel2Object:
 	db $3 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/rocktunnelpokecenter.asm
@@ -1,4 +1,4 @@
-RockTunnelPokecenterObject: ; 0x493d4 (size=44)
+RockTunnelPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/route1.asm
+++ b/data/mapObjects/route1.asm
@@ -1,4 +1,4 @@
-Route1Object: ; 0x1c0e5 (size=19)
+Route1Object:
 	db $b ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/route10.asm
@@ -1,4 +1,4 @@
-Route10Object: ; 0x582f6 (size=96)
+Route10Object:
 	db $2c ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route11.asm
+++ b/data/mapObjects/route11.asm
@@ -1,4 +1,4 @@
-Route11Object: ; 0x584e0 (size=127)
+Route11Object:
 	db $f ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route11gate.asm
+++ b/data/mapObjects/route11gate.asm
@@ -1,4 +1,4 @@
-Route11GateObject: ; 0x49416 (size=50)
+Route11GateObject:
 	db $a ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route11gateupstairs.asm
+++ b/data/mapObjects/route11gateupstairs.asm
@@ -1,4 +1,4 @@
-Route11GateUpstairsObject: ; 0x494da (size=30)
+Route11GateUpstairsObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/route12.asm
@@ -1,4 +1,4 @@
-Route12Object: ; 0x5869a (size=118)
+Route12Object:
 	db $43 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route12gate.asm
+++ b/data/mapObjects/route12gate.asm
@@ -1,4 +1,4 @@
-Route12GateObject: ; 0x4950e (size=50)
+Route12GateObject:
 	db $a ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route12gateupstairs.asm
+++ b/data/mapObjects/route12gateupstairs.asm
@@ -1,4 +1,4 @@
-Route12GateUpstairsObject: ; 0x495de (size=24)
+Route12GateUpstairsObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/route12house.asm
+++ b/data/mapObjects/route12house.asm
@@ -1,4 +1,4 @@
-Route12HouseObject: ; 0x564de (size=26)
+Route12HouseObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/route13.asm
@@ -1,4 +1,4 @@
-Route13Object: ; 0x5482e (size=93)
+Route13Object:
 	db $43 ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route14.asm
+++ b/data/mapObjects/route14.asm
@@ -1,4 +1,4 @@
-Route14Object: ; 0x549bb (size=87)
+Route14Object:
 	db $43 ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -1,4 +1,4 @@
-Route15Object: ; 0x5894e (size=126)
+Route15Object:
 	db $43 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route15gate.asm
+++ b/data/mapObjects/route15gate.asm
@@ -1,4 +1,4 @@
-Route15GateObject: ; 0x4960c (size=50)
+Route15GateObject:
 	db $a ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -1,4 +1,4 @@
-Route16Object: ; 0x58afc (size=136)
+Route16Object:
 	db $f ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/route16gate.asm
+++ b/data/mapObjects/route16gate.asm
@@ -1,4 +1,4 @@
-Route16GateObject: ; 0x4978b (size=88)
+Route16GateObject:
 	db $a ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/route16gateupstairs.asm
+++ b/data/mapObjects/route16gateupstairs.asm
@@ -1,4 +1,4 @@
-Route16GateUpstairsObject: ; 0x4984c (size=30)
+Route16GateUpstairsObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/route16house.asm
+++ b/data/mapObjects/route16house.asm
@@ -1,4 +1,4 @@
-Route16HouseObject: ; 0x1e657 (size=32)
+Route16HouseObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/route17.asm
@@ -1,4 +1,4 @@
-Route17Object: ; 0x54b42 (size=102)
+Route17Object:
 	db $43 ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -1,4 +1,4 @@
-Route18Object: ; 0x58c5a (size=66)
+Route18Object:
 	db $43 ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route18gate.asm
+++ b/data/mapObjects/route18gate.asm
@@ -1,4 +1,4 @@
-Route18GateObject: ; 0x49937 (size=50)
+Route18GateObject:
 	db $a ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route18gateupstairs.asm
+++ b/data/mapObjects/route18gateupstairs.asm
@@ -1,4 +1,4 @@
-Route18GateUpstairsObject: ; 0x499a4 (size=24)
+Route18GateUpstairsObject:
 	db $a ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,4 +1,4 @@
-Route19Object: ; 0x54e9a (size=87)
+Route19Object:
 	db $43 ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,4 +1,4 @@
-Route2Object: ; 0x54022 (size=72)
+Route2Object:
 	db $f ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/route20.asm
@@ -1,4 +1,4 @@
-Route20Object: ; 0x50113 (size=106)
+Route20Object:
 	db $43 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/route21.asm
+++ b/data/mapObjects/route21.asm
@@ -1,4 +1,4 @@
-Route21Object: ; 0x55021 (size=76)
+Route21Object:
 	db $43 ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route22.asm
+++ b/data/mapObjects/route22.asm
@@ -1,4 +1,4 @@
-Route22Object: ; 0x50022 (size=27)
+Route22Object:
 	db $2c ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/route22gate.asm
@@ -1,4 +1,4 @@
-Route22GateObject: ; 0x1e720 (size=42)
+Route22GateObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/route23.asm
@@ -1,4 +1,4 @@
-Route23Object: ; 0x50361 (size=81)
+Route23Object:
 	db $f ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -1,4 +1,4 @@
-Route24Object: ; 0x506a4 (size=67)
+Route24Object:
 	db $2c ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/route25.asm
@@ -1,4 +1,4 @@
-Route25Object: ; 0x507b2 (size=94)
+Route25Object:
 	db $2c ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/route2gate.asm
+++ b/data/mapObjects/route2gate.asm
@@ -1,4 +1,4 @@
-Route2GateObject: ; 0x5d620 (size=48)
+Route2GateObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route2house.asm
+++ b/data/mapObjects/route2house.asm
@@ -1,4 +1,4 @@
-Route2HouseObject: ; 0x1df07 (size=32)
+Route2HouseObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/route3.asm
+++ b/data/mapObjects/route3.asm
@@ -1,4 +1,4 @@
-Route3Object: ; 0x54208 (size=77)
+Route3Object:
 	db $2c ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/route4.asm
@@ -1,4 +1,4 @@
-Route4Object: ; 0x543b2 (size=58)
+Route4Object:
 	db $2c ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -1,4 +1,4 @@
-Route5Object: ; 0x545a3 (size=47)
+Route5Object:
 	db $a ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route5gate.asm
+++ b/data/mapObjects/route5gate.asm
@@ -1,4 +1,4 @@
-Route5GateObject: ; 0x1dffb (size=42)
+Route5GateObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -1,4 +1,4 @@
-Route6Object: ; 0x58022 (size=87)
+Route6Object:
 	db $f ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route6gate.asm
+++ b/data/mapObjects/route6gate.asm
@@ -1,4 +1,4 @@
-Route6GateObject: ; 0x1e0be (size=42)
+Route6GateObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/route7.asm
@@ -1,4 +1,4 @@
-Route7Object: ; 0x48022 (size=47)
+Route7Object:
 	db $f ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -1,4 +1,4 @@
-Route7GateObject: ; 0x1e185 (size=42)
+Route7GateObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route8.asm
+++ b/data/mapObjects/route8.asm
@@ -1,4 +1,4 @@
-Route8Object: ; 0x5814f (size=119)
+Route8Object:
 	db $2c ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/route8gate.asm
@@ -1,4 +1,4 @@
-Route8GateObject: ; 0x1e247 (size=42)
+Route8GateObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -1,4 +1,4 @@
-Route9Object: ; 0x546a8 (size=86)
+Route9Object:
 	db $2c ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/safarizonecenter.asm
@@ -1,4 +1,4 @@
-SafariZoneCenterObject: ; 0x45bc5 (size=89)
+SafariZoneCenterObject:
 	db $0 ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/safarizoneeast.asm
@@ -1,4 +1,4 @@
-SafariZoneEastObject: ; 0x4588b (size=81)
+SafariZoneEastObject:
 	db $0 ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/safarizoneentrance.asm
@@ -1,4 +1,4 @@
-SafariZoneEntranceObject: ; 0x753f5 (size=48)
+SafariZoneEntranceObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/safarizonenorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorthObject: ; 0x459d5 (size=105)
+SafariZoneNorthObject:
 	db $0 ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/safarizoneresthouse1.asm
+++ b/data/mapObjects/safarizoneresthouse1.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse1Object: ; 0x45cfe (size=32)
+SafariZoneRestHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/safarizoneresthouse2.asm
+++ b/data/mapObjects/safarizoneresthouse2.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse2Object: ; 0x45d43 (size=38)
+SafariZoneRestHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/safarizoneresthouse3.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
+SafariZoneRestHouse3Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/safarizoneresthouse4.asm
+++ b/data/mapObjects/safarizoneresthouse4.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse4Object: ; 0x45dd9 (size=38)
+SafariZoneRestHouse4Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/safarizonesecrethouse.asm
+++ b/data/mapObjects/safarizonesecrethouse.asm
@@ -1,4 +1,4 @@
-SafariZoneSecretHouseObject: ; 0x4a365 (size=26)
+SafariZoneSecretHouseObject:
 	db $17 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/safarizonewest.asm
+++ b/data/mapObjects/safarizonewest.asm
@@ -1,4 +1,4 @@
-SafariZoneWestObject: ; 0x4a1dc (size=108)
+SafariZoneWestObject:
 	db $0 ; border block
 
 	db $8 ; warps
--- a/data/mapObjects/saffroncity.asm
+++ b/data/mapObjects/saffroncity.asm
@@ -1,4 +1,4 @@
-SaffronCityObject: ; 0x509dc (size=188)
+SaffronCityObject:
 	db $f ; border block
 
 	db $8 ; warps
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/saffrongym.asm
@@ -1,4 +1,4 @@
-SaffronGymObject: ; 0x5d259 (size=330)
+SaffronGymObject:
 	db $2e ; border block
 
 	db $20 ; warps
--- a/data/mapObjects/saffronhouse1.asm
+++ b/data/mapObjects/saffronhouse1.asm
@@ -1,4 +1,4 @@
-SaffronHouse1Object: ; 0x1de04 (size=44)
+SaffronHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/saffronhouse2.asm
+++ b/data/mapObjects/saffronhouse2.asm
@@ -1,4 +1,4 @@
-SaffronHouse2Object: ; 0x1de8a (size=26)
+SaffronHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/saffronmart.asm
+++ b/data/mapObjects/saffronmart.asm
@@ -1,4 +1,4 @@
-SaffronMartObject: ; 0x5d41c (size=38)
+SaffronMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/saffronpokecenter.asm
@@ -1,4 +1,4 @@
-SaffronPokecenterObject: ; 0x5d54f (size=44)
+SaffronPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/school.asm
@@ -1,4 +1,4 @@
-SchoolObject: ; 0x1d55d (size=32)
+SchoolObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/seafoamislands1.asm
+++ b/data/mapObjects/seafoamislands1.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1Object: ; 0x4484f (size=72)
+SeafoamIslands1Object:
 	db $7d ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/seafoamislands2.asm
+++ b/data/mapObjects/seafoamislands2.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2Object: ; 0x46376 (size=72)
+SeafoamIslands2Object:
 	db $7d ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/seafoamislands3.asm
+++ b/data/mapObjects/seafoamislands3.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3Object: ; 0x464b2 (size=72)
+SeafoamIslands3Object:
 	db $7d ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/seafoamislands4.asm
+++ b/data/mapObjects/seafoamislands4.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4Object: ; 0x466a6 (size=96)
+SeafoamIslands4Object:
 	db $7d ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/seafoamislands5.asm
+++ b/data/mapObjects/seafoamislands5.asm
@@ -1,4 +1,4 @@
-SeafoamIslands5Object: ; 0x468bc (size=62)
+SeafoamIslands5Object:
 	db $7d ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/silphco1.asm
+++ b/data/mapObjects/silphco1.asm
@@ -1,4 +1,4 @@
-SilphCo1Object: ; 0x5d470 (size=50)
+SilphCo1Object:
 	db $2e ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/silphco10.asm
@@ -1,4 +1,4 @@
-SilphCo10Object: ; 0x5a1fb (size=95)
+SilphCo10Object:
 	db $2e ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -1,4 +1,4 @@
-SilphCo11Object: ; 0x62380 (size=72)
+SilphCo11Object:
 	db $d ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/silphco2.asm
@@ -1,4 +1,4 @@
-SilphCo2Object: ; 0x59e66 (size=98)
+SilphCo2Object:
 	db $2e ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/silphco3.asm
@@ -1,4 +1,4 @@
-SilphCo3Object: ; 0x5a035 (size=113)
+SilphCo3Object:
 	db $2e ; border block
 
 	db $a ; warps
--- a/data/mapObjects/silphco4.asm
+++ b/data/mapObjects/silphco4.asm
@@ -1,4 +1,4 @@
-SilphCo4Object: ; 0x19e35 (size=111)
+SilphCo4Object:
 	db $2e ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/silphco5.asm
+++ b/data/mapObjects/silphco5.asm
@@ -1,4 +1,4 @@
-SilphCo5Object: ; 0x1a08d (size=137)
+SilphCo5Object:
 	db $2e ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/silphco6.asm
+++ b/data/mapObjects/silphco6.asm
@@ -1,4 +1,4 @@
-SilphCo6Object: ; 0x1a2fb (size=112)
+SilphCo6Object:
 	db $2e ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/silphco7.asm
+++ b/data/mapObjects/silphco7.asm
@@ -1,4 +1,4 @@
-SilphCo7Object: ; 0x51ed7 (size=128)
+SilphCo7Object:
 	db $2e ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/silphco8.asm
@@ -1,4 +1,4 @@
-SilphCo8Object: ; 0x56613 (size=90)
+SilphCo8Object:
 	db $2e ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/silphco9.asm
+++ b/data/mapObjects/silphco9.asm
@@ -1,4 +1,4 @@
-SilphCo9Object: ; 0x5d93f (size=74)
+SilphCo9Object:
 	db $2e ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/silphcoelevator.asm
+++ b/data/mapObjects/silphcoelevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorObject: ; 0x45844 (size=23)
+SilphCoElevatorObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ssanne1.asm
+++ b/data/mapObjects/ssanne1.asm
@@ -1,4 +1,4 @@
-SSAnne1Object: ; 0x61277 (size=104)
+SSAnne1Object:
 	db $c ; border block
 
 	db $b ; warps
--- a/data/mapObjects/ssanne10.asm
+++ b/data/mapObjects/ssanne10.asm
@@ -1,4 +1,4 @@
-SSAnne10Object: ; 0x61e75 (size=165)
+SSAnne10Object:
 	db $c ; border block
 
 	db $a ; warps
--- a/data/mapObjects/ssanne2.asm
+++ b/data/mapObjects/ssanne2.asm
@@ -1,4 +1,4 @@
-SSAnne2Object: ; 0x61514 (size=90)
+SSAnne2Object:
 	db $c ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/ssanne3.asm
+++ b/data/mapObjects/ssanne3.asm
@@ -1,4 +1,4 @@
-SSAnne3Object: ; 0x4493c (size=26)
+SSAnne3Object:
 	db $c ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ssanne4.asm
+++ b/data/mapObjects/ssanne4.asm
@@ -1,4 +1,4 @@
-SSAnne4Object: ; 0x61632 (size=52)
+SSAnne4Object:
 	db $c ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/ssanne5.asm
@@ -1,4 +1,4 @@
-SSAnne5Object: ; 0x6172b (size=54)
+SSAnne5Object:
 	db $23 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/ssanne6.asm
+++ b/data/mapObjects/ssanne6.asm
@@ -1,4 +1,4 @@
-SSAnne6Object: ; 0x6181b (size=54)
+SSAnne6Object:
 	db $c ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/ssanne7.asm
+++ b/data/mapObjects/ssanne7.asm
@@ -1,4 +1,4 @@
-SSAnne7Object: ; 0x61946 (size=24)
+SSAnne7Object:
 	db $c ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/ssanne8.asm
@@ -1,4 +1,4 @@
-SSAnne8Object: ; 0x61a60 (size=127)
+SSAnne8Object:
 	db $c ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/ssanne9.asm
+++ b/data/mapObjects/ssanne9.asm
@@ -1,4 +1,4 @@
-SSAnne9Object: ; 0x61c8d (size=188)
+SSAnne9Object:
 	db $c ; border block
 
 	db $c ; warps
--- a/data/mapObjects/tradecenter.asm
+++ b/data/mapObjects/tradecenter.asm
@@ -1,4 +1,4 @@
-TradeCenterObject: ; 0x4fd53 (size=10)
+TradeCenterObject:
 	db $e ; border block
 
 	db $0 ; warps
--- a/data/mapObjects/undergroundpathentranceroute5.asm
+++ b/data/mapObjects/undergroundpathentranceroute5.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34)
+UndergroundPathEntranceRoute5Object:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/undergroundpathentranceroute6.asm
+++ b/data/mapObjects/undergroundpathentranceroute6.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34)
+UndergroundPathEntranceRoute6Object:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/undergroundpathentranceroute7.asm
+++ b/data/mapObjects/undergroundpathentranceroute7.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34)
+UndergroundPathEntranceRoute7Object:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/undergroundpathentranceroute8.asm
+++ b/data/mapObjects/undergroundpathentranceroute8.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34)
+UndergroundPathEntranceRoute8Object:
 	db $a ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/undergroundpathns.asm
+++ b/data/mapObjects/undergroundpathns.asm
@@ -1,4 +1,4 @@
-UndergroundPathNSObject: ; 0x61f2a (size=20)
+UndergroundPathNSObject:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/undergroundpathwe.asm
+++ b/data/mapObjects/undergroundpathwe.asm
@@ -1,4 +1,4 @@
-UndergroundPathWEObject: ; 0x61f4e (size=20)
+UndergroundPathWEObject:
 	db $1 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/unknowndungeon1.asm
+++ b/data/mapObjects/unknowndungeon1.asm
@@ -1,4 +1,4 @@
-UnknownDungeon1Object: ; 0x74d15 (size=97)
+UnknownDungeon1Object:
 	db $7d ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/unknowndungeon2.asm
+++ b/data/mapObjects/unknowndungeon2.asm
@@ -1,4 +1,4 @@
-UnknownDungeon2Object: ; 0x45e14 (size=73)
+UnknownDungeon2Object:
 	db $7d ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/unknowndungeon3.asm
@@ -1,4 +1,4 @@
-UnknownDungeon3Object: ; 0x45f36 (size=34)
+UnknownDungeon3Object:
 	db $7d ; border block
 
 	db $1 ; warps
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/vermilioncity.asm
@@ -1,4 +1,4 @@
-VermilionCityObject: ; 0x189ba (size=133)
+VermilionCityObject:
 	db $43 ; border block
 
 	db $9 ; warps
--- a/data/mapObjects/vermiliondock.asm
+++ b/data/mapObjects/vermiliondock.asm
@@ -1,4 +1,4 @@
-VermilionDockObject: ; 0x1dcc6 (size=20)
+VermilionDockObject:
 	db $f ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/vermiliongym.asm
@@ -1,4 +1,4 @@
-VermilionGymObject: ; 0x5cbfe (size=58)
+VermilionGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/vermilionhouse1.asm
+++ b/data/mapObjects/vermilionhouse1.asm
@@ -1,4 +1,4 @@
-VermilionHouse1Object: ; 0x1db20 (size=38)
+VermilionHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/vermilionhouse2.asm
+++ b/data/mapObjects/vermilionhouse2.asm
@@ -1,4 +1,4 @@
-VermilionHouse2Object: ; 0x560cf (size=26)
+VermilionHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/vermilionhouse3.asm
+++ b/data/mapObjects/vermilionhouse3.asm
@@ -1,4 +1,4 @@
-VermilionHouse3Object: ; 0x19c25 (size=26)
+VermilionHouse3Object:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/vermilionmart.asm
+++ b/data/mapObjects/vermilionmart.asm
@@ -1,4 +1,4 @@
-VermilionMartObject: ; 0x5c9f4 (size=38)
+VermilionMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/vermilionpokecenter.asm
@@ -1,4 +1,4 @@
-VermilionPokecenterObject: ; 0x5c9a9 (size=44)
+VermilionPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/victoryroad1.asm
@@ -1,4 +1,4 @@
-VictoryRoad1Object: ; 0x5dab8 (size=76)
+VictoryRoad1Object:
 	db $7d ; border block
 
 	db $3 ; warps
--- a/data/mapObjects/victoryroad2.asm
+++ b/data/mapObjects/victoryroad2.asm
@@ -1,4 +1,4 @@
-VictoryRoad2Object: ; 0x51915 (size=154)
+VictoryRoad2Object:
 	db $7d ; border block
 
 	db $7 ; warps
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/victoryroad3.asm
@@ -1,4 +1,4 @@
-VictoryRoad3Object: ; 0x44acd (size=106)
+VictoryRoad3Object:
 	db $7d ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/viridiancity.asm
@@ -1,4 +1,4 @@
-ViridianCityObject: ; 0x18384 (size=104)
+ViridianCityObject:
 	db $f ; border block
 
 	db $5 ; warps
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -1,4 +1,4 @@
-ViridianForestObject: ; 0x611da (size=127)
+ViridianForestObject:
 	db $3 ; border block
 
 	db $6 ; warps
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -1,4 +1,4 @@
-ViridianForestEntranceObject: ; 0x5d66d (size=48)
+ViridianForestEntranceObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/viridianforestexit.asm
@@ -1,4 +1,4 @@
-ViridianForestExitObject: ; 0x5d598 (size=48)
+ViridianForestExitObject:
 	db $a ; border block
 
 	db $4 ; warps
--- a/data/mapObjects/viridiangym.asm
+++ b/data/mapObjects/viridiangym.asm
@@ -1,4 +1,4 @@
-ViridianGymObject: ; 0x74bde (size=105)
+ViridianGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/viridianhouse.asm
@@ -1,4 +1,4 @@
-ViridianHouseObject: ; 0x1d5bb (size=44)
+ViridianHouseObject:
 	db $a ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/viridianmart.asm
+++ b/data/mapObjects/viridianmart.asm
@@ -1,4 +1,4 @@
-ViridianMartObject: ; 0x1d50a (size=38)
+ViridianMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/data/mapObjects/viridianpokecenter.asm
+++ b/data/mapObjects/viridianpokecenter.asm
@@ -1,4 +1,4 @@
-ViridianPokecenterObject: ; 0x44277 (size=44)
+ViridianPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -253,7 +253,7 @@
 .nextAnimationCommand
 	pop hl
 	jr .animationLoop
-.AnimationOver ; 417B
+.AnimationOver
 	ret
 
 LoadSubanimation:
@@ -926,7 +926,7 @@
 	db $ff ; terminator
 
 ; function to make the pokeball jump up
-TradeJumpPokeball: ; 507C
+TradeJumpPokeball:
 	ld de,BallMoveDistances2
 .loop
 	ld hl,wOAMBuffer ; OAM buffer
@@ -2996,7 +2996,7 @@
 ; sequence of animations that make up the Poké Ball toss
 	db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM
 
-.BlockBall ; 5E55
+.BlockBall
 	ld a,TOSS_ANIM
 	ld [wAnimationID],a
 	call PlayAnimation
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -819,7 +819,7 @@
 	ld [wActionResultOrTookBattleTurn], a
 	jp MainInBattleLoop
 
-FaintEnemyPokemon: ; 0x3c567
+FaintEnemyPokemon:
 	call ReadPlayerMonCurHPAndStatus
 	ld a, [wIsInBattle]
 	dec a
@@ -945,7 +945,7 @@
 	ld [wPartyGainExpFlags], a
 	jpab GainExperience
 
-EnemyMonFaintedText: ; 0x3c63e
+EnemyMonFaintedText:
 	TX_FAR _EnemyMonFaintedText
 	db "@"
 
@@ -4672,7 +4672,6 @@
 	db CRABHAMMER
 	db SLASH
 	db $FF
-; 3e023
 
 ; determines if attack is a critical hit
 ; azure heights claims "the fastest pokémon (who are,not coincidentally,
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -44,7 +44,7 @@
 	ld hl, wOAMBuffer + PARTY_LENGTH * 4
 	jp WritePokeballOAMData
 
-SetupPokeballs: ; 0x3a8a6
+SetupPokeballs:
 	ld a, [de]
 	push af
 	ld de, wBuffer
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -145,7 +145,7 @@
 	ld [hl], a
 	jr .nextMove
 
-StatusAilmentMoveEffects: ; 57e2
+StatusAilmentMoveEffects:
 	db $01 ; unused sleep effect
 	db SLEEP_EFFECT
 	db POISON_EFFECT
@@ -731,7 +731,7 @@
 	res 0,[hl]
 	ret
 
-AIUseXAccuracy: ; 0x3a7a8 unused
+AIUseXAccuracy: ; unused
 	call AIPlayRestoringSFX
 	ld hl,wEnemyBattleStatus2
 	set 0,[hl]
@@ -745,7 +745,7 @@
 	ld a,GUARD_SPEC
 	jp AIPrintItemUse
 
-AIUseDireHit: ; 0x3a7c2 unused
+AIUseDireHit: ; unused
 	call AIPlayRestoringSFX
 	ld hl,wEnemyBattleStatus2
 	set 2,[hl]
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -23,7 +23,7 @@
 	; fall through
 
 ; This is called after completing a trade.
-CableClub_DoBattleOrTradeAgain: ; 5345
+CableClub_DoBattleOrTradeAgain:
 	ld hl, wSerialPlayerDataBlock
 	ld a, SERIAL_PREAMBLE_BYTE
 	ld b, 6
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -432,7 +432,6 @@
 	db 2,  9, 13,  0,  0 ; 12
 	db 3, 10, 12, 14,  0 ; 13
 	db 2, 11, 13,  0,  0 ; 14
-; 5dec8
 
 VermilionGymTrashSuccessText1:
 	TX_FAR _VermilionGymTrashSuccessText1
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -92,7 +92,7 @@
 PKMNLeaguePCText: db $4a, "LEAGUE@"
 LogOffPCText:     db "LOG OFF@"
 
-BillsPC_:: ; 0x214c2
+BillsPC_::
 	ld hl, wd730
 	set 6, [hl]
 	xor a
@@ -457,51 +457,51 @@
 	db   "STATS"
 	next "CANCEL@"
 
-SwitchOnText: ; 0x217e9
+SwitchOnText:
 	TX_FAR _SwitchOnText
 	db "@"
 
-WhatText: ; 0x217ee
+WhatText:
 	TX_FAR _WhatText
 	db "@"
 
-DepositWhichMonText: ; 0x217f3
+DepositWhichMonText:
 	TX_FAR _DepositWhichMonText
 	db "@"
 
-MonWasStoredText: ; 0x217f8
+MonWasStoredText:
 	TX_FAR _MonWasStoredText
 	db "@"
 
-CantDepositLastMonText: ; 0x217fd
+CantDepositLastMonText:
 	TX_FAR _CantDepositLastMonText
 	db "@"
 
-BoxFullText: ; 0x21802
+BoxFullText:
 	TX_FAR _BoxFullText
 	db "@"
 
-MonIsTakenOutText: ; 0x21807
+MonIsTakenOutText:
 	TX_FAR _MonIsTakenOutText
 	db "@"
 
-NoMonText: ; 0x2180c
+NoMonText:
 	TX_FAR _NoMonText
 	db "@"
 
-CantTakeMonText: ; 0x21811
+CantTakeMonText:
 	TX_FAR _CantTakeMonText
 	db "@"
 
-ReleaseWhichMonText: ; 0x21816
+ReleaseWhichMonText:
 	TX_FAR _ReleaseWhichMonText
 	db "@"
 
-OnceReleasedText: ; 0x2181b
+OnceReleasedText:
 	TX_FAR _OnceReleasedText
 	db "@"
 
-MonWasReleasedText: ; 0x21820
+MonWasReleasedText:
 	TX_FAR _MonWasReleasedText
 	db "@"
 
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -1,4 +1,4 @@
-PKMNLeaguePC: ; 0x7657e
+PKMNLeaguePC:
 	ld hl, AccessedHoFPCText
 	call PrintText
 	ld hl, wd730
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -49,7 +49,7 @@
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-DoYouWantToNicknameText: ; 0x6557
+DoYouWantToNicknameText:
 	TX_FAR _DoYouWantToNicknameText
 	db "@"
 
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -223,7 +223,7 @@
 	db "OK@"
 
 ; Draws a line starting from hl high b and wide c
-DrawLineBox: ; 0x12ac7
+DrawLineBox:
 	ld de, SCREEN_WIDTH ; New line
 .PrintVerticalLine
 	ld [hl], $78 ; │
@@ -335,11 +335,11 @@
 	ld c, a
 	ld a, "-"
 	call StatusScreen_PrintPP ; Fill the rest with --
-.InitPP ; 12bbb
+.InitPP
 	ld hl, wLoadedMonMoves
 	coord de, 14, 10
 	ld b, 0
-.PrintPP ; 12bc3
+.PrintPP
 	ld a, [hli]
 	and a
 	jr z, .PPDone
--- a/engine/overworld/oaks_aide.asm
+++ b/engine/overworld/oaks_aide.asm
@@ -1,4 +1,4 @@
-OaksAideScript: ; 0x59035
+OaksAideScript:
 	ld hl, OaksAideHiText
 	call PrintText
 	call YesNoChoice
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -183,7 +183,7 @@
 	ld a,[wCurrentMenuItem]
 	ret
 
-WouldYouLikeToSaveText: ; 0x7377d
+WouldYouLikeToSaveText:
 	TX_FAR _WouldYouLikeToSaveText
 	db "@"
 
--- a/home.asm
+++ b/home.asm
@@ -497,7 +497,7 @@
 	ld [hl],"T"
 	and a
 	ret
-PrintStatusConditionNotFainted: ; 14f6
+PrintStatusConditionNotFainted:
 	ld a,[H_LOADEDROMBANK]
 	push af
 	ld a,BANK(PrintStatusAilment)
@@ -4192,7 +4192,7 @@
 	jp TextCommandProcessor
 
 
-PrintNumber:: ; 3c5f
+PrintNumber::
 ; Print the c-digit, b-byte value at de.
 ; Allows 2 to 7 digits. For 1-digit numbers, add
 ; the value to char "0" instead of calling PrintNumber.
--- a/home/text.asm
+++ b/home/text.asm
@@ -135,11 +135,11 @@
 	dec de
 	ret
 
-Char00Text:: ; 0x19f4 “%d ERROR.”
+Char00Text:: ; “%d ERROR.”
 	TX_FAR _Char00Text
 	db "@"
 
-Char52:: ; 0x19f9 player’s name
+Char52:: ; player’s name
 	push de
 	ld de,wPlayerName
 	jr FinishDTE
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -80,10 +80,10 @@
 	TX_FAR _DaisyUseMapText
 	db "@"
 
-BluesHouseText2: ; 0x19bc4 Daisy, walking around
+BluesHouseText2: ; Daisy, walking around
 	TX_FAR _BluesHouseText2
 	db "@"
 
-BluesHouseText3: ; 0x19bc9 map on table
+BluesHouseText3: ; map on table
 	TX_FAR _BluesHouseText3
 	db "@"
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/fuchsiahouse3.asm
@@ -52,7 +52,7 @@
 	db $0B
 	db "@"
 
-UnusedText_561c8: ; 561c8
+UnusedText_561c8:
 	para "つり こそ"
 	line "おとこの ロマン だ!"
 
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -189,26 +189,26 @@
 	TX_FAR _OakWalksUpText
 	db "@"
 
-PalletTownText2: ; 0x18fd3 girl
+PalletTownText2: ; girl
 	TX_FAR _PalletTownText2
 	db "@"
 
-PalletTownText3: ; 0x18fd8 fat man
+PalletTownText3: ; fat man
 	TX_FAR _PalletTownText3
 	db "@"
 
-PalletTownText4: ; 0x18fdd sign by lab
+PalletTownText4: ; sign by lab
 	TX_FAR _PalletTownText4
 	db "@"
 
-PalletTownText5: ; 0x18fe2 sign by fence
+PalletTownText5: ; sign by fence
 	TX_FAR _PalletTownText5
 	db "@"
 
-PalletTownText6: ; 0x18fe7 sign by Red’s house
+PalletTownText6: ; sign by Red’s house
 	TX_FAR _PalletTownText6
 	db "@"
 
-PalletTownText7: ; 0x18fec sign by Blue’s house
+PalletTownText7: ; sign by Blue’s house
 	TX_FAR _PalletTownText7
 	db "@"
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -142,7 +142,7 @@
 	db $07,$0C
 	dw MovementData_60e22
 
-MovementData_60e13: ; 60e13
+MovementData_60e13:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -152,7 +152,7 @@
 	db NPC_MOVEMENT_LEFT
 	db $FF
 
-MovementData_60e1b: ; 60e1b
+MovementData_60e1b:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
@@ -161,7 +161,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e22: ; 60e22
+MovementData_60e22:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -169,7 +169,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e28: ; 60e28
+MovementData_60e28:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -179,7 +179,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e30: ; 60e30
+MovementData_60e30:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
@@ -188,7 +188,7 @@
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-MovementData_60e37: ; 60e37
+MovementData_60e37:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -49,7 +49,7 @@
 	TX_FAR _MomHealText2
 	db "@"
 
-RedsHouse1FText2: ; 0x481c6 TV
+RedsHouse1FText2: ; TV
 	TX_ASM
 	ld a,[wSpriteStateData1 + 9]
 	cp SPRITE_FACING_UP
--- a/scripts/safarizoneentrance-yellow.asm
+++ /dev/null
@@ -1,255 +1,0 @@
-.xf1f77
-	ld hl,.ForJust500Text
-	call PrintText
-	ld a,MONEY_BOX
-	ld [wTextBoxID],a
-	call DisplayTextBoxID
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	jp nz,.PleaseComeAgain
-	ld hl,$d346 ; yellow d346
-	ld a,[hli]
-	or [hl]
-	inc hl
-	or [hl]
-	jr nz,.xf1f9f
-.xf1f98
-	call .xf20ce
-	jr c,.CantPayWalkDown
-	jr .xf1ff2
-
-.xf1f9f
-	xor a
-	ld [hMoney],a
-	ld a,$05
-	ld [hMoney + 1],a
-	ld a,$00
-	ld [hMoney + 2],a
-	call HasEnoughMoney
-	jr nc,.success
-	ld hl,.NotEnoughMoneyText
-	call PrintText
-	call .xf2077
-	jr c,.CantPayWalkDown
-	jr .xf1ff2
-
-.success
-	xor a
-	ld [wPriceTemp],a
-	ld a,$05
-	ld [wPriceTemp + 1],a
-	ld a,$00
-	ld [wPriceTemp + 2],a
-	ld hl,wPriceTemp + 2
-	ld de,wPlayerMoney + 2
-	ld c,3
-	predef SubBCDPredef
-	ld a,$b2
-	call $3736
-	call $373e
-	ld a,MONEY_BOX
-	ld [wTextBoxID],a
-	call DisplayTextBoxID
-	ld hl,.MakePaymentText
-	call PrintText
-	ld a,30
-	lb hl, (502 / $100),  (502 % $100)
-.xf1ff2
-	ld [wNumSafariBalls],a
-	ld a,h
-	ld [wSafariSteps],a
-	ld a,l
-	ld [wSafariSteps + 1],a
-	ld a,D_UP
-	ld c,3
-	call SafariZoneEntranceAutoWalk
-	SetEvent EVENT_IN_SAFARI_ZONE
-	ResetEventReuseHL EVENT_SAFARI_GAME_OVER
-	ld a,3
-	ld [wSafariZoneEntranceCurScript],a
-	jr .done
-
-.PleaseComeAgain
-	ld hl,.PleaseComeAgainText
-	call PrintText
-.CantPayWalkDown
-	ld a,D_DOWN
-	ld c,1
-	call SafariZoneEntranceAutoWalk
-	ld a,4
-	ld [wSafariZoneEntranceCurScript],a
-.done
-	ret
-
-.ForJust500Text
-	TX_FAR SafariZoneEntranceText_9e6e4
-	db "@"
-
-.MakePaymentText
-	TX_FAR SafariZoneEntranceText_9e747
-	db $b
-	TX_FAR _SafariZoneEntranceText_75360
-	db "@"
-
-.PleaseComeAgainText
-	TX_FAR _SafariZoneEntranceText_75365
-	db "@"
-
-.NotEnoughMoneyText
-	TX_FAR _SafariZoneEntranceText_7536a
-	db "@"
-
-.SafariZoneEntranceText2
-	ld hl,.FirstTimeQuestionText
-	call PrintText
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	ld hl,.RegularText
-	jr nz,.Explanation
-	ld hl,.ExplanationText
-.Explanation
-	call PrintText
-	ret
-
-.FirstTimeQuestionText
-	TX_FAR _SafariZoneEntranceText_753e6
-	db "@"
-
-.ExplanationText
-	TX_FAR _SafariZoneEntranceText_753eb
-	db "@"
-
-.RegularText
-	TX_FAR _SafariZoneEntranceText_753f0
-	db "@"
-
-SafariZoneEntranceAutoWalk:
-	push af
-	ld b,0
-	ld a,c
-	ld [wSimulatedJoypadStatesIndex],a
-	ld hl,wSimulatedJoypadStatesEnd
-	pop af
-	call FillMemory
-	jp StartSimulatingJoypadStates
-
-.xf2077
-	ld hl,wPlayerMoney
-	ld de,$ff9f
-	ld bc,3
-	call $b1 ; yellow $00b1
-	xor a
-	ld [$ffa2],a
-	ld [$ffa3],a
-	ld a,$17 ; ¥17 per safari ball
-	ld [$ffa4],a
-	predef DivideBCDPredef3
-	ld a,[$ffa4]
-	call .xf211e
-	pop af
-	ld hl,$d346
-	xor a
-	ld bc,3
-	call FillMemory
-	ld hl,.OhAllRightText
-	call PrintText_NoCreatingTextBox
-	ld a,MONEY_BOX
-	ld a,[$d124]
-	call DisplayTextBoxID
-	ld hl,.CantGive30BallsText
-	call PrintText
-	pop af
-	inc a
-	jr z,.xf20bd
-	cp 29
-	jr c,.xf20bf
-.xf20bd
-	ld a,29
-.xf20bf
-	ld hl,$1f6
-	and a
-	ret
-
-.OhAllRightText
-	TX_FAR _SafariZoneLowCostText1
-	db "@"
-
-.CantGive30BallsText
-	TX_FAR _SafariZoneLowCostText2
-	db "@"
-
-.xf20ce
-	ld hl,$d70c
-	ld a,[hl]
-	push af
-	inc [hl]
-	ld e,a
-	ld d,0
-	ld hl,.lowcosttextpointers
-	add hl,de
-	add hl,de
-	ld a,[hli]
-	ld h,[hl]
-	ld l,a
-	call PrintText
-	pop af
-	cp 3
-	jr z,.next
-	scf
-	ret
-
-.next
-	ld hl,.xf20f6
-	call $3c46
-	ld a,1
-	ld hl,$01f6
-	and a
-	ret
-
-.xf20f6
-	TX_FAR _SafariZoneLowCostText3
-	db $b
-	TX_FAR _SafariZoneLowCostText4
-	db "@"
-
-.lowcosttextpointers
-	dw .xf210a
-	dw .xf210f
-	dw .xf2114
-	dw .xf2119
-	dw .xf2119
-
-.xf210a
-	TX_FAR _SafariZoneLowCostText5
-	db "@"
-
-.xf210f
-	TX_FAR _SafariZoneLowCostText6
-	db "@"
-
-.xf2114
-	TX_FAR _SafariZoneLowCostText7
-	db "@"
-
-.xf2119
-	TX_FAR _SafariZoneLowCostText8
-	db "@"
-
-.xf211e
-	push hl
-	ld c,a
-	and $f
-	ld l,a
-	ld h,0
-	ld a,c
-	and $f0
-	swap a
-	ld bc,$a
-	call $3a74
-	ld a,l
-	pop hl
-	ret
-
-.xf2133