Fix triple newlines left over from removing address comments

data/events/field_move_blocks.asm

@@ -42,7 +42,6 @@ CutTreeBlockPointers:
 	db $0f, $17, 0
 	db -1 ; end
 
-
 WhirlpoolBlockPointers:
 	dbw TILESET_JOHTO, .johto
 	db -1 ; end

data/events/odd_eggs.asm

@@ -27,7 +27,6 @@ prob_total = 0
 	prob 10
 	prob 1
 
-
 OddEggs:
 
 OddEgg1:

data/items/marts.asm

@@ -36,7 +36,6 @@ Marts:
 	dw MartUnderground
 .End
 
-
 MartCherrygrove:
 	db 4 ; # items
 	db POTION

data/maps/attributes.asm

@@ -63,7 +63,6 @@ elif "\1" == "east"
 endc
 ENDM
 
-
 	map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
 	connection west, Route29, ROUTE_29, 0, 0, 9
 	connection east, Route27, ROUTE_27, 0, 0, 9

data/maps/map_data.asm

@@ -6,7 +6,6 @@ SECTION "Maps", ROMX
 INCLUDE "data/maps/maps.asm"
 INCLUDE "data/maps/attributes.asm"
 
-
 INCLUDE "data/maps/blocks.asm"
 
 INCLUDE "data/maps/scripts.asm"

data/maps/maps.asm

@@ -43,7 +43,6 @@ MapGroupPointers::
 	dw MapGroup_Saffron     ; 25
 	dw MapGroup_Cherrygrove ; 26
 
-
 MapGroup_Olivine:
 	map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

data/maps/outdoor_sprites.asm

@@ -30,7 +30,6 @@ OutdoorSprites:
 	dw SaffronGroupSprites
 	dw CherrygroveGroupSprites
 
-
 PalletGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY

data/party_menu_qualities.asm

@@ -18,7 +18,6 @@ endr
 	db -1 ; end
 ENDM
 
-
 PartyMenuQualityPointers:
 ; entries correspond to PARTYMENUACTION_* constants
 	dw .Default  ; PARTYMENUACTION_CHOOSE_POKEMON

data/sgb_ctrl_packets.asm

@@ -37,7 +37,6 @@ sgb_data_snd: MACRO
 	db \3 ; length (1-11)
 ENDM
 
-
 ; Crystal does not support SGB, so this is unused.
 
 PalTrnPacket:  sgb_pal_trn
@@ -49,7 +48,6 @@ PctTrnPacket:  sgb_pct_trn
 MaskEnFreezePacket: sgb_mask_en 1
 MaskEnCancelPacket: sgb_mask_en 0
 
-
 ; These are packets containing SNES code.
 ; This set of packets is found in several Japanese SGB-compatible titles.
 ; It appears to be part of NCL's SGB devkit.

data/sprites/facings.asm

@@ -37,7 +37,6 @@ Facings:
 
 NUM_FACINGS EQU (Facings.End - Facings) / 2
 
-
 ; Tables used as a reference to transform OAM data.
 
 ; Format:

data/trainers/parties.asm

@@ -8,7 +8,6 @@ Trainers:
 ;    * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
 ; - db -1 ; end
 
-
 FalknerGroup:
 	; FALKNER (1)
 	db "FALKNER@", TRAINERTYPE_MOVES
@@ -16,7 +15,6 @@ FalknerGroup:
 	db  9, PIDGEOTTO,  TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
 
-
 WhitneyGroup:
 	; WHITNEY (1)
 	db "WHITNEY@", TRAINERTYPE_MOVES
@@ -24,7 +22,6 @@ WhitneyGroup:
 	db 20, MILTANK,    ROLLOUT, ATTRACT, STOMP, MILK_DRINK
 	db -1 ; end
 
-
 BugsyGroup:
 	; BUGSY (1)
 	db "BUGSY@", TRAINERTYPE_MOVES
@@ -33,7 +30,6 @@ BugsyGroup:
 	db 16, SCYTHER,    QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
 	db -1 ; end
 
-
 MortyGroup:
 	; MORTY (1)
 	db "MORTY@", TRAINERTYPE_MOVES
@@ -43,7 +39,6 @@ MortyGroup:
 	db 23, HAUNTER,    SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
 	db -1 ; end
 
