Переглянути джерело

make script macros parameters required

SBird1337 7 роки тому
джерело
коміт
df1f95b886
1 змінених файлів з 126 додано та 126 видалено
  1. 126
    126
      src/include/script_language.h

+ 126
- 126
src/include/script_language.h Переглянути файл

@@ -27,36 +27,36 @@
27 27
 
28 28
 @@ Custom commands
29 29
 
30
-.macro msgbox msgbox_textpointer msgbox_callstd
30
+.macro msgbox msgbox_textpointer:req msgbox_callstd:req
31 31
 loadpointer 0x0 \msgbox_textpointer
32 32
 callstd \msgbox_callstd
33 33
 .endm
34 34
 
35
-.macro giveitem giveitem_item giveitem_quantity giveitem_messagetyp
35
+.macro giveitem giveitem_item:req giveitem_quantity:req giveitem_messagetyp:req
36 36
 setvarifnotzero 0x8000 \giveitem_item
37 37
 setvarifnotzero 0x8001 \giveitem_quantity
38 38
 callstd \giveitem_messagetyp
39 39
 .endm
40 40
 
41
-.macro giveitem2 giveitem2_item giveitem2_quantity giveitem2_song
41
+.macro giveitem2 giveitem2_item:req giveitem2_quantity:req giveitem2_song:req
42 42
 setvarifnotzero 0x8000 \giveitem2_item
43 43
 setvarifnotzero 0x8001 \giveitem2_quantity
44 44
 setvarifnotzero 0x8002 \giveitem2_song
45 45
 callstd 0x9
46 46
 .endm
47 47
 
48
-.macro wildbattle wildbattle_spezies wildbattle_level wildbattle_item
48
+.macro wildbattle wildbattle_spezies:req wildbattle_level:req wildbattle_item:req
49 49
 setwildbattle \wildbattle_spezies \wildbattle_level \wildbattle_item
50 50
 dowildbattle
51 51
 .endm
52 52
 
53
-.macro wildbattle2 wildbattle2_spezies wildbattle2_level wildbattle2_item wildbattle2_battlestyle
53
+.macro wildbattle2 wildbattle2_spezies:req wildbattle2_level:req wildbattle2_item:req wildbattle2_battlestyle:req
54 54
 setwildbattle \wildbattle2_spezies \wildbattle2_level \wildbattle2_item
55 55
 special 0x137
56 56
 waitstate
57 57
 .endm
58 58
 
59
-.macro msgmugr msgmugr_textpointer msgmugr_callstd msgmugr_sprite
59
+.macro msgmugr msgmugr_textpointer:req msgmugr_callstd:req msgmugr_sprite:req
60 60
 setvar MUGHSOT_1_TABLE \msgmugr_sprite
61 61
 setvar MUGSHOT_1_X 0xD0
62 62
 setvar MUGSHOT_1_Y 0x60
@@ -64,7 +64,7 @@ msgbox \msgmugr_textpointer \msgmugr_callstd
64 64
 setvar MUGHSOT_1_TABLE 0x0
65 65
 .endm
66 66
 
67
-.macro msgmugl msgmugl_textpointer msgmugl_callstd msgmugl_sprite
67
+.macro msgmugl msgmugl_textpointer:req msgmugl_callstd:req msgmugl_sprite:req
68 68
 setvar MUGHSOT_1_TABLE \msgmugl_sprite
69 69
 setvar MUGSHOT_1_X 0x16
70 70
 setvar MUGSHOT_1_Y 0x60
@@ -80,19 +80,19 @@ clearflag FLAG_ACTIVATE
80 80
 setflag FLAG_ACTIVATE
81 81
 .endm
82 82
 
83
-.macro battlescreen battlescreen_grass battlescreen_sea
83
+.macro battlescreen battlescreen_grass:req battlescreen_sea:req
84 84
 setvar NORMAL_VAR \battlescreen_grass
85 85
 setvar SEA_VAR \battlescreen_sea
86 86
 .endm
87 87
 
88
-.macro cameramove cameramove_xpos cameramove_ypos
88
+.macro cameramove cameramove_xpos:req cameramove_ypos:req
89 89
 setvar CAMERA_VAR_X \cameramove_xpos
90 90
 setvar CAMERA_VAR_Y \cameramove_ypos
91 91
 setvar CALLASM_VAR 0x1
92 92
 special 0x68
93 93
 .endm
94 94
 
95
-.macro walkingscript walkingscript_value
95
+.macro walkingscript walkingscript_value:req
96 96
 setvar WALK_SCRIPT_VAR \walkingscript_value
97 97
 .endm
98 98
 
@@ -104,25 +104,25 @@ setflag FLAG_WALK_SCRIPT
104 104
 clearflag FLAG_WALK_SCRIPT
105 105
 .endm
106 106
 
107
-.macro writemusikto1 writemusikto1_from writemusikto1_to
107
+.macro writemusikto1 writemusikto1_from:req writemusikto1_to:req
108 108
 setflag FLAG_ENABLE_MUSIC_OVERRIDES
109 109
 setvar VAR_FROM_1 \writemusikto1_from
110 110
 setvar VAR_TO_1 \writemusikto1_to
111 111
 .endm
112 112
 
