From 401d6e7f36e86aa246a2c0591195e1f0f01e879f Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 17:10:37 -0500 Subject: More syncing with pokered from April 8, 2016 to present --- macros.asm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'macros.asm') 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 -- cgit v1.3.1-sl0p