summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anims/framesets.asm1
-rw-r--r--data/battle_tower/parties.asm219
-rw-r--r--data/credits_strings.asm4
-rw-r--r--data/engine_flags.asm1
-rw-r--r--data/events/field_move_blocks.asm1
-rw-r--r--data/events/odd_eggs.asm1
-rw-r--r--data/events/pokedex_ratings.asm1
-rw-r--r--data/items/marts.asm1
-rw-r--r--data/maps/attributes.asm1
-rw-r--r--data/maps/map_data.asm1
-rw-r--r--data/maps/maps.asm1
-rw-r--r--data/maps/outdoor_sprites.asm1
-rw-r--r--data/moves/effects.asm2
-rw-r--r--data/party_menu_qualities.asm1
-rw-r--r--data/sgb_ctrl_packets.asm2
-rw-r--r--data/sprites/facings.asm1
-rw-r--r--data/trainers/attributes.asm1
-rw-r--r--data/trainers/parties.asm69
-rw-r--r--data/types/names.asm1
-rw-r--r--data/wild/fish.asm1
20 files changed, 6 insertions, 305 deletions
diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm
index 35cb3e5a8..e0fe57007 100644
--- a/data/battle_anims/framesets.asm
+++ b/data/battle_anims/framesets.asm
@@ -1266,4 +1266,3 @@ BattleAnimFrameData:
.Frameset_b8:
frame BATTLEANIMOAMSET_D7, 8
endanim
-
diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm
index e4e8f151a..15b7cdc4e 100644
--- a/data/battle_tower/parties.asm
+++ b/data/battle_tower/parties.asm
@@ -1,7 +1,6 @@
BattleTowerMons:
; 10 groups of 21 mons.
-
BattleTowerMons1:
db JOLTEON
@@ -30,7 +29,6 @@ BattleTowerMons1:
bigdw 31 ; SDef
db "SANDA-SU@@@"
-
db ESPEON
db LEFTOVERS
db MUD_SLAP, PSYCHIC_M, PSYCH_UP, TOXIC
@@ -57,7 +55,6 @@ BattleTowerMons1:
bigdw 31 ; SDef
db "E-HUi@@@@@@"
-
db UMBREON
db GOLD_BERRY
db SHADOW_BALL, IRON_TAIL, PSYCH_UP, TOXIC
@@ -84,7 +81,6 @@ BattleTowerMons1:
bigdw 39 ; SDef
db "BURAtuKI-@@"
-
db WOBBUFFET
db FOCUS_BAND
db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
@@ -111,7 +107,6 @@ BattleTowerMons1:
bigdw 23 ; SDef
db "SO-NANSU@@@"
-
db KANGASKHAN
db MIRACLEBERRY
db REVERSAL, HYPER_BEAM, EARTHQUAKE, ATTRACT
@@ -138,7 +133,6 @@ BattleTowerMons1:
bigdw 28 ; SDef
db "GARU-RA@@@@"
-
db CORSOLA
db SCOPE_LENS
db SURF, PSYCHIC_M, RECOVER, ANCIENTPOWER
@@ -165,7 +159,6 @@ BattleTowerMons1:
bigdw 28 ; SDef
db "SANI-GO@@@@"
-
db MILTANK
db GOLD_BERRY
db BLIZZARD, EARTHQUAKE, HYPER_BEAM, TOXIC
@@ -192,7 +185,6 @@ BattleTowerMons1:
bigdw 26 ; SDef
db "MIRUTANKU@@"
-
db AERODACTYL
db LEFTOVERS
db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE
@@ -219,7 +211,6 @@ BattleTowerMons1:
bigdw 26 ; SDef
db "PUTERA@@@@@"
-
db LAPRAS
db MIRACLEBERRY
db BLIZZARD, SURF, THUNDERBOLT, PSYCHIC_M
@@ -246,7 +237,6 @@ BattleTowerMons1:
bigdw 30 ; SDef
db "RAPURASU@@@"
-
db SNEASEL
db GOLD_BERRY
db SLASH, FAINT_ATTACK, SURF, BLIZZARD
@@ -273,7 +263,6 @@ BattleTowerMons1:
bigdw 27 ; SDef
db "NIyu-RA@@@@"
-
db PORYGON2
db BRIGHTPOWDER
db PSYCHIC_M, BLIZZARD, HYPER_BEAM, TRI_ATTACK
@@ -300,7 +289,6 @@ BattleTowerMons1:
bigdw 31 ; SDef
db "PORIGON2@@@"
-
db MISDREAVUS
db FOCUS_BAND
db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL
@@ -327,7 +315,6 @@ BattleTowerMons1:
bigdw 29 ; SDef
db "MUUMA@@@@@@"
-
db HOUNDOUR
db GOLD_BERRY
db FAINT_ATTACK, SOLARBEAM, ROAR, SUNNY_DAY
@@ -354,7 +341,6 @@ BattleTowerMons1:
bigdw 22 ; SDef
db "DERUBIRU@@@"
-
db GIRAFARIG
db KINGS_ROCK
db PSYBEAM, MUD_SLAP, SHADOW_BALL, AGILITY
@@ -381,7 +367,6 @@ BattleTowerMons1:
bigdw 24 ; SDef
db "KIRINRIKI@@"
-
db BLISSEY
db QUICK_CLAW
db HEADBUTT, SOLARBEAM, ROLLOUT, STRENGTH
@@ -408,7 +393,6 @@ BattleTowerMons1:
bigdw 39 ; SDef
db "HAPINASU@@@"
-
db SNORLAX
db MIRACLEBERRY
db HEADBUTT, PROTECT, SNORE, SURF
@@ -435,7 +419,6 @@ BattleTowerMons1:
bigdw 32 ; SDef
db "KABIGON@@@@"
-
db EXEGGUTOR
db KINGS_ROCK
db TOXIC, GIGA_DRAIN, THIEF, CONFUSION
@@ -462,7 +445,6 @@ BattleTowerMons1:
bigdw 25 ; SDef
db "NAtuSI-@@@@"
-
db HERACROSS
db GOLD_BERRY
db REVERSAL, ENDURE, COUNTER, ROCK_SMASH
@@ -489,7 +471,6 @@ BattleTowerMons1:
bigdw 29 ; SDef
db "HERAKUROSU@"
-
db UNOWN
db BERRY
db HIDDEN_POWER, 0, 0, 0
@@ -516,7 +497,6 @@ BattleTowerMons1:
bigdw 21 ; SDef
db "ANNO-N@@@@@"
-
db TAUROS
db KINGS_ROCK
db HEADBUTT, SWAGGER, TAIL_WHIP, ICY_WIND
@@ -543,7 +523,6 @@ BattleTowerMons1:
bigdw 24 ; SDef
db "KENTAROSU@@"
-
db MR__MIME
db QUICK_CLAW
db TOXIC, PSYCH_UP, FIRE_PUNCH, HEADBUTT
@@ -571,8 +550,6 @@ BattleTowerMons1:
db "BARIYA-DO@@"
-
-
BattleTowerMons2:
db UMBREON
@@ -601,7 +578,6 @@ BattleTowerMons2:
bigdw 72 ; SDef
db "BURAtuKI-@@"
-
db STARMIE
db GOLD_BERRY
db RECOVER, PSYCHIC_M, SURF, PSYCH_UP
@@ -628,7 +604,6 @@ BattleTowerMons2:
bigdw 54 ; SDef
db "SUTA-MI-@@@"
-
db GYARADOS
db MIRACLEBERRY
db HYPER_BEAM, DRAGON_RAGE, THUNDERBOLT, FIRE_BLAST
@@ -655,7 +630,6 @@ BattleTowerMons2:
bigdw 61 ; SDef
db "GIyaRADOSU@"
-
db STEELIX
db GOLD_BERRY
db ROAR, IRON_TAIL, SWAGGER, EARTHQUAKE
@@ -682,7 +656,6 @@ BattleTowerMons2:
bigdw 48 ; SDef
db "HAGANE-RU@@"
-
db ALAKAZAM
db BERRY_JUICE
db PSYCHIC_M, PSYCH_UP, TOXIC, THUNDERPUNCH
@@ -709,7 +682,6 @@ BattleTowerMons2:
bigdw 55 ; SDef
db "HU-DEiN@@@@"
-
db ARCANINE
db BRIGHTPOWDER
db FLAMETHROWER, ROAR, HYPER_BEAM, IRON_TAIL
@@ -736,7 +708,6 @@ BattleTowerMons2:
bigdw 52 ; SDef
db "UINDEi@@@@@"
-
db HERACROSS
db FOCUS_BAND
db ENDURE, REVERSAL, MEGAHORN, EARTHQUAKE
@@ -763,7 +734,6 @@ BattleTowerMons2:
bigdw 59 ; SDef
db "HERAKUROSU@"
-
db EXEGGUTOR
db LEFTOVERS
db HYPER_BEAM, PSYCHIC_M, TOXIC, DREAM_EATER
@@ -790,7 +760,6 @@ BattleTowerMons2:
bigdw 46 ; SDef
db "NAtuSI-@@@@"
-
db AERODACTYL
db GOLD_BERRY
db REST, HYPER_BEAM, EARTHQUAKE, DRAGON_RAGE
@@ -817,7 +786,6 @@ BattleTowerMons2:
bigdw 50 ; SDef
db "PUTERA@@@@@"
-
db BLISSEY
db BRIGHTPOWDER
db PSYCHIC_M, SUBMISSION, SOFTBOILED, COUNTER
@@ -844,7 +812,6 @@ BattleTowerMons2:
bigdw 75 ; SDef
db "HAPINASU@@@"
-
db LAPRAS
db GOLD_BERRY
db PSYCHIC_M, THUNDERBOLT, BLIZZARD, CONFUSE_RAY
@@ -871,7 +838,6 @@ BattleTowerMons2:
bigdw 54 ; SDef
db "RAPURASU@@@"
-
db PIKACHU
db LIGHT_BALL
db THUNDERBOLT, THUNDER_WAVE, STRENGTH, TOXIC
@@ -898,7 +864,6 @@ BattleTowerMons2:
bigdw 37 ; SDef
db "PIKATIyuU@@"
-
db SCIZOR
db FOCUS_BAND
db STEEL_WING, SLASH, TOXIC, SANDSTORM
@@ -925,7 +890,6 @@ BattleTowerMons2:
bigdw 53 ; SDef
db "HAtuSAMU@@@"
-
db HITMONCHAN
db GOLD_BERRY
db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MEGA_PUNCH
@@ -952,7 +916,6 @@ BattleTowerMons2:
bigdw 62 ; SDef
db "EBIWARA-@@@"
-
db TAUROS
db BRIGHTPOWDER
db THUNDERBOLT, EARTHQUAKE, HYPER_BEAM, BLIZZARD
@@ -979,7 +942,6 @@ BattleTowerMons2:
bigdw 47 ; SDef
db "KENTAROSU@@"
-
db AZUMARILL
db MYSTIC_WATER
db SURF, BLIZZARD, ATTRACT, RAIN_DANCE
@@ -1006,7 +968,6 @@ BattleTowerMons2:
bigdw 49 ; SDef
db "MARIRURI@@@"
-
db MILTANK
db KINGS_ROCK
db EARTHQUAKE, THUNDER, ATTRACT, SURF
@@ -1033,7 +994,6 @@ BattleTowerMons2:
bigdw 48 ; SDef
db "MIRUTANKU@@"
-
db WIGGLYTUFF
db GOLD_BERRY
db HYPER_BEAM, BLIZZARD, FIRE_BLAST, ATTRACT
@@ -1060,7 +1020,6 @@ BattleTowerMons2:
bigdw 40 ; SDef
db "PUKURIN@@@@"
-
db WIGGLYTUFF
db PINK_BOW
db PSYCHIC_M, SWAGGER, PSYCH_UP, HEADBUTT
@@ -1087,7 +1046,6 @@ BattleTowerMons2:
bigdw 36 ; SDef
db "PUKURIN@@@@"
-
db NIDOKING
db BERRY
db BLIZZARD, EARTHQUAKE, SURF, THUNDERPUNCH
@@ -1114,7 +1072,6 @@ BattleTowerMons2:
bigdw 46 ; SDef
db "NIDOKINGU@@"
-
db QUAGSIRE
db QUICK_CLAW
db AMNESIA, EARTHQUAKE, SURF, RAIN_DANCE
@@ -1142,8 +1099,6 @@ BattleTowerMons2:
db "NUO-@@@@@@@"
-
-
BattleTowerMons3:
db JOLTEON
@@ -1172,7 +1127,6 @@ BattleTowerMons3:
bigdw 87 ; SDef
db "SANDA-SU@@@"
-
db POLIWRATH
db BRIGHTPOWDER
db DOUBLE_TEAM, SURF, FISSURE, SUBMISSION
@@ -1199,7 +1153,6 @@ BattleTowerMons3:
bigdw 82 ; SDef
db "NIyoROBON@@"
-
db STARMIE
db LEFTOVERS
db THUNDER_WAVE, PSYCHIC_M, RECOVER, SURF
@@ -1226,7 +1179,6 @@ BattleTowerMons3:
bigdw 81 ; SDef
db "SUTA-MI-@@@"
-
db JYNX
db GOLD_BERRY
db BLIZZARD, LOVELY_KISS, DREAM_EATER, ATTRACT
@@ -1253,7 +1205,6 @@ BattleTowerMons3:
bigdw 86 ; SDef
db "RU-ZIyuRA@@"
-
db DUGTRIO
db KINGS_ROCK
db EARTHQUAKE, SLUDGE_BOMB, SLASH, MUD_SLAP
@@ -1280,7 +1231,6 @@ BattleTowerMons3:
bigdw 72 ; SDef
db "DAGUTORIO@@"
-
db BELLOSSOM
db BRIGHTPOWDER
db GIGA_DRAIN, SUNNY_DAY, SOLARBEAM, DOUBLE_TEAM
@@ -1307,7 +1257,6 @@ BattleTowerMons3:
bigdw 88 ; SDef
db "KIREIHANA@@"
-
db BLISSEY
db LEFTOVERS
db TOXIC, REFLECT, SOFTBOILED, PROTECT
@@ -1334,7 +1283,6 @@ BattleTowerMons3:
bigdw 109 ; SDef
db "HAPINASU@@@"
-
db HOUNDOOM
db CHARCOAL
db FLAMETHROWER, CRUNCH, SHADOW_BALL, DREAM_EATER
@@ -1361,7 +1309,6 @@ BattleTowerMons3:
bigdw 76 ; SDef
db "HERUGA-@@@@"
-
db MACHAMP
db MIRACLEBERRY
db CROSS_CHOP, ICE_PUNCH, EARTHQUAKE, FIRE_BLAST
@@ -1388,7 +1335,6 @@ BattleTowerMons3:
bigdw 80 ; SDef
db "KAIRIKI-@@@"
-
db CROBAT
db GOLD_BERRY
db ATTRACT, CONFUSE_RAY, TOXIC, WING_ATTACK
@@ -1415,7 +1361,6 @@ BattleTowerMons3:
bigdw 76 ; SDef
db "KUROBAtuTO@"
-
db PORYGON2
db BRIGHTPOWDER
db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK
@@ -1442,7 +1387,6 @@ BattleTowerMons3:
bigdw 81 ; SDef
db "PORIGON2@@@"
-
db MAROWAK
db THICK_CLUB
db EARTHQUAKE, RETURN, HYPER_BEAM, BONEMERANG
@@ -1469,7 +1413,6 @@ BattleTowerMons3:
bigdw 72 ; SDef
db "GARAGARA@@@"
-
db ELECTRODE
db BRIGHTPOWDER
db LIGHT_SCREEN, THUNDERBOLT, PROTECT, THUNDER
@@ -1496,7 +1439,6 @@ BattleTowerMons3:
bigdw 78 ; SDef
db "MARUMAIN@@@"
-
db LAPRAS
db LEFTOVERS
db RAIN_DANCE, WATER_GUN, ICY_WIND, STRENGTH
@@ -1523,7 +1465,6 @@ BattleTowerMons3:
bigdw 81 ; SDef
db "RAPURASU@@@"
-
db LANTURN
db GOLD_BERRY
db RAIN_DANCE, THUNDER, SURF, FLAIL
@@ -1550,7 +1491,6 @@ BattleTowerMons3:
bigdw 70 ; SDef
db "RANTA-N@@@@"
-
db ESPEON
db MIRACLEBERRY
db CONFUSION, SWIFT, TOXIC, PSYCH_UP
@@ -1577,7 +1517,6 @@ BattleTowerMons3:
bigdw 82 ; SDef
db "E-HUi@@@@@@"
-
db TENTACRUEL
db KINGS_ROCK
db WRAP, TOXIC, SLUDGE_BOMB, BUBBLEBEAM
@@ -1604,7 +1543,6 @@ BattleTowerMons3:
bigdw 101 ; SDef
db "DOKUKURAGE@"
-
db GENGAR
db GOLD_BERRY
db THIEF, LICK, NIGHT_SHADE, GIGA_DRAIN
@@ -1631,7 +1569,6 @@ BattleTowerMons3:
bigdw 70 ; SDef
db "GENGA-@@@@@"
-
db URSARING
db GOLD_BERRY
db HEADBUTT, PROTECT, ROAR, LEER
@@ -1658,7 +1595,6 @@ BattleTowerMons3:
bigdw 65 ; SDef
db "RINGUMA@@@@"
-
db FEAROW
db BRIGHTPOWDER
db MIRROR_MOVE, PURSUIT, PECK, SWIFT
@@ -1685,7 +1621,6 @@ BattleTowerMons3:
bigdw 58 ; SDef
db "ONIDORIRU@@"
-
db PRIMEAPE
db MIRACLEBERRY
db LOW_KICK, KARATE_CHOP, REVERSAL, FOCUS_ENERGY
@@ -1713,8 +1648,6 @@ BattleTowerMons3:
db "OKORIZARU@@"
-
-
BattleTowerMons4:
db TAUROS
@@ -1743,7 +1676,6 @@ BattleTowerMons4:
bigdw 94 ; SDef
db "KENTAROSU@@"
-
db KINGDRA
db LEFTOVERS
db SURF, DRAGONBREATH, HYPER_BEAM, BLIZZARD
@@ -1770,7 +1702,6 @@ BattleTowerMons4:
bigdw 115 ; SDef
db "KINGUDORA@@"
-
db SNORLAX
db QUICK_CLAW
db ATTRACT, BODY_SLAM, PSYCH_UP, EARTHQUAKE
@@ -1797,7 +1728,6 @@ BattleTowerMons4:
bigdw 125 ; SDef
db "KABIGON@@@@"
-
db LAPRAS
db LEFTOVERS
db THUNDERBOLT, ICE_BEAM, CONFUSE_RAY, SURF
@@ -1824,7 +1754,6 @@ BattleTowerMons4:
bigdw 111 ; SDef
db "RAPURASU@@@"
-
db STEELIX
db GOLD_BERRY
db SANDSTORM, IRON_TAIL, EARTHQUAKE, TOXIC
@@ -1851,7 +1780,6 @@ BattleTowerMons4:
bigdw 87 ; SDef
db "HAGANE-RU@@"
-
db ALAKAZAM
db KINGS_ROCK
db PSYCHIC_M, THUNDERPUNCH, RECOVER, FIRE_PUNCH
@@ -1878,7 +1806,6 @@ BattleTowerMons4:
bigdw 107 ; SDef
db "HU-DEiN@@@@"
-
db STARMIE
db LEFTOVERS
db BLIZZARD, THUNDERBOLT, SURF, PSYCHIC_M
@@ -1905,7 +1832,6 @@ BattleTowerMons4:
bigdw 105 ; SDef
db "SUTA-MI-@@@"
-
db WOBBUFFET
db GOLD_BERRY
db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
@@ -1932,7 +1858,6 @@ BattleTowerMons4:
bigdw 79 ; SDef
db "SO-NANSU@@@"
-
db GOLEM
db FOCUS_BAND
db EXPLOSION, EARTHQUAKE, MEGA_PUNCH, ROCK_SLIDE
@@ -1959,7 +1884,6 @@ BattleTowerMons4:
bigdw 88 ; SDef
db "GORO-NIya@@"
-
db SCIZOR
db SCOPE_LENS
db SLASH, STEEL_WING, PURSUIT, HYPER_BEAM
@@ -1986,7 +1910,6 @@ BattleTowerMons4:
bigdw 102 ; SDef
db "HAtuSAMU@@@"
-
db DUGTRIO
db KINGS_ROCK
db EARTHQUAKE, HYPER_BEAM, SLUDGE_BOMB, MUD_SLAP
@@ -2013,7 +1936,6 @@ BattleTowerMons4:
bigdw 91 ; SDef
db "DAGUTORIO@@"
-
db SLOWBRO
db MIRACLEBERRY
db SURF, PSYCHIC_M, EARTHQUAKE, BLIZZARD
@@ -2040,7 +1962,6 @@ BattleTowerMons4:
bigdw 103 ; SDef
db "YADORAN@@@@"
-
db PORYGON2
db NO_ITEM
db CONVERSION2, CONVERSION, PSYBEAM, THIEF
@@ -2067,7 +1988,6 @@ BattleTowerMons4:
bigdw 115 ; SDef
db "PORIGON2@@@"
-
db ARCANINE
db CHARCOAL
db FLAME_WHEEL, LEER, BODY_SLAM, ROAR
@@ -2094,7 +2014,6 @@ BattleTowerMons4:
bigdw 99 ; SDef
db "UINDEi@@@@@"
-
db FORRETRESS
db LEFTOVERS
db RAPID_SPIN, PROTECT, TOXIC, SANDSTORM
@@ -2121,7 +2040,6 @@ BattleTowerMons4:
bigdw 87 ; SDef
db "HUoRETOSU@@"
-
db OMASTAR
db GOLD_BERRY
db CURSE, WATER_GUN, ANCIENTPOWER, ROCK_SMASH
@@ -2148,7 +2066,6 @@ BattleTowerMons4:
bigdw 88 ; SDef
db "OMUSUTA-@@@"
-
db CHARIZARD
db KINGS_ROCK
db FIRE_SPIN, DRAGON_RAGE, FLY, SLASH
@@ -2175,7 +2092,6 @@ BattleTowerMons4:
bigdw 106 ; SDef
db "RIZA-DON@@@"
-
db EXEGGUTOR
db BRIGHTPOWDER
db EGG_BOMB, STOMP, PSYCH_UP, CONFUSION
@@ -2202,7 +2118,6 @@ BattleTowerMons4:
bigdw 84 ; SDef
db "NAtuSI-@@@@"
-
db HYPNO
db BRIGHTPOWDER
db CONFUSION, THUNDERPUNCH, HEADBUTT, DISABLE
@@ -2229,7 +2144,6 @@ BattleTowerMons4:
bigdw 122 ; SDef
db "SURI-PA-@@@"
-
db MUK
db QUICK_CLAW
db SCREECH, TOXIC, SLUDGE, HARDEN
@@ -2256,7 +2170,6 @@ BattleTowerMons4:
bigdw 111 ; SDef
db "BETOBETON@@"
-
db ELECTABUZZ
db KINGS_ROCK
db LIGHT_SCREEN, THUNDERPUNCH, SWIFT, SNORE
@@ -2284,8 +2197,6 @@ BattleTowerMons4:
db "EREBU-@@@@@"
-
-
BattleTowerMons5:
db KINGDRA
@@ -2314,7 +2225,6 @@ BattleTowerMons5:
bigdw 144 ; SDef
db "KINGUDORA@@"
-
db HOUNDOOM
db MIRACLEBERRY
db REST, CRUNCH, DREAM_EATER, FLAMETHROWER
@@ -2341,7 +2251,6 @@ BattleTowerMons5:
bigdw 127 ; SDef
db "HERUGA-@@@@"
-
db SHUCKLE
db LEFTOVERS
db SANDSTORM, REST, TOXIC, WRAP
@@ -2368,7 +2277,6 @@ BattleTowerMons5:
bigdw 279 ; SDef
db "TUBOTUBO@@@"
-
db SNORLAX
db LEFTOVERS
db HYPER_BEAM, EARTHQUAKE, SURF, PSYCH_UP
@@ -2395,7 +2303,6 @@ BattleTowerMons5:
bigdw 159 ; SDef
db "KABIGON@@@@"
-
db LAPRAS
db GOLD_BERRY
db THUNDERBOLT, SURF, CONFUSE_RAY, BLIZZARD
@@ -2422,7 +2329,6 @@ BattleTowerMons5:
bigdw 143 ; SDef
db "RAPURASU@@@"
-
db JOLTEON
db KINGS_ROCK
db THUNDERBOLT, THUNDER_WAVE, SHADOW_BALL, HIDDEN_POWER
@@ -2449,7 +2355,6 @@ BattleTowerMons5:
bigdw 144 ; SDef
db "SANDA-SU@@@"
-
db SCIZOR
db LEFTOVERS
db HYPER_BEAM, SLASH, AGILITY, METAL_CLAW
@@ -2476,7 +2381,6 @@ BattleTowerMons5:
bigdw 124 ; SDef
db "HAtuSAMU@@@"
-
db SLOWKING
db MINT_BERRY
db REST, SURF, PSYCHIC_M, AMNESIA
@@ -2503,7 +2407,6 @@ BattleTowerMons5:
bigdw 156 ; SDef
db "YADOKINGU@@"
-
db MACHAMP
db GOLD_BERRY
db CROSS_CHOP, EARTHQUAKE, FIRE_BLAST, THUNDERPUNCH
@@ -2530,7 +2433,6 @@ BattleTowerMons5:
bigdw 128 ; SDef
db "KAIRIKI-@@@"
-
db STARMIE
db SCOPE_LENS
db THUNDER_WAVE, RECOVER, THUNDERBOLT, SURF
@@ -2557,7 +2459,6 @@ BattleTowerMons5:
bigdw 130 ; SDef
db "SUTA-MI-@@@"
-
db DUGTRIO
db KINGS_ROCK
db EARTHQUAKE, SLASH, HYPER_BEAM, SLUDGE_BOMB
@@ -2584,7 +2485,6 @@ BattleTowerMons5:
bigdw 116 ; SDef
db "DAGUTORIO@@"
-
db ELECTRODE
db MIRACLEBERRY
db THUNDERBOLT, EXPLOSION, MIRROR_COAT, REST
@@ -2611,7 +2511,6 @@ BattleTowerMons5:
bigdw 126 ; SDef
db "MARUMAIN@@@"
-
db AERODACTYL
db KINGS_ROCK
db HYPER_BEAM, EARTHQUAKE, FIRE_BLAST, IRON_TAIL
@@ -2638,7 +2537,6 @@ BattleTowerMons5:
bigdw 119 ; SDef
db "PUTERA@@@@@"
-
db CROBAT
db LEFTOVERS
db CONFUSE_RAY, ATTRACT, HYPER_BEAM, TOXIC
@@ -2665,7 +2563,6 @@ BattleTowerMons5:
bigdw 127 ; SDef
db "KUROBAtuTO@"
-
db ZAPDOS
db MIRACLEBERRY
db DRILL_PECK, THUNDERBOLT, THUNDER_WAVE, HYPER_BEAM
@@ -2692,7 +2589,6 @@ BattleTowerMons5:
bigdw 136 ; SDef
db "SANDA-@@@@@"
-
db SKARMORY
db GOLD_BERRY
db SANDSTORM, FLY, STEEL_WING, TOXIC
@@ -2719,7 +2615,6 @@ BattleTowerMons5:
bigdw 113 ; SDef
db "EA-MUDO@@@@"
-
db FORRETRESS
db LEFTOVERS
db SANDSTORM, TOXIC, EXPLOSION, SWAGGER
@@ -2746,7 +2641,6 @@ BattleTowerMons5:
bigdw 103 ; SDef
db "HUoRETOSU@@"
-
db STEELIX
db MIRACLEBERRY
db SANDSTORM, IRON_TAIL, REST, EARTHQUAKE
@@ -2773,7 +2667,6 @@ BattleTowerMons5:
bigdw 109 ; SDef
db "HAGANE-RU@@"
-
db GIRAFARIG
db SCOPE_LENS
db DREAM_EATER, CRUNCH, PSYCHIC_M, EARTHQUAKE
@@ -2800,7 +2693,6 @@ BattleTowerMons5:
bigdw 101 ; SDef
db "KIRINRIKI@@"
-
db GYARADOS
db MIRACLEBERRY
db HYPER_BEAM, SURF, RAIN_DANCE, ZAP_CANNON
@@ -2827,7 +2719,6 @@ BattleTowerMons5:
bigdw 135 ; SDef
db "GIyaRADOSU@"
-
db ARTICUNO
db GOLD_BERRY
db BLIZZARD, HYPER_BEAM, ROAR, ICY_WIND
@@ -2855,8 +2746,6 @@ BattleTowerMons5:
db "HURI-ZA-@@@"
-
-
BattleTowerMons6:
db KINGDRA
@@ -2885,7 +2774,6 @@ BattleTowerMons6:
bigdw 172 ; SDef
db "KINGUDORA@@"
-
db TYRANITAR
db GOLD_BERRY
db CRUNCH, EARTHQUAKE, ROCK_SLIDE, HYPER_BEAM
@@ -2912,7 +2800,6 @@ BattleTowerMons6:
bigdw 175 ; SDef
db "BANGIRASU@@"
-
db HOUNDOOM
db MIRACLEBERRY
db FLAMETHROWER, CRUNCH, DREAM_EATER, REST
@@ -2939,7 +2826,6 @@ BattleTowerMons6:
bigdw 153 ; SDef
db "HERUGA-@@@@"
-
db PORYGON2
db LEFTOVERS
db BLIZZARD, RECOVER, TOXIC, PSYCHIC_M
@@ -2966,7 +2852,6 @@ BattleTowerMons6:
bigdw 170 ; SDef
db "PORIGON2@@@"
-
db MACHAMP
db QUICK_CLAW
db FIRE_PUNCH, CROSS_CHOP, THUNDERPUNCH, EARTHQUAKE
@@ -2993,7 +2878,6 @@ BattleTowerMons6:
bigdw 158 ; SDef
db "KAIRIKI-@@@"
-
db ZAPDOS
db MINT_BERRY
db REST, DRILL_PECK, THUNDERBOLT, THUNDER_WAVE
@@ -3020,7 +2904,6 @@ BattleTowerMons6:
bigdw 161 ; SDef
db "SANDA-@@@@@"
-
db WOBBUFFET
db GOLD_BERRY
db COUNTER, MIRROR_COAT, DESTINY_BOND, SAFEGUARD
@@ -3047,7 +2930,6 @@ BattleTowerMons6:
bigdw 122 ; SDef
db "SO-NANSU@@@"
-
db AERODACTYL
db LEFTOVERS
db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE
@@ -3074,7 +2956,6 @@ BattleTowerMons6:
bigdw 142 ; SDef
db "PUTERA@@@@@"
-
db DRAGONITE
db MIRACLEBERRY
db HYPER_BEAM, ICY_WIND, THUNDERBOLT, SURF
@@ -3101,7 +2982,6 @@ BattleTowerMons6:
bigdw 172 ; SDef
db "KAIRIyu-@@@"
-
db UMBREON
db GOLD_BERRY
db MUD_SLAP, MOONLIGHT, PSYCHIC_M, FAINT_ATTACK
@@ -3128,7 +3008,6 @@ BattleTowerMons6:
bigdw 212 ; SDef
db "BURAtuKI-@@"
-
db ARCANINE
db CHARCOAL
db FLAMETHROWER, CRUNCH, EXTREMESPEED, IRON_TAIL
@@ -3155,7 +3034,6 @@ BattleTowerMons6:
bigdw 149 ; SDef
db "UINDEi@@@@@"
-
db SKARMORY
db MIRACLEBERRY
db STEEL_WING, FLY, TOXIC, PROTECT
@@ -3182,7 +3060,6 @@ BattleTowerMons6:
bigdw 135 ; SDef
db "EA-MUDO@@@@"
-
db BLISSEY
db LEFTOVERS
db SOFTBOILED, TOXIC, PROTECT, PSYCHIC_M
@@ -3209,7 +3086,6 @@ BattleTowerMons6:
bigdw 215 ; SDef
db "HAPINASU@@@"
-
db SNORLAX
db PINK_BOW
db ROCK_SLIDE, SURF, BODY_SLAM, EARTHQUAKE
@@ -3236,7 +3112,6 @@ BattleTowerMons6:
bigdw 184 ; SDef
db "KABIGON@@@@"
-
db HERACROSS
db FOCUS_BAND
db REVERSAL, MEGAHORN, EARTHQUAKE, COUNTER
@@ -3263,7 +3138,6 @@ BattleTowerMons6:
bigdw 167 ; SDef
db "HERAKUROSU@"
-
db JYNX
db MIRACLEBERRY
db BLIZZARD, PSYCHIC_M, SHADOW_BALL, ICY_WIND
@@ -3290,7 +3164,6 @@ BattleTowerMons6:
bigdw 165 ; SDef
db "RU-ZIyuRA@@"
-
db BLASTOISE
db GOLD_BERRY
db SURF, EARTHQUAKE, RAPID_SPIN, BLIZZARD
@@ -3317,7 +3190,6 @@ BattleTowerMons6:
bigdw 180 ; SDef
db "KAMEtuKUSU@"
-
db RHYDON
db QUICK_CLAW
db EARTHQUAKE, SURF, IRON_TAIL, ROCK_SLIDE
@@ -3344,7 +3216,6 @@ BattleTowerMons6:
bigdw 104 ; SDef
db "SAIDON@@@@@"
-
db SANDSLASH
db SCOPE_LENS
db EARTHQUAKE, SLASH, HYPER_BEAM, SNORE
@@ -3371,7 +3242,6 @@ BattleTowerMons6:
bigdw 105 ; SDef
db "SANDOPAN@@@"
-
db PARASECT
db GOLD_BERRY
db SPORE, GIGA_DRAIN, HYPER_BEAM, SLUDGE_BOMB
@@ -3398,7 +3268,6 @@ BattleTowerMons6:
bigdw 144 ; SDef
db "PARASEKUTO@"
-
db GOLEM
db BRIGHTPOWDER
db EXPLOSION, EARTHQUAKE, FIRE_PUNCH, FRUSTRATION
@@ -3426,8 +3295,6 @@ BattleTowerMons6:
db "GORO-NIya@@"
-
-
BattleTowerMons7:
db JOLTEON
@@ -3456,7 +3323,6 @@ BattleTowerMons7:
bigdw 201 ; SDef
db "SANDA-SU@@@"
-
db VAPOREON
db LEFTOVERS
db BLIZZARD, SHADOW_BALL, SURF, MUD_SLAP
@@ -3483,7 +3349,6 @@ BattleTowerMons7:
bigdw 197 ; SDef
db "SIyaWA-ZU@@"
-
db UMBREON
db GOLD_BERRY
db FAINT_ATTACK, MOONLIGHT, PSYCH_UP, TOXIC
@@ -3510,7 +3375,6 @@ BattleTowerMons7:
bigdw 247 ; SDef
db "BURAtuKI-@@"
-
db BLISSEY
db GOLD_BERRY
db COUNTER, SOFTBOILED, SHADOW_BALL, THUNDERBOLT
@@ -3537,7 +3401,6 @@ BattleTowerMons7:
bigdw 250 ; SDef
db "HAPINASU@@@"
-
db SNORLAX
db LEFTOVERS
db ROCK_SLIDE, EARTHQUAKE, BLIZZARD, SHADOW_BALL
@@ -3564,7 +3427,6 @@ BattleTowerMons7:
bigdw 215 ; SDef
db "KABIGON@@@@"
-
db HOUNDOOM
db KINGS_ROCK
db CRUNCH, FLAMETHROWER, FAINT_ATTACK, ROAR
@@ -3591,7 +3453,6 @@ BattleTowerMons7:
bigdw 175 ; SDef
db "HERUGA-@@@@"
-
db TYRANITAR
db LEFTOVERS
db EARTHQUAKE, CRUNCH, ROCK_SLIDE, HYPER_BEAM
@@ -3618,7 +3479,6 @@ BattleTowerMons7:
bigdw 203 ; SDef
db "BANGIRASU@@"
-
db ZAPDOS
db GOLD_BERRY
db THUNDERBOLT, DRILL_PECK, THUNDER_WAVE, HYPER_BEAM
@@ -3645,7 +3505,6 @@ BattleTowerMons7:
bigdw 189 ; SDef
db "SANDA-@@@@@"
-
db EXEGGUTOR
db MIRACLEBERRY
db REST, EXPLOSION, PSYCHIC_M, GIGA_DRAIN
@@ -3672,7 +3531,6 @@ BattleTowerMons7:
bigdw 151 ; SDef
db "NAtuSI-@@@@"
-
db UMBREON
db GOLD_BERRY
db MOONLIGHT, FAINT_ATTACK, PSYCHIC_M, SHADOW_BALL
@@ -3699,7 +3557,6 @@ BattleTowerMons7:
bigdw 240 ; SDef
db "BURAtuKI-@@"
-
db GYARADOS
db BRIGHTPOWDER
db SURF, THUNDERBOLT, HYPER_BEAM, ROAR
@@ -3726,7 +3583,6 @@ BattleTowerMons7:
bigdw 204 ; SDef
db "GIyaRADOSU@"
-
db QUAGSIRE
db MIRACLEBERRY
db EARTHQUAKE, SURF, SLUDGE_BOMB, IRON_TAIL
@@ -3753,7 +3609,6 @@ BattleTowerMons7:
bigdw 152 ; SDef
db "NUO-@@@@@@@"
-
db URSARING
db SCOPE_LENS
db SLASH, EARTHQUAKE, HYPER_BEAM, THUNDERPUNCH
@@ -3780,7 +3635,6 @@ BattleTowerMons7:
bigdw 166 ; SDef
db "RINGUMA@@@@"
-
db MR__MIME
db KINGS_ROCK
db REFLECT, FIRE_PUNCH, PSYCHIC_M, ENCORE
@@ -3807,7 +3661,6 @@ BattleTowerMons7:
bigdw 226 ; SDef
db "BARIYA-DO@@"
-
db PRIMEAPE
db QUICK_CLAW
db CROSS_CHOP, ICE_PUNCH, THUNDERPUNCH, ROCK_SLIDE
@@ -3834,7 +3687,6 @@ BattleTowerMons7:
bigdw 162 ; SDef
db "OKORIZARU@@"
-
db GIRAFARIG
db GOLD_BERRY
db AGILITY, BATON_PASS, CRUNCH, EARTHQUAKE
@@ -3861,7 +3713,6 @@ BattleTowerMons7:
bigdw 152 ; SDef
db "KIRINRIKI@@"
-
db HITMONLEE
db FOCUS_BAND
db REVERSAL, ENDURE, BODY_SLAM, MEGA_KICK
@@ -3888,7 +3739,6 @@ BattleTowerMons7:
bigdw 217 ; SDef
db "SAWAMURA-@@"
-
db HERACROSS
db BRIGHTPOWDER
db REVERSAL, ENDURE, MEGAHORN, EARTHQUAKE
@@ -3915,7 +3765,6 @@ BattleTowerMons7:
bigdw 186 ; SDef
db "HERAKUROSU@"
-
db VENUSAUR
db BRIGHTPOWDER
db SUNNY_DAY, SOLARBEAM, SYNTHESIS, HYPER_BEAM
@@ -3942,7 +3791,6 @@ BattleTowerMons7:
bigdw 180 ; SDef
db "HUSIGIBANA@"
-
db CHARIZARD
db SCOPE_LENS
db SLASH, EARTHQUAKE, HYPER_BEAM, FLAMETHROWER
@@ -3969,7 +3817,6 @@ BattleTowerMons7:
bigdw 159 ; SDef
db "RIZA-DON@@@"
-
db BLASTOISE
db QUICK_CLAW
db HYDRO_PUMP, ICE_PUNCH, HYPER_BEAM, IRON_TAIL
@@ -3997,8 +3844,6 @@ BattleTowerMons7:
db "KAMEtuKUSU@"
-
-
BattleTowerMons8:
db JOLTEON
@@ -4027,7 +3872,6 @@ BattleTowerMons8:
bigdw 221 ; SDef
db "SANDA-SU@@@"
-
db SNORLAX
db LEFTOVERS
db REST, BELLY_DRUM, SNORE, EARTHQUAKE
@@ -4054,7 +3898,6 @@ BattleTowerMons8:
bigdw 250 ; SDef
db "KABIGON@@@@"
-
db HOUNDOOM
db MINT_BERRY
db REST, CRUNCH, FLAMETHROWER, SUNNY_DAY
@@ -4081,7 +3924,6 @@ BattleTowerMons8:
bigdw 197 ; SDef
db "HERUGA-@@@@"
-
db TAUROS
db GOLD_BERRY
db EARTHQUAKE, BODY_SLAM, IRON_TAIL, HYPER_BEAM
@@ -4108,7 +3950,6 @@ BattleTowerMons8:
bigdw 183 ; SDef
db "KENTAROSU@@"
-
db LAPRAS
db MINT_BERRY
db REST, SURF, CONFUSE_RAY, PSYCHIC_M
@@ -4135,7 +3976,6 @@ BattleTowerMons8:
bigdw 218 ; SDef
db "RAPURASU@@@"
-
db TYRANITAR
db MIRACLEBERRY
db REST, CRUNCH, EARTHQUAKE, ROCK_SLIDE
@@ -4162,7 +4002,6 @@ BattleTowerMons8:
bigdw 226 ; SDef
db "BANGIRASU@@"
-
db GENGAR
db NO_ITEM
db THUNDERBOLT, SHADOW_BALL, CONFUSE_RAY, THIEF
@@ -4189,7 +4028,6 @@ BattleTowerMons8:
bigdw 189 ; SDef
db "GENGA-@@@@@"
-
db FORRETRESS
db LEFTOVERS
db EXPLOSION, TOXIC, SOLARBEAM, SWAGGER
@@ -4216,7 +4054,6 @@ BattleTowerMons8:
bigdw 165 ; SDef
db "HUoRETOSU@@"
-
db KINGDRA
db MINT_BERRY
db REST, SURF, BLIZZARD, DRAGONBREATH
@@ -4243,7 +4080,6 @@ BattleTowerMons8:
bigdw 221 ; SDef
db "KINGUDORA@@"
-
db DRAGONITE
db GOLD_BERRY
db THUNDER_WAVE, SURF, THUNDERBOLT, OUTRAGE
@@ -4270,7 +4106,6 @@ BattleTowerMons8:
bigdw 228 ; SDef
db "KAIRIyu-@@@"
-
db PORYGON2
db LEFTOVERS
db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK
@@ -4297,7 +4132,6 @@ BattleTowerMons8:
bigdw 221 ; SDef
db "PORIGON2@@@"
-
db JYNX
db QUICK_CLAW
db LOVELY_KISS, BLIZZARD, DREAM_EATER, PSYCHIC_M
@@ -4324,7 +4158,6 @@ BattleTowerMons8:
bigdw 225 ; SDef
db "RU-ZIyuRA@@"
-
db MANTINE
db GOLD_BERRY
db SURF, CONFUSE_RAY, BLIZZARD, WING_ATTACK
@@ -4351,7 +4184,6 @@ BattleTowerMons8:
bigdw 292 ; SDef
db "MANTAIN@@@@"
-
db SKARMORY
db QUICK_CLAW
db STEEL_WING, FLY, MUD_SLAP, TOXIC
@@ -4378,7 +4210,6 @@ BattleTowerMons8:
bigdw 185 ; SDef
db "EA-MUDO@@@@"
-
db MOLTRES
db CHARCOAL
db FLAMETHROWER, SKY_ATTACK, STEEL_WING, HYPER_BEAM
@@ -4405,7 +4236,6 @@ BattleTowerMons8:
bigdw 207 ; SDef
db "HUaIYA-@@@@"
-
db AERODACTYL
db MIRACLEBERRY
db HYPER_BEAM, REST, EARTHQUAKE, ROAR
@@ -4432,7 +4262,6 @@ BattleTowerMons8:
bigdw 189 ; SDef
db "PUTERA@@@@@"
-
db ELECTRODE
db KINGS_ROCK
db THUNDERBOLT, EXPLOSION, MIRROR_COAT, TOXIC
@@ -4459,7 +4288,6 @@ BattleTowerMons8:
bigdw 201 ; SDef
db "MARUMAIN@@@"
-
db DUGTRIO
db SCOPE_LENS
db SLASH, EARTHQUAKE, THIEF, MUD_SLAP
@@ -4486,7 +4314,6 @@ BattleTowerMons8:
bigdw 177 ; SDef
db "DAGUTORIO@@"
-
db VICTREEBEL
db QUICK_CLAW
db GIGA_DRAIN, SLUDGE_BOMB, HYPER_BEAM, TOXIC
@@ -4513,7 +4340,6 @@ BattleTowerMons8:
bigdw 143 ; SDef
db "UTUBOtuTO@@"
-
db PINSIR
db GOLD_BERRY
db HYPER_BEAM, SUBMISSION, STRENGTH, TOXIC
@@ -4540,7 +4366,6 @@ BattleTowerMons8:
bigdw 157 ; SDef
db "KAIROSU@@@@"
-
db GRANBULL
db BRIGHTPOWDER
db ROAR, SHADOW_BALL, HYPER_BEAM, THUNDERPUNCH
@@ -4568,8 +4393,6 @@ BattleTowerMons8:
db "GURANBURU@@"
-
-
BattleTowerMons9:
db UMBREON
@@ -4598,7 +4421,6 @@ BattleTowerMons9:
bigdw 314 ; SDef
db "BURAtuKI-@@"
-
db DRAGONITE
db QUICK_CLAW
db FIRE_BLAST, HYPER_BEAM, OUTRAGE, BLIZZARD
@@ -4625,7 +4447,6 @@ BattleTowerMons9:
bigdw 263 ; SDef
db "KAIRIyu-@@@"
-
db STARMIE
db LEFTOVERS
db RECOVER, THUNDERBOLT, SURF, PSYCHIC_M
@@ -4652,7 +4473,6 @@ BattleTowerMons9:
bigdw 236 ; SDef
db "SUTA-MI-@@@"
-
db CLOYSTER
db LEFTOVERS
db EXPLOSION, BLIZZARD, SURF, ICY_WIND
@@ -4679,7 +4499,6 @@ BattleTowerMons9:
bigdw 162 ; SDef
db "PARUSIeN@@@"
-
db CROBAT
db GOLD_BERRY
db WING_ATTACK, HAZE, HYPER_BEAM, GIGA_DRAIN
@@ -4706,7 +4525,6 @@ BattleTowerMons9:
bigdw 225 ; SDef
db "KUROBAtuTO@"
-
db PORYGON2
db QUICK_CLAW
db TOXIC, PSYCHIC_M, RECOVER, PROTECT
@@ -4733,7 +4551,6 @@ BattleTowerMons9:
bigdw 248 ; SDef
db "PORIGON2@@@"
-
db KINGDRA
db LEFTOVERS
db DRAGONBREATH, SURF, HYPER_BEAM, BLIZZARD
@@ -4760,7 +4577,6 @@ BattleTowerMons9:
bigdw 248 ; SDef
db "KINGUDORA@@"
-
db TYRANITAR
db QUICK_CLAW
db HYPER_BEAM, CRUNCH, EARTHQUAKE, ROCK_SLIDE
@@ -4787,7 +4603,6 @@ BattleTowerMons9:
bigdw 259 ; SDef
db "BANGIRASU@@"
-
db LAPRAS
db MINT_BERRY
db REST, SURF, THUNDERBOLT, PSYCHIC_M
@@ -4814,7 +4629,6 @@ BattleTowerMons9:
bigdw 255 ; SDef
db "RAPURASU@@@"
-
db ESPEON
db GOLD_BERRY
db PSYCHIC_M, SHADOW_BALL, SUNNY_DAY, MORNING_SUN
@@ -4841,7 +4655,6 @@ BattleTowerMons9:
bigdw 250 ; SDef
db "E-HUi@@@@@@"
-
db MACHAMP
db QUICK_CLAW
db CROSS_CHOP, VITAL_THROW, FIRE_BLAST, EARTHQUAKE
@@ -4868,7 +4681,6 @@ BattleTowerMons9:
bigdw 230 ; SDef
db "KAIRIKI-@@@"
-
db SNORLAX
db MIRACLEBERRY
db FIRE_BLAST, SURF, EARTHQUAKE, HYPER_BEAM
@@ -4895,7 +4707,6 @@ BattleTowerMons9:
bigdw 275 ; SDef
db "KABIGON@@@@"
-
db ARCANINE
db MINT_BERRY
db SUNNY_DAY, FLAMETHROWER, EXTREMESPEED, REST
@@ -4922,7 +4733,6 @@ BattleTowerMons9:
bigdw 226 ; SDef
db "UINDEi@@@@@"
-
db BLISSEY
db LEFTOVERS
db SOLARBEAM, SUNNY_DAY, SOFTBOILED, FIRE_BLAST
@@ -4949,7 +4759,6 @@ BattleTowerMons9:
bigdw 322 ; SDef
db "HAPINASU@@@"
-
db HOUNDOOM
db BRIGHTPOWDER
db FLAMETHROWER, CRUNCH, SUNNY_DAY, SOLARBEAM
@@ -4976,7 +4785,6 @@ BattleTowerMons9:
bigdw 223 ; SDef
db "HERUGA-@@@@"
-
db SKARMORY
db QUICK_CLAW
db SANDSTORM, STEEL_WING, TOXIC, RETURN
@@ -5003,7 +4811,6 @@ BattleTowerMons9:
bigdw 193 ; SDef
db "EA-MUDO@@@@"
-
db SHUCKLE
db LEFTOVERS
db TOXIC, WRAP, PROTECT, ENCORE
@@ -5030,7 +4837,6 @@ BattleTowerMons9:
bigdw 493 ; SDef
db "TUBOTUBO@@@"
-
db FLAREON
db MINT_BERRY
db HYPER_BEAM, FLAMETHROWER, SHADOW_BALL, ROAR
@@ -5057,7 +4863,6 @@ BattleTowerMons9:
bigdw 265 ; SDef
db "BU-SUTA-@@@"
-
db MILTANK
db LEFTOVERS
db MILK_DRINK, EARTHQUAKE, ATTRACT, BODY_SLAM
@@ -5084,7 +4889,6 @@ BattleTowerMons9:
bigdw 182 ; SDef
db "MIRUTANKU@@"
-
db TAUROS
db PINK_BOW
db THUNDERBOLT, HYPER_BEAM, ATTRACT, EARTHQUAKE
@@ -5111,7 +4915,6 @@ BattleTowerMons9:
bigdw 180 ; SDef
db "KENTAROSU@@"
-
db MUK
db QUICK_CLAW
db TOXIC, SLUDGE_BOMB, ATTRACT, GIGA_DRAIN
@@ -5139,8 +4942,6 @@ BattleTowerMons9:
db "BETOBETON@@"
-
-
BattleTowerMons10:
db HOUNDOOM
@@ -5169,7 +4970,6 @@ BattleTowerMons10:
bigdw 252 ; SDef
db "HERUGA-@@@@"
-
db MACHAMP
db QUICK_CLAW
db CROSS_CHOP, EARTHQUAKE, HYPER_BEAM, VITAL_THROW
@@ -5196,7 +4996,6 @@ BattleTowerMons10:
bigdw 266 ; SDef
db "KAIRIKI-@@@"
-
db KINGDRA
db LEFTOVERS
db SURF, DRAGONBREATH, REST, TOXIC
@@ -5223,7 +5022,6 @@ BattleTowerMons10:
bigdw 284 ; SDef
db "KINGUDORA@@"
-
db JOLTEON
db BRIGHTPOWDER
db THUNDERBOLT, ROAR, THUNDER_WAVE, IRON_TAIL
@@ -5250,7 +5048,6 @@ BattleTowerMons10:
bigdw 278 ; SDef
db "SANDA-SU@@@"
-
db TAUROS
db KINGS_ROCK
db HYPER_BEAM, EARTHQUAKE, IRON_TAIL, THUNDERBOLT
@@ -5277,7 +5074,6 @@ BattleTowerMons10:
bigdw 230 ; SDef
db "KENTAROSU@@"
-
db ARCANINE
db LEFTOVERS
db FLAMETHROWER, EXTREMESPEED, IRON_TAIL, HYPER_BEAM
@@ -5304,7 +5100,6 @@ BattleTowerMons10:
bigdw 250 ; SDef
db "UINDEi@@@@@"
-
db CHARIZARD
db SCOPE_LENS
db FLAMETHROWER, EARTHQUAKE, SLASH, FLY
@@ -5331,7 +5126,6 @@ BattleTowerMons10:
bigdw 263 ; SDef
db "RIZA-DON@@@"
-
db ELECTRODE
db BRIGHTPOWDER
db THUNDER_WAVE, THUNDERBOLT, EXPLOSION, MIRROR_COAT
@@ -5358,7 +5152,6 @@ BattleTowerMons10:
bigdw 248 ; SDef
db "MARUMAIN@@@"
-
db RHYDON
db MIRACLEBERRY
db SURF, EARTHQUAKE, HYPER_BEAM, ROCK_SLIDE
@@ -5385,7 +5178,6 @@ BattleTowerMons10:
bigdw 178 ; SDef
db "SAIDON@@@@@"
-
db STEELIX
db LEFTOVERS
db EARTHQUAKE, HYPER_BEAM, SWAGGER, CRUNCH
@@ -5412,7 +5204,6 @@ BattleTowerMons10:
bigdw 218 ; SDef
db "HAGANE-RU@@"
-
db FEAROW
db KINGS_ROCK
db DRILL_PECK, STEEL_WING, HYPER_BEAM, MUD_SLAP
@@ -5439,7 +5230,6 @@ BattleTowerMons10:
bigdw 212 ; SDef
db "ONIDORIRU@@"
-
db MISDREAVUS
db FOCUS_BAND
db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL
@@ -5466,7 +5256,6 @@ BattleTowerMons10:
bigdw 263 ; SDef
db "MUUMA@@@@@@"
-
db SNEASEL
db SCOPE_LENS
db SLASH, BLIZZARD, DREAM_EATER, FAINT_ATTACK
@@ -5493,7 +5282,6 @@ BattleTowerMons10:
bigdw 240 ; SDef
db "NIyu-RA@@@@"
-
db SCIZOR
db QUICK_CLAW
db STEEL_WING, HYPER_BEAM, SLASH, TOXIC
@@ -5520,7 +5308,6 @@ BattleTowerMons10:
bigdw 246 ; SDef
db "HAtuSAMU@@@"
-
db BLISSEY
db LEFTOVERS
db THUNDERBOLT, BLIZZARD, FIRE_BLAST, SOFTBOILED
@@ -5547,7 +5334,6 @@ BattleTowerMons10:
bigdw 346 ; SDef
db "HAPINASU@@@"
-
db PILOSWINE
db MINT_BERRY
db REST, BLIZZARD, HYPER_BEAM, EARTHQUAKE
@@ -5574,7 +5360,6 @@ BattleTowerMons10:
bigdw 194 ; SDef
db "INOMU-@@@@@"
-
db EXEGGUTOR
db QUICK_CLAW
db PSYCHIC_M, TOXIC, EXPLOSION, GIGA_DRAIN
@@ -5601,7 +5386,6 @@ BattleTowerMons10:
bigdw 218 ; SDef
db "NAtuSI-@@@@"
-
db OMASTAR
db LEFTOVERS
db SURF, ANCIENTPOWER, BLIZZARD, TOXIC
@@ -5628,7 +5412,6 @@ BattleTowerMons10:
bigdw 214 ; SDef
db "OMUSUTA-@@@"
-
db GOLEM
db BRIGHTPOWDER
db EXPLOSION, EARTHQUAKE, ROCK_SLIDE, FIRE_BLAST
@@ -5655,7 +5438,6 @@ BattleTowerMons10:
bigdw 190 ; SDef
db "GORO-NIya@@"
-
db HITMONCHAN
db FOCUS_BAND
db COUNTER, FIRE_PUNCH, THUNDERPUNCH, ICE_PUNCH
@@ -5682,7 +5464,6 @@ BattleTowerMons10:
bigdw 280 ; SDef
db "EBIWARA-@@@"
-
db LANTURN
db QUICK_CLAW
db SURF, RAIN_DANCE, ZAP_CANNON, CONFUSE_RAY
diff --git a/data/credits_strings.asm b/data/credits_strings.asm
index f23fe3723..7d1996a4c 100644
--- a/data/credits_strings.asm
+++ b/data/credits_strings.asm
@@ -188,7 +188,7 @@ CreditsStrings:
.MonsterDesign: db " MONSTER DESIGN@" ; "#　デザイン@"
.GraphicsDesign: db " GRAPHICS DESIGN@" ; "グラフィック　デザイン@"
.Music: db " MUSIC@" ; "おんがく@"
-.SoundEffects: db " SOUND EFFECTS@" ; "サウンド　エフ→クト@"
+.SoundEffects: db " SOUND EFFECTS@" ; "サウンド　エフェクト@"
.GameDesign: db " GAME DESIGN@" ; "ゲームデザイン@"
.GameScenario: db " GAME SCENARIO@" ; "シナりオ@"
.ToolProgramming: db " TOOL PROGRAMMING@" ; "ツール　プログラム@"
@@ -202,7 +202,7 @@ CreditsStrings:
.ExecutiveProducer: db " EXECUTIVE PRODUCER@" ; "エグゼクティブ　プロデューサー@"
.PokemonAnimation: db " #MON ANIMATION@" ; "#　アニメーション@"
.PokedexText: db " #DEX TEXT@" ; "ずかん　テキスト@"
-.MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジ→クト　りーダー@"
+.MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジェクト　りーダー@"
.MobileSystemAd: db " MOBILE SYSTEM AD.@" ; "モバイル　システムアドバイザー@"
.MobileStadiumDir: db "MOBILE STADIUM DIR.@" ; "モバイルスタジアム　ディレクター@"
.Coordination: db " COORDINATION@" ; "コーディネーター@"
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 9099953ca..21f8ca0fe 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -197,4 +197,3 @@ EngineFlags:
engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0
engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F
-
diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm
index b7cae3dd7..fea80f537 100644
--- a/data/events/field_move_blocks.asm
+++ b/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
diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm
index f006833a7..d8a289872 100644
--- a/data/events/odd_eggs.asm
+++ b/data/events/odd_eggs.asm
@@ -27,7 +27,6 @@ prob_total = 0
prob 10
prob 1
-
OddEggs:
OddEgg1:
diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm
index 881ab1ab9..2a0488603 100644
--- a/data/events/pokedex_ratings.asm
+++ b/data/events/pokedex_ratings.asm
@@ -25,4 +25,3 @@ OakRatings:
rating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17
rating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18
rating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19
- \ No newline at end of file
diff --git a/data/items/marts.asm b/data/items/marts.asm
index e761e624a..1d48ea532 100644
--- a/data/items/marts.asm
+++ b/data/items/marts.asm
@@ -36,7 +36,6 @@ Marts:
dw MartUnderground
.End
-
MartCherrygrove:
db 4 ; # items
db POTION
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index f6e961406..fa42c461e 100644
--- a/data/maps/attributes.asm
+++ b/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
diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm
index 2e1b7c618..15ff249fe 100644
--- a/data/maps/map_data.asm
+++ b/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"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index e86cef4c4..1cc528738 100644
--- a/data/maps/maps.asm
+++ b/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
diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index 64c0cf238..03f4076f9 100644
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@@ -30,7 +30,6 @@ OutdoorSprites:
dw SaffronGroupSprites
dw CherrygroveGroupSprites
-
PalletGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
diff --git a/data/moves/effects.asm b/data/moves/effects.asm
index df597f8bc..81bd89f5f 100644
--- a/data/moves/effects.asm
+++ b/data/moves/effects.asm
@@ -1,3 +1,5 @@
+INCLUDE "data/moves/effects_pointers.asm"
+
MoveEffects: ; used only for BANK(MoveEffects)
NormalHit:
diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm
index 3d09ed49d..b488f4eb1 100644
--- a/data/party_menu_qualities.asm
+++ b/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
diff --git a/data/sgb_ctrl_packets.asm b/data/sgb_ctrl_packets.asm
index a8c1e25f5..b3c2b0404 100644
--- a/data/sgb_ctrl_packets.asm
+++ b/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.
diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index 6e8c304b1..aebf97ff5 100644
--- a/data/sprites/facings.asm
+++ b/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:
diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm
index 364f62492..67d852d83 100644
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -402,4 +402,3 @@ TrainerClassAttributes:
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
-
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 3c07e6597..35de91e85 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,3 +1,5 @@
+INCLUDE "data/trainers/party_pointers.asm"
+
Trainers:
; Trainer data structure:
; - db "NAME@", TRAINERTYPE_* constant
@@ -8,7 +10,6 @@ Trainers:
; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves
; - db -1 ; end
-
FalknerGroup:
; FALKNER (1)
db "FALKNER@", TRAINERTYPE_MOVES
@@ -16,7 +17,6 @@ FalknerGroup:
db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE
db -1 ; end
-
WhitneyGroup:
; WHITNEY (1)
db "WHITNEY@", TRAINERTYPE_MOVES
@@ -24,7 +24,6 @@ WhitneyGroup:
db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK
db -1 ; end
-
BugsyGroup:
; BUGSY (1)
db "BUGSY@", TRAINERTYPE_MOVES
@@ -33,7 +32,6 @@ BugsyGroup:
db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
db -1 ; end
-
MortyGroup:
; MORTY (1)
db "MORTY@", TRAINERTYPE_MOVES
@@ -43,7 +41,6 @@ MortyGroup:
db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE
db -1 ; end
-
PryceGroup:
; PRYCE (1)
db "PRYCE@", TRAINERTYPE_MOVES
@@ -52,7 +49,6 @@ PryceGroup:
db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD
db -1 ; end
-
JasmineGroup:
; JASMINE (1)
db "JASMINE@", TRAINERTYPE_MOVES
@@ -61,7 +57,6 @@ JasmineGroup:
db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL
db -1 ; end
-
ChuckGroup:
; CHUCK (1)
db "CHUCK@", TRAINERTYPE_MOVES
@@ -69,7 +64,6 @@ ChuckGroup:
db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH
db -1 ; end
-
ClairGroup:
; CLAIR (1)
db "CLAIR@", TRAINERTYPE_MOVES
@@ -79,7 +73,6 @@ ClairGroup:
db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH
db -1 ; end
-
Rival1Group:
; RIVAL1 (1)
db "?@", TRAINERTYPE_NORMAL
@@ -198,10 +191,8 @@ Rival1Group:
db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH
db -1 ; end
-
PokemonProfGroup:
-
WillGroup:
; WILL (1)
db "WILL@", TRAINERTYPE_MOVES
@@ -212,7 +203,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 +225,6 @@ PKMNTrainerGroup:
db 50, FERALIGATR
db -1 ; end
-
BrunoGroup:
; BRUNO (1)
db "BRUNO@", TRAINERTYPE_MOVES
@@ -246,7 +235,6 @@ BrunoGroup:
db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP
db -1 ; end
-
KarenGroup:
; KAREN (1)
db "KAREN@", TRAINERTYPE_MOVES
@@ -257,7 +245,6 @@ KarenGroup:
db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH
db -1 ; end
-
KogaGroup:
; KOGA (1)
db "KOGA@", TRAINERTYPE_MOVES
@@ -268,7 +255,6 @@ KogaGroup:
db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC
db -1 ; end
-
ChampionGroup:
; CHAMPION (1)
db "LANCE@", TRAINERTYPE_MOVES
@@ -280,7 +266,6 @@ ChampionGroup:
db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM
db -1 ; end
-
BrockGroup:
; BROCK (1)
db "BROCK@", TRAINERTYPE_MOVES
@@ -291,7 +276,6 @@ BrockGroup:
db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN
db -1 ; end
-
MistyGroup:
; MISTY (1)
db "MISTY@", TRAINERTYPE_MOVES
@@ -301,7 +285,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 +295,6 @@ LtSurgeGroup:
db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER
db -1 ; end
-
ScientistGroup:
; SCIENTIST (1)
db "ROSS@", TRAINERTYPE_NORMAL
@@ -344,7 +326,6 @@ ScientistGroup:
db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK
db -1 ; end
-
ErikaGroup:
; ERIKA (1)
db "ERIKA@", TRAINERTYPE_MOVES
@@ -354,7 +335,6 @@ ErikaGroup:
db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM
db -1 ; end
-
YoungsterGroup:
; YOUNGSTER (1)
db "JOEY@", TRAINERTYPE_NORMAL
@@ -434,7 +414,6 @@ YoungsterGroup:
db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT
db -1 ; end
-
SchoolboyGroup:
; SCHOOLBOY (1)
db "JACK@", TRAINERTYPE_NORMAL
@@ -591,7 +570,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 +686,6 @@ BirdKeeperGroup:
db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY
db -1 ; end
-
LassGroup:
; LASS (1)
db "CARRIE@", TRAINERTYPE_MOVES
@@ -814,7 +791,6 @@ LassGroup:
db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH
db -1 ; end
-
JanineGroup:
; JANINE (1)
db "JANINE@", TRAINERTYPE_MOVES
@@ -825,7 +801,6 @@ JanineGroup:
db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M
db -1 ; end
-
CooltrainerMGroup:
; COOLTRAINERM (1)
db "NICK@", TRAINERTYPE_MOVES
@@ -956,7 +931,6 @@ CooltrainerMGroup:
db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM
db -1 ; end
-
CooltrainerFGroup:
; COOLTRAINERF (1)
db "GWEN@", TRAINERTYPE_NORMAL
@@ -1088,7 +1062,6 @@ CooltrainerFGroup:
db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER
db -1 ; end
-
BeautyGroup:
; BEAUTY (1)
db "VICTORIA@", TRAINERTYPE_NORMAL
@@ -1184,7 +1157,6 @@ BeautyGroup:
db 19, CORSOLA
db -1 ; end
-
PokemaniacGroup:
; POKEMANIAC (1)
db "LARRY@", TRAINERTYPE_NORMAL
@@ -1266,7 +1238,6 @@ PokemaniacGroup:
db 17, NIDOQUEEN
db -1 ; end
-
GruntMGroup:
; GRUNTM (1)
db "GRUNT@", TRAINERTYPE_NORMAL
@@ -1458,7 +1429,6 @@ GruntMGroup:
db 30, GOLBAT
db -1 ; end
-
GentlemanGroup:
; GENTLEMAN (1)
db "PRESTON@", TRAINERTYPE_NORMAL
@@ -1487,7 +1457,6 @@ GentlemanGroup:
db 20, NOCTOWL
db -1 ; end
-
SkierGroup:
; SKIER (1)
db "ROXANNE@", TRAINERTYPE_NORMAL
@@ -1499,7 +1468,6 @@ SkierGroup:
db 28, DEWGONG
db -1 ; end
-
TeacherGroup:
; TEACHER (1)
db "COLETTE@", TRAINERTYPE_NORMAL
@@ -1517,7 +1485,6 @@ TeacherGroup:
db 35, JIGGLYPUFF
db -1 ; end
-
SabrinaGroup:
; SABRINA (1)
db "SABRINA@", TRAINERTYPE_MOVES
@@ -1526,7 +1493,6 @@ SabrinaGroup:
db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT
db -1 ; end
-
BugCatcherGroup:
; BUG_CATCHER (1)
db "DON@", TRAINERTYPE_NORMAL
@@ -1647,7 +1613,6 @@ BugCatcherGroup:
db 10, PARAS
db -1 ; end
-
FisherGroup:
; FISHER (1)
db "JUSTIN@", TRAINERTYPE_NORMAL
@@ -1811,7 +1776,6 @@ FisherGroup:
db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
db -1 ; end
-
SwimmerMGroup:
; SWIMMERM (1)
db "HAROLD@", TRAINERTYPE_NORMAL
@@ -1953,7 +1917,6 @@ SwimmerMGroup:
db 35, SEADRA
db -1 ; end
-
SwimmerFGroup:
; SWIMMERF (1)
db "ELAINE@", TRAINERTYPE_NORMAL
@@ -2063,7 +2026,6 @@ SwimmerFGroup:
db 35, SEAKING
db -1 ; end
-
SailorGroup:
; SAILOR (1)
db "EUGENE@", TRAINERTYPE_NORMAL
@@ -2145,7 +2107,6 @@ SailorGroup:
db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION
db -1 ; end
-
SuperNerdGroup:
; SUPER_NERD (1)
db "STAN@", TRAINERTYPE_NORMAL
@@ -2231,7 +2192,6 @@ SuperNerdGroup:
db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH
db -1 ; end
-
Rival2Group:
; RIVAL2 (1)
db "?@", TRAINERTYPE_MOVES
@@ -2293,7 +2253,6 @@ Rival2Group:
db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH
db -1 ; end
-
GuitaristGroup:
; GUITARIST (1)
db "CLYDE@", TRAINERTYPE_NORMAL
@@ -2308,7 +2267,6 @@ GuitaristGroup:
db 32, MAGNEMITE
db -1 ; end
-
HikerGroup:
; HIKER (1)
db "ANTHONY@", TRAINERTYPE_NORMAL
@@ -2454,7 +2412,6 @@ HikerGroup:
db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG
db -1 ; end
-
BikerGroup:
; BIKER (1)
db "BENNY@", TRAINERTYPE_NORMAL
@@ -2514,7 +2471,6 @@ BikerGroup:
db 32, WEEZING
db -1 ; end
-
BlaineGroup:
; BLAINE (1)
db "BLAINE@", TRAINERTYPE_MOVES
@@ -2523,7 +2479,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 +2501,6 @@ BurglarGroup:
db 30, KOFFING
db -1 ; end
-
FirebreatherGroup:
; FIREBREATHER (1)
db "OTIS@", TRAINERTYPE_NORMAL
@@ -2597,7 +2551,6 @@ FirebreatherGroup:
db 28, KOFFING
db -1 ; end
-
JugglerGroup:
; JUGGLER (1)
db "IRWIN@", TRAINERTYPE_NORMAL
@@ -2646,7 +2599,6 @@ JugglerGroup:
db 30, ELECTRODE
db -1 ; end
-
BlackbeltGroup:
; BLACKBELT_T (1)
db "KENJI@", TRAINERTYPE_NORMAL
@@ -2705,7 +2657,6 @@ BlackbeltGroup:
db 34, MACHOKE
db -1 ; end
-
ExecutiveMGroup:
; EXECUTIVEM (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES
@@ -2736,7 +2687,6 @@ ExecutiveMGroup:
db 22, KOFFING
db -1 ; end
-
PsychicGroup:
; PSYCHIC_T (1)
db "NATHAN@", TRAINERTYPE_NORMAL
@@ -2809,7 +2759,6 @@ PsychicGroup:
db 33, HYPNO
db -1 ; end
-
PicnickerGroup:
; PICNICKER (1)
db "LIZ@", TRAINERTYPE_NORMAL
@@ -2965,7 +2914,6 @@ PicnickerGroup:
db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE
db -1 ; end
-
CamperGroup:
; CAMPER (1)
db "ROLAND@", TRAINERTYPE_NORMAL
@@ -3109,7 +3057,6 @@ CamperGroup:
db 30, TAUROS
db -1 ; end
-
ExecutiveFGroup:
; EXECUTIVEF (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES
@@ -3125,7 +3072,6 @@ ExecutiveFGroup:
db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE
db -1 ; end
-
SageGroup:
; SAGE (1)
db "CHOW@", TRAINERTYPE_NORMAL
@@ -3203,7 +3149,6 @@ SageGroup:
db 32, VAPOREON
db -1 ; end
-
MediumGroup:
; MEDIUM (1)
db "MARTHA@", TRAINERTYPE_NORMAL
@@ -3245,7 +3190,6 @@ MediumGroup:
db 36, SLOWBRO
db -1 ; end
-
BoarderGroup:
; BOARDER (1)
db "RONALD@", TRAINERTYPE_NORMAL
@@ -3267,7 +3211,6 @@ BoarderGroup:
db 24, SHELLDER
db -1 ; end
-
PokefanMGroup:
; POKEFANM (1)
db "WILLIAM@", TRAINERTYPE_ITEM
@@ -3350,7 +3293,6 @@ PokefanMGroup:
db 35, TEDDIURSA, BERRY
db -1 ; end
-
KimonoGirlGroup:
; KIMONO_GIRL (1)
db "NAOKO@", TRAINERTYPE_NORMAL
@@ -3384,7 +3326,6 @@ KimonoGirlGroup:
db 17, JOLTEON
db -1 ; end
-
TwinsGroup:
; TWINS (1)
db "AMY & MAY@", TRAINERTYPE_NORMAL
@@ -3446,7 +3387,6 @@ TwinsGroup:
db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db -1 ; end
-
PokefanFGroup:
; POKEFANF (1)
db "BEVERLY@", TRAINERTYPE_ITEM
@@ -3482,7 +3422,6 @@ PokefanFGroup:
db 16, MEOWTH, BERRY
db -1 ; end
-
RedGroup:
; RED (1)
db "RED@", TRAINERTYPE_MOVES
@@ -3494,7 +3433,6 @@ RedGroup:
db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL
db -1 ; end
-
BlueGroup:
; BLUE (1)
db "BLUE@", TRAINERTYPE_MOVES
@@ -3506,7 +3444,6 @@ BlueGroup:
db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED
db -1 ; end
-
OfficerGroup:
; OFFICER (1)
db "KEITH@", TRAINERTYPE_NORMAL
@@ -3519,7 +3456,6 @@ OfficerGroup:
db 14, GROWLITHE
db -1 ; end
-
GruntFGroup:
; GRUNTF (1)
db "GRUNT@", TRAINERTYPE_NORMAL
@@ -3552,7 +3488,6 @@ GruntFGroup:
db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER
db -1 ; end
-
MysticalmanGroup:
; MYSTICALMAN (1)
db "EUSINE@", TRAINERTYPE_MOVES
diff --git a/data/types/names.asm b/data/types/names.asm
index 2fe9e959c..62d8e13bf 100644
--- a/data/types/names.asm
+++ b/data/types/names.asm
@@ -48,4 +48,3 @@ Ghost: db "GHOST@"
Steel: db "STEEL@"
Dragon: db "DRAGON@"
Dark: db "DARK@"
-
diff --git a/data/wild/fish.asm b/data/wild/fish.asm
index 919a75c15..1976c8f95 100644
--- a/data/wild/fish.asm
+++ b/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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 14:26:50 +0000