diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /asm/macros/field_effect_script.s | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'asm/macros/field_effect_script.s')
| -rw-r--r-- | asm/macros/field_effect_script.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/macros/field_effect_script.s b/asm/macros/field_effect_script.s index 597b89acb..d5895b0ef 100644 --- a/asm/macros/field_effect_script.s +++ b/asm/macros/field_effect_script.s @@ -1,41 +1,41 @@ - .macro field_eff_loadtiles address + .macro loadtiles address .byte 0 .4byte \address .endm - .macro field_eff_loadfadedpal address + .macro loadfadedpal address .byte 1 .4byte \address .endm - .macro field_eff_loadpal address + .macro loadpal address .byte 2 .4byte \address .endm - .macro field_eff_callnative address + .macro callnative address .byte 3 .4byte \address .endm - .macro field_eff_end + .macro end .byte 4 .endm - .macro field_eff_loadgfx_callnative tiles_address, palette_address, function_address + .macro loadgfx_callnative tiles_address, palette_address, function_address .byte 5 .4byte \tiles_address .4byte \palette_address .4byte \function_address .endm - .macro field_eff_loadtiles_callnative tiles_address, function_address + .macro loadtiles_callnative tiles_address, function_address .byte 6 .4byte \tiles_address .4byte \function_address .endm - .macro field_eff_loadfadedpal_callnative palette_address, function_address + .macro loadfadedpal_callnative palette_address, function_address .byte 7 .4byte \palette_address .4byte \function_address |