Bug Fixes, missing files, the ROM builds now

data/pokemon/base_stats/eucala.asm

@@ -11,7 +11,7 @@
 	db 100 ; unknown 1
 	db 120 ; step cycles to hatch
 	db 5 ; unknown 2
-	INCBIN "gfx/pokemon/name/front.dimensions"
+	INCBIN "gfx/pokemon/eucala/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_SLOW ; growth rate				; PLACEHOLDER
 	dn EGG_NONE, EGG_NONE ; egg groups

data/pokemon/base_stats/flutter_mane.asm

@@ -1,21 +1,21 @@
-db FLUTTER_MANE
+	db 0 ; species ID placeholder
 
-db  55,  55,  55, 135, 135, 135
+	db  55,  55,  55, 135, 135, 135
-;   hp  atk  def  spd  sat  sdf
+	;   hp  atk  def  spd  sat  sdf
 
-db GHOST, FAIRY ; type
+	db GHOST, FAIRY ; type
-db 50 ; catch rate
+	db 50 ; catch rate
-db 255 ; base exp
+	db 255 ; base exp
-db NO_ITEM, NO_ITEM ; items
+	db NO_ITEM, NO_ITEM ; items
-db GENDER_UNKNOWN ; gender ratio
+	db GENDER_UNKNOWN ; gender ratio
-db 100 ; unknown 1
+	db 100 ; unknown 1
-db 50 ; step cycles to hatch
+	db 50 ; step cycles to hatch
-db 5 ; unknown 2
+	db 5 ; unknown 2
-INCBIN "gfx/pokemon/flutter_mane/front.dimensions"
+	INCBIN "gfx/pokemon/flutter_mane/front.dimensions"
-dw NULL, NULL ; unused (beta front/back pics)
+	dw NULL, NULL ; unused (beta front/back pics)
-db GROWTH_SLOW ; growth rate
+	db GROWTH_SLOW ; growth rate
-dn EGG_NONE, EGG_NONE ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-; tm/hm learnset
+	; tm/hm learnset
-HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT
+	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT
-; end
+	; end

data/pokemon/base_stats/great_tusk.asm

@@ -1,21 +1,21 @@
-db GREAT_TUSK
+	db 0 ; species ID placeholder
 
-db 115, 131, 131,  87,  53,  53
+	db 115, 131, 131,  87,  53,  53
-;   hp  atk  def  spd  sat  sdf
+	;   hp  atk  def  spd  sat  sdf
 
-db GROUND, FIGHTING ; type
+	db GROUND, FIGHTING ; type
-db 50 ; catch rate
+	db 50 ; catch rate
-db 255 ; base exp
+	db 255 ; base exp
-db NO_ITEM, NO_ITEM ; items
+	db NO_ITEM, NO_ITEM ; items
-db GENDER_UNKNOWN ; gender ratio
+	db GENDER_UNKNOWN ; gender ratio
-db 100 ; unknown 1
+	db 100 ; unknown 1
-db 50 ; step cycles to hatch
+	db 50 ; step cycles to hatch
-db 5 ; unknown 2
+	db 5 ; unknown 2
-INCBIN "gfx/pokemon/great_tusk/front.dimensions"
+	INCBIN "gfx/pokemon/great_tusk/front.dimensions"
-dw NULL, NULL ; unused (beta front/back pics)
+	dw NULL, NULL ; unused (beta front/back pics)
-db GROWTH_SLOW ; growth rate
+	db GROWTH_SLOW ; growth rate
-dn EGG_NONE, EGG_NONE ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-; tm/hm learnset
+	; tm/hm learnset
-HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, STRENGTH
+	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, 	SANDSTORM, DEFENSE_CURL, REST, STRENGTH
-; end
+	; end

data/pokemon/base_stats/iron_bundle.asm

@@ -1,21 +1,21 @@
-db IRON_BUNDLE
+	db 0 ; species ID placeholder
 
-db  56,  80, 114, 136, 124,  60
+	db  56,  80, 114, 136, 124,  60
-;   hp  atk  def  spd  sat  sdf
+	;   hp  atk  def  spd  sat  sdf
 