113
-.macro writemusikto2 writemusikto2_from writemusikto2_to
113
+.macro writemusikto2 writemusikto2_from:req writemusikto2_to:req
114 114
 setflag FLAG_ENABLE_MUSIC_OVERRIDES
115 115
 setvar VAR_FROM_2 \writemusikto2_from
116 116
 setvar VAR_TO_2 \writemusikto2_to
117 117
 .endm
118 118
 
119
-.macro writemusikto3 writemusikto3_from writemusikto3_to
119
+.macro writemusikto3 writemusikto3_from:req writemusikto3_to:req
120 120
 setflag FLAG_ENABLE_MUSIC_OVERRIDES
121 121
 setvar VAR_FROM_3 \writemusikto3_from
122 122
 setvar VAR_TO_3 \writemusikto3_to
123 123
 .endm
124 124
 
125
-.macro writemusikwithmapmusik writemusikwithmapmusik_mapmusik
125
+.macro writemusikwithmapmusik writemusikwithmapmusik_mapmusik:req
126 126
 setflag FLAG_ENABLE_MUSIC_OVERRIDES
127 127
 setvar VAR_FROM_1 \writemusikwithmapmusik_mapmusik
128 128
 setvar VAR_TO_1 MUS_SKIP_PLAY
@@ -154,29 +154,29 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
154 154
 .byte 0x3
155 155
 .endm
156 156
 
157
-.macro call call_address
157
+.macro call call_address:req
158 158
 .byte 0x4
159 159
 .word \call_address
160 160
 .endm
161 161
 
162
-.macro goto goto_address
162
+.macro goto goto_address:req
163 163
 .byte 0x5
164 164
 .word \goto_address
165 165
 .endm
166 166
 
167
-.macro callif if1_value if1_pointer
167
+.macro callif if1_value:req if1_pointer:req
168 168
 .byte 0x6
169 169
 .byte \if1_value
170 170
 .word \if1_address
171 171
 .endm
172 172
 
173
-.macro gotoif if2_value if2_pointer
173
+.macro gotoif if2_value:req if2_pointer:req
174 174
 .byte 0x7
175 175
 .byte \if2_value
176 176
 .word \if2_address
177 177
 .endm
178 178
 
179
-.macro callstd callstd_call
179
+.macro callstd callstd_call:req
180 180
 .byte 0x9
181 181
 .byte \callstd_call
182 182
 .endm
@@ -185,71 +185,71 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
185 185
 .byte 0xD
186 186
 .endm
187 187
 
188
-.macro loadpointer loadpointer_bank loadpointer_pointer
188
+.macro loadpointer loadpointer_bank:req loadpointer_pointer:req
189 189
 .byte 0xF
190 190
 .byte \loadpointer_bank
191 191
 .word \loadpointer_pointer
192 192
 .endm
193 193
 
194
-.macro writebytetooffset writebytetooffset_bank writebytetooffset_location
194
+.macro writebytetooffset writebytetooffset_bank:req writebytetooffset_location:req
195 195
 .byte 0x11
196 196
 .byte \writebytetooffset_bank
197 197
 .word \writebytetooffset_location
198 198
 .endm
199 199
 
200
-.macro setvar setvar_variable setvar_value
200
+.macro setvar setvar_variable:req setvar_value:req
201 201
 .byte 0x16
202 202
 .hword \setvar_variable
203 203
 .hword \setvar_value
204 204
 .endm
205 205
 
206
-.macro addvar addvar_variable addvar_value
206
+.macro addvar addvar_variable:req addvar_value:req
207 207
 .byte 0x17
208 208
 .hword \addvar_variable
209 209
 .hword \addvar_value
210 210
 .endm
211 211
 
212
-.macro subvar subvar_variable subvar_value
212
+.macro subvar subvar_variable:req subvar_value:req
213 213
 .byte 0x18
214 214
 .hword \subvar_variable
215 215
 .hword \subvar_value
216 216
 .endm
217 217
 
218
-.macro copyvar copyvar_variableADestin copyvar_variableBSource
218
+.macro copyvar copyvar_variableADestin:req copyvar_variableBSource:req
219 219
 .byte 0x19
220 220
 .hword copyvar_variableADestin
221 221
 .hword copyvar_variableBSource
222 222
 .endm
223 223
 
224
-.macro setvarifnotzero setvarifnotzero_variableADestin setvarifnotzero_variableBSource
224
+.macro setvarifnotzero setvarifnotzero_variableADestin:req setvarifnotzero_variableBSource:req
225 225
 .byte 0x1A
226 226
 .hword setvarifnotzero_variableADestin
227 227
 .hword setvarifnotzero_variableBSource
228 228
 .endm
229 229
 
230
-.macro compare compare_variable compare_value
230
+.macro compare compare_variable:req compare_value:req
231 231
 .byte 0x21
232 232
 .hword \compare_variable
233 233
 .hword \compare_value
234 234
 .endm
235 235
 
236
-.macro comparevars comparevars_variableA comparevars_variableB
236
+.macro comparevars comparevars_variableA:req comparevars_variableB:req
237 237
 .byte 0x22
238 238
 .hword \comparevars_variableA
239 239
 .hword \comparevars_variableB
240 240
 .endm
241 241
 
