diff options
| -rw-r--r-- | data/items/key_items.asm | 2 | ||||
| -rw-r--r-- | data/items/tm_prices.asm | 2 | ||||
| -rw-r--r-- | data/pokemon/menu_icons.asm | 2 | ||||
| -rw-r--r-- | macros/asserts.asm | 16 |
4 files changed, 6 insertions, 16 deletions
diff --git a/data/items/key_items.asm b/data/items/key_items.asm index 97f5f093..1750811f 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -1,5 +1,5 @@ KeyItemFlags: - bit_array KeyItemFlags + bit_array dbit FALSE ; MASTER_BALL dbit FALSE ; ULTRA_BALL dbit FALSE ; GREAT_BALL diff --git a/data/items/tm_prices.asm b/data/items/tm_prices.asm index 89501e32..7dc500ec 100644 --- a/data/items/tm_prices.asm +++ b/data/items/tm_prices.asm @@ -1,6 +1,6 @@ TechnicalMachinePrices: ; In thousands (nybbles). - nybble_array TechnicalMachinePrices + nybble_array nybble 3 ; TM01 nybble 2 ; TM02 nybble 2 ; TM03 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index d6ed5b35..207c31e9 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -1,5 +1,5 @@ MonPartyData: - nybble_array MonPartyData + nybble_array nybble ICON_GRASS ; Bulbasaur nybble ICON_GRASS ; Ivysaur nybble ICON_GRASS ; Venusaur diff --git a/macros/asserts.asm b/macros/asserts.asm index 11e0ee99..132006f9 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -11,7 +11,7 @@ MACRO? _redef_current_label DEF \1 EQUS #{__SCOPE__} ENDC ENDC - if !DEF(\1) + IF !DEF(\1) DEF \1 EQUS \2 {\1}: ENDC @@ -68,12 +68,7 @@ ENDM MACRO? nybble_array DEF CURRENT_NYBBLE_ARRAY_VALUE = 0 DEF CURRENT_NYBBLE_ARRAY_LENGTH = 0 - IF _NARG == 1 - REDEF CURRENT_NYBBLE_ARRAY_START EQUS "\1" - ELSE - REDEF CURRENT_NYBBLE_ARRAY_START EQUS "._nybble_array\@" - {CURRENT_NYBBLE_ARRAY_START}: - ENDC + _redef_current_label CURRENT_NYBBLE_ARRAY_START, "._nybble_array\@", \# ENDM MACRO? nybble @@ -103,12 +98,7 @@ ENDM MACRO? bit_array DEF CURRENT_BIT_ARRAY_VALUE = 0 DEF CURRENT_BIT_ARRAY_LENGTH = 0 - IF _NARG == 1 - REDEF CURRENT_BIT_ARRAY_START EQUS "\1" - ELSE - REDEF CURRENT_BIT_ARRAY_START EQUS "._bit_array\@" - {CURRENT_BIT_ARRAY_START}: - ENDC + _redef_current_label CURRENT_BIT_ARRAY_START, "._bit_array\@", \# ENDM MACRO? dbit |