-
 PryceGroup:
 	; PRYCE (1)
 	db "PRYCE@", TRAINERTYPE_MOVES
@@ -52,7 +47,6 @@ PryceGroup:
 	db 31, PILOSWINE,  ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
 	db -1 ; end
 
-
 JasmineGroup:
 	; JASMINE (1)
 	db "JASMINE@", TRAINERTYPE_MOVES
@@ -61,7 +55,6 @@ JasmineGroup:
 	db 35, STEELIX,    SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
 	db -1 ; end
 
-
 ChuckGroup:
 	; CHUCK (1)
 	db "CHUCK@", TRAINERTYPE_MOVES
@@ -69,7 +62,6 @@ ChuckGroup:
 	db 30, POLIWRATH,  HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
 	db -1 ; end
 
-
 ClairGroup:
 	; CLAIR (1)
 	db "CLAIR@", TRAINERTYPE_MOVES
@@ -79,7 +71,6 @@ ClairGroup:
 	db 40, KINGDRA,    SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
 	db -1 ; end
 
-
 Rival1Group:
 	; RIVAL1 (1)
 	db "?@", TRAINERTYPE_NORMAL
@@ -198,10 +189,8 @@ Rival1Group:
 	db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
 	db -1 ; end
 
-
 PokemonProfGroup:
 
-
 WillGroup:
 	; WILL (1)
 	db "WILL@", TRAINERTYPE_MOVES
@@ -212,7 +201,6 @@ WillGroup:
 	db 42, XATU,       QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M
 	db -1 ; end
 
-
 PKMNTrainerGroup:
 	; CAL (1)
 	db "CAL@", TRAINERTYPE_NORMAL
@@ -235,7 +223,6 @@ PKMNTrainerGroup:
 	db 50, FERALIGATR
 	db -1 ; end
 
-
 BrunoGroup:
 	; BRUNO (1)
 	db "BRUNO@", TRAINERTYPE_MOVES
@@ -246,7 +233,6 @@ BrunoGroup:
 	db 46, MACHAMP,    ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
 	db -1 ; end
 
-
 KarenGroup:
 	; KAREN (1)
 	db "KAREN@", TRAINERTYPE_MOVES
@@ -257,7 +243,6 @@ KarenGroup:
 	db 47, HOUNDOOM,   ROAR, PURSUIT, FLAMETHROWER, CRUNCH
 	db -1 ; end
 
-
 KogaGroup:
 	; KOGA (1)
 	db "KOGA@", TRAINERTYPE_MOVES
@@ -268,7 +253,6 @@ KogaGroup:
 	db 44, CROBAT,     DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
 	db -1 ; end
 
-
 ChampionGroup:
 	; CHAMPION (1)
 	db "LANCE@", TRAINERTYPE_MOVES
@@ -280,7 +264,6 @@ ChampionGroup:
 	db 50, DRAGONITE,  FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
 	db -1 ; end
 
-
 BrockGroup:
 	; BROCK (1)
 	db "BROCK@", TRAINERTYPE_MOVES
@@ -291,7 +274,6 @@ BrockGroup:
 	db 42, KABUTOPS,   SLASH, SURF, ENDURE, GIGA_DRAIN
 	db -1 ; end
 
-
 MistyGroup:
 	; MISTY (1)
 	db "MISTY@", TRAINERTYPE_MOVES
@@ -301,7 +283,6 @@ MistyGroup:
 	db 47, STARMIE,    SURF, CONFUSE_RAY, RECOVER, ICE_BEAM
 	db -1 ; end
 
-
 LtSurgeGroup:
 	; LT_SURGE (1)
 	db "LT.SURGE@", TRAINERTYPE_MOVES
@@ -312,7 +293,6 @@ LtSurgeGroup:
 	db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
 	db -1 ; end
 
-
 ScientistGroup:
 	; SCIENTIST (1)
 	db "ROSS@", TRAINERTYPE_NORMAL
@@ -344,7 +324,6 @@ ScientistGroup:
 	db 30, PORYGON,    CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
 	db -1 ; end
 
-
 ErikaGroup:
 	; ERIKA (1)
 	db "ERIKA@", TRAINERTYPE_MOVES
@@ -354,7 +333,6 @@ ErikaGroup:
 	db 46, BELLOSSOM,  SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
 	db -1 ; end
 