242
-.macro callasm callasm_address
242
+.macro callasm callasm_address:req
243 243
 .byte 0x23
244 244
 .word \callasm_address
245 245
 .endm
246 246
 
247
-.macro special special_number
247
+.macro special special_number:req
248 248
 .byte 0x25
249 249
 .hword \special_number
250 250
 .endm
251 251
 
252
-.macro special2 special2_variable special2_number
252
+.macro special2 special2_variable:req special2_number:req
253 253
 .byte 0x26
254 254
 .hword \special2_variable
255 255
 .hword \special2_number
@@ -259,22 +259,22 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
259 259
 .byte 0x27
260 260
 .endm
261 261
 
262
-.macro pause pause_delay
262
+.macro pause pause_delay:req
263 263
 .byte 0x28
264 264
 .hword \pause_delay
265 265
 .endm
266 266
 
267
-.macro setflag setflag_flag
267
+.macro setflag setflag_flag:req
268 268
 .byte 0x29
269 269
 .hword \setflag_flag
270 270
 .endm
271 271
 
272
-.macro clearflag clearflag_flag
272
+.macro clearflag clearflag_flag:req
273 273
 .byte 0x2A
274 274
 .hword \clearflag_flag
275 275
 .endm
276 276
 
277
-.macro checkflag checkflag_flag
277
+.macro checkflag checkflag_flag:req
278 278
 .byte 0x2B
279 279
 .hword \checkflag_flag
280 280
 .endm
@@ -283,7 +283,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
283 283
 .byte 0x2E
284 284
 .endm
285 285
 
286
-.macro sound sound_song
286
+.macro sound sound_song:req
287 287
 .byte 0x2F
288 288
 .hword \sound_song
289 289
 .endm
@@ -292,7 +292,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
292 292
 .byte 0x30
293 293
 .endm
294 294
 
295
-.macro fanfare fanfare_song
295
+.macro fanfare fanfare_song:req
296 296
 .byte 0x31
297 297
 .hword \fanfare_song
298 298
 .endm
@@ -301,13 +301,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
301 301
 .byte 0x32
302 302
 .endm
303 303
 
304
-.macro playsong playsong_song playsong_value
304
+.macro playsong playsong_song:req playsong_value:req
305 305
 .byte 0x33
306 306
 .hword \playsong_song
307 307
 .byte \playsong_value
308 308
 .endm
309 309
 
310
-.macro playsong2 playsong2_song
310
+.macro playsong2 playsong2_song:req
311 311
 .byte 0x34
312 312
 .hword \playsong2_song
313 313
 .endm
@@ -316,22 +316,22 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
316 316
 .byte 0x35
317 317
 .endm
318 318
 
319
-.macro fadesong fadesong_song
319
+.macro fadesong fadesong_song:req
320 320
 .byte 0x36
321 321
 .hword \fadesong_song
322 322
 .endm
323 323
 
324
-.macro fadeout fadeout_volume
324
+.macro fadeout fadeout_volume:req
325 325
 .byte 0x37
326 326
 .byte \fadeout_volume
327 327
 .endm
328 328
 
329
-.macro fadein fadein_volume
329
+.macro fadein fadein_volume:req
330 330
 .byte 0x38
331 331
 .byte \fadein_volume
332 332
 .endm
333 333
 
334
-.macro warp warp_bank warp_map warp_exit warp_x warp_y
334
+.macro warp warp_bank:req warp_map:req warp_exit:req warp_x:req warp_y:req
335 335
 .byte 0x39
336 336
 .byte \warp_bank
337 337
 .byte \warp_map
@@ -340,7 +340,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
340 340
 .hword \warp_y
341 341
 .endm
342 342
 
343
-.macro warpmuted warpmuted_bank warpmuted_map warpmuted_exit warpmuted_x warpmuted_y
343
+.macro warpmuted warpmuted_bank:req warpmuted_map:req warpmuted_exit:req warpmuted_x:req warpmuted_y:req
344 344
 .byte 0x3A
345 345
 .byte \warpmuted_bank
346 346
 .byte \warpmuted_map
@@ -349,7 +349,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
349 349
 .hword \warpmuted_y
350 350
 .endm
351 351
 
352
-.macro warpwalk warpwalk_bank warpwalk_map warpwalk_exit warpwalk_x warpwalk_y
352
+.macro warpwalk warpwalk_bank:req warpwalk_map:req warpwalk_exit:req warpwalk_x:req warpwalk_y:req
353 353
 .byte 0x3B
354 354
 .byte \warpwalk_bank
355 355
 .byte \warpwalk_map
@@ -358,13 +358,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
358 358
 .hword \warpwalk_y
359 359
 .endm
360 360
 
361
-.macro warphole warphole_bank warphole_map
361
+.macro warphole warphole_bank:req warphole_map:req
362 362
 .byte 0x3C
363 363
 .byte \warphole_bank
364 364
 .byte \warphole_map
365 365
 .endm
366 366
 
367
-.macro warpteleport warpteleport_bank warpteleport_map warpteleport_exit warpteleport_x warpteleport_y
367
+.macro warpteleport warpteleport_bank:req warpteleport_map:req warpteleport_exit:req warpteleport_x:req warpteleport_y:req
368 368
 .byte 0x3D
369 369
 .byte \warpteleport_bank
