diff options
Diffstat (limited to 'constants/item_constants.asm')
| -rw-r--r-- | constants/item_constants.asm | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index fa2b1a4d0..2a4d8ee25 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -197,6 +197,8 @@ const MIRAGE_MAIL ; bd const ITEM_BE ; be +__tmhm_value__ = 1 + add_tm: MACRO ; Defines three constants: ; - TM_\1: the item id, starting at $bf @@ -205,17 +207,17 @@ add_tm: MACRO ; The first usage also defines TM01 as the first TM item id. if !DEF(TM01) TM01 EQU const_value - enum_start 1 endc -if __enum__ < 10 -MOVE_FOR_TM EQUS "TM0{d:__enum__}_MOVE" +if __tmhm_value__ < 10 +MOVE_FOR_TM EQUS "TM0{d:__tmhm_value__}_MOVE" else -MOVE_FOR_TM EQUS "TM{d:__enum__}_MOVE" +MOVE_FOR_TM EQUS "TM{d:__tmhm_value__}_MOVE" endc MOVE_FOR_TM = \1 PURGE MOVE_FOR_TM const TM_\1 - enum \1_TMNUM +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 ENDM ; see data/moves/tmhm_moves.asm for moves @@ -271,7 +273,7 @@ ENDM add_tm FIRE_PUNCH ; f0 add_tm FURY_CUTTER ; f1 add_tm NIGHTMARE ; f2 -NUM_TMS EQU __enum__ - 1 +NUM_TMS EQU __tmhm_value__ - 1 add_hm: MACRO ; Defines three constants: @@ -282,7 +284,7 @@ add_hm: MACRO if !DEF(HM01) HM01 EQU const_value endc -HM_VALUE EQU __enum__ - NUM_TMS +HM_VALUE EQU __tmhm_value__ - NUM_TMS if HM_VALUE < 10 MOVE_FOR_HM EQUS "HM0{d:HM_VALUE}_MOVE" else @@ -292,7 +294,8 @@ MOVE_FOR_HM = \1 PURGE MOVE_FOR_HM PURGE HM_VALUE const HM_\1 - enum \1_TMNUM +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 ENDM add_hm CUT ; f3 @@ -302,13 +305,13 @@ ENDM add_hm FLASH ; f7 add_hm WHIRLPOOL ; f8 add_hm WATERFALL ; f9 -NUM_HMS EQU __enum__ - NUM_TMS - 1 +NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1 add_mt: MACRO ; Defines two constants: ; - \1_TMNUM: the learnable TM/HM flag, starting at 58 ; - MT##_MOVE: alias for the move id, equal to the value of \1 -MT_VALUE EQU __enum__ - NUM_TMS - NUM_HMS +MT_VALUE EQU __tmhm_value__ - NUM_TMS - NUM_HMS if MT_VALUE < 10 MOVE_FOR_MT EQUS "MT0{d:MT_VALUE}_MOVE" else @@ -317,15 +320,16 @@ endc MOVE_FOR_MT = \1 PURGE MOVE_FOR_MT PURGE MT_VALUE - enum \1_TMNUM +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 ENDM add_mt FLAMETHROWER add_mt THUNDERBOLT add_mt ICE_BEAM -NUM_TUTORS = __enum__ - NUM_TMS - NUM_HMS - 1 +NUM_TUTORS = __tmhm_value__ - NUM_TMS - NUM_HMS - 1 -NUM_TM_HM_TUTOR EQU __enum__ - 1 +NUM_TM_HM_TUTOR EQU __tmhm_value__ - 1 const ITEM_FA ; fa |