summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Puddles-that-splash-when-you-walk.md42
-rw-r--r--screenshots/gfx-tilesets-johto_modern.pngbin2313 -> 0 bytes
-rw-r--r--screenshots/polished-map-puddle-block.pngbin6263 -> 0 bytes
-rw-r--r--screenshots/polished-map-puddle-tileset.pngbin9802 -> 0 bytes
-rw-r--r--screenshots/polished-map-puddles.pngbin17850 -> 0 bytes
-rw-r--r--screenshots/puddle-tiles.pngbin0 -> 218 bytes
6 files changed, 12 insertions, 30 deletions
diff --git a/Puddles-that-splash-when-you-walk.md b/Puddles-that-splash-when-you-walk.md
index f6bd50e..849784a 100644
--- a/Puddles-that-splash-when-you-walk.md
+++ b/Puddles-that-splash-when-you-walk.md
@@ -496,44 +496,26 @@ Edit [engine/overworld/map_objects.asm](../blob/master/engine/overworld/map_obje
+ db $00, PAL_OW_BLUE, SPRITEMOVEDATA_PUDDLE
```
+That's it! Now `COLL_PUDDLE` can be used like any other collision type—try assigning it to a block in [data/tilesets/\*_collision.asm](../tree/master/data/tilesets/).
-## 7. Add puddles to a map
-
-For example, let's copy HG/SS and add puddles to Route 34.
-
-Open [maps/Route34.blk](../blob/master/maps/Route34.blk) with [Polished Map](https://github.com/Rangi42/polished-map), using the `johto_modern` tileset, and design some puddle tiles (here I replaced some unused PokéCom Center tiles):
-
-![Screenshot](screenshots/polished-map-puddle-tileset.png)
-
-Then assemble a block using those tiles (again, I replaced an unused PokéCom Center block):
-
-![Screenshot](screenshots/polished-map-puddle-block.png)
+…Although, there aren't any suitable tiles for puddles. So let's make some.
-And use the block somewhere in the map:
-[![Screenshot](screenshots/polished-map-puddles.png)](screenshots/polished-map-puddles.png)
-
-Then save the changes. Polished Map will update the relevant tileset and map files:
+## 7. Add puddles to a map
-- [gfx/tilesets/johto_modern.png](../blob/master/gfx/tilesets/johto_modern.png)
-- [gfx/tilesets/johto_modern_palette_map.asm](../blob/master/gfx/tilesets/johto_modern_palette_map.asm)
-- [data/tilesets/johto_modern_metatiles.bin](../blob/master/data/tilesets/johto_modern_metatiles.bin)
-- [maps/Route34.blk](../blob/master/maps/Route34.blk)
+Here are some puddle tiles devamped from Gen 3:
-If you want to use those exact tiles, here they are:
+![Screenshot](screenshots/puddle-tiles.png)
-![gfx/tilesets/johto_modern.png](screenshots/gfx-tilesets-johto_modern.png)
+Let's say you want to copy HG/SS and add puddles to Route 34. Since [maps/Route34.blk](../blob/master/maps/Route34.blk) uses the `johto_modern` tileset, here's what that would involve:
-Anyway, Polished Map does *not* update collision data, so edit [data/tilesets/johto_modern_collision.asm](../blob/master/data/tilesets/johto_modern_collision.asm):
+1. Add the puddle tiles to [gfx/tilesets/johto_modern.png](../blob/master/gfx/tilesets/johto_modern.png) (you can replace some unused PokéCom Center tiles, or [expand the tilesets](Expand-tilesets-from-192-to-255-tiles))
+2. Assign the `WATER` color to those tiles in [gfx/tilesets/johto_modern_palette_map.asm](../blob/master/gfx/tilesets/johto_modern_palette_map.asm)
+3. Design a puddle block in [data/tilesets/johto_modern_metatiles.bin](../blob/master/data/tilesets/johto_modern_metatiles.bin)
+4. Assign the `PUDDLE` collision type to that block in [data/tilesets/johto_modern_collision.asm](../blob/master/data/tilesets/johto_modern_collision.asm)
+5. Redesign [maps/Route34.blk](../blob/master/maps/Route34.blk) to use the puddle block
-```diff
- ...
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e
-- tilecoll WALL, WALL, WALL, WALL ; 5f
-+ tilecoll PUDDLE, PUDDLE, PUDDLE, PUDDLE ; 5f
- tilecoll WATER, WATER, WALL, WALL ; 60
- ...
-```
+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 we can walk around Route 34, and see and hear puddles in action!
diff --git a/screenshots/gfx-tilesets-johto_modern.png b/screenshots/gfx-tilesets-johto_modern.png
deleted file mode 100644
index 4276169..0000000
--- a/screenshots/gfx-tilesets-johto_modern.png
+++ /dev/null
Binary files differ
diff --git a/screenshots/polished-map-puddle-block.png b/screenshots/polished-map-puddle-block.png
deleted file mode 100644
index 163f0bf..0000000
--- a/screenshots/polished-map-puddle-block.png
+++ /dev/null
Binary files differ
diff --git a/screenshots/polished-map-puddle-tileset.png b/screenshots/polished-map-puddle-tileset.png
deleted file mode 100644
index 63980df..0000000
--- a/screenshots/polished-map-puddle-tileset.png
+++ /dev/null
Binary files differ
diff --git a/screenshots/polished-map-puddles.png b/screenshots/polished-map-puddles.png
deleted file mode 100644
index fc64142..0000000
--- a/screenshots/polished-map-puddles.png
+++ /dev/null
Binary files differ
diff --git a/screenshots/puddle-tiles.png b/screenshots/puddle-tiles.png
new file mode 100644
index 0000000..5490bfc
--- /dev/null
+++ b/screenshots/puddle-tiles.png
Binary files differ