370 370
 .byte \warpteleport_map
@@ -373,7 +373,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
373 373
 .hword \warpteleport_y
374 374
 .endm
375 375
 
376
-.macro setwarpplace setwarpplace_bank setwarpplace_map setwarpplace_exit setwarpplace_x setwarpplace_y
376
+.macro setwarpplace setwarpplace_bank:req setwarpplace_map:req setwarpplace_exit:req setwarpplace_x:req setwarpplace_y:req
377 377
 .byte 0x3F
378 378
 .byte \setwarpplace_bank
379 379
 .byte \setwarpplace_map
@@ -382,7 +382,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
382 382
 .hword \setwarpplace_y
383 383
 .endm
384 384
 
385
-.macro getplayerpos getplayerpos_variableX getplayerpos_variableY
385
+.macro getplayerpos getplayerpos_variableX:req getplayerpos_variableY:req
386 386
 .byte 0x42
387 387
 .hword \getplayerpos_variableX
388 388
 .hword \getplayerpos_variableY
@@ -392,54 +392,54 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
392 392
 .byte 0x43
393 393
 .endm
394 394
 
395
-.macro additem additem_item additem_quantity
395
+.macro additem additem_item:req additem_quantity:req
396 396
 .byte 0x44
397 397
 .hword \additem_item
398 398
 .hword \additem_quantity
399 399
 .endm
400 400
 
401
-.macro removeitem removeitem_item removeitem_quantity
401
+.macro removeitem removeitem_item:req removeitem_quantity:req
402 402
 .byte 0x45
403 403
 .hword \removeitem_item
404 404
 .hword \removeitem_quantity
405 405
 .endm
406 406
 
407
-.macro checkitemroom checkitemroom_item checkitemroom_quantity
407
+.macro checkitemroom checkitemroom_item:req checkitemroom_quantity:req
408 408
 .byte 0x46
409 409
 .hword \checkitemroom_item
410 410
 .hword \checkitemroom_quantity
411 411
 .endm
412 412
 
413
-.macro checkitem checkitem_item checkitem_quantity
413
+.macro checkitem checkitem_item:req checkitem_quantity:req
414 414
 .byte 0x47
415 415
 .hword \checkitem_item
416 416
 .hword \checkitem_quantity
417 417
 .endm
418 418
 
419
-.macro checkitemtype checkitemtype_item
419
+.macro checkitemtype checkitemtype_item:req
420 420
 .byte 0x48
421 421
 .hword \checkitemtype_item
422 422
 .endm
423 423
 
424
-.macro addpcitem addpcitem_item addpcitem_quantity
424
+.macro addpcitem addpcitem_item:req addpcitem_quantity:req
425 425
 .byte 0x49
426 426
 .hword \addpcitem_item
427 427
 .hword \addpcitem_quantity
428 428
 .endm
429 429
 
430
-.macro checkpcitem checkpcitem_item checkpcitem_quantity
430
+.macro checkpcitem checkpcitem_item:req checkpcitem_quantity:req
431 431
 .byte 0x4A
432 432
 .hword \checkpcitem_item
433 433
 .hword \checkpcitem_quantity
434 434
 .endm
435 435
 
436
-.macro applymovement applymovement_people applymovement_movedata
436
+.macro applymovement applymovement_people:req applymovement_movedata:req
437 437
 .byte 0x4F
438 438
 .hword \applymovement_people
439 439
 .word \applymovement_movedata
440 440
 .endm
441 441
 
442
-.macro applymovementpos applymovementpos_people applymovementpos_movedata applymovementpos_x applymovementpos_y
442
+.macro applymovementpos applymovementpos_people:req applymovementpos_movedata:req applymovementpos_x:req applymovementpos_y:req
443 443
 .byte 0x50
444 444
 .hword \applymovementpos_people
445 445
 .word \applymovementpos_movedata
@@ -447,57 +447,57 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
447 447
 .byte \applymovementpos_y
448 448
 .endm
449 449
 
450
-.macro waitmovement waitmovement_people
450
+.macro waitmovement waitmovement_people:req
451 451
 .byte 0x51
452 452
 .hword \waitmovement_people
453 453
 .endm
454 454
 
455
-.macro waitmovementpos waitmovementpos_people waitmovementpos_x waitmovementpos_y
455
+.macro waitmovementpos waitmovementpos_people:req waitmovementpos_x:req waitmovementpos_y:req
456 456
 .byte 0x52
457 457
 .hword \waitmovementpos_people
458 458
 .byte \waitmovementpos_x
459 459
 .byte \waitmovementpos_y
460 460
 .endm
461 461
 
462
-.macro hidesprite hidesprite_people
462
+.macro hidesprite hidesprite_people:req
463 463
 .byte 0x53
464 464
 .hword \hidesprite_people
465 465
 .endm
466 466
 
467
-.macro hidespritepos hidesprite_people hidespritepos_x hidespritepos_y
467
+.macro hidespritepos hidesprite_people:req hidespritepos_x:req hidespritepos_y:req
468 468
 .byte 0x54
469 469
 .hword \hidespritepos_people
470 470
 .byte \hidespritepos_x
471 471
 .byte \hidespritepos_y
472 472
 .endm
473 473
 
