Merge pull request #510 from Rangi42/master

Use explicit HELD_NONE and NO_LIMITS, not 0s; also fix #511

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
 

data/events/unown_walls.asm

@@ -12,7 +12,7 @@ else
 x = 2 * (\1 - "A")
 endc
 	db x
-shift
+	shift
 endr
 	db -1 ; end
 ENDM

data/party_menu_qualities.asm

@@ -13,7 +13,7 @@
 partymenuqualities: MACRO
 rept _NARG
 	db PARTYMENUQUALITY_\1
-shift
+	shift
 endr
 	db -1 ; end
 ENDM

data/pokemon/unown_words.asm

@@ -1,9 +1,9 @@
 unownword: MACRO
 x = 1
-	rept STRLEN(\1)
+rept STRLEN(\1)
 	db STRSUB(\1, x, 1) - $40
 x = x + 1
-	endr
+endr
 	db -1
 ENDM
 

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):
+- [gfx/pokemon/idles.asm](/gfx/pokemon/idles.asm):
-  Extra animations, appended to the main animation.  
+  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/battle/effect_commands.asm

@@ -2404,10 +2404,10 @@ GetFailureResultText: ; 350e4
 	ld hl, wCurDamage
 	ld a, [hli]
 	ld b, [hl]
-	rept 3
+rept 3
 	srl a
 	rr b
-	endr
+endr
 	ld [hl], b
 	dec hl
 	ld [hli], a

engine/gfx/pic_animation.asm

@@ -53,14 +53,14 @@ AnimateMon_Unused: ; d003a
 ; d0042
 
 pokeanim: MACRO
-	rept _NARG
+rept _NARG
 ; Workaround for a bug where macro args can't come after the start of a symbol
 if !DEF(\1_POKEANIM)
 \1_POKEANIM EQUS "PokeAnim_\1_"
 endc
 	db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
 	shift
-	endr
+endr
 	db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2
 ENDM
 

engine/items/item_effects.asm

@@ -806,10 +806,10 @@ HeavyBallMultiplier:
 	ld b, h
 	ld c, l
 
-	rept 4
+rept 4
 	srl b
 	rr c
-	endr
+endr
 	call .subbc
 
 	srl b
@@ -2529,9 +2529,9 @@ BattleRestorePP: ; f652
 	push hl
 	push de
 	push bc
-	rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves
+rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves
 	inc de
-	endr
+endr
 	ld bc, MON_PP - MON_MOVES
 	add hl, bc
 	ld a, [hl]

engine/pokemon/move_mon.asm

@@ -115,20 +115,20 @@ GeneratePartyMonStats: ; d906
 	and a
 	jr nz, .randomlygeneratemoves
 	ld de, wEnemyMonMoves
-	rept NUM_MOVES + -1
+rept NUM_MOVES + -1
 	ld a, [de]
 	inc de
 	ld [hli], a
-	endr
+endr
 	ld a, [de]
 	ld [hl], a
 	jr .next
 
 .randomlygeneratemoves
 	xor a
-	rept NUM_MOVES + -1
+rept NUM_MOVES + -1
 	ld [hli], a
-	endr
+endr
 	ld [hl], a
 	ld [wBuffer1], a
 	predef FillMoves
@@ -220,7 +220,7 @@ endr
 	call FillPP
 	pop de
 	pop hl
-rept 4
+rept NUM_MOVES
 	inc de
 endr
 

macros/coords.asm

@@ -26,11 +26,11 @@ ENDM
 
 dwcoord: MACRO
 ; x, y
-	rept _NARG / 2
+rept _NARG / 2
 	dw (\2) * SCREEN_WIDTH + (\1) + wTileMap
 	shift
 	shift
-	endr
+endr
 ENDM
 
 ldcoord_a: MACRO

mobile/mobile_5f.asm

@@ -1651,17 +1651,17 @@ Function17da31: ; 17da31
 
 Unknown_17da8c:
 x = 0
-	rept 8
+rept 8
 	db 1 << x
 x = x + 1
-	endr
+endr
 
 Unknown_17da94:
 x = 0
-	rept 8
+rept 8
 	db (1 << x) ^ $ff
 x = x + 1
-	endr
+endr
 ; 17da9c
 
 Function17da9c: ; 17da9c