-db WATER, ICE ; type
+	db ICE, WATER ; type
-db 50 ; catch rate
+	db 50 ; catch rate
-db 255 ; base exp
+	db 255 ; base exp
-db NO_ITEM, NO_ITEM ; items
+	db NO_ITEM, NO_ITEM ; items
-db GENDER_UNKNOWN ; gender ratio
+	db GENDER_UNKNOWN ; gender ratio
-db 100 ; unknown 1
+	db 100 ; unknown 1
-db 50 ; step cycles to hatch
+	db 50 ; step cycles to hatch
-db 5 ; unknown 2
+	db 5 ; unknown 2
-INCBIN "gfx/pokemon/iron_bundle/front.dimensions"
+	INCBIN "gfx/pokemon/iron_bundle/front.dimensions"
-dw NULL, NULL ; unused (beta front/back pics)
+	dw NULL, NULL ; unused (beta front/back pics)
-db GROWTH_SLOW ; growth rate
+	db GROWTH_SLOW ; growth rate
-dn EGG_NONE, EGG_NONE ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-; tm/hm learnset
+	; tm/hm learnset
-HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, THIEF, STEEL_WING, FLY, SURF, WHIRLPOOL, ICE_BEAM
+	tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, THIEF, STEEL_WING, FLY, SURF, WHIRLPOOL, ICE_BEAM
-; end
+	; end

data/pokemon/base_stats/iron_thorns.asm

@@ -1,21 +1,21 @@
-db IRON_THORNS
+	db 0 ; species ID placeholder
 
-db 100, 134, 110,  72,  70,  84
+	db 100, 134, 110,  72,  70,  84
-;   hp  atk  def  spd  sat  sdf
+	;   hp  atk  def  spd  sat  sdf
 
-db ROCK, ELECTRIC ; type
+	db ROCK, ELECTRIC ; type
-db 30 ; catch rate
+	db 30 ; catch rate
-db 255 ; base exp
+	db 255 ; base exp
-db NO_ITEM, NO_ITEM ; items
+	db NO_ITEM, NO_ITEM ; items
-db GENDER_UNKNOWN ; gender ratio
+	db GENDER_UNKNOWN ; gender ratio
-db 100 ; unknown 1
+	db 100 ; unknown 1
-db 50 ; step cycles to hatch
+	db 50 ; step cycles to hatch
-db 5 ; unknown 2
+	db 5 ; unknown 2
-INCBIN "gfx/pokemon/iron_thorns/front.dimensions"
+	INCBIN "gfx/pokemon/iron_thorns/front.dimensions"
-dw NULL, NULL ; unused (beta front/back pics)
+	dw NULL, NULL ; unused (beta front/back pics)
-db GROWTH_SLOW ; growth rate
+	db GROWTH_SLOW ; growth rate
-dn EGG_NONE, EGG_NONE ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-; tm/hm learnset
+	; tm/hm learnset
-DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
-; end
+	; end

data/pokemon/base_stats/iron_treads.asm

@@ -1,21 +1,21 @@
-db IRON_TREADS
+	db 0 ; species ID placeholder
 
-db  90, 112, 120, 106,  72,  70
+	db  90, 112, 120, 106,  72,  70
-;   hp  atk  def  spd  sat  sdf
+	;   hp  atk  def  spd  sat  sdf
 
-db GROUND, STEEL ; type
+	db GROUND, STEEL ; type
-db 50 ; catch rate
+	db 50 ; catch rate
-db 255 ; base exp
+	db 255 ; base exp
-db NO_ITEM, NO_ITEM ; items
+	db NO_ITEM, NO_ITEM ; items
-db GENDER_UNKNOWN ; gender ratio
+	db GENDER_UNKNOWN ; gender ratio
-db 100 ; unknown 1
+	db 100 ; unknown 1
-db 50 ; step cycles to hatch
+	db 50 ; step cycles to hatch
-db 5 ; unknown 2
+	db 5 ; unknown 2
-INCBIN "gfx/pokemon/iron_treads/front.dimensions"
+	INCBIN "gfx/pokemon/iron_treads/front.dimensions"
-dw NULL, NULL ; unused (beta front/back pics)
+	dw NULL, NULL ; unused (beta front/back pics)
-db GROWTH_SLOW ; growth rate
+	db GROWTH_SLOW ; growth rate
-dn EGG_NONE, EGG_NONE ; egg groups
+	dn EGG_NONE, EGG_NONE ; egg groups
 
-; tm/hm learnset
+	; tm/hm learnset
-HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, STRENGTH, THUNDERBOLT
+	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, STRENGTH, THUNDERBOLT
-; end
+	; end