474
-.macro showsprite showsprite_people
474
+.macro showsprite showsprite_people:req
475 475
 .byte 0x55
476 476
 .hword \showsprite_people
477 477
 .endm
478 478
 
479
-.macro showspritepos showspritepos_people showspritepos_x showspritepos_y
479
+.macro showspritepos showspritepos_people:req showspritepos_x:req showspritepos_y:req
480 480
 .byte 0x56
481 481
 .hword \showspritepos_people
482 482
 .byte \showspritepos_x
483 483
 .byte \showspritepos_y
484 484
 .endm
485 485
 
486
-.macro movesprite movesprite_people movesprite_x movesprite_y
486
+.macro movesprite movesprite_people:req movesprite_x:req movesprite_y:req
487 487
 .byte 0x57
488 488
 .hword \movesprite_people
489 489
 .hword \movesprite_x
490 490
 .hword \movesprite_y
491 491
 .endm
492 492
 
493
-.macro spritevisible spritevisible_people spritevisible_bank movesprite_map
493
+.macro spritevisible spritevisible_people:req spritevisible_bank:req movesprite_map:req
494 494
 .byte 0x58
495 495
 .hword \spritevisible_people
496 496
 .byte \spritevisible_bank
497 497
 .byte \spritevisible_map
498 498
 .endm
499 499
 
500
-.macro spriteinvisible spriteinvisible_people spriteinvisible_bank spriteinvisible_map
500
+.macro spriteinvisible spriteinvisible_people:req spriteinvisible_bank:req spriteinvisible_map:req
501 501
 .byte 0x59
502 502
 .hword \spriteinvisible_people
503 503
 .byte \spriteinvisible_bank
@@ -508,13 +508,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
508 508
 .byte 0x5A
509 509
 .endm
510 510
 
511
-.macro spriteface spriteface_people spriteface_facing
511
+.macro spriteface spriteface_people:req spriteface_facing:req
512 512
 .byte 0x5B
513 513
 .hword \spriteface_people
514 514
 .byte \spriteface_facing
515 515
 .endm
516 516
 
517
-.macro trainerbattle trainerbattle_kind trainerbattle_id trainerbattle_value trainerbattle_before trainerbattle_after trainerbattle_later
517
+.macro trainerbattle trainerbattle_kind:req trainerbattle_id:req trainerbattle_value:req trainerbattle_before:req trainerbattle_after:req trainerbattle_later:req
518 518
 .byte 0x5C
519 519
 .byte \trainerbattle_kind
520 520
 .hword \trainerbattle_id
@@ -536,34 +536,34 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
536 536
 .byte 0x5E
537 537
 .endm
538 538
 
539
-.macro checktrainerflag checktrainerflag_flag
539
+.macro checktrainerflag checktrainerflag_flag:req
540 540
 .byte 0x60
541 541
 .hword \checktrainerflag_flag
542 542
 .endm
543 543
 
544
-.macro settrainerflag settrainerflag_flag
544
+.macro settrainerflag settrainerflag_flag:req
545 545
 .byte 0x61
546 546
 .hword \settrainerflag_flag
547 547
 .endm
548 548
 
549
-.macro cleartrainerflag cleartrainerflag_flag
549
+.macro cleartrainerflag cleartrainerflag_flag:req
550 550
 .byte 0x62
551 551
 .hword \cleartrainerflag_flag
552 552
 .endm
553 553
 
554
-.macro movesprite2 movesprite2_people movesprite2_x movesprite2_y
554
+.macro movesprite2 movesprite2_people:req movesprite2_x:req movesprite2_y:req
555 555
 .byte 0x63
556 556
 .hword \movesprite2_people
557 557
 .hword \movesprite2_x
558 558
 .hword \movesprite2_y
559 559
 .endm
560 560
 
561
-.macro moveoffscreen moveoffscreen_people
561
+.macro moveoffscreen moveoffscreen_people:req
562 562
 .byte 0x64
563 563
 .hword \moveoffscreen_people
564 564
 .endm
565 565
 
566
-.macro spritebehave spritebehave_people spritebehave_facing
566
+.macro spritebehave spritebehave_people:req spritebehave_facing:req
567 567
 .byte 0x65
568 568
 .hword \spritebehave_people
569 569
 .byte \spritebehave_behaviour
@@ -573,7 +573,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
573 573
 .byte 0x66
574 574
 .endm
575 575
 
576
-.macro preparemsg preparemsg_text
576
+.macro preparemsg preparemsg_text:req
577 577
 .byte 0x67
578 578
 .word \preparemsg_text
579 579
 .endm
@@ -602,13 +602,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
602 602
 .byte 0x6D
603 603
 .endm
604 604
 
605
-.macro yesnobox yesnobox_x yesnobox_y
605
+.macro yesnobox yesnobox_x:req yesnobox_y:req
606 606
 .byte 0x6E
607 607
 .byte \yesnobox_x
608 608
 .byte \yesnobox_y
609 609
 .endm
610 610
 
611
-.macro multichoice multichoice_x multichoice_y multichoice_choiceList multichoice_determines
611
+.macro multichoice multichoice_x:req multichoice_y:req multichoice_choiceList:req multichoice_determines:req
612 612
 .byte 0x6F
613 613
 .byte \multichoice_x
