|
@@ -131,15 +131,15 @@ callstd \msgbox_callstd
|
131
|
131
|
.endm
|
132
|
132
|
|
133
|
133
|
.macro giveitem giveitem_item:req giveitem_quantity:req giveitem_messagetyp:req
|
134
|
|
-setvarifnotzero 0x8000 \giveitem_item
|
135
|
|
-setvarifnotzero 0x8001 \giveitem_quantity
|
|
134
|
+copyvarifnotzero 0x8000 \giveitem_item
|
|
135
|
+copyvarifnotzero 0x8001 \giveitem_quantity
|
136
|
136
|
callstd \giveitem_messagetyp
|
137
|
137
|
.endm
|
138
|
138
|
|
139
|
139
|
.macro giveitem2 giveitem2_item:req giveitem2_quantity:req giveitem2_song:req
|
140
|
|
-setvarifnotzero 0x8000 \giveitem2_item
|
141
|
|
-setvarifnotzero 0x8001 \giveitem2_quantity
|
142
|
|
-setvarifnotzero 0x8002 \giveitem2_song
|
|
140
|
+copyvarifnotzero 0x8000 \giveitem2_item
|
|
141
|
+copyvarifnotzero 0x8001 \giveitem2_quantity
|
|
142
|
+copyvarifnotzero 0x8002 \giveitem2_song
|
143
|
143
|
callstd 0x9
|
144
|
144
|
.endm
|
145
|
145
|
|
|
@@ -745,7 +745,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
|
745
|
745
|
.word \braile_data
|
746
|
746
|
.endm
|
747
|
747
|
|
748
|
|
-.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req givepokemon_one givepokemon_two givepokemon_three
|
|
748
|
+.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req
|
749
|
749
|
.byte 0x79
|
750
|
750
|
.hword \givepokemon_spezies
|
751
|
751
|
.byte \givepokemon_level
|