thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 00:25:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ZetaNull/jep-hack

Browse source
This commit is contained in:
Zeta_Null 2023-11-02 15:53:54 -04:00
commit 2a3547c22e
92 changed files with 621 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/maps/attributes.asm
View file

@ -710,3 +710,4 @@ ENDM
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

7
data/maps/blocks.asm
View file

@ -1078,5 +1078,8 @@ SilentHills_Blocks:
LakeOfRagePrycesHouse_Blocks:
INCBIN "maps/LakeOfRagePrycesHouse.ablk"
DebugRoom_Blocks:
INCBIN "maps/DebugRoom.ablk"
DebugRoom_Blocks: ; Pipis Room
INCBIN "maps/DebugRoom.ablk"
CliffCave_Blocks:
INCBIN "maps/CliffCave.ablk"

1
data/maps/maps.asm
View file

@ -478,6 +478,7 @@ MapGroup_Cianwood:
map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, LANDMARK_BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Route40BattleTowerGate, TILESET_GATE, GATE, LANDMARK_BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, LANDMARK_BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CliffCave, TILESET_CAVE, CAVE, LANDMARK_CIANWOOD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE
assert_table_length NUM_CIANWOOD_MAPS
MapGroup_Viridian:

1
data/maps/scripts.asm
View file

@ -499,3 +499,4 @@ INCLUDE "maps/LakeOfRagePokecenter1F.asm"
INCLUDE "maps/LakeOfRageMart.asm"
INCLUDE "maps/LakeOfRagePrycesHouse.asm"
INCLUDE "maps/DebugRoom.asm"
INCLUDE "maps/CliffCave.asm"

6
data/pokemon/base_stats.asm
View file

@ -214,6 +214,12 @@ INCLUDE "data/pokemon/base_stats/typhlosion.asm"
INCLUDE "data/pokemon/base_stats/totodile.asm"
INCLUDE "data/pokemon/base_stats/croconaw.asm"
INCLUDE "data/pokemon/base_stats/feraligatr.asm"
INCLUDE "data/pokemon/base_stats/cubburn.asm"
INCLUDE "data/pokemon/base_stats/flambear.asm"
INCLUDE "data/pokemon/base_stats/bruinous.asm"
INCLUDE "data/pokemon/base_stats/palssio.asm"
INCLUDE "data/pokemon/base_stats/pressio.asm"
INCLUDE "data/pokemon/base_stats/donmarin.asm"
INCLUDE "data/pokemon/base_stats/sentret.asm"
INCLUDE "data/pokemon/base_stats/furret.asm"
INCLUDE "data/pokemon/base_stats/hoothoot.asm"

21
data/pokemon/base_stats/bruinous.asm Normal file
View file

@ -0,0 +1,21 @@
db 0
db 87, 105, 84, 85, 100, 73
; hp atk def spd sat sdf
db FIRE, FIRE ; type
db 45 ; catch rate
db 209 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/bruinous/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FLAMETHROWER, SOLARBEAM, HYPER_BEAM
; end

21
data/pokemon/base_stats/cubburn.asm Normal file
View file

@ -0,0 +1,21 @@
db 0
db 51, 52, 46, 48, 65, 47
; hp atk def spd sat sdf
db FIRE, FIRE ; type
db 45 ; catch rate
db 65 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/cubburn/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FLAMETHROWER
; end

21
data/pokemon/base_stats/donmarin.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 103, 73, 78, 68, 103, 105
; hp atk def spd sat sdf
db WATER, WATER ; type
db 45 ; catch rate
db 210 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/donmarin/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_MONSTER ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM, PSYCHIC_M, SWIFT, ROAR, HYPER_BEAM
; end

21
data/pokemon/base_stats/flambear.asm Normal file
View file

@ -0,0 +1,21 @@
db 0
db 70, 72, 64, 63, 85, 55
; hp atk def spd sat sdf
db FIRE, FIRE ; type
db 45 ; catch rate
db 142 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/flambear/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FLAMETHROWER
; end

21
data/pokemon/base_stats/palssio.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 60, 34, 48, 43, 65, 64
; hp atk def spd sat sdf
db WATER, WATER ; type
db 45 ; catch rate
db 66 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/palssio/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_MONSTER ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM, PSYCHIC_M, SWIFT
; end

21
data/pokemon/base_stats/pressio.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 80, 44, 58, 53, 86, 84
; hp atk def spd sat sdf
db WATER, WATER ; type
db 45 ; catch rate
db 143 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F12_5 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/pressio/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate
dn EGG_MONSTER, EGG_MONSTER ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM, PSYCHIC_M, SWIFT, ROAR
; end