-
 YoungsterGroup:
 	; YOUNGSTER (1)
 	db "JOEY@", TRAINERTYPE_NORMAL
@@ -434,7 +412,6 @@ YoungsterGroup:
 	db 37, RATICATE,   HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
 	db -1 ; end
 
-
 SchoolboyGroup:
 	; SCHOOLBOY (1)
 	db "JACK@", TRAINERTYPE_NORMAL
@@ -591,7 +568,6 @@ SchoolboyGroup:
 	db 38, MAGNETON,   ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
 	db -1 ; end
 
-
 BirdKeeperGroup:
 	; BIRD_KEEPER (1)
 	db "ROD@", TRAINERTYPE_NORMAL
@@ -708,7 +684,6 @@ BirdKeeperGroup:
 	db 38, PIDGEOT,    SWIFT, DETECT, STEEL_WING, FLY
 	db -1 ; end
 
-
 LassGroup:
 	; LASS (1)
 	db "CARRIE@", TRAINERTYPE_MOVES
@@ -814,7 +789,6 @@ LassGroup:
 	db 36, GOLDUCK,    DISABLE, SURF, PSYCHIC_M, SCREECH
 	db -1 ; end
 
-
 JanineGroup:
 	; JANINE (1)
 	db "JANINE@", TRAINERTYPE_MOVES
@@ -825,7 +799,6 @@ JanineGroup:
 	db 39, VENOMOTH,   FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
 	db -1 ; end
 
-
 CooltrainerMGroup:
 	; COOLTRAINERM (1)
 	db "NICK@", TRAINERTYPE_MOVES
@@ -956,7 +929,6 @@ CooltrainerMGroup:
 	db 37, DRAGONAIR,  WRAP, SURF, DRAGON_RAGE, SLAM
 	db -1 ; end
 
-
 CooltrainerFGroup:
 	; COOLTRAINERF (1)
 	db "GWEN@", TRAINERTYPE_NORMAL
@@ -1088,7 +1060,6 @@ CooltrainerFGroup:
 	db 35, SEADRA,     SWIFT, LEER, WATERFALL, TWISTER
 	db -1 ; end
 
-
 BeautyGroup:
 	; BEAUTY (1)
 	db "VICTORIA@", TRAINERTYPE_NORMAL
@@ -1184,7 +1155,6 @@ BeautyGroup:
 	db 19, CORSOLA
 	db -1 ; end
 
-
 PokemaniacGroup:
 	; POKEMANIAC (1)
 	db "LARRY@", TRAINERTYPE_NORMAL
@@ -1266,7 +1236,6 @@ PokemaniacGroup:
 	db 17, NIDOQUEEN
 	db -1 ; end
 
-
 GruntMGroup:
 	; GRUNTM (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
@@ -1458,7 +1427,6 @@ GruntMGroup:
 	db 30, GOLBAT
 	db -1 ; end
 
-
 GentlemanGroup:
 	; GENTLEMAN (1)
 	db "PRESTON@", TRAINERTYPE_NORMAL
@@ -1487,7 +1455,6 @@ GentlemanGroup:
 	db 20, NOCTOWL
 	db -1 ; end
 
-
 SkierGroup:
 	; SKIER (1)
 	db "ROXANNE@", TRAINERTYPE_NORMAL
@@ -1499,7 +1466,6 @@ SkierGroup:
 	db 28, DEWGONG
 	db -1 ; end
 
-
 TeacherGroup:
 	; TEACHER (1)
 	db "COLETTE@", TRAINERTYPE_NORMAL
@@ -1517,7 +1483,6 @@ TeacherGroup:
 	db 35, JIGGLYPUFF
 	db -1 ; end
 
-
 SabrinaGroup:
 	; SABRINA (1)
 	db "SABRINA@", TRAINERTYPE_MOVES
@@ -1526,7 +1491,6 @@ SabrinaGroup:
 	db 48, ALAKAZAM,   RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
 	db -1 ; end
 
-
 BugCatcherGroup:
 	; BUG_CATCHER (1)
 	db "DON@", TRAINERTYPE_NORMAL
@@ -1647,7 +1611,6 @@ BugCatcherGroup:
 	db 10, PARAS
 	db -1 ; end
 
-
 FisherGroup:
 	; FISHER (1)
 	db "JUSTIN@", TRAINERTYPE_NORMAL
@@ -1811,7 +1774,6 @@ FisherGroup:
 	db 37, QWILFISH,   ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
 	db -1 ; end
 
-
 SwimmerMGroup:
 	; SWIMMERM (1)
 	db "HAROLD@", TRAINERTYPE_NORMAL
@@ -1953,7 +1915,6 @@ SwimmerMGroup:
 	db 35, SEADRA
 	db -1 ; end
 
-
 SwimmerFGroup:
 	; SWIMMERF (1)
 	db "ELAINE@", TRAINERTYPE_NORMAL
@@ -2063,7 +2024,6 @@ SwimmerFGroup:
 	db 35, SEAKING
 	db -1 ; end
 
-
 SailorGroup:
 	; SAILOR (1)
 	db "EUGENE@", TRAINERTYPE_NORMAL
@@ -2145,7 +2105,6 @@ SailorGroup:
 	db 38, POLIWRATH,  SURF, STRENGTH, ICE_PUNCH, SUBMISSION
 	db -1 ; end
 
-
 SuperNerdGroup:
 	; SUPER_NERD (1)
 	db "STAN@", TRAINERTYPE_NORMAL
@@ -2231,7 +2190,6 @@ SuperNerdGroup:
 	db 19, SLOWPOKE,   CURSE, WATER_GUN, GROWL, STRENGTH
 	db -1 ; end
 
-
 Rival2Group:
 	; RIVAL2 (1)
 	db "?@", TRAINERTYPE_MOVES
@@ -2293,7 +2251,6 @@ Rival2Group:
 	db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
 	db -1 ; end
 
-
 GuitaristGroup:
 	; GUITARIST (1)
 	db "CLYDE@", TRAINERTYPE_NORMAL
@@ -2308,7 +2265,6 @@ GuitaristGroup:
 	db 32, MAGNEMITE
 	db -1 ; end
 
-
 HikerGroup:
 	; HIKER (1)
 	db "ANTHONY@", TRAINERTYPE_NORMAL
@@ -2454,7 +2410,6 @@ HikerGroup:
 	db 34, MACHOKE,    KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
 	db -1 ; end
 
-
 BikerGroup:
 	; BIKER (1)
 	db "BENNY@", TRAINERTYPE_NORMAL
@@ -2514,7 +2469,6 @@ BikerGroup:
 	db 32, WEEZING
 	db -1 ; end
 
-
 BlaineGroup:
 	; BLAINE (1)
 	db "BLAINE@", TRAINERTYPE_MOVES
@@ -2523,7 +2477,6 @@ BlaineGroup:
 	db 50, RAPIDASH,   QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST
 	db -1 ; end
 
-
 BurglarGroup:
 	; BURGLAR (1)
 	db "DUNCAN@", TRAINERTYPE_NORMAL
@@ -2546,7 +2499,6 @@ BurglarGroup:
 	db 30, KOFFING
 	db -1 ; end
 
-
 FirebreatherGroup:
 	; FIREBREATHER (1)
 	db "OTIS@", TRAINERTYPE_NORMAL
@@ -2597,7 +2549,6 @@ FirebreatherGroup:
 	db 28, KOFFING
 	db -1 ; end
 
-
 JugglerGroup:
 	; JUGGLER (1)
 	db "IRWIN@", TRAINERTYPE_NORMAL
@@ -2646,7 +2597,6 @@ JugglerGroup:
 	db 30, ELECTRODE
 	db -1 ; end
 
-
 BlackbeltGroup:
 	; BLACKBELT_T (1)
 	db "KENJI@", TRAINERTYPE_NORMAL
@@ -2705,7 +2655,6 @@ BlackbeltGroup:
 	db 34, MACHOKE
 	db -1 ; end
 
-
 ExecutiveMGroup:
 	; EXECUTIVEM (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
@@ -2736,7 +2685,6 @@ ExecutiveMGroup:
 	db 22, KOFFING
 	db -1 ; end
 
-
 PsychicGroup:
 	; PSYCHIC_T (1)
 	db "NATHAN@", TRAINERTYPE_NORMAL
@@ -2809,7 +2757,6 @@ PsychicGroup:
 	db 33, HYPNO
 	db -1 ; end
 
-
 PicnickerGroup:
 	; PICNICKER (1)
 	db "LIZ@", TRAINERTYPE_NORMAL
@@ -2965,7 +2912,6 @@ PicnickerGroup:
 	db 43, CLEFAIRY,   METRONOME, ENCORE, MOONLIGHT, MINIMIZE
 	db -1 ; end
 
-
 CamperGroup:
 	; CAMPER (1)
 	db "ROLAND@", TRAINERTYPE_NORMAL
@@ -3109,7 +3055,6 @@ CamperGroup:
 	db 30, TAUROS
 	db -1 ; end
 
-
 ExecutiveFGroup:
 	; EXECUTIVEF (1)
 	db "EXECUTIVE@", TRAINERTYPE_MOVES
@@ -3125,7 +3070,6 @@ ExecutiveFGroup:
 	db 25, MURKROW,    PECK, PURSUIT, HAZE, NO_MOVE
 	db -1 ; end
 
-
 SageGroup:
 	; SAGE (1)
 	db "CHOW@", TRAINERTYPE_NORMAL
@@ -3203,7 +3147,6 @@ SageGroup:
 	db 32, VAPOREON
 	db -1 ; end
 
-
 MediumGroup:
 	; MEDIUM (1)
 	db "MARTHA@", TRAINERTYPE_NORMAL
@@ -3245,7 +3188,6 @@ MediumGroup:
 	db 36, SLOWBRO
 	db -1 ; end
 
-
 BoarderGroup:
 	; BOARDER (1)
 	db "RONALD@", TRAINERTYPE_NORMAL
@@ -3267,7 +3209,6 @@ BoarderGroup:
 	db 24, SHELLDER
 	db -1 ; end
 
-
 PokefanMGroup:
 	; POKEFANM (1)
 	db "WILLIAM@", TRAINERTYPE_ITEM
@@ -3350,7 +3291,6 @@ PokefanMGroup:
 	db 35, TEDDIURSA,  BERRY
 	db -1 ; end
 
-
 KimonoGirlGroup:
 	; KIMONO_GIRL (1)
 	db "NAOKO@", TRAINERTYPE_NORMAL
@@ -3384,7 +3324,6 @@ KimonoGirlGroup:
 	db 17, JOLTEON
 	db -1 ; end
 
-
 TwinsGroup:
 	; TWINS (1)
 	db "AMY & MAY@", TRAINERTYPE_NORMAL
@@ -3446,7 +3385,6 @@ TwinsGroup:
 	db 38, DRATINI,    THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
 	db -1 ; end
 
-
 PokefanFGroup:
 	; POKEFANF (1)
 	db "BEVERLY@", TRAINERTYPE_ITEM
@@ -3482,7 +3420,6 @@ PokefanFGroup:
 	db 16, MEOWTH,     BERRY
 	db -1 ; end
 
-
 RedGroup:
 	; RED (1)
 	db "RED@", TRAINERTYPE_MOVES
@@ -3494,7 +3431,6 @@ RedGroup:
 	db 77, BLASTOISE,  RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
 	db -1 ; end
 
-
 BlueGroup:
 	; BLUE (1)
 	db "BLUE@", TRAINERTYPE_MOVES
@@ -3506,7 +3442,6 @@ BlueGroup:
 	db 58, ARCANINE,   ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
 	db -1 ; end
 
-
 OfficerGroup:
 	; OFFICER (1)
 	db "KEITH@", TRAINERTYPE_NORMAL
@@ -3519,7 +3454,6 @@ OfficerGroup:
 	db 14, GROWLITHE
 	db -1 ; end
 
-
 GruntFGroup:
 	; GRUNTF (1)
 	db "GRUNT@", TRAINERTYPE_NORMAL
@@ -3552,7 +3486,6 @@ GruntFGroup:
 	db 18, GLOOM,      ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
 	db -1 ; end
 
-
 MysticalmanGroup:
 	; MYSTICALMAN (1)
 	db "EUSINE@", TRAINERTYPE_MOVES

data/wild/fish.asm

@@ -204,7 +204,6 @@ FishGroups:
 	db  90 percent + 1, MAGIKARP,   40
 	db 100 percent,     REMORAID,   40
 
-
 TimeFishGroups:
 	;  day              nite
 	db CORSOLA,    20,  STARYU,     20 ; 0