thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 16:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Strong Arm, Water Sport, and more HMs.

Browse source 
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)
This commit is contained in:
Llinos Evans 2024-12-28 06:26:01 +00:00
parent 4b11121836
commit 093bda0253
77 changed files with 993 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

42
engine/pokemon/mon_menu.asm
View file

@ -141,6 +141,11 @@ PokemonActionSubmenu:
dbw MONMENUITEM_WATERFALL, MonMenu_Waterfall
dbw MONMENUITEM_ROCKSMASH, MonMenu_RockSmash
dbw MONMENUITEM_SWEETSCENT, MonMenu_SweetScent
dbw MONMENUITEM_UPROOT, MonMenu_Uproot
dbw MONMENUITEM_WATER_SPORT,MonMenu_WaterSport
dbw MONMENUITEM_STRONG_ARM, MonMenu_StrongArm
dbw MONMENUITEM_BRIGHT_MOSS,MonMenu_BrightMoss
dbw MONMENUITEM_WIND_RIDE, MonMenu_WindRide
dbw MONMENUITEM_STATS, OpenPartyStats
dbw MONMENUITEM_SWITCH, SwitchPartyMons
dbw MONMENUITEM_ITEM, GiveTakePartyMonItem
@ -794,6 +799,43 @@ MonMenu_SweetScent:
ld a, $2
ret
MonMenu_Uproot:
ld a, $3 ; will be unused for now, so let's stay in the party menu
ret
MonMenu_WaterSport:
farcall WaterSportFunction
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .Fail
ld b, $4
ld a, $2
ret
.Fail:
ld a, $3
ret
MonMenu_StrongArm: ; just rock climb...
farcall StrongArmFunction
ld a, [wFieldMoveSucceeded]
cp $1
jr nz, .Fail
ld b, $4
ld a, $2
ret
.Fail:
ld a, $3
ret
MonMenu_BrightMoss:
ld a, $3 ; will be unused for now, so let's stay in the party menu
ret
MonMenu_WindRide:
ld a, $3 ; will be unused for now, so let's stay in the party menu
ret
ChooseMoveToDelete:
ld hl, wOptions
ld a, [hl]