Berry Forest!

Worked on the map and added wild data. It's mostly Kanto stuff as it was in FRLG - the Sevii Islands are Kanto after all. Slowking in the water because there's not really anything else and it's kinda neat. Shuckle is in by Misty's suggestion.

constants/map_constants.asm

@@ -572,7 +572,7 @@ ENDM
 	map_const THREE_ISLAND_PORT,					10, 10 ; 1
 	map_const THREE_ISLAND,							10, 10 ; 2
 	map_const BOND_BRIDGE,							10, 10 ; 3
-	map_const BERRY_FOREST,							10, 10 ; 4
+	map_const BERRY_FOREST,							17, 15 ; 4
 	endgroup
 	
 	newgroup FOUR_ISLAND ; 31

data/maps/maps.asm

@@ -624,7 +624,7 @@ MapGroup_ThreeIsland:	; 30
 	map ThreeIslandPort, TILESET_GATE, GATE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map ThreeIsland, TILESET_CAVE, TOWN, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map BondBridge, TILESET_CAVE, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map BerryForest, TILESET_CAVE, CAVE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map BerryForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_NITE, FISHGROUP_POND
 	assert_table_length NUM_THREE_ISLAND_MAPS
 
 MapGroup_FourIsland:	; 31

data/tilesets/forest_kanto_collision.asm

@@ -30,7 +30,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; 1d
 	tilecoll WALL, WALL, WALL, WALL ; 1e
 	tilecoll WALL, WALL, WALL, WALL ; 1f
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, WALL, HOP_DOWN ; 20
 	tilecoll WALL, WALL, WALL, WALL ; 21
 	tilecoll WALL, WALL, WALL, WALL ; 22
 	tilecoll WALL, WALL, WALL, WALL ; 23
@@ -50,3 +50,17 @@
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 31
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32
 	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 34
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 36
+	tilecoll WALL, WALL, WALL, FLOOR ; 37
+	tilecoll FLOOR, WALL, WALL, WALL ; 38
+	tilecoll WALL, WALL, WALL, WALL ; 39
+	tilecoll WALL, FLOOR, WALL, WALL ; 3a
+	tilecoll WALL, WALL, FLOOR, WALL ; 3b
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 40
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 41

data/wild/kanto_grass.asm

@@ -958,4 +958,35 @@ KantoGrassWildMons:
 	dbw 49, HOUNDOUR
 	end_grass_wildmons
 	
+	; The Kanto-ness isn't an issue, and should still exist for One-Three Island.
+	; Shuckle is a nice touch.
+	; Added Lickitung so it can gorge itself on berries and be more available.
+	def_grass_wildmons BERRY_FOREST
+	db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite
+	; morn
+	dbw 45, PIDGEOT
+	dbw 46, GLOOM
+	dbw 46, WEEPINBELL
+	dbw 46, EXEGGCUTE
+	dbw 49, LICKITUNG
+	dbw 48, VENOMOTH
+	dbw 49, HYPNO
+	; day
+	dbw 45, PIDGEOT
+	dbw 46, GLOOM
+	dbw 46, WEEPINBELL
+	dbw 46, EXEGGCUTE
+	dbw 49, LICKITUNG
+	dbw 48, VENOMOTH
+	dbw 49, HYPNO
+	; nite
+	dbw 45, SHUCKLE
+	dbw 46, TANGELA
+	dbw 46, TANGELA
+	dbw 46, EXEGGCUTE
+	dbw 49, LICKITUNG
+	dbw 48, VENOMOTH
+	dbw 49, HYPNO
+	end_grass_wildmons
+	
 	db -1 ; end

data/wild/kanto_water.asm

@@ -176,5 +176,12 @@ KantoWaterWildMons:
 	dbw 30, GYARADOS
 	dbw 35, DRAGONAIR
 	end_water_wildmons
+	
+	def_water_wildmons BERRY_FOREST
+	db 6 percent ; encounter rate
+	dbw 35, GOLDUCK
+	dbw 30, SLOWBRO
+	dbw 35, SLOWKING
+	end_water_wildmons
 
 	db -1 ; end

maps/BerryForest.asm

@@ -9,6 +9,8 @@ BerryForest_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
+	warp_event 27, 29, DEBUG_ROOM, 1 ; BOND_BRIDGE
+	warp_event 26, 29, DEBUG_ROOM, 1 ; BOND_BRIDGE
 
 	def_coord_events