data/pokemon/base_stats/ruddernaut.asm

@@ -3,7 +3,7 @@
 	db 130,  80,  85,  85,  95,  60
 	;   hp  atk  def  spd  sat  sdf
 
-	db WATER, PSYCHIC ; type
+	db WATER, PSYCHIC_TYPE ; type
 	db 45 ; catch rate								; PLACEHOLDER
 	db 64 ; base exp								; PLACEHOLDER
 	db NO_ITEM, NO_ITEM ; items

data/pokemon/dex_entries.asm

@@ -333,6 +333,7 @@ DokuroarPokedexEntry::    INCLUDE "data/pokemon/dex_entries/dokuroar.asm"
 ScreamTailPokedexEntry::    INCLUDE "data/pokemon/dex_entries/scream_tail.asm"
 SandyShocksPokedexEntry::    INCLUDE "data/pokemon/dex_entries/sandy_shocks.asm"
 GreatTuskPokedexEntry::    INCLUDE "data/pokemon/dex_entries/great_tusk.asm"
+FlutterManePokedexEntry::    INCLUDE "data/pokemon/dex_entries/flutter_mane.asm"
 IronTreadsPokedexEntry::    INCLUDE "data/pokemon/dex_entries/iron_treads.asm"
 IronBundlePokedexEntry::    INCLUDE "data/pokemon/dex_entries/iron_bundle.asm"
 IronThornsPokedexEntry::    INCLUDE "data/pokemon/dex_entries/iron_thorns.asm"

data/pokemon/dex_entries/cacawphony.asm

@@ -7,4 +7,5 @@
 
 	page "the most popular"
 	next "in mating season."
-	next "Active in daytime.@" ; this sucks fix it pls
+	next "Active in daytime.@" ; this sucks fix it pls
+	

data/pokemon/dex_entries/ruddernaut.asm

@@ -0,0 +1,10 @@
+	db "LONGSHIP@" ; species name
+	dw 311, 191 ; height, weight - placeholder
+
+	db   "Its rivalry with"
+	next "LAPRAS has sparked"
+	next "debates over which"
+
+	page "of the two is a"
+	next "better form of"
+	next "water transport.@"

data/pokemon/dex_entry_pointers.asm

@@ -322,6 +322,7 @@ PokedexDataPointerTable:
 	dba ScreamTailPokedexEntry
 	dba SandyShocksPokedexEntry
 	dba GreatTuskPokedexEntry
+	dba FlutterManePokedexEntry
 	dba IronTreadsPokedexEntry
 	dba IronBundlePokedexEntry
 	dba IronThornsPokedexEntry

data/pokemon/evos_attacks_johto.asm

@@ -1732,7 +1732,7 @@ SakurazeEvosAttacks:
 	dbw 26, PETAL_DANCE
 	dbw 32, TAKE_DOWN
 	dbw 38, SYNTHESIS
-	dbw 44, SOLAR_BEAM
+	dbw 44, SOLARBEAM
 	db 0 ; no more level-up moves
 
 AmanobiEvosAttacks: ; TODO: review moveset, it's fighting/steel
@@ -1788,42 +1788,42 @@ MolambinoEvosAttacks:
 	db EVOLVE_LEVEL, 20, LUANBO
 	dbw 1, BUBBLE
 	dbw 1, SUPERSONIC
-	dbw 7, DRAINING_KISS
+	; dbw 7, DRAINING_KISS ; move not yet implemented
 	dbw 13, FLAIL
 	dbw 19, WATER_GUN
 	dbw 24, MORNING_SUN
 	dbw 29, BUBBLEBEAM
 	dbw 34, THRASH
 	dbw 39, HYDRO_PUMP
-	dbw 45, DAZZLING_GLEAM
+	; dbw 45, DAZZLING_GLEAM ; move not yet implemented
 	db 0 ; no more level-up moves
 
 LuanboEvosAttacks:
 	db EVOLVE_LEVEL, 35, GRANBO
 	dbw 1, BUBBLE
 	dbw 1, SUPERSONIC
-	dbw 7, DRAINING_KISS
+	; dbw 7, DRAINING_KISS ; move not yet implemented
 	dbw 13, FLAIL
 	dbw 19, WATER_GUN
 	dbw 25, MORNING_SUN
 	dbw 32, BUBBLEBEAM
 	dbw 39, THRASH
 	dbw 46, HYDRO_PUMP
