summaryrefslogtreecommitdiff
path: root/engine/fruit_trees.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
committersurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
commit096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree0c0bedcd311ab83262e31cf6d9d4c37257143acc /engine/fruit_trees.asm
parent98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parentf6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/fruit_trees.asm')
-rw-r--r--engine/fruit_trees.asm35
1 files changed, 3 insertions, 32 deletions
diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm
index 6a40fb05c..5c74b3bff 100644
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -102,38 +102,9 @@ GetFruitTreeItem: ; 4408a
ret
; 44097
-FruitTreeItems: ; 44097
- db BERRY
- db BERRY
- db BERRY
- db BERRY
- db PSNCUREBERRY
- db PSNCUREBERRY
- db BITTER_BERRY
- db BITTER_BERRY
- db PRZCUREBERRY
- db PRZCUREBERRY
- db MYSTERYBERRY
- db MYSTERYBERRY
- db ICE_BERRY
- db ICE_BERRY
- db MINT_BERRY
- db BURNT_BERRY
- db RED_APRICORN
- db BLU_APRICORN
- db BLK_APRICORN
- db WHT_APRICORN
- db PNK_APRICORN
- db GRN_APRICORN
- db YLW_APRICORN
- db BERRY
- db PSNCUREBERRY
- db BITTER_BERRY
- db PRZCUREBERRY
- db ICE_BERRY
- db MINT_BERRY
- db BURNT_BERRY
-; 440b5
+
+INCLUDE "data/fruit_tree_items.asm"
+
FruitBearingTreeText: ; 440b5
text_jump _FruitBearingTreeText