From 31cce83e9b3bab01d8a605b170549fbd25ca5fee Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 13:47:58 -0500 Subject: Move lots of data tables into individual data/ files (This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.) --- engine/fruit_trees.asm | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'engine/fruit_trees.asm') diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 6a40fb05c..134adda60 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -103,36 +103,7 @@ GetFruitTreeItem: ; 4408a ; 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 +INCLUDE "data/fruit_tree_items.asm" ; 440b5 FruitBearingTreeText: ; 440b5 -- cgit v1.2.3 From f1f84743f7759a0f808f935add82439ba6637d2b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 22:44:25 -0500 Subject: Keep table labels in the same files as their contents. --- engine/fruit_trees.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/fruit_trees.asm') diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 134adda60..5c74b3bff 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -102,9 +102,9 @@ GetFruitTreeItem: ; 4408a ret ; 44097 -FruitTreeItems: ; 44097 + INCLUDE "data/fruit_tree_items.asm" -; 440b5 + FruitBearingTreeText: ; 440b5 text_jump _FruitBearingTreeText -- cgit v1.2.3