614 614
 .byte \multichoice_y
@@ -616,7 +616,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
616 616
 .byte \multichoice_determines
617 617
 .endm
618 618
 
619
-.macro multichoice2 multichoice2_x multichoice2_y multichoice2_choiceList multichoice2_defaultchoice multichoice2_determines
619
+.macro multichoice2 multichoice2_x:req multichoice2_y:req multichoice2_choiceList:req multichoice2_defaultchoice:req multichoice2_determines:req
620 620
 .byte 0x70
621 621
 .byte \multichoice2_x
622 622
 .byte \multichoice2_y
@@ -625,7 +625,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
625 625
 .byte \multichoice2_determines
626 626
 .endm
627 627
 
628
-.macro multichoice3 multichoice3_x multichoice3_y multichoice3_choiceList multichoice3_numberofchoices multichoice3_determines
628
+.macro multichoice3 multichoice3_x:req multichoice3_y:req multichoice3_choiceList:req multichoice3_numberofchoices:req multichoice3_determines:req
629 629
 .byte 0x71
630 630
 .byte \multichoice3_x
631 631
 .byte \multichoice3_y
@@ -634,7 +634,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
634 634
 .byte \multichoice3_determines
635 635
 .endm
636 636
 
637
-.macro showpokepic showpokepic_spezies showpokepic_x showpokepic_y
637
+.macro showpokepic showpokepic_spezies:req showpokepic_x:req showpokepic_y:req
638 638
 .byte 0x75
639 639
 .hword \showpokepic_spezies
640 640
 .byte \showpokepic_x
@@ -645,12 +645,12 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
645 645
 .byte 0x76
646 646
 .endm
647 647
 
648
-.macro braile braile_data
648
+.macro braile braile_data:req
649 649
 .byte 0x78
650 650
 .word \braile_data
651 651
 .endm
652 652
 
653
-.macro givepokemon givepokemon_spezies givepokemon_level givepokemon_item
653
+.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req
654 654
 .byte 0x79
655 655
 .hword \givepokemon_spezies
656 656
 .byte \givepokemon_level
@@ -660,156 +660,156 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
660 660
 .byte 0x0
661 661
 .endm
662 662
 
663
-.macro giveegg giveegg_spezies
663
+.macro giveegg giveegg_spezies:req
664 664
 .byte 0x7A
665 665
 .hword \giveegg_spezies
666 666
 .endm
667 667
 
668
-.macro setpokemonmove setpokemonmove_partyslot setpokemonmove_moveslot setpokemonmove_move
668
+.macro setpokemonmove setpokemonmove_partyslot:req setpokemonmove_moveslot:req setpokemonmove_move:req
669 669
 .byte 0x7B
670 670
 .byte \setpokemonmove_partyslot
671 671
 .byte \setpokemonmove_moveslot
672 672
 .hword \setpokemonmove_move
673 673
 .endm
674 674
 
675
-.macro checkattack checkattack_move
675
+.macro checkattack checkattack_move:req
676 676
 .byte 0x7C
677 677
 .hword \checkattack_move
678 678
 .endm
679 679
 
680
-.macro bufferpokemon bufferpokemon_buffernumber bufferpokemon_spezies
680
+.macro bufferpokemon bufferpokemon_buffernumber:req bufferpokemon_spezies:req
681 681
 .byte 0x7D
682 682
 .byte \bufferpokemon_buffernumber
683 683
 .hword \bufferpokemon_spezies
684 684
 .endm
685 685
 
686
-.macro bufferfirstpokemon bufferfirstpokemon_buffernumber
686
+.macro bufferfirstpokemon bufferfirstpokemon_buffernumber:req
687 687
 .byte 0x7E
688 688
 .byte \bufferfirstpokemon_buffernumber
689 689
 .endm
690 690
 
691
-.macro bufferpartypokemon bufferpartypokemon_buffernumber bufferpartypokemon_spezies
691
+.macro bufferpartypokemon bufferpartypokemon_buffernumber:req bufferpartypokemon_spezies:req
692 692
 .byte 0x7F
693 693
 .byte \bufferpartypokemon_buffernumber
694 694
 .hword \bufferpartypokemon_spezies
695 695
 .endm
696 696
 
697
-.macro bufferitem bufferitem_buffernumber bufferitem_item
697
+.macro bufferitem bufferitem_buffernumber:req bufferitem_item:req
698 698
 .byte 0x80
699 699
 .byte \bufferitem_buffernumber
700 700
 .hword \bufferitem_item
701 701
 .endm
702 702
 
703
-.macro bufferattack bufferattack_buffernumber bufferattack_attack
703
+.macro bufferattack bufferattack_buffernumber:req bufferattack_attack:req
704 704
 .byte 0x82
705 705
 .byte \bufferattack_buffernumber
706 706
 .hword \bufferattack_attack
707 707
 .endm
708 708
 
709
-.macro buffernumber buffernumber_buffernumber buffernumber_variable
709
+.macro buffernumber buffernumber_buffernumber:req buffernumber_variable:req
710 710
 .byte 0x83
711 711
 .byte \buffernumber_buffernumber
712 712
 .hword \buffernumber_variable
713 713
 .endm
714 714
 
