Nihon Route 49, Folage, and Barreau

This commit adds Nihon Route 49. It has everything necessary to work, but the wild Pokemon don't seem to spawn. I've added infrastructure that should allow this to happen, and it works for Kanto, so I am presuming that some other tomfoolery is at work.

I've also added Folage and Barreau, and implemented Folage into the Headbutt Tree table. This was to give them to the Bug Catcher on the route.

data/pokemon/base_stats.asm

@@ -228,6 +228,8 @@ INCLUDE "data/pokemon/base_stats/ledyba.asm"
 INCLUDE "data/pokemon/base_stats/ledian.asm"
 INCLUDE "data/pokemon/base_stats/spinarak.asm"
 INCLUDE "data/pokemon/base_stats/ariados.asm"
+INCLUDE "data/pokemon/base_stats/folage.asm"
+INCLUDE "data/pokemon/base_stats/barreau.asm"
 INCLUDE "data/pokemon/base_stats/crobat.asm"
 INCLUDE "data/pokemon/base_stats/chinchou.asm"
 INCLUDE "data/pokemon/base_stats/lanturn.asm"

data/pokemon/base_stats/barreau.asm

@@ -0,0 +1,21 @@
+	db 0 ; species ID placeholder
+
+	db  60,  35,  60,  80,  75,  85
+	;   hp  atk  def  spd  sat  sdf
+
+	db BUG, PSYCHIC_TYPE ; type
+	db 45 ; catch rate
+	db 160 ; base exp
+	db NO_ITEM, SILVERPOWDER ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
+	db 15 ; step cycles to hatch
+	db 5 ; unknown 2
+	INCBIN "gfx/pokemon/barreau/front.dimensions"
+	dw NULL, NULL ; unused (beta front/back pics)
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
+
+	; tm/hm learnset
+	tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH
+	; end

data/pokemon/base_stats/folage.asm

@@ -0,0 +1,21 @@
+	db 0 ; species ID placeholder
+
+	db  40,  25,  45,  15,  25,  45
+	;   hp  atk  def  spd  sat  sdf
+
+	db BUG, BUG ; type
+	db 255 ; catch rate
+	db 53 ; base exp
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_F50 ; gender ratio
+	db 100 ; unknown 1
+	db 15 ; step cycles to hatch
+	db 5 ; unknown 2
+	INCBIN "gfx/pokemon/folage/front.dimensions"
+	dw NULL, NULL ; unused (beta front/back pics)
+	db GROWTH_MEDIUM_FAST ; growth rate
+	dn EGG_BUG, EGG_BUG ; egg groups
+
+	; tm/hm learnset
+	tmhm HIDDEN_POWER, PROTECT
+	; end

data/pokemon/cries.asm

@@ -207,6 +207,8 @@ PokemonCries::
 	mon_cry CRY_LEDYBA,     -150,  312 ; LEDIAN
 	mon_cry CRY_SPINARAK,     17,  512 ; SPINARAK
 	mon_cry CRY_SPINARAK,   -174,  482 ; ARIADOS
+	mon_cry CRY_NIDORAN_M,     0,    0 ; FOLAGE (incomplete)
+	mon_cry CRY_NIDORAN_M,     0,    0 ; BARREAU (incomplete)
 	mon_cry CRY_SQUIRTLE,    -16,  320 ; CROBAT
 	mon_cry CRY_CYNDAQUIL,   969,  320 ; CHINCHOU
 	mon_cry CRY_CYNDAQUIL,   720,  272 ; LANTURN

data/pokemon/dex_entries.asm

@@ -209,6 +209,8 @@ LedybaPokedexEntry::     INCLUDE "data/pokemon/dex_entries/ledyba.asm"
 LedianPokedexEntry::     INCLUDE "data/pokemon/dex_entries/ledian.asm"
 SpinarakPokedexEntry::   INCLUDE "data/pokemon/dex_entries/spinarak.asm"
 AriadosPokedexEntry::    INCLUDE "data/pokemon/dex_entries/ariados.asm"
+FolagePokedexEntry::   INCLUDE "data/pokemon/dex_entries/folage.asm"
+BarreauPokedexEntry::    INCLUDE "data/pokemon/dex_entries/barreau.asm"
 CrobatPokedexEntry::     INCLUDE "data/pokemon/dex_entries/crobat.asm"
 ChinchouPokedexEntry::   INCLUDE "data/pokemon/dex_entries/chinchou.asm"
 LanturnPokedexEntry::    INCLUDE "data/pokemon/dex_entries/lanturn.asm"

data/pokemon/dex_entries/barreau.asm

@@ -0,0 +1,10 @@
+	db "MOTH@" ; species name
+	dw 411, 280 ; height, weight
+
+	db   "The dust covering"
+	next "its wings scatters"
+	next "easily, causing"
+
+	page "allergic reactions"
+	next "in attackers. It"
+	next "loves nectar.@"

data/pokemon/dex_entries/folage.asm

@@ -0,0 +1,10 @@
+	db "BAGWORM@" ; species name
+	dw 100, 75 ; height, weight
+
+	db   "Dangles in trees."
+	next "Shaking its home"
+	next "makes it drop,"
+	
+	page "scaring passersby."
+	next "Easy prey for bird"
+	next "#MON.@"

data/pokemon/dex_entry_pointers.asm

@@ -202,6 +202,8 @@ PokedexDataPointerTable:
 	dba LedianPokedexEntry
 	dba SpinarakPokedexEntry
 	dba AriadosPokedexEntry
+	dba FolagePokedexEntry
+	dba BarreauPokedexEntry
 	dba CrobatPokedexEntry
 	dba ChinchouPokedexEntry
 	dba LanturnPokedexEntry

