From 0c39f6e273910be3b0ed9317e73c40615d789ae3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 12 Oct 2015 12:33:24 -0400 Subject: Happiness and Mystery Gift constants --- macros.asm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index 4370886b2..ca62491eb 100644 --- a/macros.asm +++ b/macros.asm @@ -149,3 +149,15 @@ bcd: MACRO shift endr ENDM + +ln: MACRO + if _NARG == 5 + lb \1, \2 << 4 + \3, \4 << 4 + \5 + else + if _NARG == 3 + ld \1, \2 << 4 + \3 + else + fail "incorrect number of arguments for ln" + endc + endc +ENDM -- cgit v1.2.3 From 8c2766e1b955b6b23a78d014340f51a281b2a114 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 11:37:10 -0400 Subject: ldtile and dwtile macros added and globally implemented --- macros.asm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index ca62491eb..a50c92b69 100644 --- a/macros.asm +++ b/macros.asm @@ -161,3 +161,18 @@ ln: MACRO endc endc ENDM + +dwtile: MACRO + dw (\1 << 4) + \2 + if _NARG > 2 + rept _NARG + -2 + dw \3 + shift + endr + endc +ENDM + +ldtile: MACRO + ld \1, (\2 << 4) + \3 +ENDM + -- cgit v1.2.3 From 12f9dca7a59afa64388ae3aebc6e04c383992da9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 14:29:34 -0400 Subject: Final descriptive label in tilesets/animations.asm --- macros.asm | 1 - 1 file changed, 1 deletion(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index a50c92b69..e366ad498 100644 --- a/macros.asm +++ b/macros.asm @@ -175,4 +175,3 @@ ENDM ldtile: MACRO ld \1, (\2 << 4) + \3 ENDM - -- cgit v1.2.3