-	dbw 54, DAZZLING_GLEAM
+	; dbw 54, DAZZLING_GLEAM ; move not yet implemented
 	db 0 ; no more level-up moves
 
 GranboEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, BUBBLE
 	dbw 1, SUPERSONIC
-	dbw 7, DRAINING_KISS
+	; dbw 7, DRAINING_KISS ; move not yet implemented
 	dbw 13, FLAIL
 	dbw 19, WATER_GUN
 	dbw 25, MORNING_SUN
 	dbw 32, BUBBLEBEAM
 	dbw 43, THRASH
 	dbw 52, HYDRO_PUMP
-	dbw 63, DAZZLING_GLEAM
+	; dbw 63, DAZZLING_GLEAM ; move not yet implemented
 	db 0 ; no more level-up moves
 
 AngoreEvosAttacks:
@@ -1922,14 +1922,14 @@ CoatlEvosAttacks:
 
 MimearEvosAttacks:
 	db 0 ; no more evolutions
-	dbw 1, DISARMING_VOICE
+	; dbw 1, DISARMING_VOICE ; move not yet implemented
 	dbw 1, GROWL
-	dbw 8, FAIRY_WIND
+	; dbw 8, FAIRY_WIND ; move not yet implemented
 	dbw 13, CHARM
-	dbw 21, DRAINING_KISS
+	; dbw 21, DRAINING_KISS ; move not yet implemented
 	dbw 32, MIRROR_COAT
 	dbw 37, SAFEGUARD
-	dbw 43, DAZZLING_GLEAM
+	; dbw 43, DAZZLING_GLEAM ; move not yet implemented
 	db 0 ; no more level-up moves
 
 InoshikaEvosAttacks:
@@ -2007,10 +2007,10 @@ ScreamTailEvosAttacks:
 	dbw 21, BITE
 	dbw 28, BODY_SLAM
 	dbw 35, REST
-	dbw 42, DRAINING_KISS
+	; dbw 42, DRAINING_KISS ; move not yet implemented
 	dbw 49, PSYCHIC_M
 	dbw 56, CRUNCH
-	dbw 63, DAZZLING_GLEAM
+	; dbw 63, DAZZLING_GLEAM ; move not yet implemented
 	dbw 70, PERISH_SONG
 	db 0 ; no more level-up moves
 
@@ -2053,9 +2053,9 @@ FlutterManeEvosAttacks:
 	dbw 7, SUNNY_DAY
 	dbw 14, PSYBEAM
 	dbw 21, MEAN_LOOK
-	dbw 28, FAIRY_WIND
+	; dbw 28, FAIRY_WIND ; move not yet implemented
 	dbw 35, PSYCH_UP
-	dbw 42, DAZZLING_GLEAM
+	; dbw 42, DAZZLING_GLEAM ; move not yet implemented
 	dbw 49, SHADOW_BALL
 	dbw 56, PSYCHIC_M
 	dbw 63, PAIN_SPLIT

data/pokemon/first_stages.asm

@@ -294,6 +294,38 @@ FirstEvoStages::
 	dw MAGBY      ;f0
 	dw MILTANK
 	dw CHANSEY
+	dw WARUCHU
+	dw SONEGG
+	dw SONEGG
+	dw SONEGG
+	dw SAKURAZE
+	dw AMANOBI
+	dw TRUSTAN
+	dw KUWAGUARD
+	dw TONQUITO
+	dw MOLAMBINO
+	dw MOLAMBINO
+	dw MOLAMBINO
+	dw ANGORE
+	dw EUCALA
+	dw KIWOOKED
+	dw CYCLORP
+	dw KITSEN
+	dw WISPIRIT
+	dw COATL
+	dw MIMEAR
+	dw INOSHIKA
+	dw RUDDERNAUT
+	dw XYLODON
+	dw XYLODON
+	dw DOKUROAR
+	dw SCREAM_TAIL
+	dw SANDY_SHOCKS
+	dw GREAT_TUSK
+	dw FLUTTER_MANE
+	dw IRON_TREADS
+	dw IRON_BUNDLE
+	dw IRON_THORNS
 	dw RAGING_BOLT
 	dw GOUGING_FIRE
 	dw WALKING_WAKE

data/pokemon/gen1_order.asm

@@ -306,4 +306,36 @@ Pokered_MonIndices:
 	db RAGING_BOLT
 	db GOUGING_FIRE
 	db POCKLE
