diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
| commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
| tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /data/battle_anim_scripts.s | |
| parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
merge with master, fix conflicts
Diffstat (limited to 'data/battle_anim_scripts.s')
| -rw-r--r-- | data/battle_anim_scripts.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index b657ae179..e97943840 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -6,7 +6,7 @@ gUnknown_082C8D64:: @ 82C8D64 .incbin "baserom.gba", 0x2c8d64, 0x8 -gUnknown_082C8D6C:: @ 82C8D6C +gBattleAnims_Moves:: @ 82C8D6C .incbin "baserom.gba", 0x2c8d6c, 0x590 gUnknown_082C92FC:: @ 82C92FC |