diff options
| author | YamaArashi <shadow962@live.com> | 2015-11-24 18:04:56 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-11-24 18:04:56 -0800 |
| commit | f7a92b9a95945bf59748733ac3cf8096b5d1b125 (patch) | |
| tree | 51f1c19cea7854f723d72c223704c44e44b90cb2 | |
| parent | 3565d5ea5bc7036334e3a70710b039237c9e7151 (diff) | |
string ref charmap consts and field effect script macros
| -rw-r--r-- | asm/charmap.s | 19 | ||||
| -rw-r--r-- | asm/macros.s | 1 | ||||
| -rw-r--r-- | asm/macros/field_effect_script.s | 42 |
3 files changed, 61 insertions, 1 deletions
diff --git a/asm/charmap.s b/asm/charmap.s index c7aadf035..9ff6cda30 100644 --- a/asm/charmap.s +++ b/asm/charmap.s @@ -252,5 +252,22 @@ .charmapconst PK, 0x53 .charmapconst PKMN, 0x53, 0x54 .charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59 - .charmapconst AQUA, 0xFD, 0x08 + +; string refs + ; unknown (0xFD, 0x00) + .charmapconst PLAYER, 0xFD, 0x01 + .charmapconst STRVAR_1, 0xFD, 0x02 + .charmapconst STRVAR_2, 0xFD, 0x03 + .charmapconst STRVAR_3, 0xFD, 0x04 + ; unknown (0xFD, 0x05) + .charmapconst RIVAL, 0xFD, 0x06 +; version-dependent strings (originally made for Ruby/Sapphire differences) + .charmapconst VERSION, 0xFD, 0x07 ; "EMERALD" + .charmapconst AQUA, 0xFD, 0x08 + .charmapconst MAGMA, 0xFD, 0x09 + .charmapconst ARCHIE, 0xFD, 0x0A + .charmapconst MAXIE, 0xFD, 0x0B + .charmapconst KYOGRE, 0xFD, 0x0C + .charmapconst GROUDON, 0xFD, 0x0D + .charmapconst next, 0xFE diff --git a/asm/macros.s b/asm/macros.s index c79dc7af1..c4e3b6c87 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -4,6 +4,7 @@ .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_entry x, y, width, height, name .byte \x diff --git a/asm/macros/field_effect_script.s b/asm/macros/field_effect_script.s new file mode 100644 index 000000000..597b89acb --- /dev/null +++ b/asm/macros/field_effect_script.s @@ -0,0 +1,42 @@ + .macro field_eff_loadtiles address + .byte 0 + .4byte \address + .endm + + .macro field_eff_loadfadedpal address + .byte 1 + .4byte \address + .endm + + .macro field_eff_loadpal address + .byte 2 + .4byte \address + .endm + + .macro field_eff_callnative address + .byte 3 + .4byte \address + .endm + + .macro field_eff_end + .byte 4 + .endm + + .macro field_eff_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 + .byte 6 + .4byte \tiles_address + .4byte \function_address + .endm + + .macro field_eff_loadfadedpal_callnative palette_address, function_address + .byte 7 + .4byte \palette_address + .4byte \function_address + .endm |