summaryrefslogtreecommitdiff
path: root/macros/event.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros/event.asm')
-rw-r--r--macros/event.asm18
1 files changed, 15 insertions, 3 deletions
diff --git a/macros/event.asm b/macros/event.asm
index 22652abbd..c51f798c5 100644
--- a/macros/event.asm
+++ b/macros/event.asm
@@ -206,14 +206,22 @@ writecode: macro
giveitem: macro
db giveitem_command
db \1 ; item
+if _NARG == 2
db \2 ; quantity
+else
+ db 1
+endc
endm
enum takeitem_command
takeitem: macro
db takeitem_command
db \1 ; item
+if _NARG == 2
db \2 ; quantity
+else
+ db 1
+endc
endm
enum checkitem_command
@@ -986,7 +994,11 @@ checkphonecall: macro
verbosegiveitem: macro
db verbosegiveitem_command
db \1 ; item
+if _NARG == 2
db \2 ; quantity
+else
+ db 1
+endc
endm
enum verbosegiveitem2_command
@@ -1022,9 +1034,9 @@ warpfacing: macro
db \4 ; y
endm
- enum storetext_command
-storetext: macro
- db storetext_command
+ enum battletowertext_command
+battletowertext: macro
+ db battletowertext_command
db \1 ; memory
endm