715
-.macro bufferstd bufferstd_buffernumber bufferstd_variable
715
+.macro bufferstd bufferstd_buffernumber:req bufferstd_variable:req
716 716
 .byte 0x84
717 717
 .byte \bufferstd_buffernumber
718 718
 .hword \bufferstd_stdnumber
719 719
 .endm
720 720
 
721
-.macro bufferstring bufferstring_buffernumber bufferstring_string
721
+.macro bufferstring bufferstring_buffernumber:req bufferstring_string:req
722 722
 .byte 0x85
723 723
 .byte \bufferstring_buffernumber
724 724
 .hword \bufferstring_string
725 725
 .endm
726 726
 
727
-.macro pokemart pokemart_list
727
+.macro pokemart pokemart_list:req
728 728
 .byte 0x86
729 729
 .word \pokemart_list
730 730
 .endm
731 731
 
732
-.macro random random_possiblities
732
+.macro random random_possiblities:req
733 733
 .byte 0x8F
734 734
 .hword \random_possiblities
735 735
 .endm
736 736
 
737
-.macro givemoney givemoney_quantity givemoney_command
737
+.macro givemoney givemoney_quantity:req givemoney_command:req
738 738
 .byte 0x90
739 739
 .word \givemoney_quantity
740 740
 .byte \givemoney_command
741 741
 .endm
742 742
 
743
-.macro paymoney paymoney_quantity paymoney_command
743
+.macro paymoney paymoney_quantity:req paymoney_command:req
744 744
 .byte 0x91
745 745
 .word \paymoney_quantity
746 746
 .byte \paymoney_command
747 747
 .endm
748 748
 
749
-.macro checkmoney checkmoney_quantity paymoney_command
749
+.macro checkmoney checkmoney_quantity:req paymoney_command:req
750 750
 .byte 0x92
751 751
 .word \checkmoney_quantity
752 752
 .byte \checkmoney_command
753 753
 .endm
754 754
 
755
-.macro showmoney showmoney_x showmoney_y showmoney_value
755
+.macro showmoney showmoney_x:req showmoney_y:req showmoney_value:req
756 756
 .byte 0x93
757 757
 .byte \showmoney_x
758 758
 .byte \showmoney_y
759 759
 .byte \showmoney_value
760 760
 .endm
761 761
 
762
-.macro hidemoney hidemoney_x hidemoney_y
762
+.macro hidemoney hidemoney_x:req hidemoney_y:req
763 763
 .byte 0x94
764 764
 .byte \hidemoney_x
765 765
 .byte \hidemoney_y
766 766
 .endm
767 767
 
768
-.macro updatemoney updatemoney_x updatemoney_y updatemoney_value
768
+.macro updatemoney updatemoney_x:req updatemoney_y:req updatemoney_value:req
769 769
 .byte 0x95
770 770
 .byte \updatemoney_x
771 771
 .byte \updatemoney_y
772 772
 .byte \updatemoney_value
773 773
 .endm
774 774
 
775
-.macro fadescreen fadescreen_effect
775
+.macro fadescreen fadescreen_effect:req
776 776
 .byte 0x97
777 777
 .byte \fadescreen_effect
778 778
 .endm
779 779
 
780
-.macro fadescreendelay fadescreendelay_effect fadescreendelay_delay
780
+.macro fadescreendelay fadescreendelay_effect:req fadescreendelay_delay:req
781 781
 .byte 0x98
782 782
 .byte \fadescreendelay_effect
783 783
 .byte \fadescreendelay_delay
784 784
 .endm
785 785
 
786
-.macro darken darken_flashsize
786
+.macro darken darken_flashsize:req
787 787
 .byte 0x99
788 788
 .hword \darken_flashsize
789 789
 .endm
790 790
 
791
-.macro lighten lighten_flashsize
791
+.macro lighten lighten_flashsize:req
792 792
 .byte 0x9A
793 793
 .hword \lighten_flashsize
794 794
 .endm
795 795
 
796
-.macro doanimation doanimation_animation
796
+.macro doanimation doanimation_animation:req
797 797
 .byte 0x9C
798 798
 .hword \doanimation_animation
799 799
 .endm
800 800
 
801
-.macro setanimation setanimation_animation setanimation_variable
801
+.macro setanimation setanimation_animation:req setanimation_variable:req
802 802
 .byte 0x9D
803 803
 .byte \setanimation_animation
804 804
 .hword \setanimation_variable
805 805
 .endm
806 806
 
807
-.macro checkanimation checkanimation_animation
807
+.macro checkanimation checkanimation_animation:req
808 808
 .byte 0x9E
809 809
 .hword \checkanimation_animation
810 810
 .endm
811 811
 
812
-.macro sethealingplace sethealingplace_flightspot
812
+.macro sethealingplace sethealingplace_flightspot:req
813 813
 .byte 0x9F
814 814
 .hword \sethealingplace_flightspot
815 815
 .endm
@@ -818,13 +818,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
818 818
 .byte 0xA0
819 819
 .endm
820 820
 
821
-.macro cry cry_spezies cry_effect
821
+.macro cry cry_spezies:req cry_effect:req
822 822
 .byte 0xA1
823 823
 .hword \cry_spezies
824 824
 .hword \cry_effect
825 825
 .endm
826 826
 
