diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-03 23:30:21 -0400 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-05-03 21:12:39 -0700 |
| commit | 3fdf3fdadf5ccf66fb64ca847581d7b675dede8b (patch) | |
| tree | 133bb52306cfd84298b4118fdffe4b5e482363e2 | |
| parent | 4316ef12749f9b24d4fd1528a6d4f6a7b26efe6e (diff) | |
remove the last of the baserom calls.
| -rw-r--r-- | data/battle_anim_80CA710.s | 18 | ||||
| -rw-r--r-- | data/battle_anim_812C144.s | 4 | ||||
| -rw-r--r-- | graphics/battle_anims/sprites/effect.pal | 27 |
3 files changed, 44 insertions, 5 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index da1b152fe..72ed3cffa 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -1860,7 +1860,9 @@ gBattleAnimSpriteTemplate_83D7A80:: @ 83D7A80 .align 2 gUnknown_083D7A98:: @ 83D7A98 - .incbin "baserom.gba", 0x003d7a98, 0x18 + obj_rot_scal_anim_frame 0x000A, 0xFFF3, 0x00, 0x0A + obj_rot_scal_anim_frame 0xFFF6, 0x000D, 0x00, 0x0A + obj_rot_scal_anim_end .align 2 gBattleAnimSpriteTemplate_83D7AB0:: @ 83D7AB0 @@ -3016,15 +3018,25 @@ gBattleAnimSpriteTemplate_83D9D80:: @ 83D9D80 .align 2 gUnknown_083D9D98:: @ 83D9D98 - .incbin "baserom.gba", 0x003d9d98, 0x14 + .byte 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5 .align 2 gBattleAnimSpriteTemplate_83D9DAC:: @ 83D9DAC spr_template 10172, 10172, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D8700 +@ bitfield array .align 2 gUnknown_083D9DC4:: @ 83D9DC4 - .incbin "baserom.gba", 0x003d9dc4, 0x28 + .4byte 0x2001E064 + .4byte 0x0001E055 + .4byte 0x1011E0F2 + .4byte 0x1021E042 + .4byte 0x0031E0B6 + .4byte 0x2001E03C + .4byte 0x0011E0D6 + .4byte 0x1001E071 + .4byte 0x1031E0D2 + .4byte 0x0021E026 .align 2 gSpriteAffineAnim_83D9DEC:: @ 83D9DEC diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s index acd704a85..188173252 100644 --- a/data/battle_anim_812C144.s +++ b/data/battle_anim_812C144.s @@ -325,7 +325,7 @@ gUnknown_08402604:: @ 8402604 .align 2 gUnknown_08402608:: @ 8402608 - .incbin "baserom.gba", 0x00402608, 0x8 + .byte 0, 0, 0, 0, 50 .align 2 gUnknown_08402610:: @ 8402610 @@ -500,7 +500,7 @@ gSpriteTemplate_84028CC:: @ 84028CC .align 2 gUnknown_084028E4:: @ 84028E4 - .incbin "baserom.gba", 0x004028e4, 0x30 + .incbin "graphics/battle_anims/sprites/effect.gbapal" .align 2 gSpriteAnim_8402914:: @ 8402914 diff --git a/graphics/battle_anims/sprites/effect.pal b/graphics/battle_anims/sprites/effect.pal new file mode 100644 index 000000000..3dcf4cff6 --- /dev/null +++ b/graphics/battle_anims/sprites/effect.pal @@ -0,0 +1,27 @@ +JASC-PAL +0100 +24 +230 205 8 +230 172 41 +222 148 65 +222 115 90 +213 82 123 +213 57 148 +205 24 172 +205 0 205 +205 0 189 +205 0 164 +205 0 131 +205 0 106 +213 0 82 +213 0 49 +213 0 24 +222 0 0 +222 8 0 +222 41 0 +222 74 0 +222 98 0 +230 131 0 +230 156 0 +230 189 0 +238 222 0 |