diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-01 21:04:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 21:04:00 -0500 |
| commit | 7e26aa3d21f55e1375bfde6ffbc70210170fdc37 (patch) | |
| tree | 8904e34e1c44fc10c413b2ba5a42d06b61ca1343 /asm/macros | |
| parent | 90513a9d726e6cda19a3f8fdc8988ee31d9f4ff1 (diff) | |
| parent | 92bd6400b7ded57bde9a41206d10a5dcbd9f6383 (diff) | |
Merge pull request #1316 from GriffinRichards/doc-scrcmd
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index eafd19b1c..e9d55c4bc 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,11 +1561,11 @@ .2byte \y .endm - .macro cmdD8 + .macro selectapproachingtrainer .byte 0xd8 .endm - .macro cmdD9 + .macro lockfortrainer .byte 0xd9 .endm @@ -1562,7 +1573,7 @@ .byte 0xda .endm - .macro message3 pointer:req + .macro messageinstant pointer:req .byte 0xdb .4byte \pointer .endm |