data/pokemon/dex_order_alpha.asm

@@ -13,6 +13,7 @@ AlphabeticalPokedexOrder:
 	dw ARIADOS
 	dw ARTICUNO
 	dw AZUMARILL
+	dw BARREAU
 	dw BAYLEEF
 	dw BEEDRILL
 	dw BELLIGNAN
@@ -75,6 +76,7 @@ AlphabeticalPokedexOrder:
 	dw FLAAFFY
 	dw FLAMBEAR
 	dw FLAREON
+	dw FOLAGE
 	dw FORRETRESS
 	dw FURRET
 	dw GASTLY

data/pokemon/dex_order_new.asm

@@ -49,6 +49,8 @@ NewPokedexOrder:
 	dw LEDIAN
 	dw SPINARAK
 	dw ARIADOS
+	dw FOLAGE
+	dw BARREAU
 	dw GEODUDE
 	dw GRAVELER
 	dw GOLEM

data/pokemon/egg_moves_johto.asm

@@ -24,6 +24,8 @@ EggMovePointers2::
 	dw NoEggMoves2
 	dw SpinarakEggMoves
 	dw NoEggMoves2
+	dw NoEggMoves2 ; Folage
+	dw NoEggMoves2 ; Barreau
 	dw NoEggMoves2
 	dw ChinchouEggMoves
 	dw NoEggMoves2

data/pokemon/evos_attacks_johto.asm

@@ -24,6 +24,8 @@ EvosAttacksPointers2::
 	dw LedianEvosAttacks
 	dw SpinarakEvosAttacks
 	dw AriadosEvosAttacks
+	dw FolageEvosAttacks
+	dw BarreauEvosAttacks
 	dw CrobatEvosAttacks
 	dw ChinchouEvosAttacks
 	dw LanturnEvosAttacks
@@ -447,6 +449,28 @@ AriadosEvosAttacks:
 	dbw 63, PSYCHIC_M
 	db 0 ; no more level-up moves
 
+FolageEvosAttacks:
+	dbbw EVOLVE_LEVEL, 10, BARREAU
+	db 0 ; no more evolutions
+	dbw 1, TACKLE
+	dbw 1, STRING_SHOT
+	dbw 1, PROTECT
+	dbw 10, SAFEGUARD
+	db 0 ; no more level-up moves
+
+BarreauEvosAttacks:
+	db 0 ; no more evolutions
+	dbw 1, CONFUSION
+	dbw 10, CONFUSION
+	dbw 13, REFLECT
+	dbw 13, LIGHT_SCREEN
+	dbw 18, GUST
+	dbw 23, WHIRLWIND
+	dbw 28, PSYBEAM
+	dbw 34, BARRIER
+	dbw 40, MIRROR_COAT
+	db 0 ; no more level-up moves
+
 CrobatEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, SCREECH

data/pokemon/first_stages.asm

@@ -202,6 +202,8 @@ FirstEvoStages::
 	dw LEDYBA
 	dw SPINARAK
 	dw SPINARAK   ;a8
+	dw FOLAGE
+	dw BARREAU
 	dw BITTYBAT
 	dw CHINCHOU
 	dw CHINCHOU

data/pokemon/gen1_order.asm

@@ -289,4 +289,6 @@ Pokered_MonIndices:
 	db BURGELA
 	db TANGROWTH
 	db JUNGELA
+	db FOLAGE
+	db BARREAU
 	assert_table_length NUM_POKEMON - 1

data/pokemon/menu_icons.asm

@@ -203,6 +203,8 @@ MonMenuIcons:
 	db ICON_BUG         ; LEDIAN
 	db ICON_BUG         ; SPINARAK
 	db ICON_BUG         ; ARIADOS
+	db ICON_BUG         ; FOLAGE
+	db ICON_MOTH         ; BARREAU
 	db ICON_BAT         ; CROBAT
 	db ICON_FISH        ; CHINCHOU
 	db ICON_FISH        ; LANTURN

data/pokemon/names.asm

@@ -205,6 +205,8 @@ PokemonNames::
 	db "LEDIAN@@@@"
 	db "SPINARAK@@"
 	db "ARIADOS@@@"
+	db "FOLAGE@@@@"
+	db "BARREAU@@@"
 	db "CROBAT@@@@"
 	db "CHINCHOU@@"
 	db "LANTURN@@@"

data/pokemon/palettes.asm

@@ -435,6 +435,10 @@ INCBIN "gfx/pokemon/spinarak/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/spinarak/shiny.pal"
 INCBIN "gfx/pokemon/ariados/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/ariados/shiny.pal"
+INCBIN "gfx/pokemon/folage/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/folage/shiny.pal"
+INCBIN "gfx/pokemon/barreau/front.gbcpal", middle_colors
+INCLUDE "gfx/pokemon/barreau/shiny.pal"
 INCBIN "gfx/pokemon/crobat/front.gbcpal", middle_colors
 INCLUDE "gfx/pokemon/crobat/shiny.pal"
 INCBIN "gfx/pokemon/chinchou/front.gbcpal", middle_colors

data/pokemon/pic_pointers.asm

@@ -415,6 +415,10 @@ PokemonPicPointers::
 	dba SpinarakBackpic
 	dba AriadosFrontpic
 	dba AriadosBackpic
+	dba FolageFrontpic
+	dba FolageBackpic
+	dba BarreauFrontpic
+	dba BarreauBackpic
 	dba CrobatFrontpic
 	dba CrobatBackpic
 	dba ChinchouFrontpic