6
data/pokemon/cries.asm
View file

@ -193,6 +193,12 @@ PokemonCries::
mon_cry CRY_TOTODILE, 1132, 232 ; TOTODILE
mon_cry CRY_TOTODILE, 1088, 272 ; CROCONAW
mon_cry CRY_TOTODILE, 1020, 384 ; FERALIGATR
mon_cry CRY_NIDORAN_M, 0, 0 ; CUBBURN (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; FLAMBEAR (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; BRUINOUS (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PALSSIO (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PRESSIO (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; DONMARIN (incomplete)
mon_cry CRY_SENTRET, 138, 184 ; SENTRET
mon_cry CRY_SENTRET, 107, 258 ; FURRET
mon_cry CRY_HOOTHOOT, 145, 216 ; HOOTHOOT

6
data/pokemon/dex_entries.asm
View file

@ -195,6 +195,12 @@ TyphlosionPokedexEntry:: INCLUDE "data/pokemon/dex_entries/typhlosion.asm"
TotodilePokedexEntry:: INCLUDE "data/pokemon/dex_entries/totodile.asm"
CroconawPokedexEntry:: INCLUDE "data/pokemon/dex_entries/croconaw.asm"
FeraligatrPokedexEntry:: INCLUDE "data/pokemon/dex_entries/feraligatr.asm"
CubburnPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cubburn.asm"
FlambearPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flambear.asm"
BruinousPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bruinous.asm"
PalssioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/palssio.asm"
PressioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flambear.asm"
DonmarinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bruinous.asm"
SentretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sentret.asm"
FurretPokedexEntry:: INCLUDE "data/pokemon/dex_entries/furret.asm"
HoothootPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hoothoot.asm"

10
data/pokemon/dex_entries/bruinous.asm Normal file
View file

@ -0,0 +1,10 @@
db "DYNAMITE@" ; species name
dw 603, 3420 ; height, weight
db "Fiercely loyal to"
next "its TRAINER. If"
next "given the order,"
page "BRUINOUS will"
next "attack with an"
next "explosive bite.@"

10
data/pokemon/dex_entries/cubburn.asm Normal file
View file

@ -0,0 +1,10 @@
db "PYRO@" ; species name
dw 108, 170 ; height, weight
db "If its TRAINER is"
next "cold, CUBBURN will"
next "wave its tail to"
page "warm them up. In"
next "cold regions, it"
next "is a popular pet.@"

10
data/pokemon/dex_entries/donmarin.asm Normal file
View file

@ -0,0 +1,10 @@
db "LOCH BOSS@" ; species name
dw 802, 4850 ; height, weight
db "Tempered and even-"
next "handed, DONMARIN"
next "carefully raises"
page "its pod. Its"
next "punishments are"
next "always fair.@"

10
data/pokemon/dex_entries/flambear.asm Normal file
View file

@ -0,0 +1,10 @@
db "BLAST@" ; species name
dw 211, 420 ; height, weight
db "If it thinks its"
next "TRAINER in danger,"
next "it'll bark loudly."
page "Reining this in"
next "is a true test"
next "of skill.@"

10
data/pokemon/dex_entries/palssio.asm Normal file
View file

@ -0,0 +1,10 @@
db "PLAYFUL@" ; species name
dw 311, 70 ; height, weight
db "Calm and collected,"
next "PALSSIO's presence"
next "soothes all around"
page "it. Popular with"
next "newer and more"
next "anxious TRAINERS.@"

10
data/pokemon/dex_entries/pressio.asm Normal file
View file

@ -0,0 +1,10 @@
db "PROUD@" ; species name
dw 509, 70 ; height, weight
db "Prideful in its"
next "growing intellect,"
next "PRESSIO often"
page "picks fights with"
next "#MON it sees"
next "as inferior.@"

6
data/pokemon/dex_entry_pointers.asm
View file

@ -188,6 +188,12 @@ PokedexDataPointerTable:
dba TotodilePokedexEntry
dba CroconawPokedexEntry
dba FeraligatrPokedexEntry
dba CubburnPokedexEntry
dba FlambearPokedexEntry
dba BruinousPokedexEntry
dba PalssioPokedexEntry
dba PressioPokedexEntry
dba DonmarinPokedexEntry
dba SentretPokedexEntry
dba FurretPokedexEntry
dba HoothootPokedexEntry

6
data/pokemon/dex_order_alpha.asm
View file

@ -22,6 +22,7 @@ AlphabeticalPokedexOrder:
dw BLASTOISE
dw BLASTYKE
dw BLISSEY
dw BRUINOUS
dw BULBASAUR
dw BURGELA
dw BUTTERFREE
@ -42,6 +43,7 @@ AlphabeticalPokedexOrder:
dw CORSOLA
dw CROBAT
dw CROCONAW
dw CUBBURN
dw CUBONE
dw CYNDAQUIL
dw DELIBIRD
@ -50,6 +52,7 @@ AlphabeticalPokedexOrder:
dw DITTO
dw DODRIO
dw DODUO
dw DONMARIN
dw DONPHAN
dw DRAGONAIR
dw DRAGONITE
@ -70,6 +73,7 @@ AlphabeticalPokedexOrder:
dw FEAROW
dw FERALIGATR
dw FLAAFFY
dw FLAMBEAR
dw FLAREON
dw FORRETRESS
dw FURRET
@ -174,6 +178,7 @@ AlphabeticalPokedexOrder:
dw OMANYTE
dw OMASTAR
dw ONIX
dw PALSSIO
dw PARAS
dw PARASECT
dw PARASPOR
@ -195,6 +200,7 @@ AlphabeticalPokedexOrder:
dw PONYTA
dw PORYGON
dw PORYGON2
dw PRESSIO
dw PRIMEAPE
dw PSYDUCK
dw PUPAL

6
data/pokemon/dex_order_new.asm
View file

@ -11,6 +11,12 @@ NewPokedexOrder:
dw TOTODILE
dw CROCONAW
dw FERALIGATR
dw CUBBURN
dw FLAMBEAR
dw BRUINOUS
dw PALSSIO
dw PRESSIO
dw DONMARIN
dw PIDGEY
dw PIDGEOTTO
dw PIDGEOT

22
data/pokemon/egg_moves_johto.asm
View file

@ -10,6 +10,12 @@ EggMovePointers2::
dw TotodileEggMoves
dw NoEggMoves2
dw NoEggMoves2
dw CubburnEggMoves
dw NoEggMoves2 ; Flambear
dw NoEggMoves2 ; Bruinous
dw PalssioEggMoves
dw NoEggMoves2 ; Pressio
dw NoEggMoves2 ; Donmarin
dw SentretEggMoves
dw NoEggMoves2
dw HoothootEggMoves
@ -137,6 +143,22 @@ TotodileEggMoves:
dw ROCK_SLIDE
dw -1 ; end
CubburnEggMoves:
dw CRUNCH
dw FORESIGHT
dw REVERSAL
dw QUICK_ATTACK
dw SWIFT
dw -1
PalssioEggMoves:
dw ANCIENTPOWER
dw ENCORE
dw FORESIGHT
dw PSYBEAM
dw HYPNOSIS
dw -1
SentretEggMoves:
dw DOUBLE_EDGE
dw PURSUIT

91
data/pokemon/evos_attacks_johto.asm
View file

@ -10,6 +10,12 @@ EvosAttacksPointers2::
dw TotodileEvosAttacks
dw CroconawEvosAttacks
dw FeraligatrEvosAttacks
dw CubburnEvosAttacks
dw FlambearEvosAttacks
dw BruinousEvosAttacks
dw PalssioEvosAttacks
dw PressioEvosAttacks
dw DonmarinEvosAttacks
dw SentretEvosAttacks
dw FurretEvosAttacks
dw HoothootEvosAttacks
@ -241,6 +247,91 @@ FeraligatrEvosAttacks:
dbw 58, HYDRO_PUMP
db 0 ; no more level-up moves
CubburnEvosAttacks:
dbbw EVOLVE_LEVEL, 16, FLAMBEAR
db 0
dbw 1, SCRATCH
dbw 5, LEER
dbw 9, EMBER
dbw 14, ROAR
dbw 19, BITE
dbw 25, REST
dbw 31, FLAME_WHEEL
dbw 38, SCARY_FACE
dbw 45, FURY_SWIPES
dbw 53, FLAMETHROWER
db 0
FlambearEvosAttacks:
dbbw EVOLVE_LEVEL, 34, BRUINOUS
db 0
dbw 1, SCRATCH
dbw 5, LEER
dbw 9, EMBER
dbw 14, ROAR
dbw 21, BITE
dbw 29, REST
dbw 37, FLAME_WHEEL
dbw 46, SCARY_FACE
dbw 55, FURY_SWIPES
dbw 65, FLAMETHROWER
db 0
BruinousEvosAttacks:
db 0
dbw 1, SCRATCH
dbw 5, LEER
dbw 9, EMBER
dbw 14, ROAR
dbw 21, BITE
dbw 29, REST
dbw 39, FLAME_WHEEL
dbw 50, SCARY_FACE
dbw 61, FURY_SWIPES
dbw 73, FLAMETHROWER
db 0
PalssioEvosAttacks:
dbbw EVOLVE_LEVEL, 16, PRESSIO
db 0
dbw 1, TACKLE
dbw 5, GROWL
dbw 8, WATER_GUN
dbw 13, BITE
dbw 19, MIST
dbw 25, AURORA_BEAM
dbw 34, SAFEGUARD
dbw 43, BODY_SLAM
dbw 53, HYDRO_PUMP
db 0
PressioEvosAttacks:
dbbw EVOLVE_LEVEL, 34, DONMARIN
db 0
dbw 1, TACKLE
dbw 5, GROWL
dbw 8, WATER_GUN
dbw 13, BITE
dbw 21, MIST
dbw 30, AURORA_BEAM
dbw 40, SAFEGUARD
dbw 51, BODY_SLAM
dbw 63, HYDRO_PUMP
db 0
DonmarinEvosAttacks:
db 0
dbw 1, TACKLE
dbw 5, GROWL
dbw 8, WATER_GUN
dbw 13, BITE
dbw 21, MIST
dbw 30, AURORA_BEAM
dbw 43, SAFEGUARD
dbw 57, BODY_SLAM
dbw 72, HYDRO_PUMP
db 0
SentretEvosAttacks:
dbbw EVOLVE_LEVEL, 15, FURRET
db 0 ; no more evolutions

6
data/pokemon/first_stages.asm
View file

@ -188,6 +188,12 @@ FirstEvoStages::
dw TOTODILE
dw TOTODILE
dw TOTODILE ;a0
dw CUBBURN
dw CUBBURN
dw CUBBURN
dw PALSSIO
dw PALSSIO
dw PALSSIO
dw SENTRET
dw SENTRET
dw HOOTHOOT

6
data/pokemon/gen1_order.asm
View file

@ -204,6 +204,12 @@ Pokered_MonIndices:
db TOTODILE
db CROCONAW
db FERALIGATR
db CUBBURN
db FLAMBEAR
db BRUINOUS
db PALSSIO
db PRESSIO
db DONMARIN
db SENTRET
db FURRET
db HOOTHOOT

6
data/pokemon/menu_icons.asm
View file

@ -189,6 +189,12 @@ MonMenuIcons:
db ICON_MONSTER ; TOTODILE
db ICON_MONSTER ; CROCONAW
db ICON_MONSTER ; FERALIGATR
db ICON_FOX ; CUBBURN
db ICON_FOX ; FLAMBEAR
db ICON_FOX ; BRUINOUS
db ICON_SERPENT ; PALSSIO
db ICON_SERPENT ; PRESSIO
db ICON_SERPENT ; DONMARIN
db ICON_FOX ; SENTRET
db ICON_FOX ; FURRET
db ICON_BIRD ; HOOTHOOT

6
data/pokemon/names.asm
View file

@ -191,6 +191,12 @@ PokemonNames::
db "TOTODILE@@"
db "CROCONAW@@"
db "FERALIGATR"
db "CUBBURN@@@"
db "FLAMBEAR@@"
db "BRUINOUS@@"
db "PALSSIO@@@"
db "PRESSIO@@@"
db "DONMARIN@@"
db "SENTRET@@@"
db "FURRET@@@@"
db "HOOTHOOT@@"

12
data/pokemon/palettes.asm
View file

@ -407,6 +407,18 @@ INCBIN "gfx/pokemon/croconaw/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/croconaw/shiny.pal"
INCBIN "gfx/pokemon/feraligatr/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/feraligatr/shiny.pal"
INCBIN "gfx/pokemon/cubburn/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/cubburn/shiny.pal"
INCBIN "gfx/pokemon/flambear/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/flambear/shiny.pal"
INCBIN "gfx/pokemon/bruinous/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/bruinous/shiny.pal"
INCBIN "gfx/pokemon/palssio/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/palssio/shiny.pal"
INCBIN "gfx/pokemon/pressio/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pressio/shiny.pal"
INCBIN "gfx/pokemon/donmarin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/donmarin/shiny.pal"
INCBIN "gfx/pokemon/sentret/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sentret/shiny.pal"
INCBIN "gfx/pokemon/furret/front.gbcpal", middle_colors

12
data/pokemon/pic_pointers.asm
View file

@ -387,6 +387,18 @@ PokemonPicPointers::
dba CroconawBackpic
dba FeraligatrFrontpic
dba FeraligatrBackpic
dba CubburnFrontpic
dba CubburnBackpic
dba FlambearFrontpic
dba FlambearBackpic
dba BruinousFrontpic
dba BruinousBackpic
dba PalssioFrontpic
dba PalssioBackpic
dba PressioFrontpic
dba PressioBackpic
dba DonmarinFrontpic
dba DonmarinBackpic
dba SentretFrontpic
dba SentretBackpic
dba FurretFrontpic

BIN
data/tilesets/nihon01_attributes.bin
View file

Binary file not shown.

14
data/tilesets/nihon01_collision.asm
View file

@ -5,14 +5,14 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll LADDER, LADDER, LADDER, LADDER ; 06
tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07
tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 07
tilecoll FLOOR, FLOOR, DOOR, WALL ; 08
tilecoll FLOOR, FLOOR, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
tilecoll WALL, FLOOR, WALL, WALL ; 0b
tilecoll FLOOR, WALL, WALL, WALL ; 0c
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

BIN
data/tilesets/nihon01_metatiles.bin
View file

Binary file not shown.

28
data/wild/johto_grass.asm
View file

@ -1744,4 +1744,32 @@ JohtoGrassWildMons:
dbw 44, GOLBAT
end_grass_wildmons
def_grass_wildmons CLIFF_CAVE
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, ONIX
dbw 31, GOLBAT
dbw 30, MACHOKE
dbw 31, KINGLER
dbw 32, QUAGSIRE
dbw 32, QUAGSIRE
dbw 35, STEELIX
; day
dbw 30, ONIX
dbw 31, GOLBAT
dbw 30, MACHOKE
dbw 31, KINGLER
dbw 32, QUAGSIRE
dbw 32, QUAGSIRE
dbw 35, STEELIX
; nite
dbw 30, ONIX
dbw 31, GOLBAT
dbw 30, MACHOKE
dbw 31, KINGLER
dbw 32, MISDREAVUS
dbw 32, MISDREAVUS
dbw 35, STEELIX
end_grass_wildmons
db -1 ; end

1
data/wild/treemon_maps.asm
View file

@ -52,4 +52,5 @@ RockMonMaps:
treemon_map ICE_PATH_B3F, TREEMON_SET_ROCK_ICE
treemon_map MOUNT_MOON_SQUARE, TREEMON_SET_ROCK_SQUARE
treemon_map BURNED_TOWER_1F, TREEMON_SET_ROCK_TOWER
treemon_map CLIFF_CAVE, TREEMON_SET_ROCK_DARK_CAVE
db -1

24
data/wild/treemons.asm
View file

@ -130,29 +130,33 @@ TreeMonSet_Forest:
dbbw 5, 10, KAKUNA
db -1
; Rock Smash begins here.
TreeMonSet_Rock_Beach:
dbbw 90, 15, KRABBY
dbbw 10, 15, SHUCKLE
dbbw 70, 23, KRABBY
dbbw 20, 23, CORSOLA
dbbw 10, 25, SHUCKLE
db -1
TreeMonSet_Rock_Dark_Cave:
dbbw 90, 15, GEODUDE
dbbw 10, 15, DUNSPARCE
dbbw 70, 8, GEODUDE
dbbw 20, 9, PHANPY
dbbw 10, 9, DUNSPARCE
db -1
TreeMonSet_Rock_Tower:
dbbw 90, 15, GEODUDE
dbbw 10, 15, SLUGMA
dbbw 90, 14, GEODUDE
dbbw 10, 16, SLUGMA
db -1
TreeMonSet_Rock_Ice:
dbbw 90, 15, GEODUDE
dbbw 10, 15, SWINUB
dbbw 90, 25, GEODUDE
dbbw 10, 25, SWINUB
db -1
TreeMonSet_Rock_Square:
dbbw 90, 15, GEODUDE
dbbw 10, 15, SHUCKLE
dbbw 85, 35, GRAVELER
dbbw 10, 35, SHUCKLE
dbbw 5, 40, GOLEM
db -1
TreeMonSet_Rock_Well: