From a049ef74f88a98a0925f5b918578608945445c8e Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Wed, 16 May 2012 21:16:28 -0500 Subject: [PATCH] use db instead of item_frag on ItemFragment remote chunks --- extras/crystal.py | 2 +- preprocessor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/crystal.py b/extras/crystal.py index 2d0c12fea..ecda3d338 100644 --- a/extras/crystal.py +++ b/extras/crystal.py @@ -3267,7 +3267,7 @@ class ItemFragment(Command): """used by ItemFragmentParam and PeopleEvent (for items placed on a map)""" size = 2 - macro_name = "item_frag" + macro_name = "db" base_label = "ItemFragment_" override_byte_check = True param_types = { diff --git a/preprocessor.py b/preprocessor.py index 42f64a01e..782ff80fb 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -443,7 +443,7 @@ def macro_translator(macro, token, line): # "db" is a macro because of TextEndingCommand # rgbasm can handle "db" so no preprocessing is required # (don't check its param count) - if macro.macro_name == "db" and macro == TextEndingCommand: + if macro.macro_name == "db" and macro in [TextEndingCommand, ItemFragment]: sys.stdout.write(original_line) return