diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-24 15:19:55 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-24 15:19:55 -0500 |
| commit | 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f (patch) | |
| tree | 2cc4a2c40fb21bbee0f2d19cee33a00e6b207a7b /asm | |
| parent | a277e60789d9ea78fe03a4bcded2edf7b91e548e (diff) | |
do some renaming and reorganizing
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/event.inc | 6 | ||||
| -rw-r--r-- | asm/mauville_old_man.s | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index cd2927c66..9fddd9194 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1493,6 +1493,12 @@ callstd \type .endm + @ Message box types + MSGBOX_YESNO = 5 + + YES = 1 + NO = 0 + .macro giveitem item, amount=1, function=0 setorcopyvar 0x8000, \item setorcopyvar 0x8001, \amount diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s deleted file mode 100644 index ef4d313d4..000000000 --- a/asm/mauville_old_man.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - .align 2, 0 @ Don't pad with nop. |