diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-14 09:24:18 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-14 09:28:16 -0500 |
| commit | 1cf08b32410c3f7c65deebceaebd01d90d58c600 (patch) | |
| tree | 6832d22f7452956b158188a4f9e5fa5ac79c8998 | |
| parent | 41180c74a91ebd02aa0f2445f940914a1c6a80d7 (diff) | |
| parent | f6dfeba742c415d964b415bfefb859c3a3764930 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into dism_more_data
| -rw-r--r-- | data/battle_anim_special.s | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/data/battle_anim_special.s b/data/battle_anim_special.s index c3b3b412c..967e27674 100644 --- a/data/battle_anim_special.s +++ b/data/battle_anim_special.s @@ -126,15 +126,13 @@ gUnknown_840C1C4:: @ 840C1C4 .2byte RGB(29, 30, 30) .2byte RGB(31, 17, 10) .2byte RGB(31, 9, 10) - .2byte RGB(0, 0, 0) - .2byte RGB(1, 16, 0) - .2byte RGB(3, 0, 1) - .2byte RGB(1, 8, 0) - .2byte RGB(0, 8, 0) - .2byte RGB(3, 8, 1) - .2byte RGB(6, 8, 1) - .2byte RGB(4, 0, 0) +gUnknown_840C1DC:: @ 840C1DC + .byte 0x00, 0x00, 0x01, 0x02, 0x03 + .byte 0x04, 0x01, 0x01, 0x00, 0x01 + .byte 0x03, 0x05, 0x06, 0x05, 0x04 + + .align 2 gUnknown_840C1EC:: spr_template 10269, 10269, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C |