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)

constants/battle_anim_constants.asm

@@ -220,6 +220,8 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7  ; Maximum size of a pokemon picture
 	const ANIM_OBJ_PLAYERHEAD_2ROW
 	const ANIM_OBJ_COIN_HURL
 	const ANIM_OBJ_SHOOTING_MIST
+	const ANIM_OBJ_WATER_SPORT_1
+	const ANIM_OBJ_WATER_SPORT_2
 DEF NUM_ANIM_OBJS EQU const_value
 
 ; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)

constants/battle_constants.asm

@@ -194,7 +194,7 @@ DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP_MASK
 	const SUBSTATUS_X_ACCURACY
 	const SUBSTATUS_MIST
 	const SUBSTATUS_FOCUS_ENERGY
-	const_skip
+	const SUBSTATUS_UNDERWATER
 	const SUBSTATUS_SUBSTITUTE
 	const SUBSTATUS_RECHARGE
 	const SUBSTATUS_RAGE

constants/collision_constants.asm

@@ -10,6 +10,7 @@ DEF COLL_FLOOR             EQU $00
 DEF COLL_01                EQU $01 ; garbage
 DEF COLL_03                EQU $03 ; garbage
 DEF COLL_04                EQU $04 ; garbage
+DEF COLL_ROCKY_WALL		   EQU $06 ; added using this tutorial https://github.com/pret/pokecrystal/wiki/Rock-Climb
 DEF COLL_WALL              EQU $07
 DEF COLL_CUT_08            EQU $08 ; unused
 DEF COLL_TALL_GRASS_10     EQU $10 ; unused
@@ -26,7 +27,8 @@ DEF COLL_WHIRLPOOL         EQU $24
 DEF COLL_BUOY              EQU $27
 DEF COLL_CUT_28            EQU $28 ; garbage
 DEF COLL_WATER             EQU $29
-DEF COLL_ICE_2B            EQU $2b ; unused
+DEF COLL_DIVE_DOWN		   EQU $2a
+DEF COLL_DIVE_UP           EQU $2b
 DEF COLL_WHIRLPOOL_2C      EQU $2c ; unused
 DEF COLL_WATERFALL_RIGHT   EQU $30 ; unused
 DEF COLL_WATERFALL_LEFT    EQU $31 ; unused

constants/item_constants.asm

@@ -291,6 +291,12 @@ DEF HM01 EQU const_value
 	add_hm FLASH        ; f8
 	add_hm WHIRLPOOL    ; f9
 	add_hm WATERFALL    ; fa
+	; nihon hms - Bounce is left out under the pretense of it being Waterfall. We are making it a field move, though.
+	add_hm UPROOT
+	add_hm WATER_SPORT
+	add_hm STRONG_ARM
+	add_hm BRIGHT_MOSS
+	add_hm WIND_RIDE ; ADDME: this is impossible to add until 16bit items exist. add once it's there.
 DEF NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1
 
 MACRO add_mt

constants/menu_constants.asm

@@ -55,6 +55,11 @@
 	const MONMENUITEM_ROCKSMASH  ; 12
 	const MONMENUITEM_MILKDRINK  ; 13
 	const MONMENUITEM_SWEETSCENT ; 14
+	const MONMENUITEM_UPROOT
+	const MONMENUITEM_WATER_SPORT
+	const MONMENUITEM_STRONG_ARM
+	const MONMENUITEM_BRIGHT_MOSS
+	const MONMENUITEM_WIND_RIDE
 	; options
 	const MONMENUITEM_STATS      ; 15
 	const MONMENUITEM_SWITCH     ; 16

constants/move_effect_constants.asm

@@ -158,4 +158,7 @@
 	const EFFECT_FLY
 	const EFFECT_DEFENSE_CURL
 	const EFFECT_COIN_HURL
+	const EFFECT_SURF
+	const EFFECT_WHIRLPOOL
+	const EFFECT_BOUNCE
 DEF NUM_MOVE_EFFECTS EQU const_value

constants/sprite_constants.asm

@@ -145,6 +145,7 @@
 	const SPRITE_BALDING_GUY
 	const SPRITE_GAMEBOY_GIRL
 	const SPRITE_OVERWORLD_PIKACHU
+	const SPRITE_DIVE
 DEF NUM_OVERWORLD_SPRITES EQU const_value - 1
 
 ; SpriteMons indexes (see data/sprites/sprite_mons.asm)

constants/wram_constants.asm

@@ -267,12 +267,13 @@ DEF REGISTERED_POCKET EQU %11000000
 DEF REGISTERED_NUMBER EQU %00111111
 
 ; wPlayerState::
-DEF PLAYER_NORMAL    EQU 0
-DEF PLAYER_BIKE      EQU 1
-DEF PLAYER_SKATE     EQU 2
-DEF PLAYER_SURF      EQU 4
-DEF PLAYER_SURF_PIKA EQU 8
-DEF PLAYER_RUN       EQU 16
+DEF PLAYER_NORMAL    		EQU 0
+DEF PLAYER_BIKE      		EQU 1
+DEF PLAYER_SKATE     		EQU 2
+DEF PLAYER_SURF      		EQU 4
+DEF PLAYER_SURF_PIKA 		EQU 8
+DEF PLAYER_RUN       		EQU 16
+DEF PLAYER_WATER_SPORT		EQU 16
 
 ; wCelebiEvent::
 DEF CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2