Remove extraneous map design

5 files changed, 13 insertions, 59 deletions

diff --git a/Rock-Climb.md b/Rock-Climb.md
index df3f4a5..2a0d7fd 100644
--- a/Rock-Climb.md
+++ b/Rock-Climb.md
@@ -13,8 +13,7 @@ Gen 4 introduced Rock Climb, a field move that can scale rocky walls, as HM08. I
 6. [Define text related to using Rock Climb](#6-define-text-related-to-using-rock-climb)
 7. [Finish the Rock Climb field move effect](#7-finish-the-rock-climb-field-move-effect)
 8. [Talk to rocky walls to use Rock Climb](#8-talk-to-rocky-walls-to-use-rock-climb)
-9. [Explain when Rock Climb is enabled](#9-explain-when-rock-climb-is-enabled)
-10. [Add rocky walls to a map](#10-add-rocky-walls-to-a-map)
+9. [Add rocky walls to a map](#9-add-rocky-walls-to-a-map)
 
 
 ## 1. Prepare the Rock Climb move
@@ -306,7 +305,7 @@ Edit [engine/events/overworld.asm](../blob/master/engine/events/overworld.asm):
 +	db "@"
 ```
 
-You can study how this routine works; it's similar to other field moves. Just like in HG/SS, you need the Earth Badge to use it. When you're facing up or down toward a rocky wall, you can climb it. Just like waterfalls, you'll continue moving until you reach a different type of tile.
+You can study how this routine works; it's similar to other field moves. Just like in HG/SS, you need the Earth Badge to use it. (If you don't want that, remove the two checks for `ENGINE_EARTHBADGE`.) When you're facing up or down toward a rocky wall, you can climb it. Just like waterfalls, you'll continue moving until you reach a different type of tile.
 
 Anyway, the requisite move, HM, and field effect are all done, but we still have a few improvements to make.
 
@@ -353,71 +352,26 @@ Edit [engine/overworld/events.asm](../blob/master/engine/overworld/events.asm):
 
 `TryTileCollisionEvent` checks for various relevant collision types, one after another, so we just add a case for rocky walls.
 
+That's it! Now `COLL_ROCKY_WALL` can be used like any other collision type—try assigning it to a block in [data/tilesets/\*_collision.asm](../tree/master/data/tilesets/).
 
-## 9. Explain when Rock Climb is enabled
-
-Edit [maps/ViridianGym.asm](../blob/master/maps/ViridianGym.asm):
-
-```diff
- LeaderBlueAfterText:
--	text "BLUE: …"
-+	text "BLUE: With that"
-+	line "EARTHBADGE, your"
-+
-+	para "#MON that know"
-+	line "ROCK CLIMB can"
-+	cont "use it any time."
-+
-+	para "…"
-```
+…Although, there aren't any suitable tiles for rocky walls. So let's make some.
 
 
 ## 10. Add rocky walls to a map
 
-For example, let's copy HG/SS and require Rock Climb for an item ball on Route 45.
-
-Open [maps/Route45.blk](../blob/master/maps/Route45.blk) with [Polished Map](https://github.com/Rangi42/polished-map), using the `johto` tileset, and design some rocky wall tiles:
-
-![Screenshot](screenshots/polished-map-rocky-wall-tileset.png)
-
-Then assemble a block using those tiles (here I replaced an unused house block):
-
-![Screenshot](screenshots/polished-map-rocky-wall-block.png)
-
-And use the block somewhere in the map:
-
-[![Screenshot](screenshots/polished-map-rock-climb.png)](screenshots/polished-map-rock-climb.png)
+Here are some rocky wall tiles edited from [Pokémon Orange](https://github.com/PiaCarrot/pokeorange/):
 
-Then save the changes. Polished Map will update the relevant tileset and map files:
+![Screenshot](screenshots/rocky-wall-tiles.png)
 
-- [gfx/tilesets/johto.png](../blob/master/gfx/tilesets/johto.png)
-- [gfx/tilesets/johto_palette_map.asm](../blob/master/gfx/tilesets/johto_palette_map.asm)
-- [data/tilesets/johto_metatiles.bin](../blob/master/data/tilesets/johto_metatiles.bin)
-- [maps/Route45.blk](../blob/master/maps/Route45.blk)
+Let's say you want to copy HG/SS and require Rock Climb for an item ball on Route 45. Since [maps/Route45.blk](../blob/master/maps/Route45.blk) uses the `johto` tileset, here's what that would involve:
 
-If you want to use those exact tiles, here they are:
-
-![gfx/tilesets/johto.png](screenshots/rock-climb_gfx-tilesets-johto.png)
-
-Anyway, Polished Map does *not* update collision data, so edit [data/tilesets/johto_collision.asm](../blob/master/data/tilesets/johto_collision.asm):
-
-```diff
- 	...
- 	tilecoll WALL, WALL, WALL, WALL ; 11
--	tilecoll WALL, WALL, WALL, WALL ; 12
-+	tilecoll FLOOR, FLOOR, WALL, ROCKY_WALL ; 12
- 	tilecoll WALL, WALL, WALL, WALL ; 13
- 	...
-```
-
-Finally, edit [maps/Route45.asm](../blob/master/maps/Route45.asm):
-
-```diff
--	object_event  7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
-+	object_event  8, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION
-```
+1. Add the rocky wall tiles to [gfx/tilesets/johto.png](../blob/master/gfx/tilesets/johto.png)
+2. Assign the `BROWN` color to those tiles in [gfx/tilesets/johto_palette_map.asm](../blob/master/gfx/tilesets/johto_palette_map.asm)
+3. Design a rocky wall block in [data/tilesets/johto_metatiles.bin](../blob/master/data/tilesets/johto_metatiles.bin)
+4. Assign the `ROCKY_WALL` collision type to that block in [data/tilesets/johto_collision.asm](../blob/master/data/tilesets/johto_collision.asm)
+5. Redesign [maps/Route45.blk](../blob/master/maps/Route45.blk) to use the rocky wall block
 
-We just moved an item ball so that you need Rock Climb to get it.
+You can use [Polished Map](https://github.com/Rangi42/polished-map) to edit maps and tilesets; refer to the [new map](Add-a-new-map-and-landmark) and [new tileset](Add-a-new-tileset) tutorials for more information.
 
 Now test it out!
 
diff --git a/screenshots/polished-map-rock-climb.png b/screenshots/polished-map-rock-climb.png
deleted file mode 100644
index 2057155..0000000
--- a/screenshots/polished-map-rock-climb.png
+++ /dev/null
diff --git a/screenshots/polished-map-rocky-wall-block.png b/screenshots/polished-map-rocky-wall-block.png
deleted file mode 100644
index a974644..0000000
--- a/screenshots/polished-map-rocky-wall-block.png
+++ /dev/null
diff --git a/screenshots/polished-map-rocky-wall-tileset.png b/screenshots/polished-map-rocky-wall-tileset.png
deleted file mode 100644
index 9bc6641..0000000
--- a/screenshots/polished-map-rocky-wall-tileset.png
+++ /dev/null
diff --git a/screenshots/rocky-wall-tiles.png b/screenshots/rocky-wall-tiles.png
new file mode 100644
index 0000000..bac2944
--- /dev/null
+++ b/screenshots/rocky-wall-tiles.png