diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.s | 1 | ||||
| -rw-r--r-- | asm/macros/field_effect_script.s | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/asm/macros.s b/asm/macros.s index fbead93b9..49ed99695 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -4,7 +4,6 @@ .include "asm/macros/pokemon_data.s" .include "asm/macros/ec.s" .include "asm/macros/map.s" - .include "asm/macros/field_effect_script.s" .macro region_map_location x, y, width, height, name .byte \x 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 |