827
-.macro setmaptile setmaptile_x setmaptile_y setmaptile_tile setmaptile_attribut
827
+.macro setmaptile setmaptile_x:req setmaptile_y:req setmaptile_tile:req setmaptile_attribut:req
828 828
 .byte 0xA2
829 829
 .hword \setmaptile_x
830 830
 .hword \setmaptile_y
@@ -836,7 +836,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
836 836
 .byte 0xA3
837 837
 .endm
838 838
 
839
-.macro setweather setweather_weather
839
+.macro setweather setweather_weather:req
840 840
 .byte 0xA4
841 841
 .hword \setweather_weather
842 842
 .endm
@@ -845,12 +845,12 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
845 845
 .byte 0xA5
846 846
 .endm
847 847
 
848
-.macro setmapfooter setmapfooter_footer
848
+.macro setmapfooter setmapfooter_footer:req
849 849
 .byte 0xA7
850 850
 .hword \setmapfooter_footer
851 851
 .endm
852 852
 
853
-.macro spritelevelup spritelevelup_people spritelevelup_bank spritelevelup_map
853
+.macro spritelevelup spritelevelup_people:req spritelevelup_bank:req spritelevelup_map:req
854 854
 .byte 0xA8
855 855
 .hword \spritelevelup_people
856 856
 .byte \spritelevelup_bank
@@ -858,14 +858,14 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
858 858
 .byte 0x0
859 859
 .endm
860 860
 
861
-.macro restorespritelevel restorespritelevel_people restorespritelevel_bank restorespritelevel_map
861
+.macro restorespritelevel restorespritelevel_people:req restorespritelevel_bank:req restorespritelevel_map:req
862 862
 .byte 0xA9
863 863
 .hword \restorespritelevel_people
864 864
 .byte \restorespritelevel_bank
865 865
 .byte \restorespritelevel_map
866 866
 .endm
867 867
 
868
-.macro createsprite createsprite_sprite createsprite_id createsprite_x createsprite_y createsprite_behaviour createsprite_facing
868
+.macro createsprite createsprite_sprite:req createsprite_id:req createsprite_x:req createsprite_y:req createsprite_behaviour:req createsprite_facing:req
869 869
 .byte 0xAA
870 870
 .byte \createsprite_sprite
871 871
 .byte \createsprite_id
@@ -875,19 +875,19 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
875 875
 .byte \createsprite_facing
876 876
 .endm
877 877
 
878
-.macro spriteface2 spriteface2_people spriteface2_facing
878
+.macro spriteface2 spriteface2_people:req spriteface2_facing:req
879 879
 .byte 0xAB
880 880
 .hword \spriteface2_people
881 881
 .byte \spriteface2_facing
882 882
 .endm
883 883
 
884
-.macro setdooropened setdooropened_x setdooropened_y
884
+.macro setdooropened setdooropened_x:req setdooropened_y:req
885 885
 .byte 0xAC
886 886
 .hword \setdooropened_x
887 887
 .hword \setdooropened_y
888 888
 .endm
889 889
 
890
-.macro setdoorclosed setdoorclosed_x setdoorclosed_y
890
+.macro setdoorclosed setdoorclosed_x:req setdoorclosed_y:req
891 891
 .byte 0xAD
892 892
 .hword \setdoorclosed_x
893 893
 .hword \setdoorclosed_y
@@ -897,19 +897,19 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
897 897
 .byte 0xAE
898 898
 .endm
899 899
 
900
-.macro setdooropened2 setdooropened2_x setdooropened2_y
900
+.macro setdooropened2 setdooropened2_x:req setdooropened2_y:req
901 901
 .byte 0xAF
902 902
 .hword \setdooropened2_x
903 903
 .hword \setdooropened2_y
904 904
 .endm
905 905
 
906
-.macro setdoorclosed2 setdoorclosed2_x setdoorclosed2_y
906
+.macro setdoorclosed2 setdoorclosed2_x:req setdoorclosed2_y:req
907 907
 .byte 0xB0
908 908
 .hword \setdoorclosed2_x
909 909
 .hword \setdoorclosed2_y
910 910
 .endm
911 911
 
912
-.macro setwildbattle setwildbattle_spezies setwildbattle_level setwildbattle_item
912
+.macro setwildbattle setwildbattle_spezies:req setwildbattle_level:req setwildbattle_item:req
913 913
 .byte 0xB6
914 914
 .hword \setwildbattle_spezies
915 915
 .byte \setwildbattle_level
@@ -924,14 +924,14 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
924 924
 .byte 0xC5
925 925
 .endm
926 926
 
927
-.macro setworldmapflag setworldmapflag_flag
927
+.macro setworldmapflag setworldmapflag_flag:req
928 928
 .byte 0xD0
929 929
 .hword \setworldmapflag_flag
930 930
 .endm
931 931
 
932
-.macro bufferitems bufferitems_buffernumber bufferitems_item bufferitems_quantity
932
+.macro bufferitems bufferitems_buffernumber:req bufferitems_item:req bufferitems_quantity:req
933 933
 .byte 0xD4
934 934
 .byte \bufferitems_buffernumber
935 935
 .hword \bufferitems_item
936 936
 .hword \bufferitems_quantity
937
-.endm
937
+.endm