diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-24 11:41:27 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-24 11:41:27 +0200 |
| commit | fdfd43d0d31feeda3082227bcfae7d32abc663f6 (patch) | |
| tree | 0d853b60ad7a72d6076410f676b3aeb897ad4b06 /data/animations/projectile | |
| parent | a19a870382befa354caa24148733ea335fcc692c (diff) | |
Extract animations
Diffstat (limited to 'data/animations/projectile')
20 files changed, 407 insertions, 423 deletions
diff --git a/data/animations/projectile/arrowProjectile.s b/data/animations/projectile/arrowProjectile.s index 82ba481e..52d38a55 100644 --- a/data/animations/projectile/arrowProjectile.s +++ b/data/animations/projectile/arrowProjectile.s @@ -5,20 +5,20 @@ .align 2 -gUnk_08129A28:: @ 08129A28 - .incbin "projectileD/gUnk_08129A28.bin" +gSpriteAnimations_ArrowProjectile_0:: @ 08129A28 + .include "animations/gSpriteAnimations_ArrowProjectile_0.s" -gUnk_08129A2D:: @ 08129A2D - .incbin "projectileD/gUnk_08129A2D.bin" +gSpriteAnimations_ArrowProjectile_1:: @ 08129A2D + .include "animations/gSpriteAnimations_ArrowProjectile_1.s" -gUnk_08129A32:: @ 08129A32 - .incbin "projectileD/gUnk_08129A32.bin" +gSpriteAnimations_ArrowProjectile_2:: @ 08129A32 + .include "animations/gSpriteAnimations_ArrowProjectile_2.s" -gUnk_08129A43:: @ 08129A43 - .incbin "projectileD/gUnk_08129A43.bin" +gSpriteAnimations_ArrowProjectile_3:: @ 08129A43 + .include "animations/gSpriteAnimations_ArrowProjectile_3.s" gSpriteAnimations_ArrowProjectile:: @ 08129A54 - .4byte gUnk_08129A28 - .4byte gUnk_08129A2D - .4byte gUnk_08129A32 - .4byte gUnk_08129A43 + .4byte gSpriteAnimations_ArrowProjectile_0 + .4byte gSpriteAnimations_ArrowProjectile_1 + .4byte gSpriteAnimations_ArrowProjectile_2 + .4byte gSpriteAnimations_ArrowProjectile_3 diff --git a/data/animations/projectile/boneProjectile.s b/data/animations/projectile/boneProjectile.s index f1d0570a..ed50e562 100644 --- a/data/animations/projectile/boneProjectile.s +++ b/data/animations/projectile/boneProjectile.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08129634:: @ 08129634 - .incbin "projectile2/gUnk_08129634.bin" +gSpriteAnimations_BoneProjectile_0:: @ 08129634 + .include "animations/gSpriteAnimations_BoneProjectile_0.s" gSpriteAnimations_BoneProjectile:: @ 08129648 - .4byte gUnk_08129634 + .4byte gSpriteAnimations_BoneProjectile_0 .4byte 00000000 diff --git a/data/animations/projectile/cannonballProjectile.s b/data/animations/projectile/cannonballProjectile.s index 71fea5ef..4ed3c895 100644 --- a/data/animations/projectile/cannonballProjectile.s +++ b/data/animations/projectile/cannonballProjectile.s @@ -4,18 +4,18 @@ .section .rodata .align 2 -gUnk_0812A5AC:: @ 0812A5AC - .incbin "projectile1B/gUnk_0812A5AC.bin" +gSpriteAnimations_CannonballProjectile_1:: @ 0812A5AC + .include "animations/gSpriteAnimations_CannonballProjectile_1.s" -gUnk_0812A5B9:: @ 0812A5B9 - .incbin "projectile1B/gUnk_0812A5B9.bin" +gSpriteAnimations_CannonballProjectile_0:: @ 0812A5B9 + .include "animations/gSpriteAnimations_CannonballProjectile_0.s" -gUnk_0812A5C6:: @ 0812A5C6 - .incbin "projectile1B/gUnk_0812A5C6.bin" +gSpriteAnimations_CannonballProjectile_3:: @ 0812A5C6 + .include "animations/gSpriteAnimations_CannonballProjectile_3.s" gSpriteAnimations_CannonballProjectile:: @ 0812A5D4 - .4byte gUnk_0812A5B9 - .4byte gUnk_0812A5AC - .4byte gUnk_0812A5B9 - .4byte gUnk_0812A5C6 + .4byte gSpriteAnimations_CannonballProjectile_0 + .4byte gSpriteAnimations_CannonballProjectile_1 + .4byte gSpriteAnimations_CannonballProjectile_0 + .4byte gSpriteAnimations_CannonballProjectile_3 .4byte 00000000 diff --git a/data/animations/projectile/dirtBallProjectile.s b/data/animations/projectile/dirtBallProjectile.s index ab838b26..9163a98f 100644 --- a/data/animations/projectile/dirtBallProjectile.s +++ b/data/animations/projectile/dirtBallProjectile.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_08129770:: @ 08129770 - .incbin "projectile6/gUnk_08129770.bin" +gSpriteAnimations_DirtBallProjectile_0:: @ 08129770 + .include "animations/gSpriteAnimations_DirtBallProjectile_0.s" -gUnk_08129775:: @ 08129775 - .incbin "projectile6/gUnk_08129775.bin" +gSpriteAnimations_DirtBallProjectile_1:: @ 08129775 + .include "animations/gSpriteAnimations_DirtBallProjectile_1.s" gSpriteAnimations_DirtBallProjectile:: @ 08129790 - .4byte gUnk_08129770 - .4byte gUnk_08129775 + .4byte gSpriteAnimations_DirtBallProjectile_0 + .4byte gSpriteAnimations_DirtBallProjectile_1 .4byte 00000000 diff --git a/data/animations/projectile/fireProjectile.s b/data/animations/projectile/fireProjectile.s index 81975e31..ac0bfa08 100644 --- a/data/animations/projectile/fireProjectile.s +++ b/data/animations/projectile/fireProjectile.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_0812983C:: @ 0812983C - .incbin "projectile8/gUnk_0812983C.bin" +gSpriteAnimations_FireProjectile_0:: @ 0812983C + .include "animations/gSpriteAnimations_FireProjectile_0.s" -gUnk_08129845:: @ 08129845 - .incbin "projectile8/gUnk_08129845.bin" +gSpriteAnimations_FireProjectile_1:: @ 08129845 + .include "animations/gSpriteAnimations_FireProjectile_1.s" -gUnk_0812984E:: @ 0812984E - .incbin "projectile8/gUnk_0812984E.bin" +gSpriteAnimations_FireProjectile_2:: @ 0812984E + .include "animations/gSpriteAnimations_FireProjectile_2.s" -gUnk_08129857:: @ 08129857 - .incbin "projectile8/gUnk_08129857.bin" +gSpriteAnimations_FireProjectile_3:: @ 08129857 + .include "animations/gSpriteAnimations_FireProjectile_3.s" -gUnk_08129860:: @ 08129860 - .incbin "projectile8/gUnk_08129860.bin" +gSpriteAnimations_FireProjectile_4:: @ 08129860 + .include "animations/gSpriteAnimations_FireProjectile_4.s" -gUnk_0812986D:: @ 0812986D - .incbin "projectile8/gUnk_0812986D.bin" +gSpriteAnimations_FireProjectile_5:: @ 0812986D + .include "animations/gSpriteAnimations_FireProjectile_5.s" -gUnk_0812987A:: @ 0812987A - .incbin "projectile8/gUnk_0812987A.bin" +gSpriteAnimations_FireProjectile_6:: @ 0812987A + .include "animations/gSpriteAnimations_FireProjectile_6.s" -gUnk_08129887:: @ 08129887 - .incbin "projectile8/gUnk_08129887.bin" +gSpriteAnimations_FireProjectile_7:: @ 08129887 + .include "animations/gSpriteAnimations_FireProjectile_7.s" gSpriteAnimations_FireProjectile:: @ 08129894 - .4byte gUnk_0812983C - .4byte gUnk_08129845 - .4byte gUnk_0812984E - .4byte gUnk_08129857 - .4byte gUnk_08129860 - .4byte gUnk_0812986D - .4byte gUnk_0812987A - .4byte gUnk_08129887 + .4byte gSpriteAnimations_FireProjectile_0 + .4byte gSpriteAnimations_FireProjectile_1 + .4byte gSpriteAnimations_FireProjectile_2 + .4byte gSpriteAnimations_FireProjectile_3 + .4byte gSpriteAnimations_FireProjectile_4 + .4byte gSpriteAnimations_FireProjectile_5 + .4byte gSpriteAnimations_FireProjectile_6 + .4byte gSpriteAnimations_FireProjectile_7 .4byte 00000000 diff --git a/data/animations/projectile/gyorgMaleEnergyProjectile.s b/data/animations/projectile/gyorgMaleEnergyProjectile.s index 0756781c..27d3856c 100644 --- a/data/animations/projectile/gyorgMaleEnergyProjectile.s +++ b/data/animations/projectile/gyorgMaleEnergyProjectile.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0812A9FC:: @ 0812A9FC - .incbin "projectile23/gUnk_0812A9FC.bin" +gSpriteAnimations_GyorgMaleEnergyProjectile_0:: @ 0812A9FC + .include "animations/gSpriteAnimations_GyorgMaleEnergyProjectile_0.s" -gUnk_0812AA31:: @ 0812AA31 - .incbin "projectile23/gUnk_0812AA31.bin" +gSpriteAnimations_GyorgMaleEnergyProjectile_1:: @ 0812AA31 + .include "animations/gSpriteAnimations_GyorgMaleEnergyProjectile_1.s" gSpriteAnimations_GyorgMaleEnergyProjectile:: @ 0812AA50 - .4byte gUnk_0812A9FC - .4byte gUnk_0812AA31 + .4byte gSpriteAnimations_GyorgMaleEnergyProjectile_0 + .4byte gSpriteAnimations_GyorgMaleEnergyProjectile_1 .4byte 00000000 diff --git a/data/animations/projectile/iceProjectile.s b/data/animations/projectile/iceProjectile.s index e883cc19..753fb7f9 100644 --- a/data/animations/projectile/iceProjectile.s +++ b/data/animations/projectile/iceProjectile.s @@ -4,53 +4,37 @@ .section .rodata .align 2 -gSpriteAnimations_IceProjectile_0:: @gSpriteAnimations_IceProjectile_0 - .byte 4, 2, 0x0, 0x0 - .byte 5, 2, 0x0, 0x80 - .byte 2 @ keyframe count -gSpriteAnimations_IceProjectile_1:: @gSpriteAnimations_IceProjectile_1 - .byte 2, 2, 0x40, 0x0 - .byte 3, 2, 0x40, 0x80 - .byte 2 @ keyframe count -gSpriteAnimations_IceProjectile_2:: @gSpriteAnimations_IceProjectile_2 - .byte 0, 2, 0x0, 0x0 - .byte 1, 2, 0x0, 0x80 - .byte 2 @ keyframe count -gSpriteAnimations_IceProjectile_3:: @gSpriteAnimations_IceProjectile_3 - .byte 2, 2, 0x0, 0x0 - .byte 3, 2, 0x0, 0x80 - .byte 2 @ keyframe count -gSpriteAnimations_IceProjectile_4:: @gSpriteAnimations_IceProjectile_4 - .byte 6, 4, 0x0, 0x0 - .byte 7, 4, 0x0, 0x0 - .byte 8, 4, 0x0, 0x0 - .byte 9, 4, 0x0, 0x80 - .byte 4 @ keyframe count -gSpriteAnimations_IceProjectile_5:: @gSpriteAnimations_IceProjectile_5 - .byte 7, 4, 0x0, 0x0 - .byte 8, 4, 0x0, 0x0 - .byte 9, 4, 0x0, 0x0 - .byte 6, 4, 0x0, 0x80 - .byte 4 @ keyframe count -gSpriteAnimations_IceProjectile_6:: @gSpriteAnimations_IceProjectile_6 - .byte 8, 4, 0x0, 0x0 - .byte 9, 4, 0x0, 0x0 - .byte 6, 4, 0x0, 0x0 - .byte 7, 4, 0x0, 0x80 - .byte 4 @ keyframe count -gSpriteAnimations_IceProjectile_7:: @gSpriteAnimations_IceProjectile_7 - .byte 9, 4, 0x0, 0x0 - .byte 6, 4, 0x0, 0x0 - .byte 7, 4, 0x0, 0x0 - .byte 8, 4, 0x0, 0x80 - .byte 4 @ keyframe count -gSpriteAnimations_IceProjectile:: - .4byte gSpriteAnimations_IceProjectile_0 - .4byte gSpriteAnimations_IceProjectile_1 - .4byte gSpriteAnimations_IceProjectile_2 - .4byte gSpriteAnimations_IceProjectile_3 - .4byte gSpriteAnimations_IceProjectile_4 - .4byte gSpriteAnimations_IceProjectile_5 - .4byte gSpriteAnimations_IceProjectile_6 - .4byte gSpriteAnimations_IceProjectile_7 - .4byte 0 +gUnk_081298C8:: @ 081298C8 + .incbin "projectile9/gUnk_081298C8.bin" + +gUnk_081298D1:: @ 081298D1 + .incbin "projectile9/gUnk_081298D1.bin" + +gUnk_081298DA:: @ 081298DA + .incbin "projectile9/gUnk_081298DA.bin" + +gUnk_081298E3:: @ 081298E3 + .incbin "projectile9/gUnk_081298E3.bin" + +gUnk_081298EC:: @ 081298EC + .incbin "projectile9/gUnk_081298EC.bin" + +gUnk_081298FD:: @ 081298FD + .incbin "projectile9/gUnk_081298FD.bin" + +gUnk_0812990E:: @ 0812990E + .incbin "projectile9/gUnk_0812990E.bin" + +gUnk_0812991F:: @ 0812991F + .incbin "projectile9/gUnk_0812991F.bin" + +gSpriteAnimations_IceProjectile:: @ 08129930 + .4byte gUnk_081298C8 + .4byte gUnk_081298D1 + .4byte gUnk_081298DA + .4byte gUnk_081298E3 + .4byte gUnk_081298EC + .4byte gUnk_081298FD + .4byte gUnk_0812990E + .4byte gUnk_0812991F + .4byte 00000000 diff --git a/data/animations/projectile/lakituCloudProjectile.s b/data/animations/projectile/lakituCloudProjectile.s index 1b47c66f..cb083df3 100644 --- a/data/animations/projectile/lakituCloudProjectile.s +++ b/data/animations/projectile/lakituCloudProjectile.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_08129B84:: @ 08129B84 - .incbin "projectile11/gUnk_08129B84.bin" +gSpriteAnimations_LakituCloudProjectile_0:: @ 08129B84 + .include "animations/gSpriteAnimations_LakituCloudProjectile_0.s" -gUnk_08129B95:: @ 08129B95 - .incbin "projectile11/gUnk_08129B95.bin" +gSpriteAnimations_LakituCloudProjectile_1:: @ 08129B95 + .include "animations/gSpriteAnimations_LakituCloudProjectile_1.s" -gUnk_08129BA6:: @ 08129BA6 - .incbin "projectile11/gUnk_08129BA6.bin" +gSpriteAnimations_LakituCloudProjectile_4:: @ 08129BA6 + .include "animations/gSpriteAnimations_LakituCloudProjectile_4.s" -gUnk_08129BB7:: @ 08129BB7 - .incbin "projectile11/gUnk_08129BB7.bin" +gSpriteAnimations_LakituCloudProjectile_5:: @ 08129BB7 + .include "animations/gSpriteAnimations_LakituCloudProjectile_5.s" gSpriteAnimations_LakituCloudProjectile:: @ 08129BC8 - .4byte gUnk_08129B84 - .4byte gUnk_08129B95 - .4byte gUnk_08129B84 - .4byte gUnk_08129B95 - .4byte gUnk_08129BA6 - .4byte gUnk_08129BB7 - .4byte gUnk_08129BA6 - .4byte gUnk_08129BB7 + .4byte gSpriteAnimations_LakituCloudProjectile_0 + .4byte gSpriteAnimations_LakituCloudProjectile_1 + .4byte gSpriteAnimations_LakituCloudProjectile_0 + .4byte gSpriteAnimations_LakituCloudProjectile_1 + .4byte gSpriteAnimations_LakituCloudProjectile_4 + .4byte gSpriteAnimations_LakituCloudProjectile_5 + .4byte gSpriteAnimations_LakituCloudProjectile_4 + .4byte gSpriteAnimations_LakituCloudProjectile_5 .4byte 00000000 diff --git a/data/animations/projectile/lakituLightning.s b/data/animations/projectile/lakituLightning.s index 1c35cf52..b6759571 100644 --- a/data/animations/projectile/lakituLightning.s +++ b/data/animations/projectile/lakituLightning.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08129C08:: @ 08129C08 - .incbin "projectile12/gUnk_08129C08.bin" +gSpriteAnimations_LakituLightning_0:: @ 08129C08 + .include "animations/gSpriteAnimations_LakituLightning_0.s" gSpriteAnimations_LakituLightning:: @ 08129C74 - .4byte gUnk_08129C08 + .4byte gSpriteAnimations_LakituLightning_0 .4byte 00000000 diff --git a/data/animations/projectile/mandiblesProjectile.s b/data/animations/projectile/mandiblesProjectile.s index f441bd9b..eb42670e 100644 --- a/data/animations/projectile/mandiblesProjectile.s +++ b/data/animations/projectile/mandiblesProjectile.s @@ -4,133 +4,133 @@ .section .rodata .align 2 -gUnk_08129D1C:: @ 08129D1C - .incbin "projectile13/gUnk_08129D1C.bin" +gSpriteAnimations_MandiblesProjectile_0:: @ 08129D1C + .include "animations/gSpriteAnimations_MandiblesProjectile_0.s" -gUnk_08129D21:: @ 08129D21 - .incbin "projectile13/gUnk_08129D21.bin" +gSpriteAnimations_MandiblesProjectile_1:: @ 08129D21 + .include "animations/gSpriteAnimations_MandiblesProjectile_1.s" -gUnk_08129D26:: @ 08129D26 - .incbin "projectile13/gUnk_08129D26.bin" +gSpriteAnimations_MandiblesProjectile_2:: @ 08129D26 + .include "animations/gSpriteAnimations_MandiblesProjectile_2.s" -gUnk_08129D2B:: @ 08129D2B - .incbin "projectile13/gUnk_08129D2B.bin" +gSpriteAnimations_MandiblesProjectile_3:: @ 08129D2B + .include "animations/gSpriteAnimations_MandiblesProjectile_3.s" -gUnk_08129D30:: @ 08129D30 - .incbin "projectile13/gUnk_08129D30.bin" +gSpriteAnimations_MandiblesProjectile_4:: @ 08129D30 + .include "animations/gSpriteAnimations_MandiblesProjectile_4.s" -gUnk_08129D35:: @ 08129D35 - .incbin "projectile13/gUnk_08129D35.bin" +gSpriteAnimations_MandiblesProjectile_5:: @ 08129D35 + .include "animations/gSpriteAnimations_MandiblesProjectile_5.s" -gUnk_08129D3A:: @ 08129D3A - .incbin "projectile13/gUnk_08129D3A.bin" +gSpriteAnimations_MandiblesProjectile_6:: @ 08129D3A + .include "animations/gSpriteAnimations_MandiblesProjectile_6.s" -gUnk_08129D3F:: @ 08129D3F - .incbin "projectile13/gUnk_08129D3F.bin" +gSpriteAnimations_MandiblesProjectile_7:: @ 08129D3F + .include "animations/gSpriteAnimations_MandiblesProjectile_7.s" -gUnk_08129D44:: @ 08129D44 - .incbin "projectile13/gUnk_08129D44.bin" +gSpriteAnimations_MandiblesProjectile_8:: @ 08129D44 + .include "animations/gSpriteAnimations_MandiblesProjectile_8.s" -gUnk_08129D55:: @ 08129D55 - .incbin "projectile13/gUnk_08129D55.bin" +gSpriteAnimations_MandiblesProjectile_9:: @ 08129D55 + .include "animations/gSpriteAnimations_MandiblesProjectile_9.s" -gUnk_08129D66:: @ 08129D66 - .incbin "projectile13/gUnk_08129D66.bin" +gSpriteAnimations_MandiblesProjectile_10:: @ 08129D66 + .include "animations/gSpriteAnimations_MandiblesProjectile_10.s" -gUnk_08129D77:: @ 08129D77 - .incbin "projectile13/gUnk_08129D77.bin" +gSpriteAnimations_MandiblesProjectile_11:: @ 08129D77 + .include "animations/gSpriteAnimations_MandiblesProjectile_11.s" -gUnk_08129D88:: @ 08129D88 - .incbin "projectile13/gUnk_08129D88.bin" +gSpriteAnimations_MandiblesProjectile_12:: @ 08129D88 + .include "animations/gSpriteAnimations_MandiblesProjectile_12.s" -gUnk_08129D99:: @ 08129D99 - .incbin "projectile13/gUnk_08129D99.bin" +gSpriteAnimations_MandiblesProjectile_13:: @ 08129D99 + .include "animations/gSpriteAnimations_MandiblesProjectile_13.s" -gUnk_08129DAA:: @ 08129DAA - .incbin "projectile13/gUnk_08129DAA.bin" +gSpriteAnimations_MandiblesProjectile_14:: @ 08129DAA + .include "animations/gSpriteAnimations_MandiblesProjectile_14.s" -gUnk_08129DBB:: @ 08129DBB - .incbin "projectile13/gUnk_08129DBB.bin" +gSpriteAnimations_MandiblesProjectile_15:: @ 08129DBB + .include "animations/gSpriteAnimations_MandiblesProjectile_15.s" -gUnk_08129DCC:: @ 08129DCC - .incbin "projectile13/gUnk_08129DCC.bin" +gSpriteAnimations_MandiblesProjectile_16:: @ 08129DCC + .include "animations/gSpriteAnimations_MandiblesProjectile_16.s" -gUnk_08129DD8:: @ 08129DD8 - .incbin "projectile13/gUnk_08129DD8.bin" +gSpriteAnimations_MandiblesProjectile_17:: @ 08129DD8 + .include "animations/gSpriteAnimations_MandiblesProjectile_17.s" -gUnk_08129DE4:: @ 08129DE4 - .incbin "projectile13/gUnk_08129DE4.bin" +gSpriteAnimations_MandiblesProjectile_18:: @ 08129DE4 + .include "animations/gSpriteAnimations_MandiblesProjectile_18.s" -gUnk_08129DF0:: @ 08129DF0 - .incbin "projectile13/gUnk_08129DF0.bin" +gSpriteAnimations_MandiblesProjectile_19:: @ 08129DF0 + .include "animations/gSpriteAnimations_MandiblesProjectile_19.s" -gUnk_08129DFC:: @ 08129DFC - .incbin "projectile13/gUnk_08129DFC.bin" +gSpriteAnimations_MandiblesProjectile_20:: @ 08129DFC + .include "animations/gSpriteAnimations_MandiblesProjectile_20.s" -gUnk_08129E08:: @ 08129E08 - .incbin "projectile13/gUnk_08129E08.bin" +gSpriteAnimations_MandiblesProjectile_21:: @ 08129E08 + .include "animations/gSpriteAnimations_MandiblesProjectile_21.s" -gUnk_08129E14:: @ 08129E14 - .incbin "projectile13/gUnk_08129E14.bin" +gSpriteAnimations_MandiblesProjectile_22:: @ 08129E14 + .include "animations/gSpriteAnimations_MandiblesProjectile_22.s" -gUnk_08129E20:: @ 08129E20 - .incbin "projectile13/gUnk_08129E20.bin" +gSpriteAnimations_MandiblesProjectile_23:: @ 08129E20 + .include "animations/gSpriteAnimations_MandiblesProjectile_23.s" -gUnk_08129E2C:: @ 08129E2C - .incbin "projectile13/gUnk_08129E2C.bin" +gSpriteAnimations_MandiblesProjectile_24:: @ 08129E2C + .include "animations/gSpriteAnimations_MandiblesProjectile_24.s" -gUnk_08129E4D:: @ 08129E4D - .incbin "projectile13/gUnk_08129E4D.bin" +gSpriteAnimations_MandiblesProjectile_25:: @ 08129E4D + .include "animations/gSpriteAnimations_MandiblesProjectile_25.s" -gUnk_08129E6E:: @ 08129E6E - .incbin "projectile13/gUnk_08129E6E.bin" +gSpriteAnimations_MandiblesProjectile_26:: @ 08129E6E + .include "animations/gSpriteAnimations_MandiblesProjectile_26.s" -gUnk_08129E8F:: @ 08129E8F - .incbin "projectile13/gUnk_08129E8F.bin" +gSpriteAnimations_MandiblesProjectile_27:: @ 08129E8F + .include "animations/gSpriteAnimations_MandiblesProjectile_27.s" -gUnk_08129EB0:: @ 08129EB0 - .incbin "projectile13/gUnk_08129EB0.bin" +gSpriteAnimations_MandiblesProjectile_28:: @ 08129EB0 + .include "animations/gSpriteAnimations_MandiblesProjectile_28.s" -gUnk_08129ED1:: @ 08129ED1 - .incbin "projectile13/gUnk_08129ED1.bin" +gSpriteAnimations_MandiblesProjectile_29:: @ 08129ED1 + .include "animations/gSpriteAnimations_MandiblesProjectile_29.s" -gUnk_08129EF2:: @ 08129EF2 - .incbin "projectile13/gUnk_08129EF2.bin" +gSpriteAnimations_MandiblesProjectile_30:: @ 08129EF2 + .include "animations/gSpriteAnimations_MandiblesProjectile_30.s" -gUnk_08129F13:: @ 08129F13 - .incbin "projectile13/gUnk_08129F13.bin" +gSpriteAnimations_MandiblesProjectile_31:: @ 08129F13 + .include "animations/gSpriteAnimations_MandiblesProjectile_31.s" gSpriteAnimations_MandiblesProjectile:: @ 08129F34 - .4byte gUnk_08129D1C - .4byte gUnk_08129D21 - .4byte gUnk_08129D26 - .4byte gUnk_08129D2B - .4byte gUnk_08129D30 - .4byte gUnk_08129D35 - .4byte gUnk_08129D3A - .4byte gUnk_08129D3F - .4byte gUnk_08129D44 - .4byte gUnk_08129D55 - .4byte gUnk_08129D66 - .4byte gUnk_08129D77 - .4byte gUnk_08129D88 - .4byte gUnk_08129D99 - .4byte gUnk_08129DAA - .4byte gUnk_08129DBB - .4byte gUnk_08129DCC - .4byte gUnk_08129DD8 - .4byte gUnk_08129DE4 - .4byte gUnk_08129DF0 - .4byte gUnk_08129DFC - .4byte gUnk_08129E08 - .4byte gUnk_08129E14 - .4byte gUnk_08129E20 - .4byte gUnk_08129E2C - .4byte gUnk_08129E4D - .4byte gUnk_08129E6E - .4byte gUnk_08129E8F - .4byte gUnk_08129EB0 - .4byte gUnk_08129ED1 - .4byte gUnk_08129EF2 - .4byte gUnk_08129F13 + .4byte gSpriteAnimations_MandiblesProjectile_0 + .4byte gSpriteAnimations_MandiblesProjectile_1 + .4byte gSpriteAnimations_MandiblesProjectile_2 + .4byte gSpriteAnimations_MandiblesProjectile_3 + .4byte gSpriteAnimations_MandiblesProjectile_4 + .4byte gSpriteAnimations_MandiblesProjectile_5 + .4byte gSpriteAnimations_MandiblesProjectile_6 + .4byte gSpriteAnimations_MandiblesProjectile_7 + .4byte gSpriteAnimations_MandiblesProjectile_8 + .4byte gSpriteAnimations_MandiblesProjectile_9 + .4byte gSpriteAnimations_MandiblesProjectile_10 + .4byte gSpriteAnimations_MandiblesProjectile_11 + .4byte gSpriteAnimations_MandiblesProjectile_12 + .4byte gSpriteAnimations_MandiblesProjectile_13 + .4byte gSpriteAnimations_MandiblesProjectile_14 + .4byte gSpriteAnimations_MandiblesProjectile_15 + .4byte gSpriteAnimations_MandiblesProjectile_16 + .4byte gSpriteAnimations_MandiblesProjectile_17 + .4byte gSpriteAnimations_MandiblesProjectile_18 + .4byte gSpriteAnimations_MandiblesProjectile_19 + .4byte gSpriteAnimations_MandiblesProjectile_20 + .4byte gSpriteAnimations_MandiblesProjectile_21 + .4byte gSpriteAnimations_MandiblesProjectile_22 + .4byte gSpriteAnimations_MandiblesProjectile_23 + .4byte gSpriteAnimations_MandiblesProjectile_24 + .4byte gSpriteAnimations_MandiblesProjectile_25 + .4byte gSpriteAnimations_MandiblesProjectile_26 + .4byte gSpriteAnimations_MandiblesProjectile_27 + .4byte gSpriteAnimations_MandiblesProjectile_28 + .4byte gSpriteAnimations_MandiblesProjectile_29 + .4byte gSpriteAnimations_MandiblesProjectile_30 + .4byte gSpriteAnimations_MandiblesProjectile_31 .4byte 00000000 diff --git a/data/animations/projectile/mazaalEnergyBeam.s b/data/animations/projectile/mazaalEnergyBeam.s index d8ffa2de..7b026372 100644 --- a/data/animations/projectile/mazaalEnergyBeam.s +++ b/data/animations/projectile/mazaalEnergyBeam.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_08129A70:: @ 08129A70 - .incbin "projectileE/gUnk_08129A70.bin" +gSpriteAnimations_MazaalEnergyBeam_0:: @ 08129A70 + .include "animations/gSpriteAnimations_MazaalEnergyBeam_0.s" -gUnk_08129A89:: @ 08129A89 - .incbin "projectileE/gUnk_08129A89.bin" +gSpriteAnimations_MazaalEnergyBeam_1:: @ 08129A89 + .include "animations/gSpriteAnimations_MazaalEnergyBeam_1.s" gSpriteAnimations_MazaalEnergyBeam:: @ 08129AB0 - .4byte gUnk_08129A70 - .4byte gUnk_08129A89 + .4byte gSpriteAnimations_MazaalEnergyBeam_0 + .4byte gSpriteAnimations_MazaalEnergyBeam_1 .4byte 00000000 diff --git a/data/animations/projectile/rockProjectile.s b/data/animations/projectile/rockProjectile.s index c6b4a59d..abdc7220 100644 --- a/data/animations/projectile/rockProjectile.s +++ b/data/animations/projectile/rockProjectile.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_081295F4:: @ 081295F4 - .incbin "projectile1/gUnk_081295F4.bin" +gSpriteAnimations_RockProjectile_0:: @ 081295F4 + .include "animations/gSpriteAnimations_RockProjectile_0.s" gSpriteAnimations_RockProjectile:: @ 08129604 - .4byte gUnk_081295F4 + .4byte gSpriteAnimations_RockProjectile_0 .4byte 00000000 diff --git a/data/animations/projectile/spiderWeb.s b/data/animations/projectile/spiderWeb.s index 6a5d91f1..efbb342b 100644 --- a/data/animations/projectile/spiderWeb.s +++ b/data/animations/projectile/spiderWeb.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_0812A08C:: @ 0812A08C - .incbin "projectile15/gUnk_0812A08C.bin" +gSpriteAnimations_SpiderWeb_0:: @ 0812A08C + .include "animations/gSpriteAnimations_SpiderWeb_0.s" -gUnk_0812A090:: @ 0812A090 - .incbin "projectile15/gUnk_0812A090.bin" +gSpriteAnimations_SpiderWeb_1:: @ 0812A090 + .include "animations/gSpriteAnimations_SpiderWeb_1.s" -gUnk_0812A094:: @ 0812A094 - .incbin "projectile15/gUnk_0812A094.bin" +gSpriteAnimations_SpiderWeb_2:: @ 0812A094 + .include "animations/gSpriteAnimations_SpiderWeb_2.s" -gUnk_0812A098:: @ 0812A098 - .incbin "projectile15/gUnk_0812A098.bin" +gSpriteAnimations_SpiderWeb_3:: @ 0812A098 + .include "animations/gSpriteAnimations_SpiderWeb_3.s" -gUnk_0812A09C:: @ 0812A09C - .incbin "projectile15/gUnk_0812A09C.bin" +gSpriteAnimations_SpiderWeb_4:: @ 0812A09C + .include "animations/gSpriteAnimations_SpiderWeb_4.s" -gUnk_0812A0A8:: @ 0812A0A8 - .incbin "projectile15/gUnk_0812A0A8.bin" +gSpriteAnimations_SpiderWeb_5:: @ 0812A0A8 + .include "animations/gSpriteAnimations_SpiderWeb_5.s" -gUnk_0812A0B4:: @ 0812A0B4 - .incbin "projectile15/gUnk_0812A0B4.bin" +gSpriteAnimations_SpiderWeb_6:: @ 0812A0B4 + .include "animations/gSpriteAnimations_SpiderWeb_6.s" -gUnk_0812A0C0:: @ 0812A0C0 - .incbin "projectile15/gUnk_0812A0C0.bin" +gSpriteAnimations_SpiderWeb_7:: @ 0812A0C0 + .include "animations/gSpriteAnimations_SpiderWeb_7.s" -gUnk_0812A0CC:: @ 0812A0CC - .incbin "projectile15/gUnk_0812A0CC.bin" +gSpriteAnimations_SpiderWeb_8:: @ 0812A0CC + .include "animations/gSpriteAnimations_SpiderWeb_8.s" -gUnk_0812A114:: @ 0812A114 - .incbin "projectile15/gUnk_0812A114.bin" +gSpriteAnimations_SpiderWeb_9:: @ 0812A114 + .include "animations/gSpriteAnimations_SpiderWeb_9.s" -gUnk_0812A15C:: @ 0812A15C - .incbin "projectile15/gUnk_0812A15C.bin" +gSpriteAnimations_SpiderWeb_10:: @ 0812A15C + .include "animations/gSpriteAnimations_SpiderWeb_10.s" -gUnk_0812A1A4:: @ 0812A1A4 - .incbin "projectile15/gUnk_0812A1A4.bin" +gSpriteAnimations_SpiderWeb_11:: @ 0812A1A4 + .include "animations/gSpriteAnimations_SpiderWeb_11.s" -gUnk_0812A1EC:: @ 0812A1EC - .incbin "projectile15/gUnk_0812A1EC.bin" +gSpriteAnimations_SpiderWeb_12:: @ 0812A1EC + .include "animations/gSpriteAnimations_SpiderWeb_12.s" -gUnk_0812A210:: @ 0812A210 - .incbin "projectile15/gUnk_0812A210.bin" +gSpriteAnimations_SpiderWeb_13:: @ 0812A210 + .include "animations/gSpriteAnimations_SpiderWeb_13.s" -gUnk_0812A234:: @ 0812A234 - .incbin "projectile15/gUnk_0812A234.bin" +gSpriteAnimations_SpiderWeb_14:: @ 0812A234 + .include "animations/gSpriteAnimations_SpiderWeb_14.s" -gUnk_0812A258:: @ 0812A258 - .incbin "projectile15/gUnk_0812A258.bin" +gSpriteAnimations_SpiderWeb_15:: @ 0812A258 + .include "animations/gSpriteAnimations_SpiderWeb_15.s" -gUnk_0812A27C:: @ 0812A27C - .incbin "projectile15/gUnk_0812A27C.bin" +gSpriteAnimations_SpiderWeb_16:: @ 0812A27C + .include "animations/gSpriteAnimations_SpiderWeb_16.s" -gUnk_0812A2B8:: @ 0812A2B8 - .incbin "projectile15/gUnk_0812A2B8.bin" +gSpriteAnimations_SpiderWeb_17:: @ 0812A2B8 + .include "animations/gSpriteAnimations_SpiderWeb_17.s" -gUnk_0812A2F4:: @ 0812A2F4 - .incbin "projectile15/gUnk_0812A2F4.bin" +gSpriteAnimations_SpiderWeb_18:: @ 0812A2F4 + .include "animations/gSpriteAnimations_SpiderWeb_18.s" -gUnk_0812A330:: @ 0812A330 - .incbin "projectile15/gUnk_0812A330.bin" +gSpriteAnimations_SpiderWeb_19:: @ 0812A330 + .include "animations/gSpriteAnimations_SpiderWeb_19.s" gSpriteAnimations_SpiderWeb:: @ 0812A36C - .4byte gUnk_0812A08C - .4byte gUnk_0812A090 - .4byte gUnk_0812A094 - .4byte gUnk_0812A098 - .4byte gUnk_0812A09C - .4byte gUnk_0812A0A8 - .4byte gUnk_0812A0B4 - .4byte gUnk_0812A0C0 - .4byte gUnk_0812A0CC - .4byte gUnk_0812A114 - .4byte gUnk_0812A15C - .4byte gUnk_0812A1A4 - .4byte gUnk_0812A1EC - .4byte gUnk_0812A210 - .4byte gUnk_0812A234 - .4byte gUnk_0812A258 - .4byte gUnk_0812A27C - .4byte gUnk_0812A2B8 - .4byte gUnk_0812A2F4 - .4byte gUnk_0812A330 + .4byte gSpriteAnimations_SpiderWeb_0 + .4byte gSpriteAnimations_SpiderWeb_1 + .4byte gSpriteAnimations_SpiderWeb_2 + .4byte gSpriteAnimations_SpiderWeb_3 + .4byte gSpriteAnimations_SpiderWeb_4 + .4byte gSpriteAnimations_SpiderWeb_5 + .4byte gSpriteAnimations_SpiderWeb_6 + .4byte gSpriteAnimations_SpiderWeb_7 + .4byte gSpriteAnimations_SpiderWeb_8 + .4byte gSpriteAnimations_SpiderWeb_9 + .4byte gSpriteAnimations_SpiderWeb_10 + .4byte gSpriteAnimations_SpiderWeb_11 + .4byte gSpriteAnimations_SpiderWeb_12 + .4byte gSpriteAnimations_SpiderWeb_13 + .4byte gSpriteAnimations_SpiderWeb_14 + .4byte gSpriteAnimations_SpiderWeb_15 + .4byte gSpriteAnimations_SpiderWeb_16 + .4byte gSpriteAnimations_SpiderWeb_17 + .4byte gSpriteAnimations_SpiderWeb_18 + .4byte gSpriteAnimations_SpiderWeb_19 .4byte 00000000 diff --git a/data/animations/projectile/spikedRollers.s b/data/animations/projectile/spikedRollers.s index 0a64a2e0..f568b058 100644 --- a/data/animations/projectile/spikedRollers.s +++ b/data/animations/projectile/spikedRollers.s @@ -4,61 +4,61 @@ .section .rodata @ .align 2 -gUnk_0812A6E2:: @ 0812A6E2 - .incbin "projectile1E/gUnk_0812A6E2.bin" +gSpriteAnimations_SpikedRollers_0:: @ 0812A6E2 + .include "animations/gSpriteAnimations_SpikedRollers_0.s" -gUnk_0812A6EF:: @ 0812A6EF - .incbin "projectile1E/gUnk_0812A6EF.bin" +gSpriteAnimations_SpikedRollers_1:: @ 0812A6EF + .include "animations/gSpriteAnimations_SpikedRollers_1.s" -gUnk_0812A6FC:: @ 0812A6FC - .incbin "projectile1E/gUnk_0812A6FC.bin" +gSpriteAnimations_SpikedRollers_2:: @ 0812A6FC + .include "animations/gSpriteAnimations_SpikedRollers_2.s" -gUnk_0812A709:: @ 0812A709 - .incbin "projectile1E/gUnk_0812A709.bin" +gSpriteAnimations_SpikedRollers_3:: @ 0812A709 + .include "animations/gSpriteAnimations_SpikedRollers_3.s" -gUnk_0812A716:: @ 0812A716 - .incbin "projectile1E/gUnk_0812A716.bin" +gSpriteAnimations_SpikedRollers_4:: @ 0812A716 + .include "animations/gSpriteAnimations_SpikedRollers_4.s" -gUnk_0812A723:: @ 0812A723 - .incbin "projectile1E/gUnk_0812A723.bin" +gSpriteAnimations_SpikedRollers_5:: @ 0812A723 + .include "animations/gSpriteAnimations_SpikedRollers_5.s" -gUnk_0812A730:: @ 0812A730 - .incbin "projectile1E/gUnk_0812A730.bin" +gSpriteAnimations_SpikedRollers_6:: @ 0812A730 + .include "animations/gSpriteAnimations_SpikedRollers_6.s" -gUnk_0812A73D:: @ 0812A73D - .incbin "projectile1E/gUnk_0812A73D.bin" +gSpriteAnimations_SpikedRollers_7:: @ 0812A73D + .include "animations/gSpriteAnimations_SpikedRollers_7.s" -gUnk_0812A74A:: @ 0812A74A - .incbin "projectile1E/gUnk_0812A74A.bin" +gSpriteAnimations_SpikedRollers_8:: @ 0812A74A + .include "animations/gSpriteAnimations_SpikedRollers_8.s" -gUnk_0812A757:: @ 0812A757 - .incbin "projectile1E/gUnk_0812A757.bin" +gSpriteAnimations_SpikedRollers_9:: @ 0812A757 + .include "animations/gSpriteAnimations_SpikedRollers_9.s" -gUnk_0812A764:: @ 0812A764 - .incbin "projectile1E/gUnk_0812A764.bin" +gSpriteAnimations_SpikedRollers_10:: @ 0812A764 + .include "animations/gSpriteAnimations_SpikedRollers_10.s" -gUnk_0812A771:: @ 0812A771 - .incbin "projectile1E/gUnk_0812A771.bin" +gSpriteAnimations_SpikedRollers_11:: @ 0812A771 + .include "animations/gSpriteAnimations_SpikedRollers_11.s" -gUnk_0812A77E:: @ 0812A77E - .incbin "projectile1E/gUnk_0812A77E.bin" +gSpriteAnimations_SpikedRollers_12:: @ 0812A77E + .include "animations/gSpriteAnimations_SpikedRollers_12.s" -gUnk_0812A78B:: @ 0812A78B - .incbin "projectile1E/gUnk_0812A78B.bin" +gSpriteAnimations_SpikedRollers_13:: @ 0812A78B + .include "animations/gSpriteAnimations_SpikedRollers_13.s" gSpriteAnimations_SpikedRollers:: @ 0812A798 - .4byte gUnk_0812A6E2 - .4byte gUnk_0812A6EF - .4byte gUnk_0812A6FC - .4byte gUnk_0812A709 - .4byte gUnk_0812A716 - .4byte gUnk_0812A723 - .4byte gUnk_0812A730 - .4byte gUnk_0812A73D - .4byte gUnk_0812A74A - .4byte gUnk_0812A757 - .4byte gUnk_0812A764 - .4byte gUnk_0812A771 - .4byte gUnk_0812A77E - .4byte gUnk_0812A78B + .4byte gSpriteAnimations_SpikedRollers_0 + .4byte gSpriteAnimations_SpikedRollers_1 + .4byte gSpriteAnimations_SpikedRollers_2 + .4byte gSpriteAnimations_SpikedRollers_3 + .4byte gSpriteAnimations_SpikedRollers_4 + .4byte gSpriteAnimations_SpikedRollers_5 + .4byte gSpriteAnimations_SpikedRollers_6 + .4byte gSpriteAnimations_SpikedRollers_7 + .4byte gSpriteAnimations_SpikedRollers_8 + .4byte gSpriteAnimations_SpikedRollers_9 + .4byte gSpriteAnimations_SpikedRollers_10 + .4byte gSpriteAnimations_SpikedRollers_11 + .4byte gSpriteAnimations_SpikedRollers_12 + .4byte gSpriteAnimations_SpikedRollers_13 .4byte 00000000 diff --git a/data/animations/projectile/torchTrapProjectile.s b/data/animations/projectile/torchTrapProjectile.s index 269d8dc3..68f30f1f 100644 --- a/data/animations/projectile/torchTrapProjectile.s +++ b/data/animations/projectile/torchTrapProjectile.s @@ -4,16 +4,16 @@ .section .rodata .align 2 -gUnk_0812A3E0:: @ 0812A3E0 +gSpriteAnimations_TorchTrapProjectile_0_0:: @ 0812A3E0 .incbin "baserom.gba", 0x12A3E0, 0x0000014 gSpriteAnimations_TorchTrapProjectile_0:: @ 0812A3F4 - .4byte gUnk_0812A3E0 + .4byte gSpriteAnimations_TorchTrapProjectile_0_0 .4byte 00000000 -gUnk_0812A3FC:: @ 0812A3FC - .incbin "projectile16/gUnk_0812A3FC.bin" +gSpriteAnimations_TorchTrapProjectile_1_0:: @ 0812A3FC + .include "animations/gSpriteAnimations_TorchTrapProjectile_1_0.s" gSpriteAnimations_TorchTrapProjectile_1:: @ 0812A410 - .4byte gUnk_0812A3FC + .4byte gSpriteAnimations_TorchTrapProjectile_1_0 .4byte 00000000 diff --git a/data/animations/projectile/v1DarkMagicProjectile.s b/data/animations/projectile/v1DarkMagicProjectile.s index 13ad3ff0..423d4d04 100644 --- a/data/animations/projectile/v1DarkMagicProjectile.s +++ b/data/animations/projectile/v1DarkMagicProjectile.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0812A44C:: @ 0812A44C - .incbin "projectile18/gUnk_0812A44C.bin" +gSpriteAnimations_V1DarkMagicProjectile_0:: @ 0812A44C + .include "animations/gSpriteAnimations_V1DarkMagicProjectile_0.s" -gUnk_0812A46D:: @ 0812A46D - .incbin "projectile18/gUnk_0812A46D.bin" +gSpriteAnimations_V1DarkMagicProjectile_1:: @ 0812A46D + .include "animations/gSpriteAnimations_V1DarkMagicProjectile_1.s" gSpriteAnimations_V1DarkMagicProjectile:: @ 0812A488 - .4byte gUnk_0812A44C - .4byte gUnk_0812A46D + .4byte gSpriteAnimations_V1DarkMagicProjectile_0 + .4byte gSpriteAnimations_V1DarkMagicProjectile_1 .4byte 00000000 diff --git a/data/animations/projectile/v1EyeLaser.s b/data/animations/projectile/v1EyeLaser.s index bda5f31d..79722a68 100644 --- a/data/animations/projectile/v1EyeLaser.s +++ b/data/animations/projectile/v1EyeLaser.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0812A63C:: @ 0812A63C - .incbin "projectile1C/gUnk_0812A63C.bin" +gSpriteAnimations_V1EyeLaser_0:: @ 0812A63C + .include "animations/gSpriteAnimations_V1EyeLaser_0.s" -gUnk_0812A65C:: @ 0812A65C - .incbin "projectile1C/gUnk_0812A65C.bin" +gSpriteAnimations_V1EyeLaser_1:: @ 0812A65C + .include "animations/gSpriteAnimations_V1EyeLaser_1.s" -gUnk_0812A665:: @ 0812A665 - .incbin "projectile1C/gUnk_0812A665.bin" +gSpriteAnimations_V1EyeLaser_2:: @ 0812A665 + .include "animations/gSpriteAnimations_V1EyeLaser_2.s" -gUnk_0812A66E:: @ 0812A66E - .incbin "projectile1C/gUnk_0812A66E.bin" +gSpriteAnimations_V1EyeLaser_3:: @ 0812A66E + .include "animations/gSpriteAnimations_V1EyeLaser_3.s" -gUnk_0812A677:: @ 0812A677 - .incbin "projectile1C/gUnk_0812A677.bin" +gSpriteAnimations_V1EyeLaser_4:: @ 0812A677 + .include "animations/gSpriteAnimations_V1EyeLaser_4.s" -gUnk_0812A680:: @ 0812A680 - .incbin "projectile1C/gUnk_0812A680.bin" +gSpriteAnimations_V1EyeLaser_5:: @ 0812A680 + .include "animations/gSpriteAnimations_V1EyeLaser_5.s" -gUnk_0812A689:: @ 0812A689 - .incbin "projectile1C/gUnk_0812A689.bin" +gSpriteAnimations_V1EyeLaser_6:: @ 0812A689 + .include "animations/gSpriteAnimations_V1EyeLaser_6.s" gSpriteAnimations_V1EyeLaser:: @ 0812A694 - .4byte gUnk_0812A63C - .4byte gUnk_0812A65C - .4byte gUnk_0812A665 - .4byte gUnk_0812A66E - .4byte gUnk_0812A677 - .4byte gUnk_0812A680 - .4byte gUnk_0812A689 + .4byte gSpriteAnimations_V1EyeLaser_0 + .4byte gSpriteAnimations_V1EyeLaser_1 + .4byte gSpriteAnimations_V1EyeLaser_2 + .4byte gSpriteAnimations_V1EyeLaser_3 + .4byte gSpriteAnimations_V1EyeLaser_4 + .4byte gSpriteAnimations_V1EyeLaser_5 + .4byte gSpriteAnimations_V1EyeLaser_6 .4byte 00000000 diff --git a/data/animations/projectile/v2Projectile.s b/data/animations/projectile/v2Projectile.s index af2188d4..997e03d0 100644 --- a/data/animations/projectile/v2Projectile.s +++ b/data/animations/projectile/v2Projectile.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0812A814:: @ 0812A814 - .incbin "projectile1F/gUnk_0812A814.bin" +gSpriteAnimations_V2Projectile_0:: @ 0812A814 + .include "animations/gSpriteAnimations_V2Projectile_0.s" -gUnk_0812A825:: @ 0812A825 - .incbin "projectile1F/gUnk_0812A825.bin" +gSpriteAnimations_V2Projectile_1:: @ 0812A825 + .include "animations/gSpriteAnimations_V2Projectile_1.s" gSpriteAnimations_V2Projectile:: @ 0812A840 - .4byte gUnk_0812A814 - .4byte gUnk_0812A825 + .4byte gSpriteAnimations_V2Projectile_0 + .4byte gSpriteAnimations_V2Projectile_1 .4byte 00000000 diff --git a/data/animations/projectile/v3HandProjectile.s b/data/animations/projectile/v3HandProjectile.s index cebb3600..6d91528e 100644 --- a/data/animations/projectile/v3HandProjectile.s +++ b/data/animations/projectile/v3HandProjectile.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_0812A860:: @ 0812A860 - .incbin "projectile20/gUnk_0812A860.bin" +gSpriteAnimations_V3HandProjectile_0:: @ 0812A860 + .include "animations/gSpriteAnimations_V3HandProjectile_0.s" -gUnk_0812A871:: @ 0812A871 - .incbin "projectile20/gUnk_0812A871.bin" +gSpriteAnimations_V3HandProjectile_1:: @ 0812A871 + .include "animations/gSpriteAnimations_V3HandProjectile_1.s" -gUnk_0812A8CA:: @ 0812A8CA - .incbin "projectile20/gUnk_0812A8CA.bin" +gSpriteAnimations_V3HandProjectile_2:: @ 0812A8CA + .include "animations/gSpriteAnimations_V3HandProjectile_2.s" -gUnk_0812A92B:: @ 0812A92B - .incbin "projectile20/gUnk_0812A92B.bin" +gSpriteAnimations_V3HandProjectile_3:: @ 0812A92B + .include "animations/gSpriteAnimations_V3HandProjectile_3.s" gSpriteAnimations_V3HandProjectile:: @ 0812A940 - .4byte gUnk_0812A860 - .4byte gUnk_0812A871 - .4byte gUnk_0812A8CA - .4byte gUnk_0812A92B + .4byte gSpriteAnimations_V3HandProjectile_0 + .4byte gSpriteAnimations_V3HandProjectile_1 + .4byte gSpriteAnimations_V3HandProjectile_2 + .4byte gSpriteAnimations_V3HandProjectile_3 .4byte 00000000 diff --git a/data/animations/projectile/windProjectile.s b/data/animations/projectile/windProjectile.s index fee363b6..35279785 100644 --- a/data/animations/projectile/windProjectile.s +++ b/data/animations/projectile/windProjectile.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_081297AC:: @ 081297AC - .incbin "projectile7/gUnk_081297AC.bin" +gSpriteAnimations_WindProjectile_0:: @ 081297AC + .include "animations/gSpriteAnimations_WindProjectile_0.s" -gUnk_081297B5:: @ 081297B5 - .incbin "projectile7/gUnk_081297B5.bin" +gSpriteAnimations_WindProjectile_1:: @ 081297B5 + .include "animations/gSpriteAnimations_WindProjectile_1.s" -gUnk_081297BE:: @ 081297BE - .incbin "projectile7/gUnk_081297BE.bin" +gSpriteAnimations_WindProjectile_2:: @ 081297BE + .include "animations/gSpriteAnimations_WindProjectile_2.s" -gUnk_081297C7:: @ 081297C7 - .incbin "projectile7/gUnk_081297C7.bin" +gSpriteAnimations_WindProjectile_3:: @ 081297C7 + .include "animations/gSpriteAnimations_WindProjectile_3.s" -gUnk_081297D0:: @ 081297D0 - .incbin "projectile7/gUnk_081297D0.bin" +gSpriteAnimations_WindProjectile_4:: @ 081297D0 + .include "animations/gSpriteAnimations_WindProjectile_4.s" -gUnk_081297D5:: @ 081297D5 - .incbin "projectile7/gUnk_081297D5.bin" +gSpriteAnimations_WindProjectile_5:: @ 081297D5 + .include "animations/gSpriteAnimations_WindProjectile_5.s" -gUnk_081297DA:: @ 081297DA - .incbin "projectile7/gUnk_081297DA.bin" +gSpriteAnimations_WindProjectile_6:: @ 081297DA + .include "animations/gSpriteAnimations_WindProjectile_6.s" -gUnk_081297DF:: @ 081297DF - .incbin "projectile7/gUnk_081297DF.bin" +gSpriteAnimations_WindProjectile_7:: @ 081297DF + .include "animations/gSpriteAnimations_WindProjectile_7.s" -gUnk_081297E4:: @ 081297E4 - .incbin "projectile7/gUnk_081297E4.bin" +gSpriteAnimations_WindProjectile_8:: @ 081297E4 + .include "animations/gSpriteAnimations_WindProjectile_8.s" -gUnk_081297E9:: @ 081297E9 - .incbin "projectile7/gUnk_081297E9.bin" +gSpriteAnimations_WindProjectile_9:: @ 081297E9 + .include "animations/gSpriteAnimations_WindProjectile_9.s" -gUnk_081297EE:: @ 081297EE - .incbin "projectile7/gUnk_081297EE.bin" +gSpriteAnimations_WindProjectile_10:: @ 081297EE + .include "animations/gSpriteAnimations_WindProjectile_10.s" -gUnk_081297F3:: @ 081297F3 - .incbin "projectile7/gUnk_081297F3.bin" +gSpriteAnimations_WindProjectile_11:: @ 081297F3 + .include "animations/gSpriteAnimations_WindProjectile_11.s" gSpriteAnimations_WindProjectile:: @ 081297F8 - .4byte gUnk_081297AC - .4byte gUnk_081297B5 - .4byte gUnk_081297BE - .4byte gUnk_081297C7 - .4byte gUnk_081297D0 - .4byte gUnk_081297D5 - .4byte gUnk_081297DA - .4byte gUnk_081297DF - .4byte gUnk_081297E4 - .4byte gUnk_081297E9 - .4byte gUnk_081297EE - .4byte gUnk_081297F3 + .4byte gSpriteAnimations_WindProjectile_0 + .4byte gSpriteAnimations_WindProjectile_1 + .4byte gSpriteAnimations_WindProjectile_2 + .4byte gSpriteAnimations_WindProjectile_3 + .4byte gSpriteAnimations_WindProjectile_4 + .4byte gSpriteAnimations_WindProjectile_5 + .4byte gSpriteAnimations_WindProjectile_6 + .4byte gSpriteAnimations_WindProjectile_7 + .4byte gSpriteAnimations_WindProjectile_8 + .4byte gSpriteAnimations_WindProjectile_9 + .4byte gSpriteAnimations_WindProjectile_10 + .4byte gSpriteAnimations_WindProjectile_11 .4byte 00000000 |