+	db WARUCHU
+	db SONEGG
+	db CACAWPHONY
+	db TREBIR
+	db SAKURAZE
+	db AMANOBI
+	db TRUSTAN
+	db KUWAGUARD
+	db TONQUITO
+	db MOLAMBINO
+	db LUANBO
+	db GRANBO
+	db ANGORE
+	db EUCALA
+	db KIWOOKED
+	db CYCLORP
+	db KITSEN
+	db WISPIRIT
+	db COATL
+	db MIMEAR
+	db INOSHIKA
+	db RUDDERNAUT
+	db XYLODON
+	db XYLOFIN
+	db DOKUROAR
+	db SCREAM_TAIL
+	db SANDY_SHOCKS
+	db GREAT_TUSK
+	db FLUTTER_MANE
+	db IRON_TREADS
+	db IRON_BUNDLE
+	db IRON_THORNS
 	assert_table_length NUM_POKEMON - 1

data/pokemon/palettes.asm

@@ -626,6 +626,8 @@ INCBIN "gfx/pokemon/sonegg/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/sonegg/shiny.pal"
 INCBIN "gfx/pokemon/cacawphony/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/cacawphony/shiny.pal"
+INCBIN "gfx/pokemon/trebir/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/trebir/shiny.pal"
 INCBIN "gfx/pokemon/sakuraze/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/sakuraze/shiny.pal"
 INCBIN "gfx/pokemon/amanobi/front.gbcpal", middle_colors

data/pokemon/pic_pointers.asm

@@ -658,6 +658,8 @@ PokemonPicPointers::
 	dba SandyShocksBackpic
 	dba GreatTuskFrontpic
 	dba GreatTuskBackpic
+	dba FlutterManeFrontpic
+	dba FlutterManeBackpic
 	dba IronTreadsFrontpic
 	dba IronTreadsBackpic
 	dba IronBundleFrontpic

gfx/pics.asm

@@ -832,6 +832,8 @@ GougingFireBackpic:	 INCBIN "gfx/pokemon/gouging_fire/back.2bpp.lz"
 PockleFrontpic: INCBIN "gfx/pokemon/pockle/front.animated.2bpp.lz"
 PockleBackpic:	 INCBIN "gfx/pokemon/pockle/back.2bpp.lz"
 
+SECTION "Pics 21", ROMX
+
 WaruchuFrontpic:	 INCBIN "gfx/pokemon/waruchu/front.animated.2bpp.lz"
 WaruchuBackpic:	 INCBIN "gfx/pokemon/waruchu/back.2bpp.lz"
 SoneggFrontpic:	 INCBIN "gfx/pokemon/sonegg/front.animated.2bpp.lz"
@@ -847,7 +849,7 @@ AmanobiBackpic:	 INCBIN "gfx/pokemon/amanobi/back.2bpp.lz"
 TrustanFrontpic:	 INCBIN "gfx/pokemon/trustan/front.animated.2bpp.lz"
 TrustanBackpic:	 INCBIN "gfx/pokemon/trustan/back.2bpp.lz"
 KuwaguardFrontpic:	 INCBIN "gfx/pokemon/kuwaguard/front.animated.2bpp.lz"
-Kuwaguarckpic:	 INCBIN "gfx/pokemon/kuwaguard/back.2bpp.lz"
+KuwaguardBackpic:	 INCBIN "gfx/pokemon/kuwaguard/back.2bpp.lz"
 TonquitoFrontpic:	 INCBIN "gfx/pokemon/tonquito/front.animated.2bpp.lz"
 TonquitoBackpic:	 INCBIN "gfx/pokemon/tonquito/back.2bpp.lz"
 MolambinoFrontpic:	 INCBIN "gfx/pokemon/molambino/front.animated.2bpp.lz"
@@ -888,6 +890,8 @@ SandyShocksFrontpic:	 INCBIN "gfx/pokemon/sandy_shocks/front.animated.2bpp.lz"
 SandyShocksBackpic:	 INCBIN "gfx/pokemon/sandy_shocks/back.2bpp.lz"
 GreatTuskFrontpic:	 INCBIN "gfx/pokemon/great_tusk/front.animated.2bpp.lz"
 GreatTuskBackpic:	 INCBIN "gfx/pokemon/great_tusk/back.2bpp.lz"
