From 1e2ff967aa11ed0bcdd1dd069bde67724d3851c2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 14 Oct 2015 09:29:15 -0400 Subject: Replaced "ldtile" and "dwtile" with the "tile" equs macro --- macros.asm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index e366ad498..60cc07a23 100644 --- a/macros.asm +++ b/macros.asm @@ -162,16 +162,4 @@ ln: MACRO 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 +tile EQUS "+ $10 *" -- cgit v1.2.3 From f53d65c536096213b6826765f81a0f436c88fe72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 17 Oct 2015 17:18:52 -0400 Subject: Battle intro animation function --- macros.asm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index 60cc07a23..e1f3fa31b 100644 --- a/macros.asm +++ b/macros.asm @@ -78,6 +78,13 @@ bigdw: MACRO ; big-endian word dx 2, \1 ENDM +dba: MACRO ; dbw bank, address + dbw BANK(\1), \1 + ENDM + +dab: MACRO ; dwb address, bank + dwb \1, BANK(\1) + ENDM lb: MACRO ; r, hi, lo ld \1, (\2) << 8 + (\3) -- cgit v1.2.3 From 0a244e043c83dff064d7e3ec054a587c7f999d0d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Oct 2015 10:23:58 -0400 Subject: Move battle start animation functions to its own file --- macros.asm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index e1f3fa31b..147468cdd 100644 --- a/macros.asm +++ b/macros.asm @@ -111,7 +111,7 @@ dwcoord: MACRO endr ENDM -ldcoord: MACRO +ldcoord_a: MACRO if _NARG < 3 ld [TileMap + SCREEN_WIDTH * (\2) + (\1)], a else @@ -119,6 +119,14 @@ ldcoord: MACRO endc ENDM +lda_coord: MACRO + if _NARG < 3 + ld a, [TileMap + SCREEN_WIDTH * (\2) + (\1)] + else + ld a, [\3 + SCREEN_WIDTH * (\2) + (\1)] + endc + ENDM + ; pic animations frame: MACRO db \1 -- cgit v1.2.3 From 119d6b411922eb7b375691b81fc97c9b334f4167 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Oct 2015 10:34:19 -0400 Subject: About time I got to these functions --- macros.asm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index 147468cdd..b91fa2e3d 100644 --- a/macros.asm +++ b/macros.asm @@ -14,6 +14,7 @@ INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" INCLUDE "macros/trainer.asm" +INCLUDE "macros/map_setup.asm" @@ -90,12 +91,16 @@ lb: MACRO ; r, hi, lo ld \1, (\2) << 8 + (\3) ENDM +ln: MACRO ; r, hi, lo + ld \1, (\2) << 4 + (\3) + ENDM bccoord equs "coord bc," decoord equs "coord de," hlcoord equs "coord hl," coord: MACRO +; register, x, y[, origin] if _NARG < 4 ld \1, TileMap + SCREEN_WIDTH * (\3) + (\2) else @@ -165,16 +170,4 @@ bcd: MACRO 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 - tile EQUS "+ $10 *" -- cgit v1.2.3 From 4d17f6e1f6d41b91f5a5de71984a7c6f2bd0041c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Oct 2015 19:49:19 -0400 Subject: Address comments on PR 322 --- macros.asm | 1 - 1 file changed, 1 deletion(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index b91fa2e3d..16b298268 100644 --- a/macros.asm +++ b/macros.asm @@ -14,7 +14,6 @@ INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" INCLUDE "macros/trainer.asm" -INCLUDE "macros/map_setup.asm" -- cgit v1.2.3