diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/item_constants.asm | 26 | ||||
| -rw-r--r-- | constants/item_data_constants.asm | 1 | ||||
| -rw-r--r-- | constants/script_constants.asm | 2 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 2 |
4 files changed, 16 insertions, 15 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 diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index 055e24656..e503f3057 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -28,6 +28,7 @@ ITEMMENU_CLOSE EQU 6 CANT_SELECT_F EQU 6 CANT_TOSS_F EQU 7 +NO_LIMITS EQU 0 CANT_SELECT EQU 1 << CANT_SELECT_F CANT_TOSS EQU 1 << CANT_TOSS_F diff --git a/constants/script_constants.asm b/constants/script_constants.asm index e1feaaed9..3b9220095 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -22,7 +22,7 @@ NUM_MEM_BUFFERS EQU const_value const HAVE_AMOUNT ; 1 const HAVE_LESS ; 2 -; checkpokeitem return values +; checkpokemail return values const_def const POKEMAIL_WRONG_MAIL ; 0 const POKEMAIL_CORRECT ; 1 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 0e63cce52..caa6743c2 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; OverworldSprites indexes (see data/sprites.asm) +; OverworldSprites indexes (see data/sprites/sprites.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 |