+FlutterManeFrontpic:	 INCBIN "gfx/pokemon/flutter_mane/front.animated.2bpp.lz"
+FlutterManeBackpic:	 INCBIN "gfx/pokemon/flutter_mane/back.2bpp.lz"
 IronTreadsFrontpic:	 INCBIN "gfx/pokemon/iron_treads/front.animated.2bpp.lz"
 IronTreadsBackpic:	 INCBIN "gfx/pokemon/iron_treads/back.2bpp.lz"
 IronBundleFrontpic:	 INCBIN "gfx/pokemon/iron_bundle/front.animated.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -322,10 +322,10 @@ AnimationPointers:
 	dw ScreamTailAnimation
 	dw SandyShocksAnimation
 	dw GreatTuskAnimation
+	dw FlutterManeAnimation
 	dw IronTreadsAnimation
 	dw IronBundleAnimation
 	dw IronThornsAnimation
-	
 	dw RagingBoltAnimation
 	dw GougingFireAnimation
 	dw WalkingWakeAnimation

gfx/pokemon/anims.asm

@@ -320,6 +320,7 @@ DokuroarAnimation:    INCLUDE "gfx/pokemon/dokuroar/anim.asm"
 ScreamTailAnimation:    INCLUDE "gfx/pokemon/scream_tail/anim.asm"
 SandyShocksAnimation:    INCLUDE "gfx/pokemon/sandy_shocks/anim.asm"
 GreatTuskAnimation:    INCLUDE "gfx/pokemon/great_tusk/anim.asm"
+FlutterManeAnimation:    INCLUDE "gfx/pokemon/flutter_mane/anim.asm"
 IronTreadsAnimation:    INCLUDE "gfx/pokemon/iron_treads/anim.asm"
 IronBundleAnimation:    INCLUDE "gfx/pokemon/iron_bundle/anim.asm"
 IronThornsAnimation:    INCLUDE "gfx/pokemon/iron_thorns/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -322,6 +322,7 @@ BitmasksPointers:
 	dw ScreamTailBitmasks
 	dw SandyShocksBitmasks
 	dw GreatTuskBitmasks
+	dw FlutterManeBitmasks
 	dw IronTreadsBitmasks
 	dw IronBundleBitmasks
 	dw IronThornsBitmasks

gfx/pokemon/bitmasks.asm

@@ -320,6 +320,7 @@ DokuroarBitmasks:    INCLUDE "gfx/pokemon/dokuroar/bitmask.asm"
 ScreamTailBitmasks:    INCLUDE "gfx/pokemon/scream_tail/bitmask.asm"
 SandyShocksBitmasks:    INCLUDE "gfx/pokemon/sandy_shocks/bitmask.asm"
 GreatTuskBitmasks:    INCLUDE "gfx/pokemon/great_tusk/bitmask.asm"
+FlutterManeBitmasks:    INCLUDE "gfx/pokemon/flutter_mane/bitmask.asm"
 IronTreadsBitmasks:    INCLUDE "gfx/pokemon/iron_treads/bitmask.asm"
 IronBundleBitmasks:    INCLUDE "gfx/pokemon/iron_bundle/bitmask.asm"
 IronThornsBitmasks:    INCLUDE "gfx/pokemon/iron_thorns/bitmask.asm"

gfx/pokemon/flutter_mane/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/flutter_mane/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/flutter_mane/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 22, 22, 12
+	RGB 07, 15, 25

gfx/pokemon/frame_pointers.asm

@@ -322,6 +322,7 @@ FramesPointers:
 	dba ScreamTailFrames
 	dba SandyShocksFrames
 	dba GreatTuskFrames
+	dba FlutterManeFrames
 	dba IronTreadsFrames
 	dba IronBundleFrames
 	dba IronThornsFrames

gfx/pokemon/idle_pointers.asm

@@ -322,10 +322,10 @@ AnimationIdlePointers:
 	dw ScreamTailAnimationIdle
 	dw SandyShocksAnimationIdle
 	dw GreatTuskAnimationIdle
+	dw FlutterManeAnimationIdle
 	dw IronTreadsAnimationIdle
 	dw IronBundleAnimationIdle
 	dw IronThornsAnimationIdle
-	
 	dw RagingBoltAnimationIdle
 	dw GougingFireAnimationIdle
 	dw WalkingWakeAnimationIdle

gfx/pokemon/idles.asm

