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

constants/map_constants.asm

@@ -445,6 +445,7 @@ ENDM
 	map_const BATTLE_TOWER_HALLWAY,                        11,  2 ; 14
 	map_const ROUTE_40_BATTLE_TOWER_GATE,                   5,  4 ; 15
 	map_const BATTLE_TOWER_OUTSIDE,                        10, 14 ; 16
+	map_const CLIFF_CAVE,								   19, 16 ; 17
 	endgroup
 
 	newgroup VIRIDIAN                                             ; 23

constants/pokemon_constants.asm

@@ -207,6 +207,12 @@ DEF JOHTO_POKEMON EQU const_value
 	const TOTODILE   ; 9e
 	const CROCONAW   ; 9f
 	const FERALIGATR ; a0
+	const CUBBURN
+	const FLAMBEAR
+	const BRUINOUS
+	const PALSSIO
+	const PRESSIO
+	const DONMARIN
 	const SENTRET    ; a1
 	const FURRET     ; a2
 	const HOOTHOOT   ; a3

data/maps/attributes.asm

@@ -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

data/maps/blocks.asm

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

data/maps/maps.asm

@@ -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:

data/maps/scripts.asm

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

data/pokemon/base_stats.asm

@@ -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"

data/pokemon/base_stats/bruinous.asm

@@ -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

data/pokemon/base_stats/cubburn.asm

@@ -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

data/pokemon/base_stats/donmarin.asm

@@ -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

data/pokemon/base_stats/flambear.asm

@@ -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

data/pokemon/base_stats/palssio.asm

@@ -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

data/pokemon/base_stats/pressio.asm

@@ -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

data/pokemon/cries.asm

@@ -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

data/pokemon/dex_entries.asm

@@ -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"

data/pokemon/dex_entries/bruinous.asm

@@ -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.@"

data/pokemon/dex_entries/cubburn.asm

@@ -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.@"

data/pokemon/dex_entries/donmarin.asm

@@ -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.@"

data/pokemon/dex_entries/flambear.asm

@@ -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.@"

data/pokemon/dex_entries/palssio.asm

@@ -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.@"

data/pokemon/dex_entries/pressio.asm

@@ -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.@"

data/pokemon/dex_entry_pointers.asm

@@ -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

data/pokemon/dex_order_alpha.asm

@@ -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

data/pokemon/dex_order_new.asm

@@ -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

data/pokemon/egg_moves_johto.asm

@@ -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

data/pokemon/evos_attacks_johto.asm

@@ -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

data/pokemon/first_stages.asm

@@ -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

data/pokemon/gen1_order.asm

@@ -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

data/pokemon/menu_icons.asm

@@ -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

data/pokemon/names.asm

@@ -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@@"

data/pokemon/palettes.asm

@@ -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

data/pokemon/pic_pointers.asm

@@ -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

data/tilesets/nihon01_collision.asm

@@ -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 ; 07
-	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll FLOOR, FLOOR, DOOR, WALL ; 08
-	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 09
 	tilecoll WALL, WALL, WALL, WALL ; 0a
-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0b
-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
+	tilecoll FLOOR, WALL, WALL, WALL ; 0c
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0d
-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, DOOR, WALL ; 0e
 	tilecoll WALL, WALL, WALL, WALL ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
 	tilecoll WALL, WALL, WALL, WALL ; 11

data/wild/johto_grass.asm

@@ -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

data/wild/treemon_maps.asm

@@ -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

data/wild/treemons.asm

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

engine/overworld/warp_connection.asm

@@ -1,5 +1,5 @@
 HandleNewMap:
-	call ClearUnusedMapBuffer
+;	call ClearUnusedMapBuffer
 	call ResetMapBufferEventFlags
 	call ResetFlashIfOutOfCave
 	call GetCurrentMapSceneID

gfx/footprints.asm

@@ -188,6 +188,12 @@ INCBIN "gfx/footprints/typhlosion.1bpp"
 INCBIN "gfx/footprints/totodile.1bpp"
 INCBIN "gfx/footprints/croconaw.1bpp"
 INCBIN "gfx/footprints/feraligatr.1bpp"
