diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/items/apricorn_balls.asm | 10 | ||||
-rw-r--r-- | data/mon_menu.asm | 46 | ||||
-rw-r--r-- | data/text/common_2.asm | 2 | ||||
-rw-r--r-- | data/text_buffers.asm | 9 |
4 files changed, 66 insertions, 1 deletions
diff --git a/data/items/apricorn_balls.asm b/data/items/apricorn_balls.asm new file mode 100644 index 00000000..814aeab2 --- /dev/null +++ b/data/items/apricorn_balls.asm @@ -0,0 +1,10 @@ +ApricornBalls: + ; apricorn, ball + db RED_APRICORN, LEVEL_BALL + db BLU_APRICORN, LURE_BALL + db YLW_APRICORN, MOON_BALL + db GRN_APRICORN, FRIEND_BALL + db WHT_APRICORN, FAST_BALL + db BLK_APRICORN, HEAVY_BALL + db PNK_APRICORN, LOVE_BALL + db -1 diff --git a/data/mon_menu.asm b/data/mon_menu.asm new file mode 100644 index 00000000..f2b9f3ac --- /dev/null +++ b/data/mon_menu.asm @@ -0,0 +1,46 @@ +; MonMenuOptionStrings indexes + const_def 1 + const MONMENUVALUE_STATS ; 1 + const MONMENUVALUE_SWITCH ; 2 + const MONMENUVALUE_ITEM ; 3 + const MONMENUVALUE_CANCEL ; 4 + const MONMENUVALUE_MOVE ; 5 + const MONMENUVALUE_MAIL ; 6 + const MONMENUVALUE_ERROR ; 7 + +MonMenuOptionStrings: +; entries correspond to MONMENUVALUE_* constants + db "STATS@" + db "SWITCH@" + db "ITEM@" + db "CANCEL@" + db "MOVE@" + db "MAIL@" + db "ERROR!@" + +MonMenuOptions: +; category, item, value; actions are in PokemonActionSubmenu (see engine/pokemon/mon_menu.asm) +; moves + db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT + db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY + db MONMENU_FIELD_MOVE, MONMENUITEM_SURF, SURF + db MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH, STRENGTH + db MONMENU_FIELD_MOVE, MONMENUITEM_FLASH, FLASH + db MONMENU_FIELD_MOVE, MONMENUITEM_WATERFALL, WATERFALL + db MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL, WHIRLPOOL + db MONMENU_FIELD_MOVE, MONMENUITEM_DIG, DIG + db MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT, TELEPORT + db MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED + db MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT, HEADBUTT + db MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH, ROCK_SMASH + db MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK + db MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT +; options + db MONMENU_MENUOPTION, MONMENUITEM_STATS, MONMENUVALUE_STATS + db MONMENU_MENUOPTION, MONMENUITEM_SWITCH, MONMENUVALUE_SWITCH + db MONMENU_MENUOPTION, MONMENUITEM_ITEM, MONMENUVALUE_ITEM + db MONMENU_MENUOPTION, MONMENUITEM_CANCEL, MONMENUVALUE_CANCEL + db MONMENU_MENUOPTION, MONMENUITEM_MOVE, MONMENUVALUE_MOVE + db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL + db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR + db -1 diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 05ee596f..d61544e2 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1310,7 +1310,7 @@ UnknownText_0x1c4693:: line "area was exceeded." done -UnknownText_0x1c46b7:: +_WindowPoppingErrorText:: text "No windows avail-" line "able for popping." done diff --git a/data/text_buffers.asm b/data/text_buffers.asm new file mode 100644 index 00000000..7c28c11e --- /dev/null +++ b/data/text_buffers.asm @@ -0,0 +1,9 @@ +StringBufferPointers:: +; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) + dw wStringBuffer3 ; 0 + dw wStringBuffer4 ; 1 + dw wStringBuffer5 ; 2 + dw wStringBuffer2 ; 3 + dw wStringBuffer1 ; 4 + dw wEnemyMonNick ; 5 + dw wBattleMonNick ; 6 |