From 0064333e4aa1bacb42f840ba67d38a9aced8816e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 26 Jan 2021 02:16:26 -0500 Subject: Clean up scrcmd.c --- asm/macros/event.inc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'asm/macros') diff --git a/asm/macros/event.inc b/asm/macros/event.inc index eafd19b1c..7fff4d987 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -930,6 +930,17 @@ .4byte \text .endm + @ Formatting for the braille window, to be put at the start of a pointer used by braillemessage. + @ These are from RS and are ignored in Emerald (see ScrCmd_braillemessage, and comment above) + .macro brailleformat winLeft:req, winTop:req, winRight:req, winBottom:req, textLeft:req, textTop:req + .byte \winLeft + .byte \winTop + .byte \winRight + .byte \winBottom + .byte \textLeft + .byte \textTop + .endm + @ Gives the player one of the specified (species) Pokemon at level level holding item. The trailing 0s are unused parameters .macro givemon species:req, level:req, item:req .byte 0x79 @@ -1550,7 +1561,7 @@ .2byte \y .endm - .macro cmdD8 + .macro selectapproachingtrainer .byte 0xd8 .endm @@ -1562,7 +1573,7 @@ .byte 0xda .endm - .macro message3 pointer:req + .macro messageinstant pointer:req .byte 0xdb .4byte \pointer .endm -- cgit v1.2.3