+INCBIN "gfx/footprints/cubburn.1bpp"
+INCBIN "gfx/footprints/flambear.1bpp"
+INCBIN "gfx/footprints/bruinous.1bpp"
+INCBIN "gfx/footprints/palssio.1bpp"
+INCBIN "gfx/footprints/pressio.1bpp"
+INCBIN "gfx/footprints/donmarin.1bpp"
 INCBIN "gfx/footprints/sentret.1bpp"
 INCBIN "gfx/footprints/furret.1bpp"
 INCBIN "gfx/footprints/hoothoot.1bpp"

gfx/pics.asm

@@ -780,3 +780,17 @@ AnnihilapeFrontpic:	 INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz"
 AnnihilapeBackpic:	 INCBIN "gfx/pokemon/annihilape/back.2bpp.lz"
 PupperonFrontpic:	 INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz"
 PupperonBackpic:	 INCBIN "gfx/pokemon/pupperon/back.2bpp.lz"
+
+CubburnFrontpic:	 INCBIN "gfx/pokemon/cubburn/front.animated.2bpp.lz"
+CubburnBackpic:	 INCBIN "gfx/pokemon/cubburn/back.2bpp.lz"
+FlambearFrontpic:	 INCBIN "gfx/pokemon/flambear/front.animated.2bpp.lz"
+FlambearBackpic:	 INCBIN "gfx/pokemon/flambear/back.2bpp.lz"
+BruinousFrontpic:	 INCBIN "gfx/pokemon/bruinous/front.animated.2bpp.lz"
+BruinousBackpic:	 INCBIN "gfx/pokemon/bruinous/back.2bpp.lz"
+
+PalssioFrontpic:	 INCBIN "gfx/pokemon/palssio/front.animated.2bpp.lz"
+PalssioBackpic:	 INCBIN "gfx/pokemon/palssio/back.2bpp.lz"
+PressioFrontpic:	 INCBIN "gfx/pokemon/pressio/front.animated.2bpp.lz"
+PressioBackpic:	 INCBIN "gfx/pokemon/pressio/back.2bpp.lz"
+DonmarinFrontpic:	 INCBIN "gfx/pokemon/donmarin/front.animated.2bpp.lz"
+DonmarinBackpic:	 INCBIN "gfx/pokemon/donmarin/back.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -187,6 +187,12 @@ AnimationPointers:
 	dw TotodileAnimation
 	dw CroconawAnimation
 	dw FeraligatrAnimation
+	dw CubburnAnimation
+	dw FlambearAnimation
+	dw BruinousAnimation
+	dw PalssioAnimation
+	dw PressioAnimation
+	dw DonmarinAnimation
 	dw SentretAnimation
 	dw FurretAnimation
 	dw HoothootAnimation

gfx/pokemon/anims.asm

@@ -185,6 +185,12 @@ TyphlosionAnimation: INCLUDE "gfx/pokemon/typhlosion/anim.asm"
 TotodileAnimation:   INCLUDE "gfx/pokemon/totodile/anim.asm"
 CroconawAnimation:   INCLUDE "gfx/pokemon/croconaw/anim.asm"
 FeraligatrAnimation: INCLUDE "gfx/pokemon/feraligatr/anim.asm"
+CubburnAnimation: INCLUDE "gfx/pokemon/cubburn/anim.asm"
+FlambearAnimation: INCLUDE "gfx/pokemon/flambear/anim.asm"
+BruinousAnimation: INCLUDE "gfx/pokemon/bruinous/anim.asm"
+PalssioAnimation: INCLUDE "gfx/pokemon/palssio/anim.asm"
+PressioAnimation: INCLUDE "gfx/pokemon/pressio/anim.asm"
+DonmarinAnimation: INCLUDE "gfx/pokemon/donmarin/anim.asm"
 SentretAnimation:    INCLUDE "gfx/pokemon/sentret/anim.asm"
 FurretAnimation:     INCLUDE "gfx/pokemon/furret/anim.asm"
 HoothootAnimation:   INCLUDE "gfx/pokemon/hoothoot/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -187,6 +187,12 @@ BitmasksPointers:
 	dw TotodileBitmasks
 	dw CroconawBitmasks
 	dw FeraligatrBitmasks
+	dw CubburnBitmasks
+	dw FlambearBitmasks
+	dw BruinousBitmasks
+	dw PalssioBitmasks
+	dw PressioBitmasks
+	dw DonmarinBitmasks
 	dw SentretBitmasks
 	dw FurretBitmasks
 	dw HoothootBitmasks

