aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-13 17:59:46 -0400
commit31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch)
tree6941b2b38a2615223b30e8cceb7aab636768dabd /engine/menu
parentSplit default names strings into separate lines to make it less unpleasant to... (diff)
parentFix typo: ninetails.asm -> ninetales.asm (diff)
downloadpokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz
pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menu')
-rw-r--r--engine/menu/bills_pc.asm3
-rwxr-xr-xengine/menu/pokedex.asm3
2 files changed, 0 insertions, 6 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index d367bdb5..0be2e6b0 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -343,9 +343,6 @@ BillsPCMenuText: ; 216e1 (8:56e1)
next "DEPOSIT ", $4a
next "RELEASE ", $4a
next "CHANGE BOX"
-IF DEF(_YELLOW)
- next "PRINT BOX"
-ENDC
next "SEE YA!"
db "@"
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index a58523e8..3898ef43 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -367,9 +367,6 @@ PokedexMenuItemsText: ; 402af (10:42af)
db "DATA"
next "CRY"
next "AREA"
-IF DEF(_YELLOW)
- next "PRNT"
-ENDC
next "QUIT@"
; tests if a pokemon's bit is set in the seen or owned pokemon bit fields