mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-16 18:20:50 +12:00
093bda0253
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)
42 lines
1.9 KiB
NASM
42 lines
1.9 KiB
NASM
MonMenuOptions:
|
|
; category, item, value; actions are in PokemonActionSubmenu (see engine/pokemon/mon_menu.asm)
|
|
table_width 4, MonMenuOptions
|
|
; moves
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_SURF, SURF
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH, STRENGTH
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_FLASH, FLASH
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_WATERFALL, WATERFALL
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL, WHIRLPOOL
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_DIG, DIG
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT, TELEPORT
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT, HEADBUTT
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH, ROCK_SMASH
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK ; TESTME: Am I high or is this wrong?
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_UPROOT, UPROOT
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_WATER_SPORT, WATER_SPORT
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_STRONG_ARM, STRONG_ARM
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_BRIGHT_MOSS, BRIGHT_MOSS
|
|
dbbw MONMENU_FIELD_MOVE, MONMENUITEM_WIND_RIDE, WIND_RIDE
|
|
; options
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_STATS, .stats
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_SWITCH, .switch
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_ITEM, .item
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_CANCEL, .cancel
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_MOVE, .move
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_MAIL, .mail
|
|
dbbw MONMENU_MENUOPTION, MONMENUITEM_ERROR, .error
|
|
assert_table_length NUM_MONMENUITEMS
|
|
db -1
|
|
|
|
.stats: db "STATS@"
|
|
.switch: db "SWITCH@"
|
|
.item: db "ITEM@"
|
|
.cancel: db "CANCEL@"
|
|
.move: db "MOVE@"
|
|
.mail: db "MAIL@"
|
|
.error: db "ERROR!@"
|