gfx/pokemon/bitmasks.asm

@@ -185,6 +185,12 @@ TyphlosionBitmasks: INCLUDE "gfx/pokemon/typhlosion/bitmask.asm"
 TotodileBitmasks:   INCLUDE "gfx/pokemon/totodile/bitmask.asm"
 CroconawBitmasks:   INCLUDE "gfx/pokemon/croconaw/bitmask.asm"
 FeraligatrBitmasks: INCLUDE "gfx/pokemon/feraligatr/bitmask.asm"
+CubburnBitmasks: INCLUDE "gfx/pokemon/cubburn/bitmask.asm"
+FlambearBitmasks: INCLUDE "gfx/pokemon/flambear/bitmask.asm"
+BruinousBitmasks: INCLUDE "gfx/pokemon/bruinous/bitmask.asm"
+PalssioBitmasks: INCLUDE "gfx/pokemon/palssio/bitmask.asm"
+PressioBitmasks: INCLUDE "gfx/pokemon/pressio/bitmask.asm"
+DonmarinBitmasks: INCLUDE "gfx/pokemon/donmarin/bitmask.asm"
 SentretBitmasks:    INCLUDE "gfx/pokemon/sentret/bitmask.asm"
 FurretBitmasks:     INCLUDE "gfx/pokemon/furret/bitmask.asm"
 HoothootBitmasks:   INCLUDE "gfx/pokemon/hoothoot/bitmask.asm"

gfx/pokemon/bruinous/anim.asm

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

gfx/pokemon/bruinous/anim_idle.asm

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

gfx/pokemon/bruinous/shiny.pal

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

gfx/pokemon/cubburn/anim.asm

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

gfx/pokemon/cubburn/anim_idle.asm

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

gfx/pokemon/cubburn/shiny.pal

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

gfx/pokemon/donmarin/anim.asm

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

gfx/pokemon/donmarin/anim_idle.asm

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

gfx/pokemon/donmarin/shiny.pal

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

gfx/pokemon/flambear/anim.asm

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

gfx/pokemon/flambear/anim_idle.asm

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

gfx/pokemon/flambear/shiny.pal

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

gfx/pokemon/frame_pointers.asm

@@ -187,6 +187,12 @@ FramesPointers:
 	dba TotodileFrames
 	dba CroconawFrames
 	dba FeraligatrFrames
+	dba CubburnFrames
+	dba FlambearFrames
+	dba BruinousFrames
+	dba PalssioFrames
+	dba PressioFrames
+	dba DonmarinFrames
 	dba SentretFrames
 	dba FurretFrames
 	dba HoothootFrames

gfx/pokemon/idle_pointers.asm

@@ -187,6 +187,12 @@ AnimationIdlePointers:
 	dw TotodileAnimationIdle
 	dw CroconawAnimationIdle
 	dw FeraligatrAnimationIdle
+	dw CubburnAnimationIdle
+	dw FlambearAnimationIdle
+	dw BruinousAnimationIdle
+	dw PalssioAnimationIdle
+	dw PressioAnimationIdle
+	dw DonmarinAnimationIdle
 	dw SentretAnimationIdle
 	dw FurretAnimationIdle
 	dw HoothootAnimationIdle

gfx/pokemon/idles.asm

@@ -185,6 +185,12 @@ TyphlosionAnimationIdle: INCLUDE "gfx/pokemon/typhlosion/anim_idle.asm"
 TotodileAnimationIdle:   INCLUDE "gfx/pokemon/totodile/anim_idle.asm"
 CroconawAnimationIdle:   INCLUDE "gfx/pokemon/croconaw/anim_idle.asm"
 FeraligatrAnimationIdle: INCLUDE "gfx/pokemon/feraligatr/anim_idle.asm"
+CubburnAnimationIdle: INCLUDE "gfx/pokemon/cubburn/anim_idle.asm"
+FlambearAnimationIdle: INCLUDE "gfx/pokemon/flambear/anim_idle.asm"
+BruinousAnimationIdle: INCLUDE "gfx/pokemon/bruinous/anim_idle.asm"
+PalssioAnimationIdle: INCLUDE "gfx/pokemon/palssio/anim_idle.asm"
+PressioAnimationIdle: INCLUDE "gfx/pokemon/pressio/anim_idle.asm"
+DonmarinAnimationIdle: INCLUDE "gfx/pokemon/donmarin/anim_idle.asm"
 SentretAnimationIdle:    INCLUDE "gfx/pokemon/sentret/anim_idle.asm"
 FurretAnimationIdle:     INCLUDE "gfx/pokemon/furret/anim_idle.asm"
 HoothootAnimationIdle:   INCLUDE "gfx/pokemon/hoothoot/anim_idle.asm"

gfx/pokemon/johto_frames.asm

@@ -9,6 +9,12 @@ TyphlosionFrames: INCLUDE "gfx/pokemon/typhlosion/frames.asm"
 TotodileFrames:   INCLUDE "gfx/pokemon/totodile/frames.asm"
 CroconawFrames:   INCLUDE "gfx/pokemon/croconaw/frames.asm"
 FeraligatrFrames: INCLUDE "gfx/pokemon/feraligatr/frames.asm"
+CubburnFrames: INCLUDE "gfx/pokemon/cubburn/frames.asm"
+FlambearFrames: INCLUDE "gfx/pokemon/flambear/frames.asm"
+BruinousFrames: INCLUDE "gfx/pokemon/bruinous/frames.asm"
+PalssioFrames: INCLUDE "gfx/pokemon/palssio/frames.asm"
+PressioFrames: INCLUDE "gfx/pokemon/pressio/frames.asm"
+DonmarinFrames: INCLUDE "gfx/pokemon/donmarin/frames.asm"
 SentretFrames:    INCLUDE "gfx/pokemon/sentret/frames.asm"
 FurretFrames:     INCLUDE "gfx/pokemon/furret/frames.asm"
 HoothootFrames:   INCLUDE "gfx/pokemon/hoothoot/frames.asm"

gfx/pokemon/palssio/anim.asm

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

gfx/pokemon/palssio/anim_idle.asm

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

gfx/pokemon/palssio/shiny.pal

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

gfx/pokemon/pressio/anim.asm

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

gfx/pokemon/pressio/anim_idle.asm

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

gfx/pokemon/pressio/shiny.pal

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

home/map.asm

@@ -1,10 +1,10 @@
 ; Functions dealing with rendering and interacting with maps.
 
-ClearUnusedMapBuffer::
+;ClearUnusedMapBuffer::
-	ld hl, wUnusedMapBuffer
+;	ld hl, wUnusedMapBuffer
-	ld bc, wUnusedMapBufferEnd - wUnusedMapBuffer
+;	ld bc, wUnusedMapBufferEnd - wUnusedMapBuffer
-	xor a
+;	xor a
-	jp ByteFill
+;	jp ByteFill
 
 CheckScenes::
 ; Checks wCurMapSceneScriptPointer.  If it's empty, returns -1 in a.  Otherwise, returns the active scene ID in a.

maps/CliffCave.asm

@@ -0,0 +1,54 @@
+	object_const_def
+	const CLIFFCAVE_MAN
+	const CLIFFCAVE_ROCK1
+	const CLIFFCAVE_ROCK2
+	const CLIFFCAVE_ROCK3
+	const CLIFFCAVE_ROCK4
+	const CLIFFCAVE_ROCK5
+	const CLIFFCAVE_ROCK6
+
+CliffCave_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+CliffCaveMan:
+	faceplayer
+	opentext
+	writetext CliffCaveManText
+	waitbutton
+	closetext
+	end
+
+CliffCaveManText:
+	text "Comment to be"
+	line "written."
+	done
+
+CliffCaveRock:
+	jumpstd SmashRockScript
+
+CliffCave_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  5, 15, DEBUG_ROOM, 1 ; 1F Out
+	warp_event  7,  5, CLIFF_CAVE, 3 ; To 2F from 1F
+	warp_event 27,  7, CLIFF_CAVE, 2 ; To 1F from 2F
+	warp_event 23, 23, CLIFF_CAVE, 5 ; To 3F from 2F
+	warp_event 23,  7, CLIFF_CAVE, 4 ; To 2F from 3F
+	;warp_event  5, 15, DEBUG_ROOM, 1 ; 2F Out
+	;warp_event  5, 15, DEBUG_ROOM, 1 ; 3F Out
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event 25,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveMan, -1
+	object_event  7, 15, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  7, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  2, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  9,  3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  4,  3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  4,  2, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1

maps/DebugRoom.ablk

@@ -1,6 +1,6 @@
  ! ! !WW




E

 R
  !



-E
R





E
TvUXYG~IJ
+E
R





E
TvUXYG~IJ
 H





EF|}B




EJ~E
J
@AAB

 





D



BIIIIJ
HIB
TvU
DJ
X5Y
HIJ










|}


~E
E


E

maps/DebugRoom.asm

@@ -8,23 +8,23 @@ DebugRoom_MapScripts:
 
 DebugPokemon1Script:
 	opentext
-	getmonname STRING_BUFFER_3, BURGELA
+	getmonname STRING_BUFFER_3, PALSSIO
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke BURGELA, 42, DUSK_STONE
+	givepoke PALSSIO, 42, RARE_CANDY
 	closetext
 	end
 
 DebugPokemon2Script:
 	opentext
-	getmonname STRING_BUFFER_3, LICKITUNG
+	getmonname STRING_BUFFER_3, CUBBURN
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke LICKITUNG, 42, POISON_STONE
+	givepoke CUBBURN, 42, RARE_CANDY
 	closetext
 	end
 
@@ -101,7 +101,8 @@ DebugRoom_MapEvents:
 	warp_event  5, 35, VIRIDIAN_FOREST, 1 ; southwest warp
 	warp_event 19, 34, VIRIDIAN_FOREST, 1 ; southern warp
 	warp_event 33, 33, VIRIDIAN_FOREST, 1 ; southeast warp
-	warp_event  5,  3, AZALEA_TOWN, 1 
+	warp_event  5,  3, AZALEA_TOWN, 1
+	warp_event 34, 11, CLIFF_CAVE, 1 
 
 	def_coord_events
 

maps/LakeOfRagePrycesHouse.asm

@@ -12,7 +12,12 @@ LakeOfRagePrycesHouse_MapScripts:
 ;	jumpstd MagazineBookshelfScript
 
 PrycesHousePryce:
-	jumptext PrycesHousePryceText
+	faceplayer
+	opentext
+	writetext PrycesHousePryceText
+	waitbutton
+	closetext
+	end
 
 PrycesHousePryceText:
 	text "Thank you for"
@@ -38,6 +43,7 @@ PrycesHousePryceText:
 	done
 
 LakeOfRagePrycesHouseDelibirdScript:
+	faceplayer
 	opentext
 	writetext LakeOfRagePrycesHouseDelibirdText
 	cry DELIBIRD
@@ -50,6 +56,7 @@ LakeOfRagePrycesHouseDelibirdText:
 	done
 
 LakeOfRagePrycesHouseSwinubScript:
+	faceplayer
 	opentext
 	writetext LakeOfRagePrycesHouseSwinubText
 	cry SWINUB

ram/wram.asm

@@ -868,9 +868,9 @@ SECTION "Unused Map Buffer", WRAM0
 
 ; This was a buffer for map-related pointers in the 1997 G/S prototype.
 ; See wMapBuffer in pokegold-spaceworld's wram.asm.
-wUnusedMapBuffer:: ds 24
+;wUnusedMapBuffer:: ds 24
-wUnusedMapBufferEnd::
+;wUnusedMapBufferEnd::
-
+ds 24
 
 SECTION UNION "Overworld Map", WRAM0
 
@@ -3139,18 +3139,18 @@ wLizFightCount::     db
 wAnthonyFightCount:: db
 wToddFightCount::    db
 wGinaFightCount::    db
-wIrwinFightCount::   db ; unreferenced
+;wIrwinFightCount::   db ; unreferenced
 wArnieFightCount::   db
 wAlanFightCount::    db
 wDanaFightCount::    db
 wChadFightCount::    db
-wDerekFightCount::   db ; unreferenced
+;wDerekFightCount::   db ; unreferenced
 wTullyFightCount::   db
 wBrentFightCount::   db
 wTiffanyFightCount:: db
 wVanceFightCount::   db
 wWiltonFightCount::  db
-wKenjiFightCount::   db ; unreferenced
+;wKenjiFightCount::   db ; unreferenced
 wParryFightCount::   db
 wErinFightCount::    db