From a91b7fd2a11f9bf5e3b0744cae700c69d6cb1ffe Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:23:39 +0000
Subject: [PATCH] Rock Smash, but good

Adds new rock smash wild data categories. Somehow, the functionality for this existed in-game, they just...didn't use it.
---
 constants/pokemon_data_constants.asm |  7 +++++-
 data/wild/treemon_maps.asm           | 15 ++++++++----
 data/wild/treemons.asm               | 34 ++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 0cd88a6..52edaee 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -185,7 +185,12 @@ DEF NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.as
 	const TREEMON_SET_KANTO
 	const TREEMON_SET_LAKE
 	const TREEMON_SET_FOREST
-	const TREEMON_SET_ROCK
+	const TREEMON_SET_ROCK_BEACH
+	const TREEMON_SET_ROCK_DARK_CAVE
+	const TREEMON_SET_ROCK_TOWER
+	const TREEMON_SET_ROCK_ICE
+	const TREEMON_SET_ROCK_SQUARE
+	const TREEMON_SET_ROCK_WELL
 DEF NUM_TREEMON_SETS EQU const_value
 
 ; treemon scores
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 2fbb93c..130e28f 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -41,8 +41,15 @@ TreeMonMaps:
 	db -1
 
 RockMonMaps:
-	treemon_map CIANWOOD_CITY,             TREEMON_SET_ROCK
-	treemon_map ROUTE_40,                  TREEMON_SET_ROCK
-	treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK
-	treemon_map SLOWPOKE_WELL_B1F,         TREEMON_SET_ROCK
+	treemon_map CIANWOOD_CITY,                  TREEMON_SET_ROCK_BEACH
+	treemon_map ROUTE_40,                       TREEMON_SET_ROCK_BEACH
+	treemon_map DARK_CAVE_VIOLET_ENTRANCE,      TREEMON_SET_ROCK_DARK_CAVE
+	treemon_map SLOWPOKE_WELL_B1F,              TREEMON_SET_ROCK_WELL
+	treemon_map ICE_PATH_1F,			        TREEMON_SET_ROCK_ICE
+	treemon_map ICE_PATH_B1F,			        TREEMON_SET_ROCK_ICE
+	treemon_map ICE_PATH_B2F_MAHOGANY_SIDE,     TREEMON_SET_ROCK_ICE
+	treemon_map ICE_PATH_B2F_BLACKTHORN_SIDE,   TREEMON_SET_ROCK_ICE
+	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
 	db -1
diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm
index 50faa8c..45081c9 100644
--- a/data/wild/treemons.asm
+++ b/data/wild/treemons.asm
@@ -8,7 +8,12 @@ TreeMons:
 	dw TreeMonSet_Kanto
 	dw TreeMonSet_Lake
 	dw TreeMonSet_Forest
-	dw TreeMonSet_Rock
+	dw TreeMonSet_Rock_Beach
+	dw TreeMonSet_Rock_Dark_Cave
+	dw TreeMonSet_Rock_Tower
+	dw TreeMonSet_Rock_Ice
+	dw TreeMonSet_Rock_Square
+	dw TreeMonSet_Rock_Well
 	assert_table_length NUM_TREEMON_SETS
 	dw TreeMonSet_City ; unused
 
@@ -125,7 +130,32 @@ TreeMonSet_Forest:
 	dbbw  5, 10, KAKUNA
 	db -1
 
-TreeMonSet_Rock:
+TreeMonSet_Rock_Beach:
 	dbbw 90, 15, KRABBY
 	dbbw 10, 15, SHUCKLE
 	db -1
+
+TreeMonSet_Rock_Dark_Cave:
+	dbbw 90, 15, GEODUDE
+	dbbw 10, 15, DUNSPARCE
+	db -1
+
+TreeMonSet_Rock_Tower:
+	dbbw 90, 15, GEODUDE
+	dbbw 10, 15, SLUGMA
+	db -1
+
+TreeMonSet_Rock_Ice:
+	dbbw 90, 15, GEODUDE
+	dbbw 10, 15, SWINUB
+	db -1
+
+TreeMonSet_Rock_Square:
+	dbbw 90, 15, GEODUDE
+	dbbw 10, 15, SHUCKLE
+	db -1
+
+TreeMonSet_Rock_Well:
+	dbbw 90, 15, KRABBY
+	dbbw 10, 15, SHELLDER
+	db -1