summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 17:10:37 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 17:10:37 -0500
commit401d6e7f36e86aa246a2c0591195e1f0f01e879f (patch)
tree1a8c702fa533d2923c952e9f6b69bb28d657e357 /macros.asm
parentc979b3bb03b121dd03a800df74144cd69a74601a (diff)
More syncing with pokered
from April 8, 2016 to present
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm13
1 files changed, 9 insertions, 4 deletions
diff --git a/macros.asm b/macros.asm
index 235daf73..1875d00c 100644
--- a/macros.asm
+++ b/macros.asm
@@ -355,6 +355,15 @@ TX_BILLS_PC EQUS "db $fd"
TX_POKEMART_CLERK EQUS "db $fe"
TX_POKECENTER_NURSE EQUS "db $ff"
+TX_MART: MACRO
+ db $FE, _NARG
+ rept _NARG
+ db \1
+ shift
+ endr
+ db $FF
+ ENDM
+
; Predef macro.
predef_const: MACRO
const \1PredefID
@@ -406,10 +415,6 @@ tx_pre_jump: MACRO
jp PrintPredefTextID
ENDM
-sound0x0A: macro
- db $11
-endm
-
WALK EQU $FE
STAY EQU $FF