diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-23 17:50:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-23 17:50:50 -0400 |
| commit | 0a62d48df2d73c11ca13e4c3015d3d3abfa20292 (patch) | |
| tree | 530f89782772bb76a76fbdd28247f1c6e3248483 /engine/menu/start_sub_menus.asm | |
| parent | Merge pull request #243 from Nog-Frog/rename-unused-cd40 (diff) | |
| download | pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.gz pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.xz pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.zip | |
Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
Diffstat (limited to 'engine/menu/start_sub_menus.asm')
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 947837e3..04efe711 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -446,55 +446,9 @@ CannotGetOffHereText: TX_FAR _CannotGetOffHereText db "@" -; items which bring up the party menu when used -UsableItems_PartyMenu: - db MOON_STONE - db ANTIDOTE - db BURN_HEAL - db ICE_HEAL - db AWAKENING - db PARLYZ_HEAL - db FULL_RESTORE - db MAX_POTION - db HYPER_POTION - db SUPER_POTION - db POTION - db FIRE_STONE - db THUNDER_STONE - db WATER_STONE - db HP_UP - db PROTEIN - db IRON - db CARBOS - db CALCIUM - db RARE_CANDY - db LEAF_STONE - db FULL_HEAL - db REVIVE - db MAX_REVIVE - db FRESH_WATER - db SODA_POP - db LEMONADE - db X_ATTACK - db X_DEFEND - db X_SPEED - db X_SPECIAL - db PP_UP - db ETHER - db MAX_ETHER - db ELIXER - db MAX_ELIXER - db $ff +INCLUDE "data/party_items.asm" -; items which close the item menu when used -UsableItems_CloseMenu: - db ESCAPE_ROPE - db ITEMFINDER - db POKE_FLUTE - db OLD_ROD - db GOOD_ROD - db SUPER_ROD - db $ff +INCLUDE "data/overworld_items.asm" StartMenu_TrainerInfo: call GBPalWhiteOut |