diff options
author | mid-kid <esteve.varela@gmail.com> | 2018-06-01 09:02:24 +0200 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2018-06-01 09:02:24 +0200 |
commit | 761edc7db37df18a6e7f41e0d3bb9edd1e3cf721 (patch) | |
tree | ae116b7a1e65bf0b7c0cc4e574a5655a074e8e7a /constants/item_constants.asm | |
parent | 8d10a987a375a93045659422779c30d25d1aa89b (diff) | |
parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'constants/item_constants.asm')
-rw-r--r-- | constants/item_constants.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index ec5f5f211..ec70ebf01 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -207,19 +207,6 @@ endc enum \1_TMNUM ENDM -add_hm: MACRO -if !DEF(HM01) -HM01 = const_value -endc - define _\@_1, "HM_\1" - const _\@_1 - enum \1_TMNUM -ENDM - -add_mt: MACRO - enum \1_TMNUM -ENDM - ; see data/moves/tmhm_moves.asm for moves add_tm DYNAMICPUNCH ; bf add_tm HEADBUTT ; c0 @@ -275,6 +262,15 @@ ENDM add_tm NIGHTMARE ; f2 NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC +add_hm: MACRO +if !DEF(HM01) +HM01 = const_value +endc + define _\@_1, "HM_\1" + const _\@_1 + enum \1_TMNUM +ENDM + add_hm CUT ; f3 add_hm FLY ; f4 add_hm SURF ; f5 @@ -284,6 +280,10 @@ NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC add_hm WATERFALL ; f9 NUM_HMS = const_value - HM01 +add_mt: MACRO + enum \1_TMNUM +ENDM + add_mt FLAMETHROWER add_mt THUNDERBOLT add_mt ICE_BEAM |