diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-02 22:09:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 22:09:36 -0500 |
| commit | 7d2344c07bea9a46993a92d4611fba80545acdd2 (patch) | |
| tree | 9f865097bfc54f3c9ac885d9f1ec721f01d74eab /asm/macros/field_effect_script.inc | |
| parent | f494238a9d1f8f486891845a43983e187dbeadf0 (diff) | |
| parent | dc7d86f026c01682bd024fabb0ce206eacb81c35 (diff) | |
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
Diffstat (limited to 'asm/macros/field_effect_script.inc')
| -rw-r--r-- | asm/macros/field_effect_script.inc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/asm/macros/field_effect_script.inc b/asm/macros/field_effect_script.inc index 597b89acb..38f7e3175 100644 --- a/asm/macros/field_effect_script.inc +++ b/asm/macros/field_effect_script.inc @@ -1,19 +1,21 @@ - .macro field_eff_loadtiles address +@ The first .byte argument of each macro below is an index into gFieldEffectScriptFuncs + + .macro field_eff_loadtiles address:req .byte 0 .4byte \address .endm - .macro field_eff_loadfadedpal address + .macro field_eff_loadfadedpal address:req .byte 1 .4byte \address .endm - .macro field_eff_loadpal address + .macro field_eff_loadpal address:req .byte 2 .4byte \address .endm - .macro field_eff_callnative address + .macro field_eff_callnative address:req .byte 3 .4byte \address .endm @@ -22,20 +24,20 @@ .byte 4 .endm - .macro field_eff_loadgfx_callnative tiles_address, palette_address, function_address + .macro field_eff_loadgfx_callnative tiles_address:req, palette_address:req, function_address:req .byte 5 .4byte \tiles_address .4byte \palette_address .4byte \function_address .endm - .macro field_eff_loadtiles_callnative tiles_address, function_address + .macro field_eff_loadtiles_callnative tiles_address:req, function_address:req .byte 6 .4byte \tiles_address .4byte \function_address .endm - .macro field_eff_loadfadedpal_callnative palette_address, function_address + .macro field_eff_loadfadedpal_callnative palette_address:req, function_address:req .byte 7 .4byte \palette_address .4byte \function_address |