mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-17 02:30: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)
120 lines
3.8 KiB
NASM
120 lines
3.8 KiB
NASM
; MenuHeader flags
|
|
const_def
|
|
shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set.
|
|
shift_const MENU_UNUSED_1
|
|
shift_const MENU_UNUSED_2
|
|
shift_const MENU_NO_CLICK_SFX
|
|
shift_const MENU_SPRITE_ANIMS
|
|
shift_const MENU_UNUSED_3
|
|
shift_const MENU_BACKUP_TILES
|
|
shift_const MENU_BACKUP_TILES_2
|
|
|
|
; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags
|
|
; Per flag the comment specifies which menus actually implement it
|
|
const_def
|
|
shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu
|
|
shift_const STATICMENU_ENABLE_SELECT ; VerticalMenu/_2DMenu
|
|
shift_const STATICMENU_ENABLE_LEFT_RIGHT ; DoNthMenu/SetUpMenu
|
|
shift_const STATICMENU_ENABLE_START ; DoNthMenu/SetUpMenu
|
|
shift_const STATICMENU_PLACE_TITLE ; VerticalMenu
|
|
shift_const STATICMENU_WRAP ; All
|
|
shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu
|
|
shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu
|
|
|
|
; ScrollingMenu MenuData flags
|
|
const_def
|
|
shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL
|
|
shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH
|
|
shift_const SCROLLINGMENU_ENABLE_LEFT
|
|
shift_const SCROLLINGMENU_ENABLE_RIGHT
|
|
shift_const SCROLLINGMENU_DISPLAY_ARROWS
|
|
shift_const SCROLLINGMENU_ENABLE_FUNCTION3
|
|
shift_const SCROLLINGMENU_ENABLE_START
|
|
shift_const SCROLLINGMENU_ENABLE_SELECT
|
|
|
|
; ScrollingMenu items structure format
|
|
const_def 1
|
|
const SCROLLINGMENU_ITEMS_NORMAL
|
|
const SCROLLINGMENU_ITEMS_QUANTITY
|
|
|
|
; MonMenuOptions indexes (see data/mon_menu.asm)
|
|
; used by PokemonActionSubmenu (see engine/pokemon/mon_menu.asm)
|
|
const_def 1
|
|
; moves
|
|
const MONMENUITEM_CUT ; 1
|
|
const MONMENUITEM_FLY ; 2
|
|
const MONMENUITEM_SURF ; 3
|
|
const MONMENUITEM_STRENGTH ; 4
|
|
const MONMENUITEM_WATERFALL ; 5
|
|
const MONMENUITEM_FLASH ; 6
|
|
const MONMENUITEM_WHIRLPOOL ; 7
|
|
const MONMENUITEM_DIG ; 8
|
|
const MONMENUITEM_TELEPORT ; 9
|
|
const MONMENUITEM_SOFTBOILED ; 10
|
|
const MONMENUITEM_HEADBUTT ; 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
|
|
const MONMENUITEM_ITEM ; 17
|
|
const MONMENUITEM_CANCEL ; 18
|
|
const MONMENUITEM_MOVE ; 19
|
|
const MONMENUITEM_MAIL ; 20
|
|
const MONMENUITEM_ERROR ; 21
|
|
DEF NUM_MONMENUITEMS EQU const_value - 1
|
|
|
|
; MonMenuOptions categories
|
|
DEF MONMENU_FIELD_MOVE EQU 0
|
|
DEF MONMENU_MENUOPTION EQU 1
|
|
|
|
DEF NUM_MONMENU_ITEMS EQU 8
|
|
|
|
; start/select menu return values
|
|
DEF HMENURETURN_SCRIPT EQU %10000000
|
|
DEF HMENURETURN_ASM EQU %11111111
|
|
|
|
; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
|
|
const_def
|
|
const PARTYMENUACTION_CHOOSE_POKEMON
|
|
const PARTYMENUACTION_HEALING_ITEM
|
|
const PARTYMENUACTION_SWITCH
|
|
const PARTYMENUACTION_TEACH_TMHM
|
|
const PARTYMENUACTION_MOVE
|
|
const PARTYMENUACTION_EVO_STONE
|
|
const PARTYMENUACTION_GIVE_MON
|
|
const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
|
|
const PARTYMENUACTION_GIVE_ITEM
|
|
const PARTYMENUACTION_MOBILE ; mobile
|
|
DEF NUM_PARTYMENUACTIONS EQU const_value
|
|
; PrintPartyMenuActionText arguments (see engine/pokemon/party_menu.asm)
|
|
const_next $f0
|
|
const PARTYMENUTEXT_HEAL_PSN
|
|
const PARTYMENUTEXT_HEAL_BRN
|
|
const PARTYMENUTEXT_HEAL_FRZ
|
|
const PARTYMENUTEXT_HEAL_SLP
|
|
const PARTYMENUTEXT_HEAL_PAR
|
|
const PARTYMENUTEXT_HEAL_HP
|
|
const PARTYMENUTEXT_HEAL_ALL
|
|
const PARTYMENUTEXT_REVIVE
|
|
const PARTYMENUTEXT_LEVEL_UP
|
|
const PARTYMENUTEXT_HEAL_CONFUSION
|
|
|
|
; Naming types (see engine/menus/naming_screen.asm)
|
|
const_def
|
|
const NAME_MON
|
|
const NAME_PLAYER
|
|
const NAME_RIVAL
|
|
const NAME_MOM
|
|
const NAME_BOX
|
|
const NAME_FRIEND
|
|
const NAME_6 ; duplicate of NAME_MON
|
|
const NAME_7 ; duplicate of NAME_MON
|
|
DEF NUM_NAME_TYPES EQU const_value
|