@@ -320,6 +320,7 @@ DokuroarAnimationIdle:    INCLUDE "gfx/pokemon/dokuroar/anim_idle.asm"
 ScreamTailAnimationIdle:    INCLUDE "gfx/pokemon/scream_tail/anim_idle.asm"
 SandyShocksAnimationIdle:    INCLUDE "gfx/pokemon/sandy_shocks/anim_idle.asm"
 GreatTuskAnimationIdle:    INCLUDE "gfx/pokemon/great_tusk/anim_idle.asm"
+FlutterManeAnimationIdle:    INCLUDE "gfx/pokemon/flutter_mane/anim_idle.asm"
 IronTreadsAnimationIdle:    INCLUDE "gfx/pokemon/iron_treads/anim_idle.asm"
 IronBundleAnimationIdle:    INCLUDE "gfx/pokemon/iron_bundle/anim_idle.asm"
 IronThornsAnimationIdle:    INCLUDE "gfx/pokemon/iron_thorns/anim_idle.asm"

gfx/pokemon/johto_frames.asm

@@ -144,6 +144,7 @@ DokuroarFrames:    INCLUDE "gfx/pokemon/dokuroar/frames.asm"
 ScreamTailFrames:    INCLUDE "gfx/pokemon/scream_tail/frames.asm"
 SandyShocksFrames:    INCLUDE "gfx/pokemon/sandy_shocks/frames.asm"
 GreatTuskFrames:    INCLUDE "gfx/pokemon/great_tusk/frames.asm"
+FlutterManeFrames:    INCLUDE "gfx/pokemon/flutter_mane/frames.asm"
 IronTreadsFrames:    INCLUDE "gfx/pokemon/iron_treads/frames.asm"
 IronBundleFrames:    INCLUDE "gfx/pokemon/iron_bundle/frames.asm"
 IronThornsFrames:    INCLUDE "gfx/pokemon/iron_thorns/frames.asm"

main.asm

@@ -431,12 +431,12 @@ INCLUDE "gfx/pokemon/unown_idle_pointers.asm"
 INCLUDE "gfx/pokemon/unown_idles.asm"
 INCLUDE "gfx/pokemon/bitmask_pointers.asm"
 INCLUDE "gfx/pokemon/bitmasks.asm"
-INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
-INCLUDE "gfx/pokemon/unown_bitmasks.asm"
 
 
 SECTION "Pic Animations 2", ROMX
 
+INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm"
+INCLUDE "gfx/pokemon/unown_bitmasks.asm"
 INCLUDE "gfx/pokemon/frame_pointers.asm"
 INCLUDE "gfx/pokemon/kanto_frames.asm"
 
@@ -467,18 +467,17 @@ INCLUDE "engine/movie/intro.asm"
 SECTION "bank3E", ROMX
 
 INCLUDE "engine/gfx/load_font.asm"
-INCLUDE "engine/link/time_capsule.asm"
 INCLUDE "engine/events/name_rater.asm"
 INCLUDE "engine/events/play_slow_cry.asm"
 INCLUDE "engine/pokedex/new_pokedex_entry.asm"
-INCLUDE "engine/link/time_capsule_2.asm"
 INCLUDE "engine/pokedex/unown_dex.asm"
-INCLUDE "engine/events/magikarp.asm"
 INCLUDE "engine/battle/hidden_power.asm"
 
 SECTION "bank3Econt", ROMX
 
-INCLUDE "engine/battle/misc.asm"
+INCLUDE "engine/link/time_capsule.asm"
+INCLUDE "engine/link/time_capsule_2.asm"
+INCLUDE "engine/events/magikarp.asm"
 
 SECTION "bank3F", ROMX
 
@@ -486,6 +485,7 @@ INCLUDE "engine/tilesets/tileset_anims.asm"
 INCLUDE "engine/events/npc_trade.asm"
 INCLUDE "engine/events/mom_phone.asm"
 INCLUDE "engine/events/tradeback_npc.asm" ; Tradeback NPC tutorial
+INCLUDE "engine/battle/misc.asm"
 
 SECTION "mobile40", ROMX
 

maps/DebugRoom.asm

@@ -145,7 +145,7 @@ CheatFillPokedex:
 	ld bc, 31 ; 001-248
 	call ByteFill
 	ld a, %11111111
-	ld bc, 7 ; 249-304
+	ld bc, 11 ; 249-336
 	call ByteFill
 	ret