Strong Arm, Water Sport, and more HMs.

This adds Rock Climb functionality to Strong Arm and Dive functionality to Water Sport, as discussed in the server. HMs have been added, but we need 16bit Items to add Wind Ride, and I haven't finished their functionality.

The Rock Climb tile is a bit terrible, it's not easy to notice. Maybe change so that it works well with yellow or another colour?

This does not build due to issues with effect_commands.asm, but since Zeta is meant to be working on the mapping and Water Sport anyway, it seems to be up his alley.

I ported over much of the underwater assets Rangi was using as they looked very pretty. I imagine it'll be fun to utilise going forward. May as well, right?

I shall now lay down in a dark room.

Review: c21561ea71 (diff-5508f3b794fc68821ba35e94b6a293b2aaaa16c02a1b34fac70d03fd2f74c4b2R113)

gfx/sprites.asm

@@ -151,3 +151,4 @@ ChannelerGFX::             INCBIN "gfx/sprites/channeler.2bpp"
 BaldingGuyGFX::             INCBIN "gfx/sprites/balding_guy.2bpp"
 GameboyGirlGFX::             INCBIN "gfx/sprites/gameboy_girl.2bpp"
 OverworldPikachuGFX::             INCBIN "gfx/sprites/pikachu.2bpp"
+DiveSpriteGFX::                INCBIN "gfx/sprites/dive.2bpp"

gfx/tileset_palette_maps.asm

@@ -111,6 +111,9 @@ INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
 TilesetLavenderCryptPalMap:
 INCLUDE "gfx/tilesets/lavendercrypt_palette_map.asm"
 
+TilesetUnderwaterPalMap:
+INCLUDE "gfx/tilesets/underwater_palette_map.asm"
+
 MapGroupPalettes: ; unreferenced
 ; entries correspond to MAPGROUP_* constants
 rept NUM_MAP_GROUPS

gfx/tilesets.asm

@@ -36,15 +36,6 @@ INCBIN "data/tilesets/ice_path_metatiles.bin"
 TilesetIcePathColl::
 INCLUDE "data/tilesets/ice_path_collision.asm"
 
-TilesetPlayersRoomGFX::
-INCBIN "gfx/tilesets/players_room.2bpp.lz"
-
-TilesetPlayersRoomMeta::
-INCBIN "data/tilesets/players_room_metatiles.bin"
-
-TilesetPlayersRoomColl::
-INCLUDE "data/tilesets/players_room_collision.asm"
-
 
 SECTION "Tileset Data 2", ROMX
 
@@ -665,4 +656,15 @@ TilesetForestKantoColl::
 INCLUDE "data/tilesets/forest_kanto_collision.asm"
 
 TilesetForestKantoAttr::
-INCBIN "data/tilesets/forest_kanto_attributes.bin"
+INCBIN "data/tilesets/forest_kanto_attributes.bin"
+
+SECTION "Tileset Data 17", ROMX
+; moved to make room for new rocky wall colls
+TilesetPlayersRoomGFX::
+INCBIN "gfx/tilesets/players_room.2bpp.lz"
+
+TilesetPlayersRoomMeta::
+INCBIN "data/tilesets/players_room_metatiles.bin"
+
+TilesetPlayersRoomColl::
+INCLUDE "data/tilesets/players_room_collision.asm"

gfx/tilesets/johto_palette_map.asm

@@ -9,11 +9,10 @@
 	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
 	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
+	tilepal 0, WATER, GRAY, GRAY, WATER, BROWN, BROWN, GRAY, GRAY
+rept 16
+	db $ff
+endr
 	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
 	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
 	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN