Merge branch 'master' of https://github.com/pret/pokecrystal

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

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
 

docs/pic_animations.md

@@ -22,9 +22,9 @@ Animation data is in these files:
 - [gfx/pokemon/anims.asm](/gfx/pokemon/anims.asm):
   Main animations (played everywhere)
 
-- [gfx/pokemon/extras.asm](/gfx/pokemon/extras.asm):
-  Extra animations, appended to the main animation.  
+- [gfx/pokemon/idles.asm](/gfx/pokemon/idles.asm):
+  Idle animations, appended to the main animation.  
   Used in the status screen (blinking, tail wags etc.)
 
-- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_extras.asm](/gfx/pokemon/unown_extras.asm):
+- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_idles.asm](/gfx/pokemon/unown_idles.asm):
   Unown has its own animation data despite having an entry in the main tables.

engine/pokemon/move_mon.asm

@@ -220,7 +220,7 @@ endr
 	call FillPP
 	pop de
 	pop hl
-rept 4
+rept NUM_MOVES
 	inc de
 endr
 

macros/code.asm

@@ -1,11 +1,11 @@
 ; Syntactic sugar macros
 
 lb: MACRO ; r, hi, lo
-	ld \1, (\2 & $ff) << 8 + (\3 & $ff)
+	ld \1, (((\2) & $ff) << 8) | (((\3) & $ff))
 ENDM
 
 ln: MACRO ; r, hi, lo
-	ld \1, (\2 & $f) << 4 + (\3 & $f)
+	ld \1, (((\2) & $f) << 4) | (((\3) & $f))
 ENDM
 
 ldpixel: MACRO