From 249bad9551b1c9c29fd64bc36486eb6612427c3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 00:16:35 -0400 Subject: Replace EVENT_ALWAYS_THERE with -1 --- macros.asm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index cbd071b8f..de576302a 100644 --- a/macros.asm +++ b/macros.asm @@ -44,6 +44,14 @@ dbwww: MACRO dw \2, \3, \4 ENDM +dbankaddr: MACRO + dbw BANK(\1), \1 + ENDM + +daddrbank: MACRO + dwb \1, BANK(\1) + ENDM + dn: MACRO rept _NARG / 2 db (\1) << 4 + (\2) -- cgit v1.2.3 From 8fa8e29170fe78a7f9ed1b2396935af47e16c0c1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 02:23:48 -0400 Subject: - Update variable sprites to use constants rather than fixed values --- macros.asm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index de576302a..cbd071b8f 100644 --- a/macros.asm +++ b/macros.asm @@ -44,14 +44,6 @@ dbwww: MACRO dw \2, \3, \4 ENDM -dbankaddr: MACRO - dbw BANK(\1), \1 - ENDM - -daddrbank: MACRO - dwb \1, BANK(\1) - ENDM - dn: MACRO rept _NARG / 2 db (\1) << 4 + (\2) -- cgit v1.2.3 From 39524cdb766660a7bf6d60379040349652cecc04 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 Jul 2015 15:48:44 -0400 Subject: More enumeration of constants, more annotations of scripts. --- macros.asm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index cbd071b8f..ccbc4ed22 100644 --- a/macros.asm +++ b/macros.asm @@ -136,3 +136,9 @@ bcd: MACRO shift endr ENDM + +add_n_times: MACRO + rept \3 + add \1, \2 + endr +ENDM -- cgit v1.2.3 From 894955f9d922de5fc33e6c0aa7af9795dbcbc158 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 Jul 2015 18:10:10 -0400 Subject: Special script annotation, trainer constant enumeration, person-event structure update --- macros.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index ccbc4ed22..7b81469bc 100644 --- a/macros.asm +++ b/macros.asm @@ -13,6 +13,7 @@ INCLUDE "macros/pic.asm" INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" +INCLUDE "macros/trainer.asm" -- cgit v1.2.3 From bef792f2d21ccac0127aeffd9e0838aba81f44b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 03:51:52 -0400 Subject: More label updates, moved predefs to new file Also named most of the engine and event flag constants. --- macros.asm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index 7b81469bc..8147fc4ab 100644 --- a/macros.asm +++ b/macros.asm @@ -40,6 +40,11 @@ dbbw: MACRO dw \3 ENDM +dbww: MACRO + db \1 + dw \2, \3 + ENDM + dbwww: MACRO db \1 dw \2, \3, \4 -- cgit v1.2.3 From d9300a9becc9aa699b7191f87d8b493a93139ba2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 11:28:05 -0400 Subject: Fix unnecessary white space and retire add_n_times --- macros.asm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index 8147fc4ab..7ed3ecf36 100644 --- a/macros.asm +++ b/macros.asm @@ -142,9 +142,3 @@ bcd: MACRO shift endr ENDM - -add_n_times: MACRO - rept \3 - add \1, \2 - endr -ENDM -- cgit v1.2.3