mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-07 00:25:24 +13:00
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.
This commit is contained in:
parent
e9cab6db16
commit
9c824b3c5e
65 changed files with 369 additions and 59 deletions
|
|
@ -374,6 +374,9 @@ ENDM
|
|||
map_attributes Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH
|
||||
connection north, Route10North, ROUTE_10_NORTH, 0
|
||||
connection south, LavenderTown, LAVENDER_TOWN, 0
|
||||
|
||||
map_attributes SilentHills, SILENT_HILLS, $00, WEST ; this is on its own for now. add connections to mt. silver later.
|
||||
connection west, Route49, ROUTE_49, 0
|
||||
|
||||
map_attributes Route23, ROUTE_23, $0f, 0
|
||||
map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0
|
||||
|
|
@ -708,7 +711,7 @@ ENDM
|
|||
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0
|
||||
map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $00, 0
|
||||
map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0
|
||||
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.
|
||||
map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V
|
||||
map_attributes CliffCave, CLIFF_CAVE, $00, 0
|
||||
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
|
||||
map_attributes Route49, ROUTE_49, $00, 0
|
||||
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
|
||||
|
|
|
|||
|
|
@ -1086,3 +1086,6 @@ CliffCave_Blocks:
|
|||
|
||||
BlueForest_Blocks:
|
||||
INCBIN "maps/BlueForest.ablk"
|
||||
|
||||
Route49_Blocks:
|
||||
INCBIN "maps/Route49.ablk"
|
||||
|
|
|
|||
|
|
@ -109,6 +109,7 @@ Landmarks:
|
|||
landmark 140, 116, FastShipName
|
||||
assert_table_length NIHON_LANDMARK
|
||||
landmark 92, 108, SilentHillsName
|
||||
landmark 91, 108, Route49Name ; probably not correct
|
||||
landmark 140, 60, BlueForestName
|
||||
assert_table_length NUM_LANDMARKS
|
||||
|
||||
|
|
@ -216,4 +217,5 @@ UndergroundName: db "UNDERGROUND@"
|
|||
BattleTowerName: db "BATTLE¯TOWER@"
|
||||
SpecialMapName: db "SPECIAL@"
|
||||
SilentHillsName: db "SILENT¯HILLS@"
|
||||
Route49Name: db "ROUTE 49@"
|
||||
BlueForestName: db "BLUE¯FOREST@"
|
||||
|
|
|
|||
|
|
@ -557,6 +557,7 @@ MapGroup_SilentHills:
|
|||
table_width MAP_LENGTH, MapGroup_SilentHills
|
||||
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_MORN, FISHGROUP_SHORE
|
||||
map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
|
||||
assert_table_length NUM_SILENT_HILLS_MAPS
|
||||
|
||||
MapGroup_BlueForest:
|
||||
|
|
|
|||
|
|
@ -500,4 +500,5 @@ INCLUDE "maps/LakeOfRageMart.asm"
|
|||
INCLUDE "maps/LakeOfRagePrycesHouse.asm"
|
||||
INCLUDE "maps/DebugRoom.asm"
|
||||
INCLUDE "maps/CliffCave.asm"
|
||||
INCLUDE "maps/Route49.asm"
|
||||
INCLUDE "maps/BlueForest.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"
|
||||
|
|
|
|||
21
data/pokemon/base_stats/barreau.asm
Normal file
21
data/pokemon/base_stats/barreau.asm
Normal file
|
|
@ -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
|
||||
21
data/pokemon/base_stats/folage.asm
Normal file
21
data/pokemon/base_stats/folage.asm
Normal file
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
10
data/pokemon/dex_entries/barreau.asm
Normal file
10
data/pokemon/dex_entries/barreau.asm
Normal file
|
|
@ -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.@"
|
||||
10
data/pokemon/dex_entries/folage.asm
Normal file
10
data/pokemon/dex_entries/folage.asm
Normal file
|
|
@ -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.@"
|
||||
|
|
@ -202,6 +202,8 @@ PokedexDataPointerTable:
|
|||
dba LedianPokedexEntry
|
||||
dba SpinarakPokedexEntry
|
||||
dba AriadosPokedexEntry
|
||||
dba FolagePokedexEntry
|
||||
dba BarreauPokedexEntry
|
||||
dba CrobatPokedexEntry
|
||||
dba ChinchouPokedexEntry
|
||||
dba LanturnPokedexEntry
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ NewPokedexOrder:
|
|||
dw LEDIAN
|
||||
dw SPINARAK
|
||||
dw ARIADOS
|
||||
dw FOLAGE
|
||||
dw BARREAU
|
||||
dw GEODUDE
|
||||
dw GRAVELER
|
||||
dw GOLEM
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ EggMovePointers2::
|
|||
dw NoEggMoves2
|
||||
dw SpinarakEggMoves
|
||||
dw NoEggMoves2
|
||||
dw NoEggMoves2 ; Folage
|
||||
dw NoEggMoves2 ; Barreau
|
||||
dw NoEggMoves2
|
||||
dw ChinchouEggMoves
|
||||
dw NoEggMoves2
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -202,6 +202,8 @@ FirstEvoStages::
|
|||
dw LEDYBA
|
||||
dw SPINARAK
|
||||
dw SPINARAK ;a8
|
||||
dw FOLAGE
|
||||
dw BARREAU
|
||||
dw BITTYBAT
|
||||
dw CHINCHOU
|
||||
dw CHINCHOU
|
||||
|
|
|
|||
|
|
@ -289,4 +289,6 @@ Pokered_MonIndices:
|
|||
db BURGELA
|
||||
db TANGROWTH
|
||||
db JUNGELA
|
||||
db FOLAGE
|
||||
db BARREAU
|
||||
assert_table_length NUM_POKEMON - 1
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -205,6 +205,8 @@ PokemonNames::
|
|||
db "LEDIAN@@@@"
|
||||
db "SPINARAK@@"
|
||||
db "ARIADOS@@@"
|
||||
db "FOLAGE@@@@"
|
||||
db "BARREAU@@@"
|
||||
db "CROBAT@@@@"
|
||||
db "CHINCHOU@@"
|
||||
db "LANTURN@@@"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -14,10 +14,10 @@
|
|||
tilecoll FLOOR, WALL, WALL, WALL ; 0d
|
||||
tilecoll WALL, WALL, DOOR, WALL ; 0e
|
||||
tilecoll WALL, WALL, WALL, WALL ; 0f
|
||||
tilecoll WALL, WALL, WALL, WALL ; 10
|
||||
tilecoll WALL, WALL, WALL, WALL ; 11
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 10
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, CUT_TREE ; 11
|
||||
tilecoll WALL, WALL, WALL, WALL ; 12
|
||||
tilecoll WALL, WALL, WALL, WALL ; 13
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 13
|
||||
tilecoll WALL, WALL, WALL, DOOR ; 14
|
||||
tilecoll WALL, WALL, WALL, WALL ; 15
|
||||
tilecoll WALL, WALL, WALL, DOOR ; 16
|
||||
|
|
@ -32,22 +32,22 @@
|
|||
tilecoll WALL, WALL, WALL, WALL ; 1f
|
||||
tilecoll WALL, WALL, WALL, WALL ; 20
|
||||
tilecoll WALL, WALL, WALL, WALL ; 21
|
||||
tilecoll WALL, WALL, WALL, WALL ; 22
|
||||
tilecoll WALL, WALL, WALL, WALL ; 23
|
||||
tilecoll FLOOR, WALL, FLOOR, WALL ; 24
|
||||
tilecoll WALL, WALL, WALL, WALL ; 25
|
||||
tilecoll WALL, WALL, WALL, WALL ; 26
|
||||
tilecoll WALL, WALL, DOOR, WALL ; 27
|
||||
tilecoll WALL, WALL, WALL, DOOR ; 28
|
||||
tilecoll WALL, WALL, WALL, WALL ; 29
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a
|
||||
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 22
|
||||
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 23
|
||||
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
|
||||
tilecoll FLOOR, WALL, WALL, WALL ; 25
|
||||
tilecoll FLOOR, WALL, FLOOR, WALL ; 26
|
||||
tilecoll FLOOR, FLOOR, WALL, WALL ; 27
|
||||
tilecoll WALL, WALL, FLOOR, WALL ; 28
|
||||
tilecoll WALL, WALL, FLOOR, FLOOR ; 29
|
||||
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
|
||||
tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d
|
||||
tilecoll WALL, WALL, WALL, DOOR ; 2e
|
||||
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
|
||||
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2d
|
||||
tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
|
||||
tilecoll FLOOR, FLOOR, WALL, WALL ; 2f
|
||||
tilecoll BUOY, BUOY, BUOY, WATER ; 30
|
||||
tilecoll BUOY, BUOY, WATER, WATER ; 31
|
||||
tilecoll WALL, WALL, FLOOR, WALL ; 30
|
||||
tilecoll WALL, WALL, FLOOR, WALL ; 31
|
||||
tilecoll BUOY, BUOY, WATER, BUOY ; 32
|
||||
tilecoll FLOOR, FLOOR, WALL, WALL ; 33
|
||||
tilecoll BUOY, WATER, BUOY, WATER ; 34
|
||||
|
|
@ -90,17 +90,17 @@
|
|||
tilecoll WATER, WATER, WATER, WATER ; 59
|
||||
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
|
||||
tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e
|
||||
tilecoll WALL, WALL, WALL, FLOOR ; 5c
|
||||
tilecoll WALL, WALL, FLOOR, FLOOR ; 5d
|
||||
tilecoll WALL, WALL, FLOOR, WALL ; 5e
|
||||
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
|
||||
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60
|
||||
tilecoll WALL, FLOOR, WALL, FLOOR ; 60
|
||||
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
|
||||
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62
|
||||
tilecoll FLOOR, WALL, FLOOR, WALL ; 62
|
||||
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
|
||||
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64
|
||||
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
|
||||
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66
|
||||
tilecoll WALL, FLOOR, WALL, WALL ; 64
|
||||
tilecoll FLOOR, FLOOR, WALL, WALL ; 65
|
||||
tilecoll FLOOR, WALL, WALL, WALL ; 66
|
||||
tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67
|
||||
tilecoll WALL, FLOOR, WALL, FLOOR ; 68
|
||||
tilecoll FLOOR, WALL, FLOOR, WALL ; 69
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2464,6 +2464,14 @@ BugCatcherGroup:
|
|||
dw PARAS
|
||||
db -1 ; end
|
||||
|
||||
next_list_item ; BUG_CATCHER (20)
|
||||
db "SIONED@", TRAINERTYPE_NORMAL
|
||||
db 42
|
||||
dw BARREAU
|
||||
db 42
|
||||
dw CARAPTHOR
|
||||
db -1 ; end
|
||||
|
||||
end_list_items
|
||||
|
||||
FisherGroup:
|
||||
|
|
@ -5085,6 +5093,10 @@ TwinsGroup:
|
|||
|
||||
end_list_items
|
||||
|
||||
; Added this to make room for more stuff.
|
||||
; Yeah, they filled trainers to max capacity originally. Pretty impressive.
|
||||
SECTION "Enemy Trainer Parties 3", ROMX
|
||||
|
||||
PokefanFGroup:
|
||||
next_list_item ; POKEFANF (1)
|
||||
db "BEVERLY@", TRAINERTYPE_ITEM
|
||||
|
|
|
|||
31
data/wild/nihon_grass.asm
Normal file
31
data/wild/nihon_grass.asm
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
NihonGrassWildMons:
|
||||
|
||||
def_grass_wildmons ROUTE_49
|
||||
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
|
||||
; morn
|
||||
dbw 30, PIDGEY
|
||||
dbw 31, RATTATA
|
||||
dbw 30, PIKACHU
|
||||
dbw 31, MAREEP
|
||||
dbw 32, HOPPIP
|
||||
dbw 32, METAPOD
|
||||
dbw 35, SUNFLORA
|
||||
; day
|
||||
dbw 30, PIDGEY
|
||||
dbw 31, RATTATA
|
||||
dbw 30, PIKACHU
|
||||
dbw 31, MAREEP
|
||||
dbw 32, HOPPIP
|
||||
dbw 32, METAPOD
|
||||
dbw 35, GIRAFARIG
|
||||
; nite
|
||||
dbw 30, PIDGEY
|
||||
dbw 31, RATTATA
|
||||
dbw 30, PIKACHU
|
||||
dbw 31, MAREEP
|
||||
dbw 32, HOPPIP
|
||||
dbw 32, METAPOD
|
||||
dbw 35, SKARMORY
|
||||
end_grass_wildmons
|
||||
|
||||
db -1 ; end
|
||||
3
data/wild/nihon_water.asm
Normal file
3
data/wild/nihon_water.asm
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
NihonWaterWildMons:
|
||||
|
||||
db -1 ; end
|
||||
|
|
@ -43,7 +43,7 @@ TreeMonSet_Canyon:
|
|||
TreeMonSet_Town:
|
||||
; common
|
||||
dbbw 50, 10, SPEAROW
|
||||
dbbw 15, 10, EKANS
|
||||
dbbw 15, 10, FOLAGE
|
||||
dbbw 15, 10, SPEAROW
|
||||
dbbw 10, 10, AIPOM
|
||||
dbbw 5, 10, AIPOM
|
||||
|
|
@ -63,16 +63,16 @@ TreeMonSet_Route:
|
|||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, SPINARAK
|
||||
dbbw 15, 10, LEDYBA
|
||||
dbbw 10, 10, EXEGGCUTE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
dbbw 10, 10, FOLAGE
|
||||
dbbw 5, 10, FOLAGE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
db -1
|
||||
; rare
|
||||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 10, 10, EXEGGCUTE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
dbbw 10, 10, FOLAGE
|
||||
dbbw 5, 10, FOLAGE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
db -1
|
||||
|
||||
|
|
@ -89,8 +89,8 @@ TreeMonSet_Kanto:
|
|||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 10, 10, EXEGGCUTE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
dbbw 10, 10, FOLAGE
|
||||
dbbw 5, 10, FOLAGE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
db -1
|
||||
|
||||
|
|
@ -99,16 +99,16 @@ TreeMonSet_Lake:
|
|||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, VENONAT
|
||||
dbbw 15, 10, HOOTHOOT
|
||||
dbbw 10, 10, EXEGGCUTE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
dbbw 10, 10, FOLAGE
|
||||
dbbw 5, 10, FOLAGE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
db -1
|
||||
; rare
|
||||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 10, 10, EXEGGCUTE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
dbbw 10, 10, FOLAGE
|
||||
dbbw 5, 10, FOLAGE
|
||||
dbbw 5, 10, EXEGGCUTE
|
||||
db -1
|
||||
|
||||
|
|
@ -117,14 +117,14 @@ TreeMonSet_Forest:
|
|||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 15, 10, PINECO
|
||||
dbbw 10, 10, NOCTOWL
|
||||
dbbw 10, 10, FOLAGE
|
||||
dbbw 5, 10, BUTTERFREE
|
||||
dbbw 5, 10, BEEDRILL
|
||||
db -1
|
||||
; rare
|
||||
dbbw 50, 10, HOOTHOOT
|
||||
dbbw 15, 10, CATERPIE
|
||||
dbbw 15, 10, WEEDLE
|
||||
dbbw 15, 10, FOLAGE
|
||||
dbbw 10, 10, HOOTHOOT
|
||||
dbbw 5, 10, METAPOD
|
||||
dbbw 5, 10, KAKUNA
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ AsleepTreeMonsNite:
|
|||
dw EXEGGCUTE
|
||||
dw LEDYBA
|
||||
dw AIPOM
|
||||
dw FOLAGE
|
||||
dw -1 ; end
|
||||
|
||||
AsleepTreeMonsDay:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue