diff options
Diffstat (limited to 'data')
249 files changed, 8365 insertions, 8397 deletions
diff --git a/data/animations/enemy/acroBandits.s b/data/animations/enemy/acroBandits.s index 4dedae93..c75bd694 100644 --- a/data/animations/enemy/acroBandits.s +++ b/data/animations/enemy/acroBandits.s @@ -4,65 +4,65 @@ .section .rodata @ .align 2 -gUnk_080CE60E:: @ 080CE60E - .incbin "acroBandits/gUnk_080CE60E.bin" +gSpriteAnimations_AcroBandits_0:: @ 080CE60E + .include "animations/gSpriteAnimations_AcroBandits_0.s" -gUnk_080CE626:: @ 080CE626 - .incbin "acroBandits/gUnk_080CE626.bin" +gSpriteAnimations_AcroBandits_1:: @ 080CE626 + .include "animations/gSpriteAnimations_AcroBandits_1.s" -gUnk_080CE657:: @ 080CE657 - .incbin "acroBandits/gUnk_080CE657.bin" +gSpriteAnimations_AcroBandits_2:: @ 080CE657 + .include "animations/gSpriteAnimations_AcroBandits_2.s" -gUnk_080CE667:: @ 080CE667 - .incbin "acroBandits/gUnk_080CE667.bin" +gSpriteAnimations_AcroBandits_3:: @ 080CE667 + .include "animations/gSpriteAnimations_AcroBandits_3.s" -gUnk_080CE68F:: @ 080CE68F - .incbin "acroBandits/gUnk_080CE68F.bin" +gSpriteAnimations_AcroBandits_4:: @ 080CE68F + .include "animations/gSpriteAnimations_AcroBandits_4.s" -gUnk_080CE698:: @ 080CE698 - .incbin "acroBandits/gUnk_080CE698.bin" +gSpriteAnimations_AcroBandits_5:: @ 080CE698 + .include "animations/gSpriteAnimations_AcroBandits_5.s" -gUnk_080CE69D:: @ 080CE69D - .incbin "acroBandits/gUnk_080CE69D.bin" +gSpriteAnimations_AcroBandits_6:: @ 080CE69D + .include "animations/gSpriteAnimations_AcroBandits_6.s" -gUnk_080CE6A6:: @ 080CE6A6 - .incbin "acroBandits/gUnk_080CE6A6.bin" +gSpriteAnimations_AcroBandits_7:: @ 080CE6A6 + .include "animations/gSpriteAnimations_AcroBandits_7.s" -gUnk_080CE6AF:: @ 080CE6AF - .incbin "acroBandits/gUnk_080CE6AF.bin" +gSpriteAnimations_AcroBandits_8:: @ 080CE6AF + .include "animations/gSpriteAnimations_AcroBandits_8.s" -gUnk_080CE6C0:: @ 080CE6C0 - .incbin "acroBandits/gUnk_080CE6C0.bin" +gSpriteAnimations_AcroBandits_9:: @ 080CE6C0 + .include "animations/gSpriteAnimations_AcroBandits_9.s" -gUnk_080CE6D1:: @ 080CE6D1 - .incbin "acroBandits/gUnk_080CE6D1.bin" +gSpriteAnimations_AcroBandits_10:: @ 080CE6D1 + .include "animations/gSpriteAnimations_AcroBandits_10.s" -gUnk_080CE6D6:: @ 080CE6D6 - .incbin "acroBandits/gUnk_080CE6D6.bin" +gSpriteAnimations_AcroBandits_11:: @ 080CE6D6 + .include "animations/gSpriteAnimations_AcroBandits_11.s" -gUnk_080CE6DB:: @ 080CE6DB - .incbin "acroBandits/gUnk_080CE6DB.bin" +gSpriteAnimations_AcroBandits_12:: @ 080CE6DB + .include "animations/gSpriteAnimations_AcroBandits_12.s" -gUnk_080CE6E7:: @ 080CE6E7 - .incbin "acroBandits/gUnk_080CE6E7.bin" +gSpriteAnimations_AcroBandits_13:: @ 080CE6E7 + .include "animations/gSpriteAnimations_AcroBandits_13.s" -gUnk_080CE727:: @ 080CE727 - .incbin "acroBandits/gUnk_080CE727.bin" +gSpriteAnimations_AcroBandits_14:: @ 080CE727 + .include "animations/gSpriteAnimations_AcroBandits_14.s" gSpriteAnimations_AcroBandits:: @ 080CE770 - .4byte gUnk_080CE60E - .4byte gUnk_080CE626 - .4byte gUnk_080CE657 - .4byte gUnk_080CE667 - .4byte gUnk_080CE68F - .4byte gUnk_080CE698 - .4byte gUnk_080CE69D - .4byte gUnk_080CE6A6 - .4byte gUnk_080CE6AF - .4byte gUnk_080CE6C0 - .4byte gUnk_080CE6D1 - .4byte gUnk_080CE6D6 - .4byte gUnk_080CE6DB - .4byte gUnk_080CE6E7 - .4byte gUnk_080CE727 + .4byte gSpriteAnimations_AcroBandits_0 + .4byte gSpriteAnimations_AcroBandits_1 + .4byte gSpriteAnimations_AcroBandits_2 + .4byte gSpriteAnimations_AcroBandits_3 + .4byte gSpriteAnimations_AcroBandits_4 + .4byte gSpriteAnimations_AcroBandits_5 + .4byte gSpriteAnimations_AcroBandits_6 + .4byte gSpriteAnimations_AcroBandits_7 + .4byte gSpriteAnimations_AcroBandits_8 + .4byte gSpriteAnimations_AcroBandits_9 + .4byte gSpriteAnimations_AcroBandits_10 + .4byte gSpriteAnimations_AcroBandits_11 + .4byte gSpriteAnimations_AcroBandits_12 + .4byte gSpriteAnimations_AcroBandits_13 + .4byte gSpriteAnimations_AcroBandits_14 .4byte 00000000 diff --git a/data/animations/enemy/armos.s b/data/animations/enemy/armos.s index 448edeb9..b792b0fd 100644 --- a/data/animations/enemy/armos.s +++ b/data/animations/enemy/armos.s @@ -7,37 +7,37 @@ gUnk_080CE164:: @ 080CE164 .incbin "armos/gUnk_080CE164.bin" -gUnk_080CE16C:: @ 080CE16C - .incbin "armos/gUnk_080CE16C.bin" +gSpriteAnimations_Armos_0:: @ 080CE16C + .include "animations/gSpriteAnimations_Armos_0.s" -gUnk_080CE185:: @ 080CE185 - .incbin "armos/gUnk_080CE185.bin" +gSpriteAnimations_Armos_1:: @ 080CE185 + .include "animations/gSpriteAnimations_Armos_1.s" -gUnk_080CE19E:: @ 080CE19E - .incbin "armos/gUnk_080CE19E.bin" +gSpriteAnimations_Armos_2:: @ 080CE19E + .include "animations/gSpriteAnimations_Armos_2.s" -gUnk_080CE1B7:: @ 080CE1B7 - .incbin "armos/gUnk_080CE1B7.bin" +gSpriteAnimations_Armos_3:: @ 080CE1B7 + .include "animations/gSpriteAnimations_Armos_3.s" -gUnk_080CE1D0:: @ 080CE1D0 - .incbin "armos/gUnk_080CE1D0.bin" +gSpriteAnimations_Armos_4:: @ 080CE1D0 + .include "animations/gSpriteAnimations_Armos_4.s" -gUnk_080CE205:: @ 080CE205 - .incbin "armos/gUnk_080CE205.bin" +gSpriteAnimations_Armos_5:: @ 080CE205 + .include "animations/gSpriteAnimations_Armos_5.s" -gUnk_080CE246:: @ 080CE246 - .incbin "armos/gUnk_080CE246.bin" +gSpriteAnimations_Armos_6:: @ 080CE246 + .include "animations/gSpriteAnimations_Armos_6.s" -gUnk_080CE25E:: @ 080CE25E - .incbin "armos/gUnk_080CE25E.bin" +gSpriteAnimations_Armos_7:: @ 080CE25E + .include "animations/gSpriteAnimations_Armos_7.s" gSpriteAnimations_Armos:: @ 080CE264 - .4byte gUnk_080CE16C - .4byte gUnk_080CE185 - .4byte gUnk_080CE19E - .4byte gUnk_080CE1B7 - .4byte gUnk_080CE1D0 - .4byte gUnk_080CE205 - .4byte gUnk_080CE246 - .4byte gUnk_080CE25E + .4byte gSpriteAnimations_Armos_0 + .4byte gSpriteAnimations_Armos_1 + .4byte gSpriteAnimations_Armos_2 + .4byte gSpriteAnimations_Armos_3 + .4byte gSpriteAnimations_Armos_4 + .4byte gSpriteAnimations_Armos_5 + .4byte gSpriteAnimations_Armos_6 + .4byte gSpriteAnimations_Armos_7 .4byte 00000000 diff --git a/data/animations/enemy/ballChainSoldier.s b/data/animations/enemy/ballChainSoldier.s index ccb9484a..37fc771a 100644 --- a/data/animations/enemy/ballChainSoldier.s +++ b/data/animations/enemy/ballChainSoldier.s @@ -4,140 +4,140 @@ .section .rodata .align 2 -gUnk_080D0744:: @ 080D0744 - .incbin "ballChainSoldier/gUnk_080D0744.bin" +gSpriteAnimations_BallChainSoldier_0:: @ 080D0744 + .include "animations/gSpriteAnimations_BallChainSoldier_0.s" -gUnk_080D0748:: @ 080D0748 - .incbin "ballChainSoldier/gUnk_080D0748.bin" +gSpriteAnimations_BallChainSoldier_19:: @ 080D0748 + .include "animations/gSpriteAnimations_BallChainSoldier_19.s" -gUnk_080D074C:: @ 080D074C - .incbin "ballChainSoldier/gUnk_080D074C.bin" +gSpriteAnimations_BallChainSoldier_18:: @ 080D074C + .include "animations/gSpriteAnimations_BallChainSoldier_18.s" -gUnk_080D0750:: @ 080D0750 - .incbin "ballChainSoldier/gUnk_080D0750.bin" +gSpriteAnimations_BallChainSoldier_17:: @ 080D0750 + .include "animations/gSpriteAnimations_BallChainSoldier_17.s" -gUnk_080D0754:: @ 080D0754 - .incbin "ballChainSoldier/gUnk_080D0754.bin" +gSpriteAnimations_BallChainSoldier_16:: @ 080D0754 + .include "animations/gSpriteAnimations_BallChainSoldier_16.s" -gUnk_080D0758:: @ 080D0758 - .incbin "ballChainSoldier/gUnk_080D0758.bin" +gSpriteAnimations_BallChainSoldier_4:: @ 080D0758 + .include "animations/gSpriteAnimations_BallChainSoldier_4.s" -gUnk_080D075C:: @ 080D075C - .incbin "ballChainSoldier/gUnk_080D075C.bin" +gSpriteAnimations_BallChainSoldier_7:: @ 080D075C + .include "animations/gSpriteAnimations_BallChainSoldier_7.s" -gUnk_080D0760:: @ 080D0760 - .incbin "ballChainSoldier/gUnk_080D0760.bin" +gSpriteAnimations_BallChainSoldier_6:: @ 080D0760 + .include "animations/gSpriteAnimations_BallChainSoldier_6.s" -gUnk_080D0764:: @ 080D0764 - .incbin "ballChainSoldier/gUnk_080D0764.bin" +gSpriteAnimations_BallChainSoldier_5:: @ 080D0764 + .include "animations/gSpriteAnimations_BallChainSoldier_5.s" -gUnk_080D0768:: @ 080D0768 - .incbin "ballChainSoldier/gUnk_080D0768.bin" +gSpriteAnimations_BallChainSoldier_20:: @ 080D0768 + .include "animations/gSpriteAnimations_BallChainSoldier_20.s" -gUnk_080D076C:: @ 080D076C - .incbin "ballChainSoldier/gUnk_080D076C.bin" +gSpriteAnimations_BallChainSoldier_23:: @ 080D076C + .include "animations/gSpriteAnimations_BallChainSoldier_23.s" -gUnk_080D0770:: @ 080D0770 - .incbin "ballChainSoldier/gUnk_080D0770.bin" +gSpriteAnimations_BallChainSoldier_22:: @ 080D0770 + .include "animations/gSpriteAnimations_BallChainSoldier_22.s" -gUnk_080D0774:: @ 080D0774 - .incbin "ballChainSoldier/gUnk_080D0774.bin" +gSpriteAnimations_BallChainSoldier_21:: @ 080D0774 + .include "animations/gSpriteAnimations_BallChainSoldier_21.s" -gUnk_080D0778:: @ 080D0778 - .incbin "ballChainSoldier/gUnk_080D0778.bin" +gSpriteAnimations_BallChainSoldier_9:: @ 080D0778 + .include "animations/gSpriteAnimations_BallChainSoldier_9.s" -gUnk_080D077C:: @ 080D077C - .incbin "ballChainSoldier/gUnk_080D077C.bin" +gSpriteAnimations_BallChainSoldier_8:: @ 080D077C + .include "animations/gSpriteAnimations_BallChainSoldier_8.s" -gUnk_080D0780:: @ 080D0780 - .incbin "ballChainSoldier/gUnk_080D0780.bin" +gSpriteAnimations_BallChainSoldier_11:: @ 080D0780 + .include "animations/gSpriteAnimations_BallChainSoldier_11.s" -gUnk_080D0784:: @ 080D0784 - .incbin "ballChainSoldier/gUnk_080D0784.bin" +gSpriteAnimations_BallChainSoldier_10:: @ 080D0784 + .include "animations/gSpriteAnimations_BallChainSoldier_10.s" -gUnk_080D0788:: @ 080D0788 - .incbin "ballChainSoldier/gUnk_080D0788.bin" +gSpriteAnimations_BallChainSoldier_25:: @ 080D0788 + .include "animations/gSpriteAnimations_BallChainSoldier_25.s" -gUnk_080D078C:: @ 080D078C - .incbin "ballChainSoldier/gUnk_080D078C.bin" +gSpriteAnimations_BallChainSoldier_24:: @ 080D078C + .include "animations/gSpriteAnimations_BallChainSoldier_24.s" -gUnk_080D0790:: @ 080D0790 - .incbin "ballChainSoldier/gUnk_080D0790.bin" +gSpriteAnimations_BallChainSoldier_27:: @ 080D0790 + .include "animations/gSpriteAnimations_BallChainSoldier_27.s" -gUnk_080D0794:: @ 080D0794 - .incbin "ballChainSoldier/gUnk_080D0794.bin" +gSpriteAnimations_BallChainSoldier_26:: @ 080D0794 + .include "animations/gSpriteAnimations_BallChainSoldier_26.s" -gUnk_080D0798:: @ 080D0798 - .incbin "ballChainSoldier/gUnk_080D0798.bin" +gSpriteAnimations_BallChainSoldier_12:: @ 080D0798 + .include "animations/gSpriteAnimations_BallChainSoldier_12.s" -gUnk_080D079C:: @ 080D079C - .incbin "ballChainSoldier/gUnk_080D079C.bin" +gSpriteAnimations_BallChainSoldier_13:: @ 080D079C + .include "animations/gSpriteAnimations_BallChainSoldier_13.s" -gUnk_080D07A0:: @ 080D07A0 - .incbin "ballChainSoldier/gUnk_080D07A0.bin" +gSpriteAnimations_BallChainSoldier_14:: @ 080D07A0 + .include "animations/gSpriteAnimations_BallChainSoldier_14.s" -gUnk_080D07A4:: @ 080D07A4 - .incbin "ballChainSoldier/gUnk_080D07A4.bin" +gSpriteAnimations_BallChainSoldier_15:: @ 080D07A4 + .include "animations/gSpriteAnimations_BallChainSoldier_15.s" -gUnk_080D07A8:: @ 080D07A8 - .incbin "ballChainSoldier/gUnk_080D07A8.bin" +gSpriteAnimations_BallChainSoldier_28:: @ 080D07A8 + .include "animations/gSpriteAnimations_BallChainSoldier_28.s" -gUnk_080D07AC:: @ 080D07AC - .incbin "ballChainSoldier/gUnk_080D07AC.bin" +gSpriteAnimations_BallChainSoldier_29:: @ 080D07AC + .include "animations/gSpriteAnimations_BallChainSoldier_29.s" -gUnk_080D07B0:: @ 080D07B0 - .incbin "ballChainSoldier/gUnk_080D07B0.bin" +gSpriteAnimations_BallChainSoldier_30:: @ 080D07B0 + .include "animations/gSpriteAnimations_BallChainSoldier_30.s" -gUnk_080D07B4:: @ 080D07B4 - .incbin "ballChainSoldier/gUnk_080D07B4.bin" +gSpriteAnimations_BallChainSoldier_31:: @ 080D07B4 + .include "animations/gSpriteAnimations_BallChainSoldier_31.s" -gUnk_080D07B8:: @ 080D07B8 - .incbin "ballChainSoldier/gUnk_080D07B8.bin" +gSpriteAnimations_BallChainSoldier_32:: @ 080D07B8 + .include "animations/gSpriteAnimations_BallChainSoldier_32.s" -gUnk_080D07C5:: @ 080D07C5 - .incbin "ballChainSoldier/gUnk_080D07C5.bin" +gSpriteAnimations_BallChainSoldier_33:: @ 080D07C5 + .include "animations/gSpriteAnimations_BallChainSoldier_33.s" -gUnk_080D07D2:: @ 080D07D2 - .incbin "ballChainSoldier/gUnk_080D07D2.bin" +gSpriteAnimations_BallChainSoldier_34:: @ 080D07D2 + .include "animations/gSpriteAnimations_BallChainSoldier_34.s" -gUnk_080D07DF:: @ 080D07DF - .incbin "ballChainSoldier/gUnk_080D07DF.bin" +gSpriteAnimations_BallChainSoldier_35:: @ 080D07DF + .include "animations/gSpriteAnimations_BallChainSoldier_35.s" gSpriteAnimations_BallChainSoldier:: @ 080D07EC - .4byte gUnk_080D0744 - .4byte gUnk_080D0740 - .4byte gUnk_080D073C - .4byte gUnk_080D0738 - .4byte gUnk_080D0758 - .4byte gUnk_080D0764 - .4byte gUnk_080D0760 - .4byte gUnk_080D075C - .4byte gUnk_080D077C - .4byte gUnk_080D0778 - .4byte gUnk_080D0784 - .4byte gUnk_080D0780 - .4byte gUnk_080D0798 - .4byte gUnk_080D079C - .4byte gUnk_080D07A0 - .4byte gUnk_080D07A4 - .4byte gUnk_080D0754 - .4byte gUnk_080D0750 - .4byte gUnk_080D074C - .4byte gUnk_080D0748 - .4byte gUnk_080D0768 - .4byte gUnk_080D0774 - .4byte gUnk_080D0770 - .4byte gUnk_080D076C - .4byte gUnk_080D078C - .4byte gUnk_080D0788 - .4byte gUnk_080D0794 - .4byte gUnk_080D0790 - .4byte gUnk_080D07A8 - .4byte gUnk_080D07AC - .4byte gUnk_080D07B0 - .4byte gUnk_080D07B4 - .4byte gUnk_080D07B8 - .4byte gUnk_080D07C5 - .4byte gUnk_080D07D2 - .4byte gUnk_080D07DF + .4byte gSpriteAnimations_BallChainSoldier_0 + .4byte gSpriteAnimations_BallChainSoldier_1 + .4byte gSpriteAnimations_BallChainSoldier_2 + .4byte gSpriteAnimations_BallChainSoldier_3 + .4byte gSpriteAnimations_BallChainSoldier_4 + .4byte gSpriteAnimations_BallChainSoldier_5 + .4byte gSpriteAnimations_BallChainSoldier_6 + .4byte gSpriteAnimations_BallChainSoldier_7 + .4byte gSpriteAnimations_BallChainSoldier_8 + .4byte gSpriteAnimations_BallChainSoldier_9 + .4byte gSpriteAnimations_BallChainSoldier_10 + .4byte gSpriteAnimations_BallChainSoldier_11 + .4byte gSpriteAnimations_BallChainSoldier_12 + .4byte gSpriteAnimations_BallChainSoldier_13 + .4byte gSpriteAnimations_BallChainSoldier_14 + .4byte gSpriteAnimations_BallChainSoldier_15 + .4byte gSpriteAnimations_BallChainSoldier_16 + .4byte gSpriteAnimations_BallChainSoldier_17 + .4byte gSpriteAnimations_BallChainSoldier_18 + .4byte gSpriteAnimations_BallChainSoldier_19 + .4byte gSpriteAnimations_BallChainSoldier_20 + .4byte gSpriteAnimations_BallChainSoldier_21 + .4byte gSpriteAnimations_BallChainSoldier_22 + .4byte gSpriteAnimations_BallChainSoldier_23 + .4byte gSpriteAnimations_BallChainSoldier_24 + .4byte gSpriteAnimations_BallChainSoldier_25 + .4byte gSpriteAnimations_BallChainSoldier_26 + .4byte gSpriteAnimations_BallChainSoldier_27 + .4byte gSpriteAnimations_BallChainSoldier_28 + .4byte gSpriteAnimations_BallChainSoldier_29 + .4byte gSpriteAnimations_BallChainSoldier_30 + .4byte gSpriteAnimations_BallChainSoldier_31 + .4byte gSpriteAnimations_BallChainSoldier_32 + .4byte gSpriteAnimations_BallChainSoldier_33 + .4byte gSpriteAnimations_BallChainSoldier_34 + .4byte gSpriteAnimations_BallChainSoldier_35 .4byte 00000000 diff --git a/data/animations/enemy/beetle.s b/data/animations/enemy/beetle.s index ad879d6e..ac709c31 100644 --- a/data/animations/enemy/beetle.s +++ b/data/animations/enemy/beetle.s @@ -3,33 +3,33 @@ .section .rodata -gUnk_080CB5EC:: @ 080CB5EC - .incbin "beetle/gUnk_080CB5EC.bin" +gSpriteAnimations_Beetle_0:: @ 080CB5EC + .include "animations/gSpriteAnimations_Beetle_0.s" -gUnk_080CB600:: @ 080CB600 - .incbin "beetle/gUnk_080CB600.bin" +gSpriteAnimations_Beetle_1:: @ 080CB600 + .include "animations/gSpriteAnimations_Beetle_1.s" -gUnk_080CB61C:: @ 080CB61C - .incbin "beetle/gUnk_080CB61C.bin" +gSpriteAnimations_Beetle_2:: @ 080CB61C + .include "animations/gSpriteAnimations_Beetle_2.s" -gUnk_080CB62D:: @ 080CB62D - .incbin "beetle/gUnk_080CB62D.bin" +gSpriteAnimations_Beetle_3:: @ 080CB62D + .include "animations/gSpriteAnimations_Beetle_3.s" -gUnk_080CB645:: @ 080CB645 - .incbin "beetle/gUnk_080CB645.bin" +gSpriteAnimations_Beetle_4:: @ 080CB645 + .include "animations/gSpriteAnimations_Beetle_4.s" -gUnk_080CB65D:: @ 080CB65D - .incbin "beetle/gUnk_080CB65D.bin" +gSpriteAnimations_Beetle_5:: @ 080CB65D + .include "animations/gSpriteAnimations_Beetle_5.s" -gUnk_080CB671:: @ 080CB671 - .incbin "beetle/gUnk_080CB671.bin" +gSpriteAnimations_Beetle_6:: @ 080CB671 + .include "animations/gSpriteAnimations_Beetle_6.s" gSpriteAnimations_Beetle:: @ 080CB67C - .4byte gUnk_080CB5EC - .4byte gUnk_080CB600 - .4byte gUnk_080CB61C - .4byte gUnk_080CB62D - .4byte gUnk_080CB645 - .4byte gUnk_080CB65D - .4byte gUnk_080CB671 + .4byte gSpriteAnimations_Beetle_0 + .4byte gSpriteAnimations_Beetle_1 + .4byte gSpriteAnimations_Beetle_2 + .4byte gSpriteAnimations_Beetle_3 + .4byte gSpriteAnimations_Beetle_4 + .4byte gSpriteAnimations_Beetle_5 + .4byte gSpriteAnimations_Beetle_6 .4byte 00000000 diff --git a/data/animations/enemy/bobomb.s b/data/animations/enemy/bobomb.s index f9bca349..e174efc7 100644 --- a/data/animations/enemy/bobomb.s +++ b/data/animations/enemy/bobomb.s @@ -3,45 +3,45 @@ .section .rodata -gUnk_080CD628:: @ 080CD628 - .incbin "bobomb/gUnk_080CD628.bin" +gSpriteAnimations_Bobomb_0:: @ 080CD628 + .include "animations/gSpriteAnimations_Bobomb_0.s" -gUnk_080CD639:: @ 080CD639 - .incbin "bobomb/gUnk_080CD639.bin" +gSpriteAnimations_Bobomb_1:: @ 080CD639 + .include "animations/gSpriteAnimations_Bobomb_1.s" -gUnk_080CD64A:: @ 080CD64A - .incbin "bobomb/gUnk_080CD64A.bin" +gSpriteAnimations_Bobomb_2:: @ 080CD64A + .include "animations/gSpriteAnimations_Bobomb_2.s" -gUnk_080CD65B:: @ 080CD65B - .incbin "bobomb/gUnk_080CD65B.bin" +gSpriteAnimations_Bobomb_3:: @ 080CD65B + .include "animations/gSpriteAnimations_Bobomb_3.s" -gUnk_080CD66C:: @ 080CD66C - .incbin "bobomb/gUnk_080CD66C.bin" +gSpriteAnimations_Bobomb_4:: @ 080CD66C + .include "animations/gSpriteAnimations_Bobomb_4.s" -gUnk_080CD671:: @ 080CD671 - .incbin "bobomb/gUnk_080CD671.bin" +gSpriteAnimations_Bobomb_5:: @ 080CD671 + .include "animations/gSpriteAnimations_Bobomb_5.s" -gUnk_080CD676:: @ 080CD676 - .incbin "bobomb/gUnk_080CD676.bin" +gSpriteAnimations_Bobomb_6:: @ 080CD676 + .include "animations/gSpriteAnimations_Bobomb_6.s" -gUnk_080CD67F:: @ 080CD67F - .incbin "bobomb/gUnk_080CD67F.bin" +gSpriteAnimations_Bobomb_7:: @ 080CD67F + .include "animations/gSpriteAnimations_Bobomb_7.s" -gUnk_080CD688:: @ 080CD688 - .incbin "bobomb/gUnk_080CD688.bin" +gSpriteAnimations_Bobomb_8:: @ 080CD688 + .include "animations/gSpriteAnimations_Bobomb_8.s" -gUnk_080CD6AC:: @ 080CD6AC - .incbin "bobomb/gUnk_080CD6AC.bin" +gSpriteAnimations_Bobomb_9:: @ 080CD6AC + .include "animations/gSpriteAnimations_Bobomb_9.s" gSpriteAnimations_Bobomb:: @ 080CD6D0 - .4byte gUnk_080CD628 - .4byte gUnk_080CD639 - .4byte gUnk_080CD64A - .4byte gUnk_080CD65B - .4byte gUnk_080CD66C - .4byte gUnk_080CD671 - .4byte gUnk_080CD676 - .4byte gUnk_080CD67F - .4byte gUnk_080CD688 - .4byte gUnk_080CD6AC + .4byte gSpriteAnimations_Bobomb_0 + .4byte gSpriteAnimations_Bobomb_1 + .4byte gSpriteAnimations_Bobomb_2 + .4byte gSpriteAnimations_Bobomb_3 + .4byte gSpriteAnimations_Bobomb_4 + .4byte gSpriteAnimations_Bobomb_5 + .4byte gSpriteAnimations_Bobomb_6 + .4byte gSpriteAnimations_Bobomb_7 + .4byte gSpriteAnimations_Bobomb_8 + .4byte gSpriteAnimations_Bobomb_9 .4byte 00000000 diff --git a/data/animations/enemy/bombPeahat.s b/data/animations/enemy/bombPeahat.s index 568c2f5b..29ea76ee 100644 --- a/data/animations/enemy/bombPeahat.s +++ b/data/animations/enemy/bombPeahat.s @@ -3,21 +3,21 @@ .section .rodata -gUnk_080CD184:: @ 080CD184 - .incbin "bombPeahat/gUnk_080CD184.bin" +gSpriteAnimations_BombPeahat_0:: @ 080CD184 + .include "animations/gSpriteAnimations_BombPeahat_0.s" -gUnk_080CD195:: @ 080CD195 - .incbin "bombPeahat/gUnk_080CD195.bin" +gSpriteAnimations_BombPeahat_1:: @ 080CD195 + .include "animations/gSpriteAnimations_BombPeahat_1.s" -gUnk_080CD1D6:: @ 080CD1D6 - .incbin "bombPeahat/gUnk_080CD1D6.bin" +gSpriteAnimations_BombPeahat_2:: @ 080CD1D6 + .include "animations/gSpriteAnimations_BombPeahat_2.s" -gUnk_080CD217:: @ 080CD217 - .incbin "bombPeahat/gUnk_080CD217.bin" +gSpriteAnimations_BombPeahat_3:: @ 080CD217 + .include "animations/gSpriteAnimations_BombPeahat_3.s" gSpriteAnimations_BombPeahat:: @ 080CD220 - .4byte gUnk_080CD184 - .4byte gUnk_080CD195 - .4byte gUnk_080CD1D6 - .4byte gUnk_080CD217 + .4byte gSpriteAnimations_BombPeahat_0 + .4byte gSpriteAnimations_BombPeahat_1 + .4byte gSpriteAnimations_BombPeahat_2 + .4byte gSpriteAnimations_BombPeahat_3 .4byte 00000000 diff --git a/data/animations/enemy/bombarossa.s b/data/animations/enemy/bombarossa.s index 0c4c8f6b..ad392cf5 100644 --- a/data/animations/enemy/bombarossa.s +++ b/data/animations/enemy/bombarossa.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_080CEB60:: @ 080CEB60 - .incbin "bombarossa/gUnk_080CEB60.bin" +gSpriteAnimations_Bombarossa_0:: @ 080CEB60 + .include "animations/gSpriteAnimations_Bombarossa_0.s" gSpriteAnimations_Bombarossa:: @ 080CEB6C - .4byte gUnk_080CEB60 + .4byte gSpriteAnimations_Bombarossa_0 .4byte 00000000 diff --git a/data/animations/enemy/bowMoblin.s b/data/animations/enemy/bowMoblin.s index d4d92fbd..891348ad 100644 --- a/data/animations/enemy/bowMoblin.s +++ b/data/animations/enemy/bowMoblin.s @@ -4,69 +4,69 @@ .section .rodata .align 2 -gUnk_080CFFCC:: @ 080CFFCC - .incbin "bowMoblin/gUnk_080CFFCC.bin" +gSpriteAnimations_BowMoblin_0:: @ 080CFFCC + .include "animations/gSpriteAnimations_BowMoblin_0.s" -gUnk_080CFFD5:: @ 080CFFD5 - .incbin "bowMoblin/gUnk_080CFFD5.bin" +gSpriteAnimations_BowMoblin_1:: @ 080CFFD5 + .include "animations/gSpriteAnimations_BowMoblin_1.s" -gUnk_080CFFDE:: @ 080CFFDE - .incbin "bowMoblin/gUnk_080CFFDE.bin" +gSpriteAnimations_BowMoblin_2:: @ 080CFFDE + .include "animations/gSpriteAnimations_BowMoblin_2.s" -gUnk_080CFFE7:: @ 080CFFE7 - .incbin "bowMoblin/gUnk_080CFFE7.bin" +gSpriteAnimations_BowMoblin_3:: @ 080CFFE7 + .include "animations/gSpriteAnimations_BowMoblin_3.s" -gUnk_080CFFF0:: @ 080CFFF0 - .incbin "bowMoblin/gUnk_080CFFF0.bin" +gSpriteAnimations_BowMoblin_4:: @ 080CFFF0 + .include "animations/gSpriteAnimations_BowMoblin_4.s" -gUnk_080D0001:: @ 080D0001 - .incbin "bowMoblin/gUnk_080D0001.bin" +gSpriteAnimations_BowMoblin_5:: @ 080D0001 + .include "animations/gSpriteAnimations_BowMoblin_5.s" -gUnk_080D0012:: @ 080D0012 - .incbin "bowMoblin/gUnk_080D0012.bin" +gSpriteAnimations_BowMoblin_6:: @ 080D0012 + .include "animations/gSpriteAnimations_BowMoblin_6.s" -gUnk_080D0023:: @ 080D0023 - .incbin "bowMoblin/gUnk_080D0023.bin" +gSpriteAnimations_BowMoblin_7:: @ 080D0023 + .include "animations/gSpriteAnimations_BowMoblin_7.s" -gUnk_080D0034:: @ 080D0034 - .incbin "bowMoblin/gUnk_080D0034.bin" +gSpriteAnimations_BowMoblin_8:: @ 080D0034 + .include "animations/gSpriteAnimations_BowMoblin_8.s" -gUnk_080D0045:: @ 080D0045 - .incbin "bowMoblin/gUnk_080D0045.bin" +gSpriteAnimations_BowMoblin_9:: @ 080D0045 + .include "animations/gSpriteAnimations_BowMoblin_9.s" -gUnk_080D0056:: @ 080D0056 - .incbin "bowMoblin/gUnk_080D0056.bin" +gSpriteAnimations_BowMoblin_10:: @ 080D0056 + .include "animations/gSpriteAnimations_BowMoblin_10.s" -gUnk_080D0067:: @ 080D0067 - .incbin "bowMoblin/gUnk_080D0067.bin" +gSpriteAnimations_BowMoblin_11:: @ 080D0067 + .include "animations/gSpriteAnimations_BowMoblin_11.s" -gUnk_080D0078:: @ 080D0078 - .incbin "bowMoblin/gUnk_080D0078.bin" +gSpriteAnimations_BowMoblin_12:: @ 080D0078 + .include "animations/gSpriteAnimations_BowMoblin_12.s" -gUnk_080D008D:: @ 080D008D - .incbin "bowMoblin/gUnk_080D008D.bin" +gSpriteAnimations_BowMoblin_13:: @ 080D008D + .include "animations/gSpriteAnimations_BowMoblin_13.s" -gUnk_080D00A2:: @ 080D00A2 - .incbin "bowMoblin/gUnk_080D00A2.bin" +gSpriteAnimations_BowMoblin_14:: @ 080D00A2 + .include "animations/gSpriteAnimations_BowMoblin_14.s" -gUnk_080D00B7:: @ 080D00B7 - .incbin "bowMoblin/gUnk_080D00B7.bin" +gSpriteAnimations_BowMoblin_15:: @ 080D00B7 + .include "animations/gSpriteAnimations_BowMoblin_15.s" gSpriteAnimations_BowMoblin:: @ 080D00CC - .4byte gUnk_080CFFCC - .4byte gUnk_080CFFD5 - .4byte gUnk_080CFFDE - .4byte gUnk_080CFFE7 - .4byte gUnk_080CFFF0 - .4byte gUnk_080D0001 - .4byte gUnk_080D0012 - .4byte gUnk_080D0023 - .4byte gUnk_080D0034 - .4byte gUnk_080D0045 - .4byte gUnk_080D0056 - .4byte gUnk_080D0067 - .4byte gUnk_080D0078 - .4byte gUnk_080D008D - .4byte gUnk_080D00A2 - .4byte gUnk_080D00B7 + .4byte gSpriteAnimations_BowMoblin_0 + .4byte gSpriteAnimations_BowMoblin_1 + .4byte gSpriteAnimations_BowMoblin_2 + .4byte gSpriteAnimations_BowMoblin_3 + .4byte gSpriteAnimations_BowMoblin_4 + .4byte gSpriteAnimations_BowMoblin_5 + .4byte gSpriteAnimations_BowMoblin_6 + .4byte gSpriteAnimations_BowMoblin_7 + .4byte gSpriteAnimations_BowMoblin_8 + .4byte gSpriteAnimations_BowMoblin_9 + .4byte gSpriteAnimations_BowMoblin_10 + .4byte gSpriteAnimations_BowMoblin_11 + .4byte gSpriteAnimations_BowMoblin_12 + .4byte gSpriteAnimations_BowMoblin_13 + .4byte gSpriteAnimations_BowMoblin_14 + .4byte gSpriteAnimations_BowMoblin_15 .4byte 00000000 diff --git a/data/animations/enemy/businessScrub.s b/data/animations/enemy/businessScrub.s index 9d54d592..e2d02fed 100644 --- a/data/animations/enemy/businessScrub.s +++ b/data/animations/enemy/businessScrub.s @@ -4,109 +4,109 @@ .section .rodata -gUnk_080CCA0A:: @ 080CCA0A - .incbin "businessScrub/gUnk_080CCA0A.bin" +gSpriteAnimations_BusinessScrub_2:: @ 080CCA0A + .include "animations/gSpriteAnimations_BusinessScrub_2.s" -gUnk_080CCA1F:: @ 080CCA1F - .incbin "businessScrub/gUnk_080CCA1F.bin" +gSpriteAnimations_BusinessScrub_0:: @ 080CCA1F + .include "animations/gSpriteAnimations_BusinessScrub_0.s" -gUnk_080CCA34:: @ 080CCA34 - .incbin "businessScrub/gUnk_080CCA34.bin" +gSpriteAnimations_BusinessScrub_1:: @ 080CCA34 + .include "animations/gSpriteAnimations_BusinessScrub_1.s" -gUnk_080CCA49:: @ 080CCA49 - .incbin "businessScrub/gUnk_080CCA49.bin" +gSpriteAnimations_BusinessScrub_3:: @ 080CCA49 + .include "animations/gSpriteAnimations_BusinessScrub_3.s" -gUnk_080CCA5E:: @ 080CCA5E - .incbin "businessScrub/gUnk_080CCA5E.bin" +gSpriteAnimations_BusinessScrub_14:: @ 080CCA5E + .include "animations/gSpriteAnimations_BusinessScrub_14.s" -gUnk_080CCA6F:: @ 080CCA6F - .incbin "businessScrub/gUnk_080CCA6F.bin" +gSpriteAnimations_BusinessScrub_12:: @ 080CCA6F + .include "animations/gSpriteAnimations_BusinessScrub_12.s" -gUnk_080CCA80:: @ 080CCA80 - .incbin "businessScrub/gUnk_080CCA80.bin" +gSpriteAnimations_BusinessScrub_13:: @ 080CCA80 + .include "animations/gSpriteAnimations_BusinessScrub_13.s" -gUnk_080CCA91:: @ 080CCA91 - .incbin "businessScrub/gUnk_080CCA91.bin" +gSpriteAnimations_BusinessScrub_15:: @ 080CCA91 + .include "animations/gSpriteAnimations_BusinessScrub_15.s" -gUnk_080CCAA2:: @ 080CCAA2 - .incbin "businessScrub/gUnk_080CCAA2.bin" +gSpriteAnimations_BusinessScrub_6:: @ 080CCAA2 + .include "animations/gSpriteAnimations_BusinessScrub_6.s" -gUnk_080CCAA7:: @ 080CCAA7 - .incbin "businessScrub/gUnk_080CCAA7.bin" +gSpriteAnimations_BusinessScrub_4:: @ 080CCAA7 + .include "animations/gSpriteAnimations_BusinessScrub_4.s" -gUnk_080CCAAC:: @ 080CCAAC - .incbin "businessScrub/gUnk_080CCAAC.bin" +gSpriteAnimations_BusinessScrub_5:: @ 080CCAAC + .include "animations/gSpriteAnimations_BusinessScrub_5.s" -gUnk_080CCAB1:: @ 080CCAB1 - .incbin "businessScrub/gUnk_080CCAB1.bin" +gSpriteAnimations_BusinessScrub_7:: @ 080CCAB1 + .include "animations/gSpriteAnimations_BusinessScrub_7.s" -gUnk_080CCAB6:: @ 080CCAB6 - .incbin "businessScrub/gUnk_080CCAB6.bin" +gSpriteAnimations_BusinessScrub_10:: @ 080CCAB6 + .include "animations/gSpriteAnimations_BusinessScrub_10.s" -gUnk_080CCAC6:: @ 080CCAC6 - .incbin "businessScrub/gUnk_080CCAC6.bin" +gSpriteAnimations_BusinessScrub_8:: @ 080CCAC6 + .include "animations/gSpriteAnimations_BusinessScrub_8.s" -gUnk_080CCAD6:: @ 080CCAD6 - .incbin "businessScrub/gUnk_080CCAD6.bin" +gSpriteAnimations_BusinessScrub_9:: @ 080CCAD6 + .include "animations/gSpriteAnimations_BusinessScrub_9.s" -gUnk_080CCAE6:: @ 080CCAE6 - .incbin "businessScrub/gUnk_080CCAE6.bin" +gSpriteAnimations_BusinessScrub_11:: @ 080CCAE6 + .include "animations/gSpriteAnimations_BusinessScrub_11.s" -gUnk_080CCAF6:: @ 080CCAF6 - .incbin "businessScrub/gUnk_080CCAF6.bin" +gSpriteAnimations_BusinessScrub_18:: @ 080CCAF6 + .include "animations/gSpriteAnimations_BusinessScrub_18.s" -gUnk_080CCB07:: @ 080CCB07 - .incbin "businessScrub/gUnk_080CCB07.bin" +gSpriteAnimations_BusinessScrub_16:: @ 080CCB07 + .include "animations/gSpriteAnimations_BusinessScrub_16.s" -gUnk_080CCB18:: @ 080CCB18 - .incbin "businessScrub/gUnk_080CCB18.bin" +gSpriteAnimations_BusinessScrub_17:: @ 080CCB18 + .include "animations/gSpriteAnimations_BusinessScrub_17.s" -gUnk_080CCB29:: @ 080CCB29 - .incbin "businessScrub/gUnk_080CCB29.bin" +gSpriteAnimations_BusinessScrub_19:: @ 080CCB29 + .include "animations/gSpriteAnimations_BusinessScrub_19.s" -gUnk_080CCB3A:: @ 080CCB3A - .incbin "businessScrub/gUnk_080CCB3A.bin" +gSpriteAnimations_BusinessScrub_22:: @ 080CCB3A + .include "animations/gSpriteAnimations_BusinessScrub_22.s" -gUnk_080CCB47:: @ 080CCB47 - .incbin "businessScrub/gUnk_080CCB47.bin" +gSpriteAnimations_BusinessScrub_20:: @ 080CCB47 + .include "animations/gSpriteAnimations_BusinessScrub_20.s" -gUnk_080CCB54:: @ 080CCB54 - .incbin "businessScrub/gUnk_080CCB54.bin" +gSpriteAnimations_BusinessScrub_21:: @ 080CCB54 + .include "animations/gSpriteAnimations_BusinessScrub_21.s" -gUnk_080CCB61:: @ 080CCB61 - .incbin "businessScrub/gUnk_080CCB61.bin" +gSpriteAnimations_BusinessScrub_23:: @ 080CCB61 + .include "animations/gSpriteAnimations_BusinessScrub_23.s" -gUnk_080CCB6E:: @ 080CCB6E - .incbin "businessScrub/gUnk_080CCB6E.bin" +gSpriteAnimations_BusinessScrub_24:: @ 080CCB6E + .include "animations/gSpriteAnimations_BusinessScrub_24.s" -gUnk_080CCB7F:: @ 080CCB7F - .incbin "businessScrub/gUnk_080CCB7F.bin" +gSpriteAnimations_BusinessScrub_25:: @ 080CCB7F + .include "animations/gSpriteAnimations_BusinessScrub_25.s" gSpriteAnimations_BusinessScrub:: @ 080CCB94 - .4byte gUnk_080CCA1F - .4byte gUnk_080CCA34 - .4byte gUnk_080CCA0A - .4byte gUnk_080CCA49 - .4byte gUnk_080CCAA7 - .4byte gUnk_080CCAAC - .4byte gUnk_080CCAA2 - .4byte gUnk_080CCAB1 - .4byte gUnk_080CCAC6 - .4byte gUnk_080CCAD6 - .4byte gUnk_080CCAB6 - .4byte gUnk_080CCAE6 - .4byte gUnk_080CCA6F - .4byte gUnk_080CCA80 - .4byte gUnk_080CCA5E - .4byte gUnk_080CCA91 - .4byte gUnk_080CCB07 - .4byte gUnk_080CCB18 - .4byte gUnk_080CCAF6 - .4byte gUnk_080CCB29 - .4byte gUnk_080CCB47 - .4byte gUnk_080CCB54 - .4byte gUnk_080CCB3A - .4byte gUnk_080CCB61 - .4byte gUnk_080CCB6E - .4byte gUnk_080CCB7F + .4byte gSpriteAnimations_BusinessScrub_0 + .4byte gSpriteAnimations_BusinessScrub_1 + .4byte gSpriteAnimations_BusinessScrub_2 + .4byte gSpriteAnimations_BusinessScrub_3 + .4byte gSpriteAnimations_BusinessScrub_4 + .4byte gSpriteAnimations_BusinessScrub_5 + .4byte gSpriteAnimations_BusinessScrub_6 + .4byte gSpriteAnimations_BusinessScrub_7 + .4byte gSpriteAnimations_BusinessScrub_8 + .4byte gSpriteAnimations_BusinessScrub_9 + .4byte gSpriteAnimations_BusinessScrub_10 + .4byte gSpriteAnimations_BusinessScrub_11 + .4byte gSpriteAnimations_BusinessScrub_12 + .4byte gSpriteAnimations_BusinessScrub_13 + .4byte gSpriteAnimations_BusinessScrub_14 + .4byte gSpriteAnimations_BusinessScrub_15 + .4byte gSpriteAnimations_BusinessScrub_16 + .4byte gSpriteAnimations_BusinessScrub_17 + .4byte gSpriteAnimations_BusinessScrub_18 + .4byte gSpriteAnimations_BusinessScrub_19 + .4byte gSpriteAnimations_BusinessScrub_20 + .4byte gSpriteAnimations_BusinessScrub_21 + .4byte gSpriteAnimations_BusinessScrub_22 + .4byte gSpriteAnimations_BusinessScrub_23 + .4byte gSpriteAnimations_BusinessScrub_24 + .4byte gSpriteAnimations_BusinessScrub_25 .4byte 00000000 diff --git a/data/animations/enemy/chaser.s b/data/animations/enemy/chaser.s index 2d678b41..66950e79 100644 --- a/data/animations/enemy/chaser.s +++ b/data/animations/enemy/chaser.s @@ -3,17 +3,17 @@ .section .rodata -gUnk_080CD2A8:: @ 080CD2A8 - .incbin "chaser/gUnk_080CD2A8.bin" +gSpriteAnimations_Chaser_0:: @ 080CD2A8 + .include "animations/gSpriteAnimations_Chaser_0.s" -gUnk_080CD2AC:: @ 080CD2AC - .incbin "chaser/gUnk_080CD2AC.bin" +gSpriteAnimations_Chaser_1:: @ 080CD2AC + .include "animations/gSpriteAnimations_Chaser_1.s" -gUnk_080CD2BD:: @ 080CD2BD - .incbin "chaser/gUnk_080CD2BD.bin" +gSpriteAnimations_Chaser_2:: @ 080CD2BD + .include "animations/gSpriteAnimations_Chaser_2.s" gSpriteAnimations_Chaser:: @ 080CD2C8 - .4byte gUnk_080CD2A8 - .4byte gUnk_080CD2AC - .4byte gUnk_080CD2BD + .4byte gSpriteAnimations_Chaser_0 + .4byte gSpriteAnimations_Chaser_1 + .4byte gSpriteAnimations_Chaser_2 .4byte 00000000 diff --git a/data/animations/enemy/chuchu.s b/data/animations/enemy/chuchu.s index 0cd82f11..e6f9a35d 100644 --- a/data/animations/enemy/chuchu.s +++ b/data/animations/enemy/chuchu.s @@ -7,45 +7,45 @@ gUnk_080CA2B4:: @ 080CA2B4 .incbin "chuchu/gUnk_080CA2B4.bin" -gUnk_080CA2BE:: @ 080CA2BE - .incbin "chuchu/gUnk_080CA2BE.bin" +gSpriteAnimations_Chuchu_0:: @ 080CA2BE + .include "animations/gSpriteAnimations_Chuchu_0.s" -gUnk_080CA2EA:: @ 080CA2EA - .incbin "chuchu/gUnk_080CA2EA.bin" +gSpriteAnimations_Chuchu_1:: @ 080CA2EA + .include "animations/gSpriteAnimations_Chuchu_1.s" -gUnk_080CA2FB:: @ 080CA2FB - .incbin "chuchu/gUnk_080CA2FB.bin" +gSpriteAnimations_Chuchu_2:: @ 080CA2FB + .include "animations/gSpriteAnimations_Chuchu_2.s" -gUnk_080CA33C:: @ 080CA33C - .incbin "chuchu/gUnk_080CA33C.bin" +gSpriteAnimations_Chuchu_3:: @ 080CA33C + .include "animations/gSpriteAnimations_Chuchu_3.s" -gUnk_080CA358:: @ 080CA358 - .incbin "chuchu/gUnk_080CA358.bin" +gSpriteAnimations_Chuchu_4:: @ 080CA358 + .include "animations/gSpriteAnimations_Chuchu_4.s" -gUnk_080CA364:: @ 080CA364 - .incbin "chuchu/gUnk_080CA364.bin" +gSpriteAnimations_Chuchu_5:: @ 080CA364 + .include "animations/gSpriteAnimations_Chuchu_5.s" -gUnk_080CA370:: @ 080CA370 - .incbin "chuchu/gUnk_080CA370.bin" +gSpriteAnimations_Chuchu_6:: @ 080CA370 + .include "animations/gSpriteAnimations_Chuchu_6.s" -gUnk_080CA3B1:: @ 080CA3B1 - .incbin "chuchu/gUnk_080CA3B1.bin" +gSpriteAnimations_Chuchu_7:: @ 080CA3B1 + .include "animations/gSpriteAnimations_Chuchu_7.s" -gUnk_080CA3C5:: @ 080CA3C5 - .incbin "chuchu/gUnk_080CA3C5.bin" +gSpriteAnimations_Chuchu_8:: @ 080CA3C5 + .include "animations/gSpriteAnimations_Chuchu_8.s" -gUnk_080CA42E:: @ 080CA42E - .incbin "chuchu/gUnk_080CA42E.bin" +gSpriteAnimations_Chuchu_9:: @ 080CA42E + .include "animations/gSpriteAnimations_Chuchu_9.s" gSpriteAnimations_Chuchu:: @ 080CA470 - .4byte gUnk_080CA2BE - .4byte gUnk_080CA2EA - .4byte gUnk_080CA2FB - .4byte gUnk_080CA33C - .4byte gUnk_080CA358 - .4byte gUnk_080CA364 - .4byte gUnk_080CA370 - .4byte gUnk_080CA3B1 - .4byte gUnk_080CA3C5 - .4byte gUnk_080CA42E + .4byte gSpriteAnimations_Chuchu_0 + .4byte gSpriteAnimations_Chuchu_1 + .4byte gSpriteAnimations_Chuchu_2 + .4byte gSpriteAnimations_Chuchu_3 + .4byte gSpriteAnimations_Chuchu_4 + .4byte gSpriteAnimations_Chuchu_5 + .4byte gSpriteAnimations_Chuchu_6 + .4byte gSpriteAnimations_Chuchu_7 + .4byte gSpriteAnimations_Chuchu_8 + .4byte gSpriteAnimations_Chuchu_9 .4byte 00000000 diff --git a/data/animations/enemy/chuchuBoss.s b/data/animations/enemy/chuchuBoss.s index 9ca1cb25..41d08cad 100644 --- a/data/animations/enemy/chuchuBoss.s +++ b/data/animations/enemy/chuchuBoss.s @@ -3,122 +3,122 @@ .section .rodata -gUnk_080CC2DF:: @ 080CC2DF - .incbin "chuchuBoss/gUnk_080CC2DF.bin" +gSpriteAnimations_ChuchuBoss_1_0:: @ 080CC2DF + .include "animations/gSpriteAnimations_ChuchuBoss_1_0.s" -gUnk_080CC2E3:: @ 080CC2E3 - .incbin "chuchuBoss/gUnk_080CC2E3.bin" +gSpriteAnimations_ChuchuBoss_1_1:: @ 080CC2E3 + .include "animations/gSpriteAnimations_ChuchuBoss_1_1.s" -gUnk_080CC2E7:: @ 080CC2E7 - .incbin "chuchuBoss/gUnk_080CC2E7.bin" +gSpriteAnimations_ChuchuBoss_1_2:: @ 080CC2E7 + .include "animations/gSpriteAnimations_ChuchuBoss_1_2.s" -gUnk_080CC2EB:: @ 080CC2EB - .incbin "chuchuBoss/gUnk_080CC2EB.bin" +gSpriteAnimations_ChuchuBoss_1_3:: @ 080CC2EB + .include "animations/gSpriteAnimations_ChuchuBoss_1_3.s" -gUnk_080CC2EF:: @ 080CC2EF - .incbin "chuchuBoss/gUnk_080CC2EF.bin" +gSpriteAnimations_ChuchuBoss_0_0:: @ 080CC2EF + .include "animations/gSpriteAnimations_ChuchuBoss_0_0.s" -gUnk_080CC2F4:: @ 080CC2F4 - .incbin "chuchuBoss/gUnk_080CC2F4.bin" +gSpriteAnimations_ChuchuBoss_0_1:: @ 080CC2F4 + .include "animations/gSpriteAnimations_ChuchuBoss_0_1.s" -gUnk_080CC305:: @ 080CC305 - .incbin "chuchuBoss/gUnk_080CC305.bin" +gSpriteAnimations_ChuchuBoss_0_2:: @ 080CC305 + .include "animations/gSpriteAnimations_ChuchuBoss_0_2.s" -gUnk_080CC31E:: @ 080CC31E - .incbin "chuchuBoss/gUnk_080CC31E.bin" +gSpriteAnimations_ChuchuBoss_0_3:: @ 080CC31E + .include "animations/gSpriteAnimations_ChuchuBoss_0_3.s" -gUnk_080CC32B:: @ 080CC32B - .incbin "chuchuBoss/gUnk_080CC32B.bin" +gSpriteAnimations_ChuchuBoss_0_4:: @ 080CC32B + .include "animations/gSpriteAnimations_ChuchuBoss_0_4.s" -gUnk_080CC338:: @ 080CC338 - .incbin "chuchuBoss/gUnk_080CC338.bin" +gSpriteAnimations_ChuchuBoss_0_10:: @ 080CC338 + .include "animations/gSpriteAnimations_ChuchuBoss_0_10.s" -gUnk_080CC33D:: @ 080CC33D - .incbin "chuchuBoss/gUnk_080CC33D.bin" +gSpriteAnimations_ChuchuBoss_0_5:: @ 080CC33D + .include "animations/gSpriteAnimations_ChuchuBoss_0_5.s" -gUnk_080CC346:: @ 080CC346 - .incbin "chuchuBoss/gUnk_080CC346.bin" +gSpriteAnimations_ChuchuBoss_0_7:: @ 080CC346 + .include "animations/gSpriteAnimations_ChuchuBoss_0_7.s" -gUnk_080CC353:: @ 080CC353 - .incbin "chuchuBoss/gUnk_080CC353.bin" +gSpriteAnimations_ChuchuBoss_0_6:: @ 080CC353 + .include "animations/gSpriteAnimations_ChuchuBoss_0_6.s" -gUnk_080CC35C:: @ 080CC35C - .incbin "chuchuBoss/gUnk_080CC35C.bin" +gSpriteAnimations_ChuchuBoss_0_8:: @ 080CC35C + .include "animations/gSpriteAnimations_ChuchuBoss_0_8.s" -gUnk_080CC369:: @ 080CC369 - .incbin "chuchuBoss/gUnk_080CC369.bin" +gSpriteAnimations_ChuchuBoss_0_11:: @ 080CC369 + .include "animations/gSpriteAnimations_ChuchuBoss_0_11.s" -gUnk_080CC372:: @ 080CC372 - .incbin "chuchuBoss/gUnk_080CC372.bin" +gSpriteAnimations_ChuchuBoss_0_12:: @ 080CC372 + .include "animations/gSpriteAnimations_ChuchuBoss_0_12.s" -gUnk_080CC37B:: @ 080CC37B - .incbin "chuchuBoss/gUnk_080CC37B.bin" +gSpriteAnimations_ChuchuBoss_0_9:: @ 080CC37B + .include "animations/gSpriteAnimations_ChuchuBoss_0_9.s" -gUnk_080CC39C:: @ 080CC39C - .incbin "chuchuBoss/gUnk_080CC39C.bin" +gSpriteAnimations_ChuchuBoss_2_0:: @ 080CC39C + .include "animations/gSpriteAnimations_ChuchuBoss_2_0.s" -gUnk_080CC3D4:: @ 080CC3D4 - .incbin "chuchuBoss/gUnk_080CC3D4.bin" +gSpriteAnimations_ChuchuBoss_2_1:: @ 080CC3D4 + .include "animations/gSpriteAnimations_ChuchuBoss_2_1.s" -gUnk_080CC40C:: @ 080CC40C - .incbin "chuchuBoss/gUnk_080CC40C.bin" +gSpriteAnimations_ChuchuBoss_2_2:: @ 080CC40C + .include "animations/gSpriteAnimations_ChuchuBoss_2_2.s" -gUnk_080CC440:: @ 080CC440 - .incbin "chuchuBoss/gUnk_080CC440.bin" +gSpriteAnimations_ChuchuBoss_2_4:: @ 080CC440 + .include "animations/gSpriteAnimations_ChuchuBoss_2_4.s" -gUnk_080CC478:: @ 080CC478 - .incbin "chuchuBoss/gUnk_080CC478.bin" +gSpriteAnimations_ChuchuBoss_2_5:: @ 080CC478 + .include "animations/gSpriteAnimations_ChuchuBoss_2_5.s" -gUnk_080CC4B0:: @ 080CC4B0 - .incbin "chuchuBoss/gUnk_080CC4B0.bin" +gSpriteAnimations_ChuchuBoss_2_3:: @ 080CC4B0 + .include "animations/gSpriteAnimations_ChuchuBoss_2_3.s" -gUnk_080CC515:: @ 080CC515 - .incbin "chuchuBoss/gUnk_080CC515.bin" +gSpriteAnimations_ChuchuBoss_2_6:: @ 080CC515 + .include "animations/gSpriteAnimations_ChuchuBoss_2_6.s" -gUnk_080CC582:: @ 080CC582 - .incbin "chuchuBoss/gUnk_080CC582.bin" +gSpriteAnimations_ChuchuBoss_2_7:: @ 080CC582 + .include "animations/gSpriteAnimations_ChuchuBoss_2_7.s" -gUnk_080CC5EF:: @ 080CC5EF - .incbin "chuchuBoss/gUnk_080CC5EF.bin" +gSpriteAnimations_ChuchuBoss_2_8:: @ 080CC5EF + .include "animations/gSpriteAnimations_ChuchuBoss_2_8.s" -gUnk_080CC65C:: @ 080CC65C - .incbin "chuchuBoss/gUnk_080CC65C.bin" +gSpriteAnimations_ChuchuBoss_2_9:: @ 080CC65C + .include "animations/gSpriteAnimations_ChuchuBoss_2_9.s" -gUnk_080CC67D:: @ 080CC67D - .incbin "chuchuBoss/gUnk_080CC67D.bin" +gSpriteAnimations_ChuchuBoss_1_4:: @ 080CC67D + .include "animations/gSpriteAnimations_ChuchuBoss_1_4.s" gSpriteAnimations_ChuchuBoss_1:: @ 080CC684 - .4byte gUnk_080CC2DF - .4byte gUnk_080CC2E3 - .4byte gUnk_080CC2E7 - .4byte gUnk_080CC2EB - .4byte gUnk_080CC67D + .4byte gSpriteAnimations_ChuchuBoss_1_0 + .4byte gSpriteAnimations_ChuchuBoss_1_1 + .4byte gSpriteAnimations_ChuchuBoss_1_2 + .4byte gSpriteAnimations_ChuchuBoss_1_3 + .4byte gSpriteAnimations_ChuchuBoss_1_4 .4byte 00000000 gSpriteAnimations_ChuchuBoss_0:: @ 080CC69C - .4byte gUnk_080CC2EF - .4byte gUnk_080CC2F4 - .4byte gUnk_080CC305 - .4byte gUnk_080CC31E - .4byte gUnk_080CC32B - .4byte gUnk_080CC33D - .4byte gUnk_080CC353 - .4byte gUnk_080CC346 - .4byte gUnk_080CC35C - .4byte gUnk_080CC37B - .4byte gUnk_080CC338 - .4byte gUnk_080CC369 - .4byte gUnk_080CC372 + .4byte gSpriteAnimations_ChuchuBoss_0_0 + .4byte gSpriteAnimations_ChuchuBoss_0_1 + .4byte gSpriteAnimations_ChuchuBoss_0_2 + .4byte gSpriteAnimations_ChuchuBoss_0_3 + .4byte gSpriteAnimations_ChuchuBoss_0_4 + .4byte gSpriteAnimations_ChuchuBoss_0_5 + .4byte gSpriteAnimations_ChuchuBoss_0_6 + .4byte gSpriteAnimations_ChuchuBoss_0_7 + .4byte gSpriteAnimations_ChuchuBoss_0_8 + .4byte gSpriteAnimations_ChuchuBoss_0_9 + .4byte gSpriteAnimations_ChuchuBoss_0_10 + .4byte gSpriteAnimations_ChuchuBoss_0_11 + .4byte gSpriteAnimations_ChuchuBoss_0_12 .4byte 00000000 gSpriteAnimations_ChuchuBoss_2:: @ 080CC6D4 - .4byte gUnk_080CC39C - .4byte gUnk_080CC3D4 - .4byte gUnk_080CC40C - .4byte gUnk_080CC4B0 - .4byte gUnk_080CC440 - .4byte gUnk_080CC478 - .4byte gUnk_080CC515 - .4byte gUnk_080CC582 - .4byte gUnk_080CC5EF - .4byte gUnk_080CC65C + .4byte gSpriteAnimations_ChuchuBoss_2_0 + .4byte gSpriteAnimations_ChuchuBoss_2_1 + .4byte gSpriteAnimations_ChuchuBoss_2_2 + .4byte gSpriteAnimations_ChuchuBoss_2_3 + .4byte gSpriteAnimations_ChuchuBoss_2_4 + .4byte gSpriteAnimations_ChuchuBoss_2_5 + .4byte gSpriteAnimations_ChuchuBoss_2_6 + .4byte gSpriteAnimations_ChuchuBoss_2_7 + .4byte gSpriteAnimations_ChuchuBoss_2_8 + .4byte gSpriteAnimations_ChuchuBoss_2_9 diff --git a/data/animations/enemy/cloudPiranha.s b/data/animations/enemy/cloudPiranha.s index ef00db68..fc2ca23d 100644 --- a/data/animations/enemy/cloudPiranha.s +++ b/data/animations/enemy/cloudPiranha.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_080CF530:: @ 080CF530 - .incbin "cloudPiranha/gUnk_080CF530.bin" +gSpriteAnimations_CloudPiranha_0:: @ 080CF530 + .include "animations/gSpriteAnimations_CloudPiranha_0.s" -gUnk_080CF53D:: @ 080CF53D - .incbin "cloudPiranha/gUnk_080CF53D.bin" +gSpriteAnimations_CloudPiranha_1:: @ 080CF53D + .include "animations/gSpriteAnimations_CloudPiranha_1.s" -gUnk_080CF54A:: @ 080CF54A - .incbin "cloudPiranha/gUnk_080CF54A.bin" +gSpriteAnimations_CloudPiranha_2:: @ 080CF54A + .include "animations/gSpriteAnimations_CloudPiranha_2.s" -gUnk_080CF557:: @ 080CF557 - .incbin "cloudPiranha/gUnk_080CF557.bin" +gSpriteAnimations_CloudPiranha_3:: @ 080CF557 + .include "animations/gSpriteAnimations_CloudPiranha_3.s" -gUnk_080CF564:: @ 080CF564 - .incbin "cloudPiranha/gUnk_080CF564.bin" +gSpriteAnimations_CloudPiranha_4:: @ 080CF564 + .include "animations/gSpriteAnimations_CloudPiranha_4.s" -gUnk_080CF571:: @ 080CF571 - .incbin "cloudPiranha/gUnk_080CF571.bin" +gSpriteAnimations_CloudPiranha_5:: @ 080CF571 + .include "animations/gSpriteAnimations_CloudPiranha_5.s" -gUnk_080CF57E:: @ 080CF57E - .incbin "cloudPiranha/gUnk_080CF57E.bin" +gSpriteAnimations_CloudPiranha_6:: @ 080CF57E + .include "animations/gSpriteAnimations_CloudPiranha_6.s" -gUnk_080CF58B:: @ 080CF58B - .incbin "cloudPiranha/gUnk_080CF58B.bin" +gSpriteAnimations_CloudPiranha_7:: @ 080CF58B + .include "animations/gSpriteAnimations_CloudPiranha_7.s" -gUnk_080CF598:: @ 080CF598 - .incbin "cloudPiranha/gUnk_080CF598.bin" +gSpriteAnimations_CloudPiranha_8:: @ 080CF598 + .include "animations/gSpriteAnimations_CloudPiranha_8.s" -gUnk_080CF5A5:: @ 080CF5A5 - .incbin "cloudPiranha/gUnk_080CF5A5.bin" +gSpriteAnimations_CloudPiranha_9:: @ 080CF5A5 + .include "animations/gSpriteAnimations_CloudPiranha_9.s" -gUnk_080CF5B2:: @ 080CF5B2 - .incbin "cloudPiranha/gUnk_080CF5B2.bin" +gSpriteAnimations_CloudPiranha_10:: @ 080CF5B2 + .include "animations/gSpriteAnimations_CloudPiranha_10.s" -gUnk_080CF5BF:: @ 080CF5BF - .incbin "cloudPiranha/gUnk_080CF5BF.bin" +gSpriteAnimations_CloudPiranha_11:: @ 080CF5BF + .include "animations/gSpriteAnimations_CloudPiranha_11.s" gSpriteAnimations_CloudPiranha:: @ 080CF5CC - .4byte gUnk_080CF530 - .4byte gUnk_080CF53D - .4byte gUnk_080CF54A - .4byte gUnk_080CF557 - .4byte gUnk_080CF564 - .4byte gUnk_080CF571 - .4byte gUnk_080CF57E - .4byte gUnk_080CF58B - .4byte gUnk_080CF598 - .4byte gUnk_080CF5A5 - .4byte gUnk_080CF5B2 - .4byte gUnk_080CF5BF + .4byte gSpriteAnimations_CloudPiranha_0 + .4byte gSpriteAnimations_CloudPiranha_1 + .4byte gSpriteAnimations_CloudPiranha_2 + .4byte gSpriteAnimations_CloudPiranha_3 + .4byte gSpriteAnimations_CloudPiranha_4 + .4byte gSpriteAnimations_CloudPiranha_5 + .4byte gSpriteAnimations_CloudPiranha_6 + .4byte gSpriteAnimations_CloudPiranha_7 + .4byte gSpriteAnimations_CloudPiranha_8 + .4byte gSpriteAnimations_CloudPiranha_9 + .4byte gSpriteAnimations_CloudPiranha_10 + .4byte gSpriteAnimations_CloudPiranha_11 .4byte 00000000 diff --git a/data/animations/enemy/crow.s b/data/animations/enemy/crow.s index 8b6482dd..f01e8fc5 100644 --- a/data/animations/enemy/crow.s +++ b/data/animations/enemy/crow.s @@ -5,29 +5,29 @@ .align 2 -gUnk_080CE9B0:: @ 080CE9B0 - .incbin "crow/gUnk_080CE9B0.bin" +gSpriteAnimations_Crow_0:: @ 080CE9B0 + .include "animations/gSpriteAnimations_Crow_0.s" -gUnk_080CE9B5:: @ 080CE9B5 - .incbin "crow/gUnk_080CE9B5.bin" +gSpriteAnimations_Crow_1:: @ 080CE9B5 + .include "animations/gSpriteAnimations_Crow_1.s" -gUnk_080CE9BA:: @ 080CE9BA - .incbin "crow/gUnk_080CE9BA.bin" +gSpriteAnimations_Crow_2:: @ 080CE9BA + .include "animations/gSpriteAnimations_Crow_2.s" -gUnk_080CE9CB:: @ 080CE9CB - .incbin "crow/gUnk_080CE9CB.bin" +gSpriteAnimations_Crow_3:: @ 080CE9CB + .include "animations/gSpriteAnimations_Crow_3.s" -gUnk_080CE9DC:: @ 080CE9DC - .incbin "crow/gUnk_080CE9DC.bin" +gSpriteAnimations_Crow_4:: @ 080CE9DC + .include "animations/gSpriteAnimations_Crow_4.s" -gUnk_080CE9ED:: @ 080CE9ED - .incbin "crow/gUnk_080CE9ED.bin" +gSpriteAnimations_Crow_5:: @ 080CE9ED + .include "animations/gSpriteAnimations_Crow_5.s" gSpriteAnimations_Crow:: @ 080CEA00 - .4byte gUnk_080CE9B0 - .4byte gUnk_080CE9B5 - .4byte gUnk_080CE9BA - .4byte gUnk_080CE9CB - .4byte gUnk_080CE9DC - .4byte gUnk_080CE9ED + .4byte gSpriteAnimations_Crow_0 + .4byte gSpriteAnimations_Crow_1 + .4byte gSpriteAnimations_Crow_2 + .4byte gSpriteAnimations_Crow_3 + .4byte gSpriteAnimations_Crow_4 + .4byte gSpriteAnimations_Crow_5 .4byte 00000000 diff --git a/data/animations/enemy/cuccoAggr.s b/data/animations/enemy/cuccoAggr.s index 3f43c950..815d45f8 100644 --- a/data/animations/enemy/cuccoAggr.s +++ b/data/animations/enemy/cuccoAggr.s @@ -4,24 +4,24 @@ .section .rodata @ .align 2 -gUnk_080CF831:: @ 080CF831 - .incbin "cuccoAggr/gUnk_080CF831.bin" +gSpriteAnimations_CuccoAggr_0:: @ 080CF831 + .include "animations/gSpriteAnimations_CuccoAggr_0.s" -gUnk_080CF836:: @ 080CF836 - .incbin "cuccoAggr/gUnk_080CF836.bin" +gSpriteAnimations_CuccoAggr_1:: @ 080CF836 + .include "animations/gSpriteAnimations_CuccoAggr_1.s" -gUnk_080CF847:: @ 080CF847 - .incbin "cuccoAggr/gUnk_080CF847.bin" +gSpriteAnimations_CuccoAggr_2:: @ 080CF847 + .include "animations/gSpriteAnimations_CuccoAggr_2.s" -gUnk_080CF85F:: @ 080CF85F - .incbin "cuccoAggr/gUnk_080CF85F.bin" +gSpriteAnimations_CuccoAggr_3:: @ 080CF85F + .include "animations/gSpriteAnimations_CuccoAggr_3.s" -gUnk_080CF87F:: @ 080CF87F - .incbin "cuccoAggr/gUnk_080CF87F.bin" +gSpriteAnimations_CuccoAggr_4:: @ 080CF87F + .include "animations/gSpriteAnimations_CuccoAggr_4.s" gSpriteAnimations_CuccoAggr:: @ 080CF890 - .4byte gUnk_080CF831 - .4byte gUnk_080CF836 - .4byte gUnk_080CF847 - .4byte gUnk_080CF85F - .4byte gUnk_080CF87F + .4byte gSpriteAnimations_CuccoAggr_0 + .4byte gSpriteAnimations_CuccoAggr_1 + .4byte gSpriteAnimations_CuccoAggr_2 + .4byte gSpriteAnimations_CuccoAggr_3 + .4byte gSpriteAnimations_CuccoAggr_4 diff --git a/data/animations/enemy/curtain.s b/data/animations/enemy/curtain.s index 3c90e805..ba4205b0 100644 --- a/data/animations/enemy/curtain.s +++ b/data/animations/enemy/curtain.s @@ -5,21 +5,21 @@ .align 2 -gUnk_080D1CF0:: @ 080D1CF0 - .incbin "curtain/gUnk_080D1CF0.bin" +gSpriteAnimations_Curtain_0:: @ 080D1CF0 + .include "animations/gSpriteAnimations_Curtain_0.s" -gUnk_080D1CF9:: @ 080D1CF9 - .incbin "curtain/gUnk_080D1CF9.bin" +gSpriteAnimations_Curtain_1:: @ 080D1CF9 + .include "animations/gSpriteAnimations_Curtain_1.s" -gUnk_080D1D02:: @ 080D1D02 - .incbin "curtain/gUnk_080D1D02.bin" +gSpriteAnimations_Curtain_2:: @ 080D1D02 + .include "animations/gSpriteAnimations_Curtain_2.s" -gUnk_080D1D26:: @ 080D1D26 - .incbin "curtain/gUnk_080D1D26.bin" +gSpriteAnimations_Curtain_3:: @ 080D1D26 + .include "animations/gSpriteAnimations_Curtain_3.s" gSpriteAnimations_Curtain:: @ 080D1D34 - .4byte gUnk_080D1CF0 - .4byte gUnk_080D1CF9 - .4byte gUnk_080D1D02 - .4byte gUnk_080D1D26 + .4byte gSpriteAnimations_Curtain_0 + .4byte gSpriteAnimations_Curtain_1 + .4byte gSpriteAnimations_Curtain_2 + .4byte gSpriteAnimations_Curtain_3 .4byte 00000000 diff --git a/data/animations/enemy/darkNut.s b/data/animations/enemy/darkNut.s index d1012274..d6a9c040 100644 --- a/data/animations/enemy/darkNut.s +++ b/data/animations/enemy/darkNut.s @@ -4,312 +4,312 @@ .section .rodata .align 2 -gUnk_080CAB6C:: @ 080CAB6C - .incbin "darkNut/gUnk_080CAB6C.bin" +gSpriteAnimations_DarkNut_0_0:: @ 080CAB6C + .include "animations/gSpriteAnimations_DarkNut_0_0.s" -gUnk_080CAB70:: @ 080CAB70 - .incbin "darkNut/gUnk_080CAB70.bin" +gSpriteAnimations_DarkNut_0_1:: @ 080CAB70 + .include "animations/gSpriteAnimations_DarkNut_0_1.s" -gUnk_080CAB74:: @ 080CAB74 - .incbin "darkNut/gUnk_080CAB74.bin" +gSpriteAnimations_DarkNut_0_2:: @ 080CAB74 + .include "animations/gSpriteAnimations_DarkNut_0_2.s" -gUnk_080CAB78:: @ 080CAB78 - .incbin "darkNut/gUnk_080CAB78.bin" +gSpriteAnimations_DarkNut_0_3:: @ 080CAB78 + .include "animations/gSpriteAnimations_DarkNut_0_3.s" -gUnk_080CAB7C:: @ 080CAB7C - .incbin "darkNut/gUnk_080CAB7C.bin" +gSpriteAnimations_DarkNut_0_4:: @ 080CAB7C + .include "animations/gSpriteAnimations_DarkNut_0_4.s" -gUnk_080CAB8C:: @ 080CAB8C - .incbin "darkNut/gUnk_080CAB8C.bin" +gSpriteAnimations_DarkNut_0_5:: @ 080CAB8C + .include "animations/gSpriteAnimations_DarkNut_0_5.s" -gUnk_080CAB9C:: @ 080CAB9C - .incbin "darkNut/gUnk_080CAB9C.bin" +gSpriteAnimations_DarkNut_0_6:: @ 080CAB9C + .include "animations/gSpriteAnimations_DarkNut_0_6.s" -gUnk_080CABAC:: @ 080CABAC - .incbin "darkNut/gUnk_080CABAC.bin" +gSpriteAnimations_DarkNut_0_7:: @ 080CABAC + .include "animations/gSpriteAnimations_DarkNut_0_7.s" -gUnk_080CABBC:: @ 080CABBC - .incbin "darkNut/gUnk_080CABBC.bin" +gSpriteAnimations_DarkNut_0_8:: @ 080CABBC + .include "animations/gSpriteAnimations_DarkNut_0_8.s" -gUnk_080CABC0:: @ 080CABC0 - .incbin "darkNut/gUnk_080CABC0.bin" +gSpriteAnimations_DarkNut_0_9:: @ 080CABC0 + .include "animations/gSpriteAnimations_DarkNut_0_9.s" -gUnk_080CABC4:: @ 080CABC4 - .incbin "darkNut/gUnk_080CABC4.bin" +gSpriteAnimations_DarkNut_0_10:: @ 080CABC4 + .include "animations/gSpriteAnimations_DarkNut_0_10.s" -gUnk_080CABC8:: @ 080CABC8 - .incbin "darkNut/gUnk_080CABC8.bin" +gSpriteAnimations_DarkNut_0_11:: @ 080CABC8 + .include "animations/gSpriteAnimations_DarkNut_0_11.s" -gUnk_080CABCC:: @ 080CABCC - .incbin "darkNut/gUnk_080CABCC.bin" +gSpriteAnimations_DarkNut_0_12:: @ 080CABCC + .include "animations/gSpriteAnimations_DarkNut_0_12.s" -gUnk_080CABE5:: @ 080CABE5 - .incbin "darkNut/gUnk_080CABE5.bin" +gSpriteAnimations_DarkNut_0_13:: @ 080CABE5 + .include "animations/gSpriteAnimations_DarkNut_0_13.s" -gUnk_080CABFE:: @ 080CABFE - .incbin "darkNut/gUnk_080CABFE.bin" +gSpriteAnimations_DarkNut_0_14:: @ 080CABFE + .include "animations/gSpriteAnimations_DarkNut_0_14.s" -gUnk_080CAC17:: @ 080CAC17 - .incbin "darkNut/gUnk_080CAC17.bin" +gSpriteAnimations_DarkNut_0_15:: @ 080CAC17 + .include "animations/gSpriteAnimations_DarkNut_0_15.s" -gUnk_080CAC30:: @ 080CAC30 - .incbin "darkNut/gUnk_080CAC30.bin" +gSpriteAnimations_DarkNut_0_16:: @ 080CAC30 + .include "animations/gSpriteAnimations_DarkNut_0_16.s" -gUnk_080CAC3C:: @ 080CAC3C - .incbin "darkNut/gUnk_080CAC3C.bin" +gSpriteAnimations_DarkNut_0_17:: @ 080CAC3C + .include "animations/gSpriteAnimations_DarkNut_0_17.s" -gUnk_080CAC48:: @ 080CAC48 - .incbin "darkNut/gUnk_080CAC48.bin" +gSpriteAnimations_DarkNut_0_18:: @ 080CAC48 + .include "animations/gSpriteAnimations_DarkNut_0_18.s" -gUnk_080CAC54:: @ 080CAC54 - .incbin "darkNut/gUnk_080CAC54.bin" +gSpriteAnimations_DarkNut_0_19:: @ 080CAC54 + .include "animations/gSpriteAnimations_DarkNut_0_19.s" -gUnk_080CAC60:: @ 080CAC60 - .incbin "darkNut/gUnk_080CAC60.bin" +gSpriteAnimations_DarkNut_0_20:: @ 080CAC60 + .include "animations/gSpriteAnimations_DarkNut_0_20.s" -gUnk_080CAC88:: @ 080CAC88 - .incbin "darkNut/gUnk_080CAC88.bin" +gSpriteAnimations_DarkNut_0_21:: @ 080CAC88 + .include "animations/gSpriteAnimations_DarkNut_0_21.s" -gUnk_080CACB0:: @ 080CACB0 - .incbin "darkNut/gUnk_080CACB0.bin" +gSpriteAnimations_DarkNut_0_22:: @ 080CACB0 + .include "animations/gSpriteAnimations_DarkNut_0_22.s" -gUnk_080CACD8:: @ 080CACD8 - .incbin "darkNut/gUnk_080CACD8.bin" +gSpriteAnimations_DarkNut_0_23:: @ 080CACD8 + .include "animations/gSpriteAnimations_DarkNut_0_23.s" -gUnk_080CAD00:: @ 080CAD00 - .incbin "darkNut/gUnk_080CAD00.bin" +gSpriteAnimations_DarkNut_0_24:: @ 080CAD00 + .include "animations/gSpriteAnimations_DarkNut_0_24.s" -gUnk_080CAD19:: @ 080CAD19 - .incbin "darkNut/gUnk_080CAD19.bin" +gSpriteAnimations_DarkNut_0_25:: @ 080CAD19 + .include "animations/gSpriteAnimations_DarkNut_0_25.s" -gUnk_080CAD32:: @ 080CAD32 - .incbin "darkNut/gUnk_080CAD32.bin" +gSpriteAnimations_DarkNut_0_26:: @ 080CAD32 + .include "animations/gSpriteAnimations_DarkNut_0_26.s" -gUnk_080CAD4B:: @ 080CAD4B - .incbin "darkNut/gUnk_080CAD4B.bin" +gSpriteAnimations_DarkNut_0_27:: @ 080CAD4B + .include "animations/gSpriteAnimations_DarkNut_0_27.s" -gUnk_080CAD64:: @ 080CAD64 - .incbin "darkNut/gUnk_080CAD64.bin" +gSpriteAnimations_DarkNut_0_28:: @ 080CAD64 + .include "animations/gSpriteAnimations_DarkNut_0_28.s" -gUnk_080CAD70:: @ 080CAD70 - .incbin "darkNut/gUnk_080CAD70.bin" +gSpriteAnimations_DarkNut_0_29:: @ 080CAD70 + .include "animations/gSpriteAnimations_DarkNut_0_29.s" -gUnk_080CAD7C:: @ 080CAD7C - .incbin "darkNut/gUnk_080CAD7C.bin" +gSpriteAnimations_DarkNut_0_30:: @ 080CAD7C + .include "animations/gSpriteAnimations_DarkNut_0_30.s" -gUnk_080CAD88:: @ 080CAD88 - .incbin "darkNut/gUnk_080CAD88.bin" +gSpriteAnimations_DarkNut_0_31:: @ 080CAD88 + .include "animations/gSpriteAnimations_DarkNut_0_31.s" -gUnk_080CAD94:: @ 080CAD94 - .incbin "darkNut/gUnk_080CAD94.bin" +gSpriteAnimations_DarkNut_0_32:: @ 080CAD94 + .include "animations/gSpriteAnimations_DarkNut_0_32.s" -gUnk_080CADA9:: @ 080CADA9 - .incbin "darkNut/gUnk_080CADA9.bin" +gSpriteAnimations_DarkNut_0_33:: @ 080CADA9 + .include "animations/gSpriteAnimations_DarkNut_0_33.s" -gUnk_080CADBE:: @ 080CADBE - .incbin "darkNut/gUnk_080CADBE.bin" +gSpriteAnimations_DarkNut_0_34:: @ 080CADBE + .include "animations/gSpriteAnimations_DarkNut_0_34.s" -gUnk_080CADD3:: @ 080CADD3 - .incbin "darkNut/gUnk_080CADD3.bin" +gSpriteAnimations_DarkNut_0_35:: @ 080CADD3 + .include "animations/gSpriteAnimations_DarkNut_0_35.s" -gUnk_080CADE8:: @ 080CADE8 - .incbin "darkNut/gUnk_080CADE8.bin" +gSpriteAnimations_DarkNut_0_36:: @ 080CADE8 + .include "animations/gSpriteAnimations_DarkNut_0_36.s" -gUnk_080CAE01:: @ 080CAE01 - .incbin "darkNut/gUnk_080CAE01.bin" +gSpriteAnimations_DarkNut_0_37:: @ 080CAE01 + .include "animations/gSpriteAnimations_DarkNut_0_37.s" -gUnk_080CAE1A:: @ 080CAE1A - .incbin "darkNut/gUnk_080CAE1A.bin" +gSpriteAnimations_DarkNut_0_38:: @ 080CAE1A + .include "animations/gSpriteAnimations_DarkNut_0_38.s" -gUnk_080CAE33:: @ 080CAE33 - .incbin "darkNut/gUnk_080CAE33.bin" +gSpriteAnimations_DarkNut_0_39:: @ 080CAE33 + .include "animations/gSpriteAnimations_DarkNut_0_39.s" -gUnk_080CAE4C:: @ 080CAE4C - .incbin "darkNut/gUnk_080CAE4C.bin" +gSpriteAnimations_DarkNut_0_40:: @ 080CAE4C + .include "animations/gSpriteAnimations_DarkNut_0_40.s" -gUnk_080CAE65:: @ 080CAE65 - .incbin "darkNut/gUnk_080CAE65.bin" +gSpriteAnimations_DarkNut_0_41:: @ 080CAE65 + .include "animations/gSpriteAnimations_DarkNut_0_41.s" -gUnk_080CAE7E:: @ 080CAE7E - .incbin "darkNut/gUnk_080CAE7E.bin" +gSpriteAnimations_DarkNut_0_42:: @ 080CAE7E + .include "animations/gSpriteAnimations_DarkNut_0_42.s" -gUnk_080CAE97:: @ 080CAE97 - .incbin "darkNut/gUnk_080CAE97.bin" +gSpriteAnimations_DarkNut_0_43:: @ 080CAE97 + .include "animations/gSpriteAnimations_DarkNut_0_43.s" -gUnk_080CAEB0:: @ 080CAEB0 - .incbin "darkNut/gUnk_080CAEB0.bin" +gSpriteAnimations_DarkNut_0_44:: @ 080CAEB0 + .include "animations/gSpriteAnimations_DarkNut_0_44.s" -gUnk_080CAEC0:: @ 080CAEC0 - .incbin "darkNut/gUnk_080CAEC0.bin" +gSpriteAnimations_DarkNut_0_45:: @ 080CAEC0 + .include "animations/gSpriteAnimations_DarkNut_0_45.s" -gUnk_080CAED0:: @ 080CAED0 - .incbin "darkNut/gUnk_080CAED0.bin" +gSpriteAnimations_DarkNut_0_46:: @ 080CAED0 + .include "animations/gSpriteAnimations_DarkNut_0_46.s" -gUnk_080CAEE0:: @ 080CAEE0 - .incbin "darkNut/gUnk_080CAEE0.bin" +gSpriteAnimations_DarkNut_0_47:: @ 080CAEE0 + .include "animations/gSpriteAnimations_DarkNut_0_47.s" -gUnk_080CAEF0:: @ 080CAEF0 - .incbin "darkNut/gUnk_080CAEF0.bin" +gSpriteAnimations_DarkNut_1_0:: @ 080CAEF0 + .include "animations/gSpriteAnimations_DarkNut_1_0.s" -gUnk_080CAF20:: @ 080CAF20 - .incbin "darkNut/gUnk_080CAF20.bin" +gSpriteAnimations_DarkNut_1_1:: @ 080CAF20 + .include "animations/gSpriteAnimations_DarkNut_1_1.s" -gUnk_080CAF50:: @ 080CAF50 - .incbin "darkNut/gUnk_080CAF50.bin" +gSpriteAnimations_DarkNut_1_2:: @ 080CAF50 + .include "animations/gSpriteAnimations_DarkNut_1_2.s" -gUnk_080CAF80:: @ 080CAF80 - .incbin "darkNut/gUnk_080CAF80.bin" +gSpriteAnimations_DarkNut_1_3:: @ 080CAF80 + .include "animations/gSpriteAnimations_DarkNut_1_3.s" -gUnk_080CAFB0:: @ 080CAFB0 - .incbin "darkNut/gUnk_080CAFB0.bin" +gSpriteAnimations_DarkNut_1_4:: @ 080CAFB0 + .include "animations/gSpriteAnimations_DarkNut_1_4.s" -gUnk_080CAFC8:: @ 080CAFC8 - .incbin "darkNut/gUnk_080CAFC8.bin" +gSpriteAnimations_DarkNut_1_5:: @ 080CAFC8 + .include "animations/gSpriteAnimations_DarkNut_1_5.s" -gUnk_080CAFE0:: @ 080CAFE0 - .incbin "darkNut/gUnk_080CAFE0.bin" +gSpriteAnimations_DarkNut_1_6:: @ 080CAFE0 + .include "animations/gSpriteAnimations_DarkNut_1_6.s" -gUnk_080CAFF8:: @ 080CAFF8 - .incbin "darkNut/gUnk_080CAFF8.bin" +gSpriteAnimations_DarkNut_1_7:: @ 080CAFF8 + .include "animations/gSpriteAnimations_DarkNut_1_7.s" -gUnk_080CB010:: @ 080CB010 - .incbin "darkNut/gUnk_080CB010.bin" +gSpriteAnimations_DarkNut_1_8:: @ 080CB010 + .include "animations/gSpriteAnimations_DarkNut_1_8.s" -gUnk_080CB045:: @ 080CB045 - .incbin "darkNut/gUnk_080CB045.bin" +gSpriteAnimations_DarkNut_1_9:: @ 080CB045 + .include "animations/gSpriteAnimations_DarkNut_1_9.s" -gUnk_080CB07A:: @ 080CB07A - .incbin "darkNut/gUnk_080CB07A.bin" +gSpriteAnimations_DarkNut_1_10:: @ 080CB07A + .include "animations/gSpriteAnimations_DarkNut_1_10.s" -gUnk_080CB0AF:: @ 080CB0AF - .incbin "darkNut/gUnk_080CB0AF.bin" +gSpriteAnimations_DarkNut_1_11:: @ 080CB0AF + .include "animations/gSpriteAnimations_DarkNut_1_11.s" -gUnk_080CB0E4:: @ 080CB0E4 - .incbin "darkNut/gUnk_080CB0E4.bin" +gSpriteAnimations_DarkNut_1_12:: @ 080CB0E4 + .include "animations/gSpriteAnimations_DarkNut_1_12.s" -gUnk_080CB0EC:: @ 080CB0EC - .incbin "darkNut/gUnk_080CB0EC.bin" +gSpriteAnimations_DarkNut_1_13:: @ 080CB0EC + .include "animations/gSpriteAnimations_DarkNut_1_13.s" -gUnk_080CB0F4:: @ 080CB0F4 - .incbin "darkNut/gUnk_080CB0F4.bin" +gSpriteAnimations_DarkNut_1_14:: @ 080CB0F4 + .include "animations/gSpriteAnimations_DarkNut_1_14.s" -gUnk_080CB0FC:: @ 080CB0FC - .incbin "darkNut/gUnk_080CB0FC.bin" +gSpriteAnimations_DarkNut_1_15:: @ 080CB0FC + .include "animations/gSpriteAnimations_DarkNut_1_15.s" -gUnk_080CB104:: @ 080CB104 - .incbin "darkNut/gUnk_080CB104.bin" +gSpriteAnimations_DarkNut_1_16:: @ 080CB104 + .include "animations/gSpriteAnimations_DarkNut_1_16.s" -gUnk_080CB174:: @ 080CB174 - .incbin "darkNut/gUnk_080CB174.bin" +gSpriteAnimations_DarkNut_1_17:: @ 080CB174 + .include "animations/gSpriteAnimations_DarkNut_1_17.s" -gUnk_080CB1E4:: @ 080CB1E4 - .incbin "darkNut/gUnk_080CB1E4.bin" +gSpriteAnimations_DarkNut_1_18:: @ 080CB1E4 + .include "animations/gSpriteAnimations_DarkNut_1_18.s" -gUnk_080CB254:: @ 080CB254 - .incbin "darkNut/gUnk_080CB254.bin" +gSpriteAnimations_DarkNut_1_19:: @ 080CB254 + .include "animations/gSpriteAnimations_DarkNut_1_19.s" -gUnk_080CB2C4:: @ 080CB2C4 - .incbin "darkNut/gUnk_080CB2C4.bin" +gSpriteAnimations_DarkNut_1_20:: @ 080CB2C4 + .include "animations/gSpriteAnimations_DarkNut_1_20.s" -gUnk_080CB2F8:: @ 080CB2F8 - .incbin "darkNut/gUnk_080CB2F8.bin" +gSpriteAnimations_DarkNut_1_21:: @ 080CB2F8 + .include "animations/gSpriteAnimations_DarkNut_1_21.s" -gUnk_080CB32C:: @ 080CB32C - .incbin "darkNut/gUnk_080CB32C.bin" +gSpriteAnimations_DarkNut_1_22:: @ 080CB32C + .include "animations/gSpriteAnimations_DarkNut_1_22.s" -gUnk_080CB360:: @ 080CB360 - .incbin "darkNut/gUnk_080CB360.bin" +gSpriteAnimations_DarkNut_1_23:: @ 080CB360 + .include "animations/gSpriteAnimations_DarkNut_1_23.s" -gUnk_080CB394:: @ 080CB394 - .incbin "darkNut/gUnk_080CB394.bin" +gSpriteAnimations_DarkNut_1_24:: @ 080CB394 + .include "animations/gSpriteAnimations_DarkNut_1_24.s" -gUnk_080CB3BD:: @ 080CB3BD - .incbin "darkNut/gUnk_080CB3BD.bin" +gSpriteAnimations_DarkNut_1_25:: @ 080CB3BD + .include "animations/gSpriteAnimations_DarkNut_1_25.s" -gUnk_080CB3E6:: @ 080CB3E6 - .incbin "darkNut/gUnk_080CB3E6.bin" +gSpriteAnimations_DarkNut_1_26:: @ 080CB3E6 + .include "animations/gSpriteAnimations_DarkNut_1_26.s" -gUnk_080CB40F:: @ 080CB40F - .incbin "darkNut/gUnk_080CB40F.bin" +gSpriteAnimations_DarkNut_1_27:: @ 080CB40F + .include "animations/gSpriteAnimations_DarkNut_1_27.s" gSpriteAnimations_DarkNut_0:: @ 080CB438 - .4byte gUnk_080CAB6C - .4byte gUnk_080CAB70 - .4byte gUnk_080CAB74 - .4byte gUnk_080CAB78 - .4byte gUnk_080CAB7C - .4byte gUnk_080CAB8C - .4byte gUnk_080CAB9C - .4byte gUnk_080CABAC - .4byte gUnk_080CABBC - .4byte gUnk_080CABC0 - .4byte gUnk_080CABC4 - .4byte gUnk_080CABC8 - .4byte gUnk_080CABCC - .4byte gUnk_080CABE5 - .4byte gUnk_080CABFE - .4byte gUnk_080CAC17 - .4byte gUnk_080CAC30 - .4byte gUnk_080CAC3C - .4byte gUnk_080CAC48 - .4byte gUnk_080CAC54 - .4byte gUnk_080CAC60 - .4byte gUnk_080CAC88 - .4byte gUnk_080CACB0 - .4byte gUnk_080CACD8 - .4byte gUnk_080CAD00 - .4byte gUnk_080CAD19 - .4byte gUnk_080CAD32 - .4byte gUnk_080CAD4B - .4byte gUnk_080CAD64 - .4byte gUnk_080CAD70 - .4byte gUnk_080CAD7C - .4byte gUnk_080CAD88 - .4byte gUnk_080CAD94 - .4byte gUnk_080CADA9 - .4byte gUnk_080CADBE - .4byte gUnk_080CADD3 - .4byte gUnk_080CADE8 - .4byte gUnk_080CAE01 - .4byte gUnk_080CAE1A - .4byte gUnk_080CAE33 - .4byte gUnk_080CAE4C - .4byte gUnk_080CAE65 - .4byte gUnk_080CAE7E - .4byte gUnk_080CAE97 - .4byte gUnk_080CAEB0 - .4byte gUnk_080CAEC0 - .4byte gUnk_080CAED0 - .4byte gUnk_080CAEE0 + .4byte gSpriteAnimations_DarkNut_0_0 + .4byte gSpriteAnimations_DarkNut_0_1 + .4byte gSpriteAnimations_DarkNut_0_2 + .4byte gSpriteAnimations_DarkNut_0_3 + .4byte gSpriteAnimations_DarkNut_0_4 + .4byte gSpriteAnimations_DarkNut_0_5 + .4byte gSpriteAnimations_DarkNut_0_6 + .4byte gSpriteAnimations_DarkNut_0_7 + .4byte gSpriteAnimations_DarkNut_0_8 + .4byte gSpriteAnimations_DarkNut_0_9 + .4byte gSpriteAnimations_DarkNut_0_10 + .4byte gSpriteAnimations_DarkNut_0_11 + .4byte gSpriteAnimations_DarkNut_0_12 + .4byte gSpriteAnimations_DarkNut_0_13 + .4byte gSpriteAnimations_DarkNut_0_14 + .4byte gSpriteAnimations_DarkNut_0_15 + .4byte gSpriteAnimations_DarkNut_0_16 + .4byte gSpriteAnimations_DarkNut_0_17 + .4byte gSpriteAnimations_DarkNut_0_18 + .4byte gSpriteAnimations_DarkNut_0_19 + .4byte gSpriteAnimations_DarkNut_0_20 + .4byte gSpriteAnimations_DarkNut_0_21 + .4byte gSpriteAnimations_DarkNut_0_22 + .4byte gSpriteAnimations_DarkNut_0_23 + .4byte gSpriteAnimations_DarkNut_0_24 + .4byte gSpriteAnimations_DarkNut_0_25 + .4byte gSpriteAnimations_DarkNut_0_26 + .4byte gSpriteAnimations_DarkNut_0_27 + .4byte gSpriteAnimations_DarkNut_0_28 + .4byte gSpriteAnimations_DarkNut_0_29 + .4byte gSpriteAnimations_DarkNut_0_30 + .4byte gSpriteAnimations_DarkNut_0_31 + .4byte gSpriteAnimations_DarkNut_0_32 + .4byte gSpriteAnimations_DarkNut_0_33 + .4byte gSpriteAnimations_DarkNut_0_34 + .4byte gSpriteAnimations_DarkNut_0_35 + .4byte gSpriteAnimations_DarkNut_0_36 + .4byte gSpriteAnimations_DarkNut_0_37 + .4byte gSpriteAnimations_DarkNut_0_38 + .4byte gSpriteAnimations_DarkNut_0_39 + .4byte gSpriteAnimations_DarkNut_0_40 + .4byte gSpriteAnimations_DarkNut_0_41 + .4byte gSpriteAnimations_DarkNut_0_42 + .4byte gSpriteAnimations_DarkNut_0_43 + .4byte gSpriteAnimations_DarkNut_0_44 + .4byte gSpriteAnimations_DarkNut_0_45 + .4byte gSpriteAnimations_DarkNut_0_46 + .4byte gSpriteAnimations_DarkNut_0_47 .4byte 00000000 gSpriteAnimations_DarkNut_1:: @ 080CB4FC - .4byte gUnk_080CAEF0 - .4byte gUnk_080CAF20 - .4byte gUnk_080CAF50 - .4byte gUnk_080CAF80 - .4byte gUnk_080CAFB0 - .4byte gUnk_080CAFC8 - .4byte gUnk_080CAFE0 - .4byte gUnk_080CAFF8 - .4byte gUnk_080CB010 - .4byte gUnk_080CB045 - .4byte gUnk_080CB07A - .4byte gUnk_080CB0AF - .4byte gUnk_080CB0E4 - .4byte gUnk_080CB0EC - .4byte gUnk_080CB0F4 - .4byte gUnk_080CB0FC - .4byte gUnk_080CB104 - .4byte gUnk_080CB174 - .4byte gUnk_080CB1E4 - .4byte gUnk_080CB254 - .4byte gUnk_080CB2C4 - .4byte gUnk_080CB2F8 - .4byte gUnk_080CB32C - .4byte gUnk_080CB360 - .4byte gUnk_080CB394 - .4byte gUnk_080CB3BD - .4byte gUnk_080CB3E6 - .4byte gUnk_080CB40F + .4byte gSpriteAnimations_DarkNut_1_0 + .4byte gSpriteAnimations_DarkNut_1_1 + .4byte gSpriteAnimations_DarkNut_1_2 + .4byte gSpriteAnimations_DarkNut_1_3 + .4byte gSpriteAnimations_DarkNut_1_4 + .4byte gSpriteAnimations_DarkNut_1_5 + .4byte gSpriteAnimations_DarkNut_1_6 + .4byte gSpriteAnimations_DarkNut_1_7 + .4byte gSpriteAnimations_DarkNut_1_8 + .4byte gSpriteAnimations_DarkNut_1_9 + .4byte gSpriteAnimations_DarkNut_1_10 + .4byte gSpriteAnimations_DarkNut_1_11 + .4byte gSpriteAnimations_DarkNut_1_12 + .4byte gSpriteAnimations_DarkNut_1_13 + .4byte gSpriteAnimations_DarkNut_1_14 + .4byte gSpriteAnimations_DarkNut_1_15 + .4byte gSpriteAnimations_DarkNut_1_16 + .4byte gSpriteAnimations_DarkNut_1_17 + .4byte gSpriteAnimations_DarkNut_1_18 + .4byte gSpriteAnimations_DarkNut_1_19 + .4byte gSpriteAnimations_DarkNut_1_20 + .4byte gSpriteAnimations_DarkNut_1_21 + .4byte gSpriteAnimations_DarkNut_1_22 + .4byte gSpriteAnimations_DarkNut_1_23 + .4byte gSpriteAnimations_DarkNut_1_24 + .4byte gSpriteAnimations_DarkNut_1_25 + .4byte gSpriteAnimations_DarkNut_1_26 + .4byte gSpriteAnimations_DarkNut_1_27 .4byte 00000000 diff --git a/data/animations/enemy/doorMimic.s b/data/animations/enemy/doorMimic.s index d31a3c22..2470c7bf 100644 --- a/data/animations/enemy/doorMimic.s +++ b/data/animations/enemy/doorMimic.s @@ -3,35 +3,35 @@ .section .rodata -gUnk_080CB8B4:: @ 080CB8B4 - .incbin "doorMimic/gUnk_080CB8B4.bin" +gSpriteAnimations_DoorMimic_0:: @ 080CB8B4 + .include "animations/gSpriteAnimations_DoorMimic_0.s" -gUnk_080CB8B9:: @ 080CB8B9 - .incbin "doorMimic/gUnk_080CB8B9.bin" +gSpriteAnimations_DoorMimic_1:: @ 080CB8B9 + .include "animations/gSpriteAnimations_DoorMimic_1.s" -gUnk_080CB8BE:: @ 080CB8BE - .incbin "doorMimic/gUnk_080CB8BE.bin" +gSpriteAnimations_DoorMimic_4:: @ 080CB8BE + .include "animations/gSpriteAnimations_DoorMimic_4.s" -gUnk_080CB8D7:: @ 080CB8D7 - .incbin "doorMimic/gUnk_080CB8D7.bin" +gSpriteAnimations_DoorMimic_5:: @ 080CB8D7 + .include "animations/gSpriteAnimations_DoorMimic_5.s" -gUnk_080CB8F0:: @ 080CB8F0 - .incbin "doorMimic/gUnk_080CB8F0.bin" +gSpriteAnimations_DoorMimic_8:: @ 080CB8F0 + .include "animations/gSpriteAnimations_DoorMimic_8.s" -gUnk_080CB901:: @ 080CB901 - .incbin "doorMimic/gUnk_080CB901.bin" +gSpriteAnimations_DoorMimic_9:: @ 080CB901 + .include "animations/gSpriteAnimations_DoorMimic_9.s" gSpriteAnimations_DoorMimic:: @ 080CB914 - .4byte gUnk_080CB8B4 - .4byte gUnk_080CB8B9 - .4byte gUnk_080CB8B9 - .4byte gUnk_080CB8B4 - .4byte gUnk_080CB8BE - .4byte gUnk_080CB8D7 - .4byte gUnk_080CB8D7 - .4byte gUnk_080CB8BE - .4byte gUnk_080CB8F0 - .4byte gUnk_080CB901 - .4byte gUnk_080CB901 - .4byte gUnk_080CB8F0 + .4byte gSpriteAnimations_DoorMimic_0 + .4byte gSpriteAnimations_DoorMimic_1 + .4byte gSpriteAnimations_DoorMimic_1 + .4byte gSpriteAnimations_DoorMimic_0 + .4byte gSpriteAnimations_DoorMimic_4 + .4byte gSpriteAnimations_DoorMimic_5 + .4byte gSpriteAnimations_DoorMimic_5 + .4byte gSpriteAnimations_DoorMimic_4 + .4byte gSpriteAnimations_DoorMimic_8 + .4byte gSpriteAnimations_DoorMimic_9 + .4byte gSpriteAnimations_DoorMimic_9 + .4byte gSpriteAnimations_DoorMimic_8 .4byte 00000000 diff --git a/data/animations/enemy/enemy62.s b/data/animations/enemy/enemy62.s index 67987686..729d7ac0 100644 --- a/data/animations/enemy/enemy62.s +++ b/data/animations/enemy/enemy62.s @@ -4,261 +4,261 @@ .section .rodata .align 2 -gUnk_080D2368:: @ 080D2368 - .incbin "enemy62/gUnk_080D2368.bin" +gSpriteAnimations_Enemy62_0:: @ 080D2368 + .include "animations/gSpriteAnimations_Enemy62_0.s" -gUnk_080D2379:: @ 080D2379 - .incbin "enemy62/gUnk_080D2379.bin" +gSpriteAnimations_Enemy62_1:: @ 080D2379 + .include "animations/gSpriteAnimations_Enemy62_1.s" -gUnk_080D238A:: @ 080D238A - .incbin "enemy62/gUnk_080D238A.bin" +gSpriteAnimations_Enemy62_2:: @ 080D238A + .include "animations/gSpriteAnimations_Enemy62_2.s" -gUnk_080D239B:: @ 080D239B - .incbin "enemy62/gUnk_080D239B.bin" +gSpriteAnimations_Enemy62_3:: @ 080D239B + .include "animations/gSpriteAnimations_Enemy62_3.s" -gUnk_080D23AC:: @ 080D23AC - .incbin "enemy62/gUnk_080D23AC.bin" +gSpriteAnimations_Enemy62_4:: @ 080D23AC + .include "animations/gSpriteAnimations_Enemy62_4.s" -gUnk_080D23BD:: @ 080D23BD - .incbin "enemy62/gUnk_080D23BD.bin" +gSpriteAnimations_Enemy62_5:: @ 080D23BD + .include "animations/gSpriteAnimations_Enemy62_5.s" -gUnk_080D23CE:: @ 080D23CE - .incbin "enemy62/gUnk_080D23CE.bin" +gSpriteAnimations_Enemy62_6:: @ 080D23CE + .include "animations/gSpriteAnimations_Enemy62_6.s" -gUnk_080D23DF:: @ 080D23DF - .incbin "enemy62/gUnk_080D23DF.bin" +gSpriteAnimations_Enemy62_7:: @ 080D23DF + .include "animations/gSpriteAnimations_Enemy62_7.s" -gUnk_080D23F0:: @ 080D23F0 - .incbin "enemy62/gUnk_080D23F0.bin" +gSpriteAnimations_Enemy62_8:: @ 080D23F0 + .include "animations/gSpriteAnimations_Enemy62_8.s" -gUnk_080D2401:: @ 080D2401 - .incbin "enemy62/gUnk_080D2401.bin" +gSpriteAnimations_Enemy62_9:: @ 080D2401 + .include "animations/gSpriteAnimations_Enemy62_9.s" -gUnk_080D2412:: @ 080D2412 - .incbin "enemy62/gUnk_080D2412.bin" +gSpriteAnimations_Enemy62_10:: @ 080D2412 + .include "animations/gSpriteAnimations_Enemy62_10.s" -gUnk_080D2423:: @ 080D2423 - .incbin "enemy62/gUnk_080D2423.bin" +gSpriteAnimations_Enemy62_11:: @ 080D2423 + .include "animations/gSpriteAnimations_Enemy62_11.s" -gUnk_080D2434:: @ 080D2434 - .incbin "enemy62/gUnk_080D2434.bin" +gSpriteAnimations_Enemy62_12:: @ 080D2434 + .include "animations/gSpriteAnimations_Enemy62_12.s" -gUnk_080D2445:: @ 080D2445 - .incbin "enemy62/gUnk_080D2445.bin" +gSpriteAnimations_Enemy62_13:: @ 080D2445 + .include "animations/gSpriteAnimations_Enemy62_13.s" -gUnk_080D2456:: @ 080D2456 - .incbin "enemy62/gUnk_080D2456.bin" +gSpriteAnimations_Enemy62_14:: @ 080D2456 + .include "animations/gSpriteAnimations_Enemy62_14.s" -gUnk_080D2467:: @ 080D2467 - .incbin "enemy62/gUnk_080D2467.bin" +gSpriteAnimations_Enemy62_15:: @ 080D2467 + .include "animations/gSpriteAnimations_Enemy62_15.s" -gUnk_080D2478:: @ 080D2478 - .incbin "enemy62/gUnk_080D2478.bin" +gSpriteAnimations_Enemy62_16:: @ 080D2478 + .include "animations/gSpriteAnimations_Enemy62_16.s" -gUnk_080D2489:: @ 080D2489 - .incbin "enemy62/gUnk_080D2489.bin" +gSpriteAnimations_Enemy62_17:: @ 080D2489 + .include "animations/gSpriteAnimations_Enemy62_17.s" -gUnk_080D249A:: @ 080D249A - .incbin "enemy62/gUnk_080D249A.bin" +gSpriteAnimations_Enemy62_18:: @ 080D249A + .include "animations/gSpriteAnimations_Enemy62_18.s" -gUnk_080D24AB:: @ 080D24AB - .incbin "enemy62/gUnk_080D24AB.bin" +gSpriteAnimations_Enemy62_19:: @ 080D24AB + .include "animations/gSpriteAnimations_Enemy62_19.s" -gUnk_080D24BC:: @ 080D24BC - .incbin "enemy62/gUnk_080D24BC.bin" +gSpriteAnimations_Enemy62_20:: @ 080D24BC + .include "animations/gSpriteAnimations_Enemy62_20.s" -gUnk_080D24CD:: @ 080D24CD - .incbin "enemy62/gUnk_080D24CD.bin" +gSpriteAnimations_Enemy62_21:: @ 080D24CD + .include "animations/gSpriteAnimations_Enemy62_21.s" -gUnk_080D24DE:: @ 080D24DE - .incbin "enemy62/gUnk_080D24DE.bin" +gSpriteAnimations_Enemy62_22:: @ 080D24DE + .include "animations/gSpriteAnimations_Enemy62_22.s" -gUnk_080D24EF:: @ 080D24EF - .incbin "enemy62/gUnk_080D24EF.bin" +gSpriteAnimations_Enemy62_23:: @ 080D24EF + .include "animations/gSpriteAnimations_Enemy62_23.s" -gUnk_080D2500:: @ 080D2500 - .incbin "enemy62/gUnk_080D2500.bin" +gSpriteAnimations_Enemy62_24:: @ 080D2500 + .include "animations/gSpriteAnimations_Enemy62_24.s" -gUnk_080D2511:: @ 080D2511 - .incbin "enemy62/gUnk_080D2511.bin" +gSpriteAnimations_Enemy62_25:: @ 080D2511 + .include "animations/gSpriteAnimations_Enemy62_25.s" -gUnk_080D2522:: @ 080D2522 - .incbin "enemy62/gUnk_080D2522.bin" +gSpriteAnimations_Enemy62_26:: @ 080D2522 + .include "animations/gSpriteAnimations_Enemy62_26.s" -gUnk_080D2533:: @ 080D2533 - .incbin "enemy62/gUnk_080D2533.bin" +gSpriteAnimations_Enemy62_27:: @ 080D2533 + .include "animations/gSpriteAnimations_Enemy62_27.s" -gUnk_080D2544:: @ 080D2544 - .incbin "enemy62/gUnk_080D2544.bin" +gSpriteAnimations_Enemy62_28:: @ 080D2544 + .include "animations/gSpriteAnimations_Enemy62_28.s" -gUnk_080D2555:: @ 080D2555 - .incbin "enemy62/gUnk_080D2555.bin" +gSpriteAnimations_Enemy62_29:: @ 080D2555 + .include "animations/gSpriteAnimations_Enemy62_29.s" -gUnk_080D2566:: @ 080D2566 - .incbin "enemy62/gUnk_080D2566.bin" +gSpriteAnimations_Enemy62_30:: @ 080D2566 + .include "animations/gSpriteAnimations_Enemy62_30.s" -gUnk_080D2577:: @ 080D2577 - .incbin "enemy62/gUnk_080D2577.bin" +gSpriteAnimations_Enemy62_31:: @ 080D2577 + .include "animations/gSpriteAnimations_Enemy62_31.s" -gUnk_080D2588:: @ 080D2588 - .incbin "enemy62/gUnk_080D2588.bin" +gSpriteAnimations_Enemy62_32:: @ 080D2588 + .include "animations/gSpriteAnimations_Enemy62_32.s" -gUnk_080D2599:: @ 080D2599 - .incbin "enemy62/gUnk_080D2599.bin" +gSpriteAnimations_Enemy62_33:: @ 080D2599 + .include "animations/gSpriteAnimations_Enemy62_33.s" -gUnk_080D25AA:: @ 080D25AA - .incbin "enemy62/gUnk_080D25AA.bin" +gSpriteAnimations_Enemy62_34:: @ 080D25AA + .include "animations/gSpriteAnimations_Enemy62_34.s" -gUnk_080D25BB:: @ 080D25BB - .incbin "enemy62/gUnk_080D25BB.bin" +gSpriteAnimations_Enemy62_35:: @ 080D25BB + .include "animations/gSpriteAnimations_Enemy62_35.s" -gUnk_080D25CC:: @ 080D25CC - .incbin "enemy62/gUnk_080D25CC.bin" +gSpriteAnimations_Enemy62_36:: @ 080D25CC + .include "animations/gSpriteAnimations_Enemy62_36.s" -gUnk_080D25DD:: @ 080D25DD - .incbin "enemy62/gUnk_080D25DD.bin" +gSpriteAnimations_Enemy62_37:: @ 080D25DD + .include "animations/gSpriteAnimations_Enemy62_37.s" -gUnk_080D25EE:: @ 080D25EE - .incbin "enemy62/gUnk_080D25EE.bin" +gSpriteAnimations_Enemy62_38:: @ 080D25EE + .include "animations/gSpriteAnimations_Enemy62_38.s" -gUnk_080D25FF:: @ 080D25FF - .incbin "enemy62/gUnk_080D25FF.bin" +gSpriteAnimations_Enemy62_39:: @ 080D25FF + .include "animations/gSpriteAnimations_Enemy62_39.s" -gUnk_080D2610:: @ 080D2610 - .incbin "enemy62/gUnk_080D2610.bin" +gSpriteAnimations_Enemy62_40:: @ 080D2610 + .include "animations/gSpriteAnimations_Enemy62_40.s" -gUnk_080D2621:: @ 080D2621 - .incbin "enemy62/gUnk_080D2621.bin" +gSpriteAnimations_Enemy62_41:: @ 080D2621 + .include "animations/gSpriteAnimations_Enemy62_41.s" -gUnk_080D2632:: @ 080D2632 - .incbin "enemy62/gUnk_080D2632.bin" +gSpriteAnimations_Enemy62_42:: @ 080D2632 + .include "animations/gSpriteAnimations_Enemy62_42.s" -gUnk_080D2643:: @ 080D2643 - .incbin "enemy62/gUnk_080D2643.bin" +gSpriteAnimations_Enemy62_43:: @ 080D2643 + .include "animations/gSpriteAnimations_Enemy62_43.s" -gUnk_080D2654:: @ 080D2654 - .incbin "enemy62/gUnk_080D2654.bin" +gSpriteAnimations_Enemy62_44:: @ 080D2654 + .include "animations/gSpriteAnimations_Enemy62_44.s" -gUnk_080D2665:: @ 080D2665 - .incbin "enemy62/gUnk_080D2665.bin" +gSpriteAnimations_Enemy62_45:: @ 080D2665 + .include "animations/gSpriteAnimations_Enemy62_45.s" -gUnk_080D2676:: @ 080D2676 - .incbin "enemy62/gUnk_080D2676.bin" +gSpriteAnimations_Enemy62_46:: @ 080D2676 + .include "animations/gSpriteAnimations_Enemy62_46.s" -gUnk_080D2687:: @ 080D2687 - .incbin "enemy62/gUnk_080D2687.bin" +gSpriteAnimations_Enemy62_47:: @ 080D2687 + .include "animations/gSpriteAnimations_Enemy62_47.s" -gUnk_080D2698:: @ 080D2698 - .incbin "enemy62/gUnk_080D2698.bin" +gSpriteAnimations_Enemy62_48:: @ 080D2698 + .include "animations/gSpriteAnimations_Enemy62_48.s" -gUnk_080D26A9:: @ 080D26A9 - .incbin "enemy62/gUnk_080D26A9.bin" +gSpriteAnimations_Enemy62_49:: @ 080D26A9 + .include "animations/gSpriteAnimations_Enemy62_49.s" -gUnk_080D26BA:: @ 080D26BA - .incbin "enemy62/gUnk_080D26BA.bin" +gSpriteAnimations_Enemy62_50:: @ 080D26BA + .include "animations/gSpriteAnimations_Enemy62_50.s" -gUnk_080D26CB:: @ 080D26CB - .incbin "enemy62/gUnk_080D26CB.bin" +gSpriteAnimations_Enemy62_51:: @ 080D26CB + .include "animations/gSpriteAnimations_Enemy62_51.s" -gUnk_080D26DC:: @ 080D26DC - .incbin "enemy62/gUnk_080D26DC.bin" +gSpriteAnimations_Enemy62_52:: @ 080D26DC + .include "animations/gSpriteAnimations_Enemy62_52.s" -gUnk_080D26ED:: @ 080D26ED - .incbin "enemy62/gUnk_080D26ED.bin" +gSpriteAnimations_Enemy62_53:: @ 080D26ED + .include "animations/gSpriteAnimations_Enemy62_53.s" -gUnk_080D26FE:: @ 080D26FE - .incbin "enemy62/gUnk_080D26FE.bin" +gSpriteAnimations_Enemy62_54:: @ 080D26FE + .include "animations/gSpriteAnimations_Enemy62_54.s" -gUnk_080D270F:: @ 080D270F - .incbin "enemy62/gUnk_080D270F.bin" +gSpriteAnimations_Enemy62_55:: @ 080D270F + .include "animations/gSpriteAnimations_Enemy62_55.s" -gUnk_080D2720:: @ 080D2720 - .incbin "enemy62/gUnk_080D2720.bin" +gSpriteAnimations_Enemy62_56:: @ 080D2720 + .include "animations/gSpriteAnimations_Enemy62_56.s" -gUnk_080D2731:: @ 080D2731 - .incbin "enemy62/gUnk_080D2731.bin" +gSpriteAnimations_Enemy62_57:: @ 080D2731 + .include "animations/gSpriteAnimations_Enemy62_57.s" -gUnk_080D2742:: @ 080D2742 - .incbin "enemy62/gUnk_080D2742.bin" +gSpriteAnimations_Enemy62_58:: @ 080D2742 + .include "animations/gSpriteAnimations_Enemy62_58.s" -gUnk_080D2753:: @ 080D2753 - .incbin "enemy62/gUnk_080D2753.bin" +gSpriteAnimations_Enemy62_59:: @ 080D2753 + .include "animations/gSpriteAnimations_Enemy62_59.s" -gUnk_080D2764:: @ 080D2764 - .incbin "enemy62/gUnk_080D2764.bin" +gSpriteAnimations_Enemy62_60:: @ 080D2764 + .include "animations/gSpriteAnimations_Enemy62_60.s" -gUnk_080D2775:: @ 080D2775 - .incbin "enemy62/gUnk_080D2775.bin" +gSpriteAnimations_Enemy62_61:: @ 080D2775 + .include "animations/gSpriteAnimations_Enemy62_61.s" -gUnk_080D2786:: @ 080D2786 - .incbin "enemy62/gUnk_080D2786.bin" +gSpriteAnimations_Enemy62_62:: @ 080D2786 + .include "animations/gSpriteAnimations_Enemy62_62.s" -gUnk_080D2797:: @ 080D2797 - .incbin "enemy62/gUnk_080D2797.bin" +gSpriteAnimations_Enemy62_63:: @ 080D2797 + .include "animations/gSpriteAnimations_Enemy62_63.s" gSpriteAnimations_Enemy62:: @ 080D27A8 - .4byte gUnk_080D2368 - .4byte gUnk_080D2379 - .4byte gUnk_080D238A - .4byte gUnk_080D239B - .4byte gUnk_080D23AC - .4byte gUnk_080D23BD - .4byte gUnk_080D23CE - .4byte gUnk_080D23DF - .4byte gUnk_080D23F0 - .4byte gUnk_080D2401 - .4byte gUnk_080D2412 - .4byte gUnk_080D2423 - .4byte gUnk_080D2434 - .4byte gUnk_080D2445 - .4byte gUnk_080D2456 - .4byte gUnk_080D2467 - .4byte gUnk_080D2478 - .4byte gUnk_080D2489 - .4byte gUnk_080D249A - .4byte gUnk_080D24AB - .4byte gUnk_080D24BC - .4byte gUnk_080D24CD - .4byte gUnk_080D24DE - .4byte gUnk_080D24EF - .4byte gUnk_080D2500 - .4byte gUnk_080D2511 - .4byte gUnk_080D2522 - .4byte gUnk_080D2533 - .4byte gUnk_080D2544 - .4byte gUnk_080D2555 - .4byte gUnk_080D2566 - .4byte gUnk_080D2577 - .4byte gUnk_080D2588 - .4byte gUnk_080D2599 - .4byte gUnk_080D25AA - .4byte gUnk_080D25BB - .4byte gUnk_080D25CC - .4byte gUnk_080D25DD - .4byte gUnk_080D25EE - .4byte gUnk_080D25FF - .4byte gUnk_080D2610 - .4byte gUnk_080D2621 - .4byte gUnk_080D2632 - .4byte gUnk_080D2643 - .4byte gUnk_080D2654 - .4byte gUnk_080D2665 - .4byte gUnk_080D2676 - .4byte gUnk_080D2687 - .4byte gUnk_080D2698 - .4byte gUnk_080D26A9 - .4byte gUnk_080D26BA - .4byte gUnk_080D26CB - .4byte gUnk_080D26DC - .4byte gUnk_080D26ED - .4byte gUnk_080D26FE - .4byte gUnk_080D270F - .4byte gUnk_080D2720 - .4byte gUnk_080D2731 - .4byte gUnk_080D2742 - .4byte gUnk_080D2753 - .4byte gUnk_080D2764 - .4byte gUnk_080D2775 - .4byte gUnk_080D2786 - .4byte gUnk_080D2797 + .4byte gSpriteAnimations_Enemy62_0 + .4byte gSpriteAnimations_Enemy62_1 + .4byte gSpriteAnimations_Enemy62_2 + .4byte gSpriteAnimations_Enemy62_3 + .4byte gSpriteAnimations_Enemy62_4 + .4byte gSpriteAnimations_Enemy62_5 + .4byte gSpriteAnimations_Enemy62_6 + .4byte gSpriteAnimations_Enemy62_7 + .4byte gSpriteAnimations_Enemy62_8 + .4byte gSpriteAnimations_Enemy62_9 + .4byte gSpriteAnimations_Enemy62_10 + .4byte gSpriteAnimations_Enemy62_11 + .4byte gSpriteAnimations_Enemy62_12 + .4byte gSpriteAnimations_Enemy62_13 + .4byte gSpriteAnimations_Enemy62_14 + .4byte gSpriteAnimations_Enemy62_15 + .4byte gSpriteAnimations_Enemy62_16 + .4byte gSpriteAnimations_Enemy62_17 + .4byte gSpriteAnimations_Enemy62_18 + .4byte gSpriteAnimations_Enemy62_19 + .4byte gSpriteAnimations_Enemy62_20 + .4byte gSpriteAnimations_Enemy62_21 + .4byte gSpriteAnimations_Enemy62_22 + .4byte gSpriteAnimations_Enemy62_23 + .4byte gSpriteAnimations_Enemy62_24 + .4byte gSpriteAnimations_Enemy62_25 + .4byte gSpriteAnimations_Enemy62_26 + .4byte gSpriteAnimations_Enemy62_27 + .4byte gSpriteAnimations_Enemy62_28 + .4byte gSpriteAnimations_Enemy62_29 + .4byte gSpriteAnimations_Enemy62_30 + .4byte gSpriteAnimations_Enemy62_31 + .4byte gSpriteAnimations_Enemy62_32 + .4byte gSpriteAnimations_Enemy62_33 + .4byte gSpriteAnimations_Enemy62_34 + .4byte gSpriteAnimations_Enemy62_35 + .4byte gSpriteAnimations_Enemy62_36 + .4byte gSpriteAnimations_Enemy62_37 + .4byte gSpriteAnimations_Enemy62_38 + .4byte gSpriteAnimations_Enemy62_39 + .4byte gSpriteAnimations_Enemy62_40 + .4byte gSpriteAnimations_Enemy62_41 + .4byte gSpriteAnimations_Enemy62_42 + .4byte gSpriteAnimations_Enemy62_43 + .4byte gSpriteAnimations_Enemy62_44 + .4byte gSpriteAnimations_Enemy62_45 + .4byte gSpriteAnimations_Enemy62_46 + .4byte gSpriteAnimations_Enemy62_47 + .4byte gSpriteAnimations_Enemy62_48 + .4byte gSpriteAnimations_Enemy62_49 + .4byte gSpriteAnimations_Enemy62_50 + .4byte gSpriteAnimations_Enemy62_51 + .4byte gSpriteAnimations_Enemy62_52 + .4byte gSpriteAnimations_Enemy62_53 + .4byte gSpriteAnimations_Enemy62_54 + .4byte gSpriteAnimations_Enemy62_55 + .4byte gSpriteAnimations_Enemy62_56 + .4byte gSpriteAnimations_Enemy62_57 + .4byte gSpriteAnimations_Enemy62_58 + .4byte gSpriteAnimations_Enemy62_59 + .4byte gSpriteAnimations_Enemy62_60 + .4byte gSpriteAnimations_Enemy62_61 + .4byte gSpriteAnimations_Enemy62_62 + .4byte gSpriteAnimations_Enemy62_63 .4byte 00000000 diff --git a/data/animations/enemy/eyegore.s b/data/animations/enemy/eyegore.s index 9e19db8f..567eb414 100644 --- a/data/animations/enemy/eyegore.s +++ b/data/animations/enemy/eyegore.s @@ -4,66 +4,66 @@ .section .rodata .align 2 -gUnk_080CE30C:: @ 080CE30C - .incbin "eyegore/gUnk_080CE30C.bin" +gSpriteAnimations_Eyegore_2:: @ 080CE30C + .include "animations/gSpriteAnimations_Eyegore_2.s" -gUnk_080CE31C:: @ 080CE31C - .incbin "eyegore/gUnk_080CE31C.bin" +gSpriteAnimations_Eyegore_6:: @ 080CE31C + .include "animations/gSpriteAnimations_Eyegore_6.s" -gUnk_080CE335:: @ 080CE335 - .incbin "eyegore/gUnk_080CE335.bin" +gSpriteAnimations_Eyegore_0:: @ 080CE335 + .include "animations/gSpriteAnimations_Eyegore_0.s" -gUnk_080CE345:: @ 080CE345 - .incbin "eyegore/gUnk_080CE345.bin" +gSpriteAnimations_Eyegore_4:: @ 080CE345 + .include "animations/gSpriteAnimations_Eyegore_4.s" -gUnk_080CE35E:: @ 080CE35E - .incbin "eyegore/gUnk_080CE35E.bin" +gSpriteAnimations_Eyegore_3:: @ 080CE35E + .include "animations/gSpriteAnimations_Eyegore_3.s" -gUnk_080CE36E:: @ 080CE36E - .incbin "eyegore/gUnk_080CE36E.bin" +gSpriteAnimations_Eyegore_7:: @ 080CE36E + .include "animations/gSpriteAnimations_Eyegore_7.s" -gUnk_080CE387:: @ 080CE387 - .incbin "eyegore/gUnk_080CE387.bin" +gSpriteAnimations_Eyegore_1:: @ 080CE387 + .include "animations/gSpriteAnimations_Eyegore_1.s" -gUnk_080CE397:: @ 080CE397 - .incbin "eyegore/gUnk_080CE397.bin" +gSpriteAnimations_Eyegore_5:: @ 080CE397 + .include "animations/gSpriteAnimations_Eyegore_5.s" -gUnk_080CE3B0:: @ 080CE3B0 - .incbin "eyegore/gUnk_080CE3B0.bin" +gSpriteAnimations_Eyegore_10:: @ 080CE3B0 + .include "animations/gSpriteAnimations_Eyegore_10.s" -gUnk_080CE3BC:: @ 080CE3BC - .incbin "eyegore/gUnk_080CE3BC.bin" +gSpriteAnimations_Eyegore_8:: @ 080CE3BC + .include "animations/gSpriteAnimations_Eyegore_8.s" -gUnk_080CE3C8:: @ 080CE3C8 - .incbin "eyegore/gUnk_080CE3C8.bin" +gSpriteAnimations_Eyegore_11:: @ 080CE3C8 + .include "animations/gSpriteAnimations_Eyegore_11.s" -gUnk_080CE3D4:: @ 080CE3D4 - .incbin "eyegore/gUnk_080CE3D4.bin" +gSpriteAnimations_Eyegore_9:: @ 080CE3D4 + .include "animations/gSpriteAnimations_Eyegore_9.s" -gUnk_080CE3E0:: @ 080CE3E0 - .incbin "eyegore/gUnk_080CE3E0.bin" +gSpriteAnimations_Eyegore_14:: @ 080CE3E0 + .include "animations/gSpriteAnimations_Eyegore_14.s" -gUnk_080CE3EC:: @ 080CE3EC - .incbin "eyegore/gUnk_080CE3EC.bin" +gSpriteAnimations_Eyegore_15:: @ 080CE3EC + .include "animations/gSpriteAnimations_Eyegore_15.s" -gUnk_080CE3F8:: @ 080CE3F8 - .incbin "eyegore/gUnk_080CE3F8.bin" +gSpriteAnimations_Eyegore_13:: @ 080CE3F8 + .include "animations/gSpriteAnimations_Eyegore_13.s" gSpriteAnimations_Eyegore:: @ 080CE404 - .4byte gUnk_080CE335 - .4byte gUnk_080CE387 - .4byte gUnk_080CE30C - .4byte gUnk_080CE35E - .4byte gUnk_080CE345 - .4byte gUnk_080CE397 - .4byte gUnk_080CE31C - .4byte gUnk_080CE36E - .4byte gUnk_080CE3BC - .4byte gUnk_080CE3D4 - .4byte gUnk_080CE3B0 - .4byte gUnk_080CE3C8 - .4byte gUnk_080CE3BC - .4byte gUnk_080CE3F8 - .4byte gUnk_080CE3E0 - .4byte gUnk_080CE3EC + .4byte gSpriteAnimations_Eyegore_0 + .4byte gSpriteAnimations_Eyegore_1 + .4byte gSpriteAnimations_Eyegore_2 + .4byte gSpriteAnimations_Eyegore_3 + .4byte gSpriteAnimations_Eyegore_4 + .4byte gSpriteAnimations_Eyegore_5 + .4byte gSpriteAnimations_Eyegore_6 + .4byte gSpriteAnimations_Eyegore_7 + .4byte gSpriteAnimations_Eyegore_8 + .4byte gSpriteAnimations_Eyegore_9 + .4byte gSpriteAnimations_Eyegore_10 + .4byte gSpriteAnimations_Eyegore_11 + .4byte gSpriteAnimations_Eyegore_8 + .4byte gSpriteAnimations_Eyegore_13 + .4byte gSpriteAnimations_Eyegore_14 + .4byte gSpriteAnimations_Eyegore_15 .4byte 00000000 diff --git a/data/animations/enemy/fallingBoulder.s b/data/animations/enemy/fallingBoulder.s index 559d52c1..197247a2 100644 --- a/data/animations/enemy/fallingBoulder.s +++ b/data/animations/enemy/fallingBoulder.s @@ -3,13 +3,13 @@ .section .rodata -gUnk_080CD5A4:: @ 080CD5A4 - .incbin "fallingBoulder/gUnk_080CD5A4.bin" +gSpriteAnimations_FallingBoulder_0:: @ 080CD5A4 + .include "animations/gSpriteAnimations_FallingBoulder_0.s" -gUnk_080CD5B5:: @ 080CD5B5 - .incbin "fallingBoulder/gUnk_080CD5B5.bin" +gSpriteAnimations_FallingBoulder_1:: @ 080CD5B5 + .include "animations/gSpriteAnimations_FallingBoulder_1.s" gSpriteAnimations_FallingBoulder:: @ 080CD5C8 - .4byte gUnk_080CD5A4 - .4byte gUnk_080CD5B5 + .4byte gSpriteAnimations_FallingBoulder_0 + .4byte gSpriteAnimations_FallingBoulder_1 .4byte 00000000 diff --git a/data/animations/enemy/fireballGuy.s b/data/animations/enemy/fireballGuy.s index 928b0e8d..41d80842 100644 --- a/data/animations/enemy/fireballGuy.s +++ b/data/animations/enemy/fireballGuy.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_080D1818:: @ 080D1818 - .incbin "fireballGuy/gUnk_080D1818.bin" +gSpriteAnimations_FireballGuy_0:: @ 080D1818 + .include "animations/gSpriteAnimations_FireballGuy_0.s" -gUnk_080D1839:: @ 080D1839 - .incbin "fireballGuy/gUnk_080D1839.bin" +gSpriteAnimations_FireballGuy_1:: @ 080D1839 + .include "animations/gSpriteAnimations_FireballGuy_1.s" gSpriteAnimations_FireballGuy:: @ 080D185C - .4byte gUnk_080D1818 - .4byte gUnk_080D1839 + .4byte gSpriteAnimations_FireballGuy_0 + .4byte gSpriteAnimations_FireballGuy_1 .4byte 00000000 diff --git a/data/animations/enemy/flyingSkull.s b/data/animations/enemy/flyingSkull.s index 5e2b8502..631b517b 100644 --- a/data/animations/enemy/flyingSkull.s +++ b/data/animations/enemy/flyingSkull.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_080CFBE8:: @ 080CFBE8 - .incbin "flyingSkull/gUnk_080CFBE8.bin" +gSpriteAnimations_FlyingSkull_0:: @ 080CFBE8 + .include "animations/gSpriteAnimations_FlyingSkull_0.s" gSpriteAnimations_FlyingSkull:: @ 080CFC0C - .4byte gUnk_080CFBE8 + .4byte gSpriteAnimations_FlyingSkull_0 .4byte 00000000 diff --git a/data/animations/enemy/ghini.s b/data/animations/enemy/ghini.s index ae7f8040..76f2bcca 100644 --- a/data/animations/enemy/ghini.s +++ b/data/animations/enemy/ghini.s @@ -4,45 +4,45 @@ .section .rodata .align 2 -gUnk_080D0988:: @ 080D0988 - .incbin "ghini/gUnk_080D0988.bin" +gSpriteAnimations_Ghini_0:: @ 080D0988 + .include "animations/gSpriteAnimations_Ghini_0.s" -gUnk_080D09A4:: @ 080D09A4 - .incbin "ghini/gUnk_080D09A4.bin" +gSpriteAnimations_Ghini_2:: @ 080D09A4 + .include "animations/gSpriteAnimations_Ghini_2.s" -gUnk_080D09C9:: @ 080D09C9 - .incbin "ghini/gUnk_080D09C9.bin" +gSpriteAnimations_Ghini_1:: @ 080D09C9 + .include "animations/gSpriteAnimations_Ghini_1.s" -gUnk_080D09EE:: @ 080D09EE - .incbin "ghini/gUnk_080D09EE.bin" +gSpriteAnimations_Ghini_3:: @ 080D09EE + .include "animations/gSpriteAnimations_Ghini_3.s" -gUnk_080D0A32:: @ 080D0A32 - .incbin "ghini/gUnk_080D0A32.bin" +gSpriteAnimations_Ghini_4:: @ 080D0A32 + .include "animations/gSpriteAnimations_Ghini_4.s" -gUnk_080D0A6B:: @ 080D0A6B - .incbin "ghini/gUnk_080D0A6B.bin" +gSpriteAnimations_Ghini_5:: @ 080D0A6B + .include "animations/gSpriteAnimations_Ghini_5.s" -gUnk_080D0A6F:: @ 080D0A6F - .incbin "ghini/gUnk_080D0A6F.bin" +gSpriteAnimations_Ghini_6:: @ 080D0A6F + .include "animations/gSpriteAnimations_Ghini_6.s" -gUnk_080D0A73:: @ 080D0A73 - .incbin "ghini/gUnk_080D0A73.bin" +gSpriteAnimations_Ghini_7:: @ 080D0A73 + .include "animations/gSpriteAnimations_Ghini_7.s" -gUnk_080D0A7F:: @ 080D0A7F - .incbin "ghini/gUnk_080D0A7F.bin" +gSpriteAnimations_Ghini_8:: @ 080D0A7F + .include "animations/gSpriteAnimations_Ghini_8.s" -gUnk_080D0A8B:: @ 080D0A8B - .incbin "ghini/gUnk_080D0A8B.bin" +gSpriteAnimations_Ghini_9:: @ 080D0A8B + .include "animations/gSpriteAnimations_Ghini_9.s" gSpriteAnimations_Ghini:: @ 080D0A90 - .4byte gUnk_080D0988 - .4byte gUnk_080D09C9 - .4byte gUnk_080D09A4 - .4byte gUnk_080D09EE - .4byte gUnk_080D0A32 - .4byte gUnk_080D0A6B - .4byte gUnk_080D0A6F - .4byte gUnk_080D0A73 - .4byte gUnk_080D0A7F - .4byte gUnk_080D0A8B + .4byte gSpriteAnimations_Ghini_0 + .4byte gSpriteAnimations_Ghini_1 + .4byte gSpriteAnimations_Ghini_2 + .4byte gSpriteAnimations_Ghini_3 + .4byte gSpriteAnimations_Ghini_4 + .4byte gSpriteAnimations_Ghini_5 + .4byte gSpriteAnimations_Ghini_6 + .4byte gSpriteAnimations_Ghini_7 + .4byte gSpriteAnimations_Ghini_8 + .4byte gSpriteAnimations_Ghini_9 .4byte 00000000 diff --git a/data/animations/enemy/gibdo.s b/data/animations/enemy/gibdo.s index be8b3d68..7532f19e 100644 --- a/data/animations/enemy/gibdo.s +++ b/data/animations/enemy/gibdo.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_080CF2D0:: @ 080CF2D0 - .incbin "gibdo/gUnk_080CF2D0.bin" +gSpriteAnimations_Gibdo_0:: @ 080CF2D0 + .include "animations/gSpriteAnimations_Gibdo_0.s" -gUnk_080CF2D4:: @ 080CF2D4 - .incbin "gibdo/gUnk_080CF2D4.bin" +gSpriteAnimations_Gibdo_1:: @ 080CF2D4 + .include "animations/gSpriteAnimations_Gibdo_1.s" -gUnk_080CF2D8:: @ 080CF2D8 - .incbin "gibdo/gUnk_080CF2D8.bin" +gSpriteAnimations_Gibdo_2:: @ 080CF2D8 + .include "animations/gSpriteAnimations_Gibdo_2.s" -gUnk_080CF2DC:: @ 080CF2DC - .incbin "gibdo/gUnk_080CF2DC.bin" +gSpriteAnimations_Gibdo_3:: @ 080CF2DC + .include "animations/gSpriteAnimations_Gibdo_3.s" -gUnk_080CF2E0:: @ 080CF2E0 - .incbin "gibdo/gUnk_080CF2E0.bin" +gSpriteAnimations_Gibdo_4:: @ 080CF2E0 + .include "animations/gSpriteAnimations_Gibdo_4.s" -gUnk_080CF2F9:: @ 080CF2F9 - .incbin "gibdo/gUnk_080CF2F9.bin" +gSpriteAnimations_Gibdo_5:: @ 080CF2F9 + .include "animations/gSpriteAnimations_Gibdo_5.s" -gUnk_080CF312:: @ 080CF312 - .incbin "gibdo/gUnk_080CF312.bin" +gSpriteAnimations_Gibdo_6:: @ 080CF312 + .include "animations/gSpriteAnimations_Gibdo_6.s" -gUnk_080CF32B:: @ 080CF32B - .incbin "gibdo/gUnk_080CF32B.bin" +gSpriteAnimations_Gibdo_7:: @ 080CF32B + .include "animations/gSpriteAnimations_Gibdo_7.s" -gUnk_080CF344:: @ 080CF344 - .incbin "gibdo/gUnk_080CF344.bin" +gSpriteAnimations_Gibdo_8:: @ 080CF344 + .include "animations/gSpriteAnimations_Gibdo_8.s" -gUnk_080CF35C:: @ 080CF35C - .incbin "gibdo/gUnk_080CF35C.bin" +gSpriteAnimations_Gibdo_9:: @ 080CF35C + .include "animations/gSpriteAnimations_Gibdo_9.s" -gUnk_080CF374:: @ 080CF374 - .incbin "gibdo/gUnk_080CF374.bin" +gSpriteAnimations_Gibdo_10:: @ 080CF374 + .include "animations/gSpriteAnimations_Gibdo_10.s" -gUnk_080CF38C:: @ 080CF38C - .incbin "gibdo/gUnk_080CF38C.bin" +gSpriteAnimations_Gibdo_11:: @ 080CF38C + .include "animations/gSpriteAnimations_Gibdo_11.s" -gUnk_080CF3A4:: @ 080CF3A4 - .incbin "gibdo/gUnk_080CF3A4.bin" +gSpriteAnimations_Gibdo_12:: @ 080CF3A4 + .include "animations/gSpriteAnimations_Gibdo_12.s" -gUnk_080CF3AD:: @ 080CF3AD - .incbin "gibdo/gUnk_080CF3AD.bin" +gSpriteAnimations_Gibdo_13:: @ 080CF3AD + .include "animations/gSpriteAnimations_Gibdo_13.s" -gUnk_080CF3B6:: @ 080CF3B6 - .incbin "gibdo/gUnk_080CF3B6.bin" +gSpriteAnimations_Gibdo_14:: @ 080CF3B6 + .include "animations/gSpriteAnimations_Gibdo_14.s" -gUnk_080CF3BF:: @ 080CF3BF - .incbin "gibdo/gUnk_080CF3BF.bin" +gSpriteAnimations_Gibdo_15:: @ 080CF3BF + .include "animations/gSpriteAnimations_Gibdo_15.s" -gUnk_080CF3C8:: @ 080CF3C8 - .incbin "gibdo/gUnk_080CF3C8.bin" +gSpriteAnimations_Gibdo_16:: @ 080CF3C8 + .include "animations/gSpriteAnimations_Gibdo_16.s" -gUnk_080CF3DC:: @ 080CF3DC - .incbin "gibdo/gUnk_080CF3DC.bin" +gSpriteAnimations_Gibdo_17:: @ 080CF3DC + .include "animations/gSpriteAnimations_Gibdo_17.s" -gUnk_080CF3F0:: @ 080CF3F0 - .incbin "gibdo/gUnk_080CF3F0.bin" +gSpriteAnimations_Gibdo_18:: @ 080CF3F0 + .include "animations/gSpriteAnimations_Gibdo_18.s" -gUnk_080CF404:: @ 080CF404 - .incbin "gibdo/gUnk_080CF404.bin" +gSpriteAnimations_Gibdo_19:: @ 080CF404 + .include "animations/gSpriteAnimations_Gibdo_19.s" gSpriteAnimations_Gibdo:: @ 080CF418 - .4byte gUnk_080CF2D0 - .4byte gUnk_080CF2D4 - .4byte gUnk_080CF2D8 - .4byte gUnk_080CF2DC - .4byte gUnk_080CF2E0 - .4byte gUnk_080CF2F9 - .4byte gUnk_080CF312 - .4byte gUnk_080CF32B - .4byte gUnk_080CF344 - .4byte gUnk_080CF35C - .4byte gUnk_080CF374 - .4byte gUnk_080CF38C - .4byte gUnk_080CF3A4 - .4byte gUnk_080CF3AD - .4byte gUnk_080CF3B6 - .4byte gUnk_080CF3BF - .4byte gUnk_080CF3C8 - .4byte gUnk_080CF3DC - .4byte gUnk_080CF3F0 - .4byte gUnk_080CF404 + .4byte gSpriteAnimations_Gibdo_0 + .4byte gSpriteAnimations_Gibdo_1 + .4byte gSpriteAnimations_Gibdo_2 + .4byte gSpriteAnimations_Gibdo_3 + .4byte gSpriteAnimations_Gibdo_4 + .4byte gSpriteAnimations_Gibdo_5 + .4byte gSpriteAnimations_Gibdo_6 + .4byte gSpriteAnimations_Gibdo_7 + .4byte gSpriteAnimations_Gibdo_8 + .4byte gSpriteAnimations_Gibdo_9 + .4byte gSpriteAnimations_Gibdo_10 + .4byte gSpriteAnimations_Gibdo_11 + .4byte gSpriteAnimations_Gibdo_12 + .4byte gSpriteAnimations_Gibdo_13 + .4byte gSpriteAnimations_Gibdo_14 + .4byte gSpriteAnimations_Gibdo_15 + .4byte gSpriteAnimations_Gibdo_16 + .4byte gSpriteAnimations_Gibdo_17 + .4byte gSpriteAnimations_Gibdo_18 + .4byte gSpriteAnimations_Gibdo_19 .4byte 00000000 diff --git a/data/animations/enemy/gleerok.s b/data/animations/enemy/gleerok.s index d8b55762..aa73d70e 100644 --- a/data/animations/enemy/gleerok.s +++ b/data/animations/enemy/gleerok.s @@ -6,546 +6,546 @@ -gUnk_080CD8A3:: @ 080CD8A3 - .incbin "gleerok/gUnk_080CD8A3.bin" +gSpriteAnimations_Gleerok_1_36:: @ 080CD8A3 + .include "animations/gSpriteAnimations_Gleerok_1_36.s" -gUnk_080CD8A7:: @ 080CD8A7 - .incbin "gleerok/gUnk_080CD8A7.bin" +gSpriteAnimations_Gleerok_1_37:: @ 080CD8A7 + .include "animations/gSpriteAnimations_Gleerok_1_37.s" -gUnk_080CD8AB:: @ 080CD8AB - .incbin "gleerok/gUnk_080CD8AB.bin" +gSpriteAnimations_Gleerok_1_38:: @ 080CD8AB + .include "animations/gSpriteAnimations_Gleerok_1_38.s" -gUnk_080CD8AF:: @ 080CD8AF - .incbin "gleerok/gUnk_080CD8AF.bin" +gSpriteAnimations_Gleerok_1_39:: @ 080CD8AF + .include "animations/gSpriteAnimations_Gleerok_1_39.s" -gUnk_080CD8B3:: @ 080CD8B3 - .incbin "gleerok/gUnk_080CD8B3.bin" +gSpriteAnimations_Gleerok_1_40:: @ 080CD8B3 + .include "animations/gSpriteAnimations_Gleerok_1_40.s" -gUnk_080CD8B7:: @ 080CD8B7 - .incbin "gleerok/gUnk_080CD8B7.bin" +gSpriteAnimations_Gleerok_1_41:: @ 080CD8B7 + .include "animations/gSpriteAnimations_Gleerok_1_41.s" -gUnk_080CD8BB:: @ 080CD8BB - .incbin "gleerok/gUnk_080CD8BB.bin" +gSpriteAnimations_Gleerok_1_42:: @ 080CD8BB + .include "animations/gSpriteAnimations_Gleerok_1_42.s" -gUnk_080CD8BF:: @ 080CD8BF - .incbin "gleerok/gUnk_080CD8BF.bin" +gSpriteAnimations_Gleerok_1_43:: @ 080CD8BF + .include "animations/gSpriteAnimations_Gleerok_1_43.s" -gUnk_080CD8C3:: @ 080CD8C3 - .incbin "gleerok/gUnk_080CD8C3.bin" +gSpriteAnimations_Gleerok_1_44:: @ 080CD8C3 + .include "animations/gSpriteAnimations_Gleerok_1_44.s" -gUnk_080CD8C7:: @ 080CD8C7 - .incbin "gleerok/gUnk_080CD8C7.bin" +gSpriteAnimations_Gleerok_1_45:: @ 080CD8C7 + .include "animations/gSpriteAnimations_Gleerok_1_45.s" -gUnk_080CD8CB:: @ 080CD8CB - .incbin "gleerok/gUnk_080CD8CB.bin" +gSpriteAnimations_Gleerok_1_46:: @ 080CD8CB + .include "animations/gSpriteAnimations_Gleerok_1_46.s" -gUnk_080CD8CF:: @ 080CD8CF - .incbin "gleerok/gUnk_080CD8CF.bin" +gSpriteAnimations_Gleerok_1_47:: @ 080CD8CF + .include "animations/gSpriteAnimations_Gleerok_1_47.s" -gUnk_080CD8D3:: @ 080CD8D3 - .incbin "gleerok/gUnk_080CD8D3.bin" +gSpriteAnimations_Gleerok_1_24:: @ 080CD8D3 + .include "animations/gSpriteAnimations_Gleerok_1_24.s" -gUnk_080CD8D7:: @ 080CD8D7 - .incbin "gleerok/gUnk_080CD8D7.bin" +gSpriteAnimations_Gleerok_1_25:: @ 080CD8D7 + .include "animations/gSpriteAnimations_Gleerok_1_25.s" -gUnk_080CD8DB:: @ 080CD8DB - .incbin "gleerok/gUnk_080CD8DB.bin" +gSpriteAnimations_Gleerok_1_26:: @ 080CD8DB + .include "animations/gSpriteAnimations_Gleerok_1_26.s" -gUnk_080CD8DF:: @ 080CD8DF - .incbin "gleerok/gUnk_080CD8DF.bin" +gSpriteAnimations_Gleerok_1_27:: @ 080CD8DF + .include "animations/gSpriteAnimations_Gleerok_1_27.s" -gUnk_080CD8E3:: @ 080CD8E3 - .incbin "gleerok/gUnk_080CD8E3.bin" +gSpriteAnimations_Gleerok_1_28:: @ 080CD8E3 + .include "animations/gSpriteAnimations_Gleerok_1_28.s" -gUnk_080CD8E7:: @ 080CD8E7 - .incbin "gleerok/gUnk_080CD8E7.bin" +gSpriteAnimations_Gleerok_1_29:: @ 080CD8E7 + .include "animations/gSpriteAnimations_Gleerok_1_29.s" -gUnk_080CD8EB:: @ 080CD8EB - .incbin "gleerok/gUnk_080CD8EB.bin" +gSpriteAnimations_Gleerok_1_30:: @ 080CD8EB + .include "animations/gSpriteAnimations_Gleerok_1_30.s" -gUnk_080CD8EF:: @ 080CD8EF - .incbin "gleerok/gUnk_080CD8EF.bin" +gSpriteAnimations_Gleerok_1_31:: @ 080CD8EF + .include "animations/gSpriteAnimations_Gleerok_1_31.s" -gUnk_080CD8F3:: @ 080CD8F3 - .incbin "gleerok/gUnk_080CD8F3.bin" +gSpriteAnimations_Gleerok_1_32:: @ 080CD8F3 + .include "animations/gSpriteAnimations_Gleerok_1_32.s" -gUnk_080CD8F7:: @ 080CD8F7 - .incbin "gleerok/gUnk_080CD8F7.bin" +gSpriteAnimations_Gleerok_1_33:: @ 080CD8F7 + .include "animations/gSpriteAnimations_Gleerok_1_33.s" -gUnk_080CD8FB:: @ 080CD8FB - .incbin "gleerok/gUnk_080CD8FB.bin" +gSpriteAnimations_Gleerok_1_34:: @ 080CD8FB + .include "animations/gSpriteAnimations_Gleerok_1_34.s" -gUnk_080CD8FF:: @ 080CD8FF - .incbin "gleerok/gUnk_080CD8FF.bin" +gSpriteAnimations_Gleerok_1_35:: @ 080CD8FF + .include "animations/gSpriteAnimations_Gleerok_1_35.s" -gUnk_080CD903:: @ 080CD903 - .incbin "gleerok/gUnk_080CD903.bin" +gSpriteAnimations_Gleerok_1_12:: @ 080CD903 + .include "animations/gSpriteAnimations_Gleerok_1_12.s" -gUnk_080CD907:: @ 080CD907 - .incbin "gleerok/gUnk_080CD907.bin" +gSpriteAnimations_Gleerok_1_13:: @ 080CD907 + .include "animations/gSpriteAnimations_Gleerok_1_13.s" -gUnk_080CD90B:: @ 080CD90B - .incbin "gleerok/gUnk_080CD90B.bin" +gSpriteAnimations_Gleerok_1_14:: @ 080CD90B + .include "animations/gSpriteAnimations_Gleerok_1_14.s" -gUnk_080CD90F:: @ 080CD90F - .incbin "gleerok/gUnk_080CD90F.bin" +gSpriteAnimations_Gleerok_1_15:: @ 080CD90F + .include "animations/gSpriteAnimations_Gleerok_1_15.s" -gUnk_080CD913:: @ 080CD913 - .incbin "gleerok/gUnk_080CD913.bin" +gSpriteAnimations_Gleerok_1_16:: @ 080CD913 + .include "animations/gSpriteAnimations_Gleerok_1_16.s" -gUnk_080CD917:: @ 080CD917 - .incbin "gleerok/gUnk_080CD917.bin" +gSpriteAnimations_Gleerok_1_17:: @ 080CD917 + .include "animations/gSpriteAnimations_Gleerok_1_17.s" -gUnk_080CD91B:: @ 080CD91B - .incbin "gleerok/gUnk_080CD91B.bin" +gSpriteAnimations_Gleerok_1_18:: @ 080CD91B + .include "animations/gSpriteAnimations_Gleerok_1_18.s" -gUnk_080CD91F:: @ 080CD91F - .incbin "gleerok/gUnk_080CD91F.bin" +gSpriteAnimations_Gleerok_1_19:: @ 080CD91F + .include "animations/gSpriteAnimations_Gleerok_1_19.s" -gUnk_080CD923:: @ 080CD923 - .incbin "gleerok/gUnk_080CD923.bin" +gSpriteAnimations_Gleerok_1_20:: @ 080CD923 + .include "animations/gSpriteAnimations_Gleerok_1_20.s" -gUnk_080CD927:: @ 080CD927 - .incbin "gleerok/gUnk_080CD927.bin" +gSpriteAnimations_Gleerok_1_21:: @ 080CD927 + .include "animations/gSpriteAnimations_Gleerok_1_21.s" -gUnk_080CD92B:: @ 080CD92B - .incbin "gleerok/gUnk_080CD92B.bin" +gSpriteAnimations_Gleerok_1_22:: @ 080CD92B + .include "animations/gSpriteAnimations_Gleerok_1_22.s" -gUnk_080CD92F:: @ 080CD92F - .incbin "gleerok/gUnk_080CD92F.bin" +gSpriteAnimations_Gleerok_1_23:: @ 080CD92F + .include "animations/gSpriteAnimations_Gleerok_1_23.s" -gUnk_080CD933:: @ 080CD933 - .incbin "gleerok/gUnk_080CD933.bin" +gSpriteAnimations_Gleerok_1_0:: @ 080CD933 + .include "animations/gSpriteAnimations_Gleerok_1_0.s" -gUnk_080CD937:: @ 080CD937 - .incbin "gleerok/gUnk_080CD937.bin" +gSpriteAnimations_Gleerok_1_1:: @ 080CD937 + .include "animations/gSpriteAnimations_Gleerok_1_1.s" -gUnk_080CD93B:: @ 080CD93B - .incbin "gleerok/gUnk_080CD93B.bin" +gSpriteAnimations_Gleerok_1_2:: @ 080CD93B + .include "animations/gSpriteAnimations_Gleerok_1_2.s" -gUnk_080CD93F:: @ 080CD93F - .incbin "gleerok/gUnk_080CD93F.bin" +gSpriteAnimations_Gleerok_1_3:: @ 080CD93F + .include "animations/gSpriteAnimations_Gleerok_1_3.s" -gUnk_080CD943:: @ 080CD943 - .incbin "gleerok/gUnk_080CD943.bin" +gSpriteAnimations_Gleerok_1_4:: @ 080CD943 + .include "animations/gSpriteAnimations_Gleerok_1_4.s" -gUnk_080CD947:: @ 080CD947 - .incbin "gleerok/gUnk_080CD947.bin" +gSpriteAnimations_Gleerok_1_5:: @ 080CD947 + .include "animations/gSpriteAnimations_Gleerok_1_5.s" -gUnk_080CD94B:: @ 080CD94B - .incbin "gleerok/gUnk_080CD94B.bin" +gSpriteAnimations_Gleerok_1_6:: @ 080CD94B + .include "animations/gSpriteAnimations_Gleerok_1_6.s" -gUnk_080CD94F:: @ 080CD94F - .incbin "gleerok/gUnk_080CD94F.bin" +gSpriteAnimations_Gleerok_1_7:: @ 080CD94F + .include "animations/gSpriteAnimations_Gleerok_1_7.s" -gUnk_080CD953:: @ 080CD953 - .incbin "gleerok/gUnk_080CD953.bin" +gSpriteAnimations_Gleerok_1_8:: @ 080CD953 + .include "animations/gSpriteAnimations_Gleerok_1_8.s" -gUnk_080CD957:: @ 080CD957 - .incbin "gleerok/gUnk_080CD957.bin" +gSpriteAnimations_Gleerok_1_9:: @ 080CD957 + .include "animations/gSpriteAnimations_Gleerok_1_9.s" -gUnk_080CD95B:: @ 080CD95B - .incbin "gleerok/gUnk_080CD95B.bin" +gSpriteAnimations_Gleerok_1_10:: @ 080CD95B + .include "animations/gSpriteAnimations_Gleerok_1_10.s" -gUnk_080CD95F:: @ 080CD95F - .incbin "gleerok/gUnk_080CD95F.bin" +gSpriteAnimations_Gleerok_1_11:: @ 080CD95F + .include "animations/gSpriteAnimations_Gleerok_1_11.s" -gUnk_080CD963:: @ 080CD963 - .incbin "gleerok/gUnk_080CD963.bin" +gSpriteAnimations_Gleerok_1_48:: @ 080CD963 + .include "animations/gSpriteAnimations_Gleerok_1_48.s" -gUnk_080CD967:: @ 080CD967 - .incbin "gleerok/gUnk_080CD967.bin" +gSpriteAnimations_Gleerok_1_49:: @ 080CD967 + .include "animations/gSpriteAnimations_Gleerok_1_49.s" -gUnk_080CD96B:: @ 080CD96B - .incbin "gleerok/gUnk_080CD96B.bin" +gSpriteAnimations_Gleerok_1_50:: @ 080CD96B + .include "animations/gSpriteAnimations_Gleerok_1_50.s" -gUnk_080CD96F:: @ 080CD96F - .incbin "gleerok/gUnk_080CD96F.bin" +gSpriteAnimations_Gleerok_1_51:: @ 080CD96F + .include "animations/gSpriteAnimations_Gleerok_1_51.s" -gUnk_080CD973:: @ 080CD973 - .incbin "gleerok/gUnk_080CD973.bin" +gSpriteAnimations_Gleerok_1_52:: @ 080CD973 + .include "animations/gSpriteAnimations_Gleerok_1_52.s" -gUnk_080CD977:: @ 080CD977 - .incbin "gleerok/gUnk_080CD977.bin" +gSpriteAnimations_Gleerok_1_53:: @ 080CD977 + .include "animations/gSpriteAnimations_Gleerok_1_53.s" -gUnk_080CD97B:: @ 080CD97B - .incbin "gleerok/gUnk_080CD97B.bin" +gSpriteAnimations_Gleerok_1_54:: @ 080CD97B + .include "animations/gSpriteAnimations_Gleerok_1_54.s" -gUnk_080CD97F:: @ 080CD97F - .incbin "gleerok/gUnk_080CD97F.bin" +gSpriteAnimations_Gleerok_1_55:: @ 080CD97F + .include "animations/gSpriteAnimations_Gleerok_1_55.s" -gUnk_080CD983:: @ 080CD983 - .incbin "gleerok/gUnk_080CD983.bin" +gSpriteAnimations_Gleerok_1_56:: @ 080CD983 + .include "animations/gSpriteAnimations_Gleerok_1_56.s" -gUnk_080CD987:: @ 080CD987 - .incbin "gleerok/gUnk_080CD987.bin" +gSpriteAnimations_Gleerok_1_57:: @ 080CD987 + .include "animations/gSpriteAnimations_Gleerok_1_57.s" -gUnk_080CD98B:: @ 080CD98B - .incbin "gleerok/gUnk_080CD98B.bin" +gSpriteAnimations_Gleerok_1_58:: @ 080CD98B + .include "animations/gSpriteAnimations_Gleerok_1_58.s" -gUnk_080CD98F:: @ 080CD98F - .incbin "gleerok/gUnk_080CD98F.bin" +gSpriteAnimations_Gleerok_1_59:: @ 080CD98F + .include "animations/gSpriteAnimations_Gleerok_1_59.s" -gUnk_080CD993:: @ 080CD993 - .incbin "gleerok/gUnk_080CD993.bin" +gSpriteAnimations_Gleerok_1_60:: @ 080CD993 + .include "animations/gSpriteAnimations_Gleerok_1_60.s" -gUnk_080CD997:: @ 080CD997 - .incbin "gleerok/gUnk_080CD997.bin" +gSpriteAnimations_Gleerok_1_61:: @ 080CD997 + .include "animations/gSpriteAnimations_Gleerok_1_61.s" -gUnk_080CD99B:: @ 080CD99B - .incbin "gleerok/gUnk_080CD99B.bin" +gSpriteAnimations_Gleerok_1_62:: @ 080CD99B + .include "animations/gSpriteAnimations_Gleerok_1_62.s" -gUnk_080CD99F:: @ 080CD99F - .incbin "gleerok/gUnk_080CD99F.bin" +gSpriteAnimations_Gleerok_1_63:: @ 080CD99F + .include "animations/gSpriteAnimations_Gleerok_1_63.s" -gUnk_080CD9A3:: @ 080CD9A3 - .incbin "gleerok/gUnk_080CD9A3.bin" +gSpriteAnimations_Gleerok_1_64:: @ 080CD9A3 + .include "animations/gSpriteAnimations_Gleerok_1_64.s" -gUnk_080CD9A7:: @ 080CD9A7 - .incbin "gleerok/gUnk_080CD9A7.bin" +gSpriteAnimations_Gleerok_1_65:: @ 080CD9A7 + .include "animations/gSpriteAnimations_Gleerok_1_65.s" -gUnk_080CD9AB:: @ 080CD9AB - .incbin "gleerok/gUnk_080CD9AB.bin" +gSpriteAnimations_Gleerok_1_66:: @ 080CD9AB + .include "animations/gSpriteAnimations_Gleerok_1_66.s" -gUnk_080CD9AF:: @ 080CD9AF - .incbin "gleerok/gUnk_080CD9AF.bin" +gSpriteAnimations_Gleerok_1_67:: @ 080CD9AF + .include "animations/gSpriteAnimations_Gleerok_1_67.s" -gUnk_080CD9B3:: @ 080CD9B3 - .incbin "gleerok/gUnk_080CD9B3.bin" +gSpriteAnimations_Gleerok_1_68:: @ 080CD9B3 + .include "animations/gSpriteAnimations_Gleerok_1_68.s" -gUnk_080CD9B7:: @ 080CD9B7 - .incbin "gleerok/gUnk_080CD9B7.bin" +gSpriteAnimations_Gleerok_1_69:: @ 080CD9B7 + .include "animations/gSpriteAnimations_Gleerok_1_69.s" -gUnk_080CD9BB:: @ 080CD9BB - .incbin "gleerok/gUnk_080CD9BB.bin" +gSpriteAnimations_Gleerok_1_70:: @ 080CD9BB + .include "animations/gSpriteAnimations_Gleerok_1_70.s" -gUnk_080CD9BF:: @ 080CD9BF - .incbin "gleerok/gUnk_080CD9BF.bin" +gSpriteAnimations_Gleerok_1_71:: @ 080CD9BF + .include "animations/gSpriteAnimations_Gleerok_1_71.s" -gUnk_080CD9C3:: @ 080CD9C3 - .incbin "gleerok/gUnk_080CD9C3.bin" +gSpriteAnimations_Gleerok_1_72:: @ 080CD9C3 + .include "animations/gSpriteAnimations_Gleerok_1_72.s" -gUnk_080CD9C7:: @ 080CD9C7 - .incbin "gleerok/gUnk_080CD9C7.bin" +gSpriteAnimations_Gleerok_1_73:: @ 080CD9C7 + .include "animations/gSpriteAnimations_Gleerok_1_73.s" -gUnk_080CD9CB:: @ 080CD9CB - .incbin "gleerok/gUnk_080CD9CB.bin" +gSpriteAnimations_Gleerok_1_76:: @ 080CD9CB + .include "animations/gSpriteAnimations_Gleerok_1_76.s" -gUnk_080CD9CF:: @ 080CD9CF - .incbin "gleerok/gUnk_080CD9CF.bin" +gSpriteAnimations_Gleerok_1_77:: @ 080CD9CF + .include "animations/gSpriteAnimations_Gleerok_1_77.s" -gUnk_080CD9DF:: @ 080CD9DF - .incbin "gleerok/gUnk_080CD9DF.bin" +gSpriteAnimations_Gleerok_1_78:: @ 080CD9DF + .include "animations/gSpriteAnimations_Gleerok_1_78.s" -gUnk_080CD9FB:: @ 080CD9FB - .incbin "gleerok/gUnk_080CD9FB.bin" +gSpriteAnimations_Gleerok_0_0:: @ 080CD9FB + .include "animations/gSpriteAnimations_Gleerok_0_0.s" -gUnk_080CD9FF:: @ 080CD9FF - .incbin "gleerok/gUnk_080CD9FF.bin" +gSpriteAnimations_Gleerok_0_1:: @ 080CD9FF + .include "animations/gSpriteAnimations_Gleerok_0_1.s" -gUnk_080CDA03:: @ 080CDA03 - .incbin "gleerok/gUnk_080CDA03.bin" +gSpriteAnimations_Gleerok_0_2:: @ 080CDA03 + .include "animations/gSpriteAnimations_Gleerok_0_2.s" -gUnk_080CDA07:: @ 080CDA07 - .incbin "gleerok/gUnk_080CDA07.bin" +gSpriteAnimations_Gleerok_0_3:: @ 080CDA07 + .include "animations/gSpriteAnimations_Gleerok_0_3.s" -gUnk_080CDA0B:: @ 080CDA0B - .incbin "gleerok/gUnk_080CDA0B.bin" +gSpriteAnimations_Gleerok_0_4:: @ 080CDA0B + .include "animations/gSpriteAnimations_Gleerok_0_4.s" -gUnk_080CDA0F:: @ 080CDA0F - .incbin "gleerok/gUnk_080CDA0F.bin" +gSpriteAnimations_Gleerok_0_5:: @ 080CDA0F + .include "animations/gSpriteAnimations_Gleerok_0_5.s" -gUnk_080CDA13:: @ 080CDA13 - .incbin "gleerok/gUnk_080CDA13.bin" +gSpriteAnimations_Gleerok_0_6:: @ 080CDA13 + .include "animations/gSpriteAnimations_Gleerok_0_6.s" -gUnk_080CDA17:: @ 080CDA17 - .incbin "gleerok/gUnk_080CDA17.bin" +gSpriteAnimations_Gleerok_0_7:: @ 080CDA17 + .include "animations/gSpriteAnimations_Gleerok_0_7.s" -gUnk_080CDA1B:: @ 080CDA1B - .incbin "gleerok/gUnk_080CDA1B.bin" +gSpriteAnimations_Gleerok_0_8:: @ 080CDA1B + .include "animations/gSpriteAnimations_Gleerok_0_8.s" -gUnk_080CDA1F:: @ 080CDA1F - .incbin "gleerok/gUnk_080CDA1F.bin" +gSpriteAnimations_Gleerok_0_9:: @ 080CDA1F + .include "animations/gSpriteAnimations_Gleerok_0_9.s" -gUnk_080CDA23:: @ 080CDA23 - .incbin "gleerok/gUnk_080CDA23.bin" +gSpriteAnimations_Gleerok_0_10:: @ 080CDA23 + .include "animations/gSpriteAnimations_Gleerok_0_10.s" -gUnk_080CDA27:: @ 080CDA27 - .incbin "gleerok/gUnk_080CDA27.bin" +gSpriteAnimations_Gleerok_0_11:: @ 080CDA27 + .include "animations/gSpriteAnimations_Gleerok_0_11.s" -gUnk_080CDA2B:: @ 080CDA2B - .incbin "gleerok/gUnk_080CDA2B.bin" +gSpriteAnimations_Gleerok_0_12:: @ 080CDA2B + .include "animations/gSpriteAnimations_Gleerok_0_12.s" -gUnk_080CDA2F:: @ 080CDA2F - .incbin "gleerok/gUnk_080CDA2F.bin" +gSpriteAnimations_Gleerok_0_13:: @ 080CDA2F + .include "animations/gSpriteAnimations_Gleerok_0_13.s" -gUnk_080CDA33:: @ 080CDA33 - .incbin "gleerok/gUnk_080CDA33.bin" +gSpriteAnimations_Gleerok_0_14:: @ 080CDA33 + .include "animations/gSpriteAnimations_Gleerok_0_14.s" -gUnk_080CDA37:: @ 080CDA37 - .incbin "gleerok/gUnk_080CDA37.bin" +gSpriteAnimations_Gleerok_0_15:: @ 080CDA37 + .include "animations/gSpriteAnimations_Gleerok_0_15.s" -gUnk_080CDA3B:: @ 080CDA3B - .incbin "gleerok/gUnk_080CDA3B.bin" +gSpriteAnimations_Gleerok_0_16:: @ 080CDA3B + .include "animations/gSpriteAnimations_Gleerok_0_16.s" -gUnk_080CDA3F:: @ 080CDA3F - .incbin "gleerok/gUnk_080CDA3F.bin" +gSpriteAnimations_Gleerok_0_17:: @ 080CDA3F + .include "animations/gSpriteAnimations_Gleerok_0_17.s" -gUnk_080CDA43:: @ 080CDA43 - .incbin "gleerok/gUnk_080CDA43.bin" +gSpriteAnimations_Gleerok_0_18:: @ 080CDA43 + .include "animations/gSpriteAnimations_Gleerok_0_18.s" -gUnk_080CDA47:: @ 080CDA47 - .incbin "gleerok/gUnk_080CDA47.bin" +gSpriteAnimations_Gleerok_0_19:: @ 080CDA47 + .include "animations/gSpriteAnimations_Gleerok_0_19.s" -gUnk_080CDA4B:: @ 080CDA4B - .incbin "gleerok/gUnk_080CDA4B.bin" +gSpriteAnimations_Gleerok_0_20:: @ 080CDA4B + .include "animations/gSpriteAnimations_Gleerok_0_20.s" -gUnk_080CDA4F:: @ 080CDA4F - .incbin "gleerok/gUnk_080CDA4F.bin" +gSpriteAnimations_Gleerok_0_21:: @ 080CDA4F + .include "animations/gSpriteAnimations_Gleerok_0_21.s" -gUnk_080CDA53:: @ 080CDA53 - .incbin "gleerok/gUnk_080CDA53.bin" +gSpriteAnimations_Gleerok_0_22:: @ 080CDA53 + .include "animations/gSpriteAnimations_Gleerok_0_22.s" -gUnk_080CDA57:: @ 080CDA57 - .incbin "gleerok/gUnk_080CDA57.bin" +gSpriteAnimations_Gleerok_0_23:: @ 080CDA57 + .include "animations/gSpriteAnimations_Gleerok_0_23.s" -gUnk_080CDA5B:: @ 080CDA5B - .incbin "gleerok/gUnk_080CDA5B.bin" +gSpriteAnimations_Gleerok_0_26:: @ 080CDA5B + .include "animations/gSpriteAnimations_Gleerok_0_26.s" -gUnk_080CDA5F:: @ 080CDA5F - .incbin "gleerok/gUnk_080CDA5F.bin" +gSpriteAnimations_Gleerok_0_25:: @ 080CDA5F + .include "animations/gSpriteAnimations_Gleerok_0_25.s" -gUnk_080CDA63:: @ 080CDA63 - .incbin "gleerok/gUnk_080CDA63.bin" +gSpriteAnimations_Gleerok_0_24:: @ 080CDA63 + .include "animations/gSpriteAnimations_Gleerok_0_24.s" -gUnk_080CDA67:: @ 080CDA67 - .incbin "gleerok/gUnk_080CDA67.bin" +gSpriteAnimations_Gleerok_0_30:: @ 080CDA67 + .include "animations/gSpriteAnimations_Gleerok_0_30.s" -gUnk_080CDA6B:: @ 080CDA6B - .incbin "gleerok/gUnk_080CDA6B.bin" +gSpriteAnimations_Gleerok_0_29:: @ 080CDA6B + .include "animations/gSpriteAnimations_Gleerok_0_29.s" -gUnk_080CDA6F:: @ 080CDA6F - .incbin "gleerok/gUnk_080CDA6F.bin" +gSpriteAnimations_Gleerok_0_28:: @ 080CDA6F + .include "animations/gSpriteAnimations_Gleerok_0_28.s" -gUnk_080CDA73:: @ 080CDA73 - .incbin "gleerok/gUnk_080CDA73.bin" +gSpriteAnimations_Gleerok_0_34:: @ 080CDA73 + .include "animations/gSpriteAnimations_Gleerok_0_34.s" -gUnk_080CDA77:: @ 080CDA77 - .incbin "gleerok/gUnk_080CDA77.bin" +gSpriteAnimations_Gleerok_0_33:: @ 080CDA77 + .include "animations/gSpriteAnimations_Gleerok_0_33.s" -gUnk_080CDA7B:: @ 080CDA7B - .incbin "gleerok/gUnk_080CDA7B.bin" +gSpriteAnimations_Gleerok_0_32:: @ 080CDA7B + .include "animations/gSpriteAnimations_Gleerok_0_32.s" -gUnk_080CDA7F:: @ 080CDA7F - .incbin "gleerok/gUnk_080CDA7F.bin" +gSpriteAnimations_Gleerok_0_38:: @ 080CDA7F + .include "animations/gSpriteAnimations_Gleerok_0_38.s" -gUnk_080CDA83:: @ 080CDA83 - .incbin "gleerok/gUnk_080CDA83.bin" +gSpriteAnimations_Gleerok_0_37:: @ 080CDA83 + .include "animations/gSpriteAnimations_Gleerok_0_37.s" -gUnk_080CDA87:: @ 080CDA87 - .incbin "gleerok/gUnk_080CDA87.bin" +gSpriteAnimations_Gleerok_0_36:: @ 080CDA87 + .include "animations/gSpriteAnimations_Gleerok_0_36.s" -gUnk_080CDA8B:: @ 080CDA8B - .incbin "gleerok/gUnk_080CDA8B.bin" +gSpriteAnimations_Gleerok_0_40:: @ 080CDA8B + .include "animations/gSpriteAnimations_Gleerok_0_40.s" -gUnk_080CDA90:: @ 080CDA90 - .incbin "gleerok/gUnk_080CDA90.bin" +gSpriteAnimations_Gleerok_0_41:: @ 080CDA90 + .include "animations/gSpriteAnimations_Gleerok_0_41.s" -gUnk_080CDA95:: @ 080CDA95 - .incbin "gleerok/gUnk_080CDA95.bin" +gSpriteAnimations_Gleerok_0_42:: @ 080CDA95 + .include "animations/gSpriteAnimations_Gleerok_0_42.s" -gUnk_080CDA9A:: @ 080CDA9A - .incbin "gleerok/gUnk_080CDA9A.bin" +gSpriteAnimations_Gleerok_0_43:: @ 080CDA9A + .include "animations/gSpriteAnimations_Gleerok_0_43.s" -gUnk_080CDA9F:: @ 080CDA9F - .incbin "gleerok/gUnk_080CDA9F.bin" +gSpriteAnimations_Gleerok_1_79:: @ 080CDA9F + .include "animations/gSpriteAnimations_Gleerok_1_79.s" -gUnk_080CDAC4:: @ 080CDAC4 - .incbin "gleerok/gUnk_080CDAC4.bin" +gSpriteAnimations_Gleerok_1_86:: @ 080CDAC4 + .include "animations/gSpriteAnimations_Gleerok_1_86.s" -gUnk_080CDAD5:: @ 080CDAD5 - .incbin "gleerok/gUnk_080CDAD5.bin" +gSpriteAnimations_Gleerok_1_87:: @ 080CDAD5 + .include "animations/gSpriteAnimations_Gleerok_1_87.s" -gUnk_080CDAE6:: @ 080CDAE6 - .incbin "gleerok/gUnk_080CDAE6.bin" +gSpriteAnimations_Gleerok_1_80:: @ 080CDAE6 + .include "animations/gSpriteAnimations_Gleerok_1_80.s" -gUnk_080CDAF3:: @ 080CDAF3 - .incbin "gleerok/gUnk_080CDAF3.bin" +gSpriteAnimations_Gleerok_0_44:: @ 080CDAF3 + .include "animations/gSpriteAnimations_Gleerok_0_44.s" -gUnk_080CDB03:: @ 080CDB03 - .incbin "gleerok/gUnk_080CDB03.bin" +gSpriteAnimations_Gleerok_0_45:: @ 080CDB03 + .include "animations/gSpriteAnimations_Gleerok_0_45.s" -gUnk_080CDB17:: @ 080CDB17 - .incbin "gleerok/gUnk_080CDB17.bin" +gSpriteAnimations_Gleerok_0_46:: @ 080CDB17 + .include "animations/gSpriteAnimations_Gleerok_0_46.s" -gUnk_080CDB28:: @ 080CDB28 - .incbin "gleerok/gUnk_080CDB28.bin" +gSpriteAnimations_Gleerok_1_81:: @ 080CDB28 + .include "animations/gSpriteAnimations_Gleerok_1_81.s" -gUnk_080CDB39:: @ 080CDB39 - .incbin "gleerok/gUnk_080CDB39.bin" +gSpriteAnimations_Gleerok_1_82:: @ 080CDB39 + .include "animations/gSpriteAnimations_Gleerok_1_82.s" -gUnk_080CDB5D:: @ 080CDB5D - .incbin "gleerok/gUnk_080CDB5D.bin" +gSpriteAnimations_Gleerok_1_83:: @ 080CDB5D + .include "animations/gSpriteAnimations_Gleerok_1_83.s" -gUnk_080CDB6D:: @ 080CDB6D - .incbin "gleerok/gUnk_080CDB6D.bin" +gSpriteAnimations_Gleerok_1_84:: @ 080CDB6D + .include "animations/gSpriteAnimations_Gleerok_1_84.s" -gUnk_080CDB7E:: @ 080CDB7E - .incbin "gleerok/gUnk_080CDB7E.bin" +gSpriteAnimations_Gleerok_1_85:: @ 080CDB7E + .include "animations/gSpriteAnimations_Gleerok_1_85.s" -gUnk_080CDB92:: @ 080CDB92 - .incbin "gleerok/gUnk_080CDB92.bin" +gSpriteAnimations_Gleerok_0_47:: @ 080CDB92 + .include "animations/gSpriteAnimations_Gleerok_0_47.s" -gUnk_080CDBAB:: @ 080CDBAB - .incbin "gleerok/gUnk_080CDBAB.bin" +gSpriteAnimations_Gleerok_0_48:: @ 080CDBAB + .include "animations/gSpriteAnimations_Gleerok_0_48.s" -gUnk_080CDBC4:: @ 080CDBC4 - .incbin "gleerok/gUnk_080CDBC4.bin" +gSpriteAnimations_Gleerok_0_49:: @ 080CDBC4 + .include "animations/gSpriteAnimations_Gleerok_0_49.s" -gUnk_080CDBDD:: @ 080CDBDD - .incbin "gleerok/gUnk_080CDBDD.bin" +gSpriteAnimations_Gleerok_0_50:: @ 080CDBDD + .include "animations/gSpriteAnimations_Gleerok_0_50.s" gSpriteAnimations_Gleerok_1:: @ 080CDC00 - .4byte gUnk_080CD933 - .4byte gUnk_080CD937 - .4byte gUnk_080CD93B - .4byte gUnk_080CD93F - .4byte gUnk_080CD943 - .4byte gUnk_080CD947 - .4byte gUnk_080CD94B - .4byte gUnk_080CD94F - .4byte gUnk_080CD953 - .4byte gUnk_080CD957 - .4byte gUnk_080CD95B - .4byte gUnk_080CD95F - .4byte gUnk_080CD903 - .4byte gUnk_080CD907 - .4byte gUnk_080CD90B - .4byte gUnk_080CD90F - .4byte gUnk_080CD913 - .4byte gUnk_080CD917 - .4byte gUnk_080CD91B - .4byte gUnk_080CD91F - .4byte gUnk_080CD923 - .4byte gUnk_080CD927 - .4byte gUnk_080CD92B - .4byte gUnk_080CD92F - .4byte gUnk_080CD8D3 - .4byte gUnk_080CD8D7 - .4byte gUnk_080CD8DB - .4byte gUnk_080CD8DF - .4byte gUnk_080CD8E3 - .4byte gUnk_080CD8E7 - .4byte gUnk_080CD8EB - .4byte gUnk_080CD8EF - .4byte gUnk_080CD8F3 - .4byte gUnk_080CD8F7 - .4byte gUnk_080CD8FB - .4byte gUnk_080CD8FF - .4byte gUnk_080CD8A3 - .4byte gUnk_080CD8A7 - .4byte gUnk_080CD8AB - .4byte gUnk_080CD8AF - .4byte gUnk_080CD8B3 - .4byte gUnk_080CD8B7 - .4byte gUnk_080CD8BB - .4byte gUnk_080CD8BF - .4byte gUnk_080CD8C3 - .4byte gUnk_080CD8C7 - .4byte gUnk_080CD8CB - .4byte gUnk_080CD8CF - .4byte gUnk_080CD963 - .4byte gUnk_080CD967 - .4byte gUnk_080CD96B - .4byte gUnk_080CD96F - .4byte gUnk_080CD973 - .4byte gUnk_080CD977 - .4byte gUnk_080CD97B - .4byte gUnk_080CD97F - .4byte gUnk_080CD983 - .4byte gUnk_080CD987 - .4byte gUnk_080CD98B - .4byte gUnk_080CD98F - .4byte gUnk_080CD993 - .4byte gUnk_080CD997 - .4byte gUnk_080CD99B - .4byte gUnk_080CD99F - .4byte gUnk_080CD9A3 - .4byte gUnk_080CD9A7 - .4byte gUnk_080CD9AB - .4byte gUnk_080CD9AF - .4byte gUnk_080CD9B3 - .4byte gUnk_080CD9B7 - .4byte gUnk_080CD9BB - .4byte gUnk_080CD9BF - .4byte gUnk_080CD9C3 - .4byte gUnk_080CD9C7 - .4byte gUnk_080CD9C3 - .4byte gUnk_080CD9C7 - .4byte gUnk_080CD9CB - .4byte gUnk_080CD9CF - .4byte gUnk_080CD9DF - .4byte gUnk_080CDA9F - .4byte gUnk_080CDAE6 - .4byte gUnk_080CDB28 - .4byte gUnk_080CDB39 - .4byte gUnk_080CDB5D - .4byte gUnk_080CDB6D - .4byte gUnk_080CDB7E - .4byte gUnk_080CDAC4 - .4byte gUnk_080CDAD5 + .4byte gSpriteAnimations_Gleerok_1_0 + .4byte gSpriteAnimations_Gleerok_1_1 + .4byte gSpriteAnimations_Gleerok_1_2 + .4byte gSpriteAnimations_Gleerok_1_3 + .4byte gSpriteAnimations_Gleerok_1_4 + .4byte gSpriteAnimations_Gleerok_1_5 + .4byte gSpriteAnimations_Gleerok_1_6 + .4byte gSpriteAnimations_Gleerok_1_7 + .4byte gSpriteAnimations_Gleerok_1_8 + .4byte gSpriteAnimations_Gleerok_1_9 + .4byte gSpriteAnimations_Gleerok_1_10 + .4byte gSpriteAnimations_Gleerok_1_11 + .4byte gSpriteAnimations_Gleerok_1_12 + .4byte gSpriteAnimations_Gleerok_1_13 + .4byte gSpriteAnimations_Gleerok_1_14 + .4byte gSpriteAnimations_Gleerok_1_15 + .4byte gSpriteAnimations_Gleerok_1_16 + .4byte gSpriteAnimations_Gleerok_1_17 + .4byte gSpriteAnimations_Gleerok_1_18 + .4byte gSpriteAnimations_Gleerok_1_19 + .4byte gSpriteAnimations_Gleerok_1_20 + .4byte gSpriteAnimations_Gleerok_1_21 + .4byte gSpriteAnimations_Gleerok_1_22 + .4byte gSpriteAnimations_Gleerok_1_23 + .4byte gSpriteAnimations_Gleerok_1_24 + .4byte gSpriteAnimations_Gleerok_1_25 + .4byte gSpriteAnimations_Gleerok_1_26 + .4byte gSpriteAnimations_Gleerok_1_27 + .4byte gSpriteAnimations_Gleerok_1_28 + .4byte gSpriteAnimations_Gleerok_1_29 + .4byte gSpriteAnimations_Gleerok_1_30 + .4byte gSpriteAnimations_Gleerok_1_31 + .4byte gSpriteAnimations_Gleerok_1_32 + .4byte gSpriteAnimations_Gleerok_1_33 + .4byte gSpriteAnimations_Gleerok_1_34 + .4byte gSpriteAnimations_Gleerok_1_35 + .4byte gSpriteAnimations_Gleerok_1_36 + .4byte gSpriteAnimations_Gleerok_1_37 + .4byte gSpriteAnimations_Gleerok_1_38 + .4byte gSpriteAnimations_Gleerok_1_39 + .4byte gSpriteAnimations_Gleerok_1_40 + .4byte gSpriteAnimations_Gleerok_1_41 + .4byte gSpriteAnimations_Gleerok_1_42 + .4byte gSpriteAnimations_Gleerok_1_43 + .4byte gSpriteAnimations_Gleerok_1_44 + .4byte gSpriteAnimations_Gleerok_1_45 + .4byte gSpriteAnimations_Gleerok_1_46 + .4byte gSpriteAnimations_Gleerok_1_47 + .4byte gSpriteAnimations_Gleerok_1_48 + .4byte gSpriteAnimations_Gleerok_1_49 + .4byte gSpriteAnimations_Gleerok_1_50 + .4byte gSpriteAnimations_Gleerok_1_51 + .4byte gSpriteAnimations_Gleerok_1_52 + .4byte gSpriteAnimations_Gleerok_1_53 + .4byte gSpriteAnimations_Gleerok_1_54 + .4byte gSpriteAnimations_Gleerok_1_55 + .4byte gSpriteAnimations_Gleerok_1_56 + .4byte gSpriteAnimations_Gleerok_1_57 + .4byte gSpriteAnimations_Gleerok_1_58 + .4byte gSpriteAnimations_Gleerok_1_59 + .4byte gSpriteAnimations_Gleerok_1_60 + .4byte gSpriteAnimations_Gleerok_1_61 + .4byte gSpriteAnimations_Gleerok_1_62 + .4byte gSpriteAnimations_Gleerok_1_63 + .4byte gSpriteAnimations_Gleerok_1_64 + .4byte gSpriteAnimations_Gleerok_1_65 + .4byte gSpriteAnimations_Gleerok_1_66 + .4byte gSpriteAnimations_Gleerok_1_67 + .4byte gSpriteAnimations_Gleerok_1_68 + .4byte gSpriteAnimations_Gleerok_1_69 + .4byte gSpriteAnimations_Gleerok_1_70 + .4byte gSpriteAnimations_Gleerok_1_71 + .4byte gSpriteAnimations_Gleerok_1_72 + .4byte gSpriteAnimations_Gleerok_1_73 + .4byte gSpriteAnimations_Gleerok_1_72 + .4byte gSpriteAnimations_Gleerok_1_73 + .4byte gSpriteAnimations_Gleerok_1_76 + .4byte gSpriteAnimations_Gleerok_1_77 + .4byte gSpriteAnimations_Gleerok_1_78 + .4byte gSpriteAnimations_Gleerok_1_79 + .4byte gSpriteAnimations_Gleerok_1_80 + .4byte gSpriteAnimations_Gleerok_1_81 + .4byte gSpriteAnimations_Gleerok_1_82 + .4byte gSpriteAnimations_Gleerok_1_83 + .4byte gSpriteAnimations_Gleerok_1_84 + .4byte gSpriteAnimations_Gleerok_1_85 + .4byte gSpriteAnimations_Gleerok_1_86 + .4byte gSpriteAnimations_Gleerok_1_87 .4byte 00000000 gSpriteAnimations_Gleerok_0:: @ 080CDD64 - .4byte gUnk_080CD9FB - .4byte gUnk_080CD9FF - .4byte gUnk_080CDA03 - .4byte gUnk_080CDA07 - .4byte gUnk_080CDA0B - .4byte gUnk_080CDA0F - .4byte gUnk_080CDA13 - .4byte gUnk_080CDA17 - .4byte gUnk_080CDA1B - .4byte gUnk_080CDA1F - .4byte gUnk_080CDA23 - .4byte gUnk_080CDA27 - .4byte gUnk_080CDA2B - .4byte gUnk_080CDA2F - .4byte gUnk_080CDA33 - .4byte gUnk_080CDA37 - .4byte gUnk_080CDA3B - .4byte gUnk_080CDA3F - .4byte gUnk_080CDA43 - .4byte gUnk_080CDA47 - .4byte gUnk_080CDA4B - .4byte gUnk_080CDA4F - .4byte gUnk_080CDA53 - .4byte gUnk_080CDA57 - .4byte gUnk_080CDA63 - .4byte gUnk_080CDA5F - .4byte gUnk_080CDA5B - .4byte gUnk_080CD9FB - .4byte gUnk_080CDA6F - .4byte gUnk_080CDA6B - .4byte gUnk_080CDA67 - .4byte gUnk_080CDA07 - .4byte gUnk_080CDA7B - .4byte gUnk_080CDA77 - .4byte gUnk_080CDA73 - .4byte gUnk_080CDA13 - .4byte gUnk_080CDA87 - .4byte gUnk_080CDA83 - .4byte gUnk_080CDA7F - .4byte gUnk_080CDA1F - .4byte gUnk_080CDA8B - .4byte gUnk_080CDA90 - .4byte gUnk_080CDA95 - .4byte gUnk_080CDA9A - .4byte gUnk_080CDAF3 - .4byte gUnk_080CDB03 - .4byte gUnk_080CDB17 - .4byte gUnk_080CDB92 - .4byte gUnk_080CDBAB - .4byte gUnk_080CDBC4 - .4byte gUnk_080CDBDD + .4byte gSpriteAnimations_Gleerok_0_0 + .4byte gSpriteAnimations_Gleerok_0_1 + .4byte gSpriteAnimations_Gleerok_0_2 + .4byte gSpriteAnimations_Gleerok_0_3 + .4byte gSpriteAnimations_Gleerok_0_4 + .4byte gSpriteAnimations_Gleerok_0_5 + .4byte gSpriteAnimations_Gleerok_0_6 + .4byte gSpriteAnimations_Gleerok_0_7 + .4byte gSpriteAnimations_Gleerok_0_8 + .4byte gSpriteAnimations_Gleerok_0_9 + .4byte gSpriteAnimations_Gleerok_0_10 + .4byte gSpriteAnimations_Gleerok_0_11 + .4byte gSpriteAnimations_Gleerok_0_12 + .4byte gSpriteAnimations_Gleerok_0_13 + .4byte gSpriteAnimations_Gleerok_0_14 + .4byte gSpriteAnimations_Gleerok_0_15 + .4byte gSpriteAnimations_Gleerok_0_16 + .4byte gSpriteAnimations_Gleerok_0_17 + .4byte gSpriteAnimations_Gleerok_0_18 + .4byte gSpriteAnimations_Gleerok_0_19 + .4byte gSpriteAnimations_Gleerok_0_20 + .4byte gSpriteAnimations_Gleerok_0_21 + .4byte gSpriteAnimations_Gleerok_0_22 + .4byte gSpriteAnimations_Gleerok_0_23 + .4byte gSpriteAnimations_Gleerok_0_24 + .4byte gSpriteAnimations_Gleerok_0_25 + .4byte gSpriteAnimations_Gleerok_0_26 + .4byte gSpriteAnimations_Gleerok_0_0 + .4byte gSpriteAnimations_Gleerok_0_28 + .4byte gSpriteAnimations_Gleerok_0_29 + .4byte gSpriteAnimations_Gleerok_0_30 + .4byte gSpriteAnimations_Gleerok_0_3 + .4byte gSpriteAnimations_Gleerok_0_32 + .4byte gSpriteAnimations_Gleerok_0_33 + .4byte gSpriteAnimations_Gleerok_0_34 + .4byte gSpriteAnimations_Gleerok_0_6 + .4byte gSpriteAnimations_Gleerok_0_36 + .4byte gSpriteAnimations_Gleerok_0_37 + .4byte gSpriteAnimations_Gleerok_0_38 + .4byte gSpriteAnimations_Gleerok_0_9 + .4byte gSpriteAnimations_Gleerok_0_40 + .4byte gSpriteAnimations_Gleerok_0_41 + .4byte gSpriteAnimations_Gleerok_0_42 + .4byte gSpriteAnimations_Gleerok_0_43 + .4byte gSpriteAnimations_Gleerok_0_44 + .4byte gSpriteAnimations_Gleerok_0_45 + .4byte gSpriteAnimations_Gleerok_0_46 + .4byte gSpriteAnimations_Gleerok_0_47 + .4byte gSpriteAnimations_Gleerok_0_48 + .4byte gSpriteAnimations_Gleerok_0_49 + .4byte gSpriteAnimations_Gleerok_0_50 .4byte 00000000 diff --git a/data/animations/enemy/gyorgChild.s b/data/animations/enemy/gyorgChild.s index 67719bce..d0a62788 100644 --- a/data/animations/enemy/gyorgChild.s +++ b/data/animations/enemy/gyorgChild.s @@ -4,69 +4,69 @@ .section .rodata @ .align 2 -gUnk_080D1EB6:: @ 080D1EB6 - .incbin "gyorgChild/gUnk_080D1EB6.bin" +gSpriteAnimations_GyorgChild_0:: @ 080D1EB6 + .include "animations/gSpriteAnimations_GyorgChild_0.s" -gUnk_080D1EBF:: @ 080D1EBF - .incbin "gyorgChild/gUnk_080D1EBF.bin" +gSpriteAnimations_GyorgChild_1:: @ 080D1EBF + .include "animations/gSpriteAnimations_GyorgChild_1.s" -gUnk_080D1EC8:: @ 080D1EC8 - .incbin "gyorgChild/gUnk_080D1EC8.bin" +gSpriteAnimations_GyorgChild_2:: @ 080D1EC8 + .include "animations/gSpriteAnimations_GyorgChild_2.s" -gUnk_080D1ED1:: @ 080D1ED1 - .incbin "gyorgChild/gUnk_080D1ED1.bin" +gSpriteAnimations_GyorgChild_3:: @ 080D1ED1 + .include "animations/gSpriteAnimations_GyorgChild_3.s" -gUnk_080D1EDA:: @ 080D1EDA - .incbin "gyorgChild/gUnk_080D1EDA.bin" +gSpriteAnimations_GyorgChild_4:: @ 080D1EDA + .include "animations/gSpriteAnimations_GyorgChild_4.s" -gUnk_080D1EE3:: @ 080D1EE3 - .incbin "gyorgChild/gUnk_080D1EE3.bin" +gSpriteAnimations_GyorgChild_5:: @ 080D1EE3 + .include "animations/gSpriteAnimations_GyorgChild_5.s" -gUnk_080D1EEC:: @ 080D1EEC - .incbin "gyorgChild/gUnk_080D1EEC.bin" +gSpriteAnimations_GyorgChild_6:: @ 080D1EEC + .include "animations/gSpriteAnimations_GyorgChild_6.s" -gUnk_080D1EF5:: @ 080D1EF5 - .incbin "gyorgChild/gUnk_080D1EF5.bin" +gSpriteAnimations_GyorgChild_7:: @ 080D1EF5 + .include "animations/gSpriteAnimations_GyorgChild_7.s" -gUnk_080D1EFE:: @ 080D1EFE - .incbin "gyorgChild/gUnk_080D1EFE.bin" +gSpriteAnimations_GyorgChild_8:: @ 080D1EFE + .include "animations/gSpriteAnimations_GyorgChild_8.s" -gUnk_080D1F02:: @ 080D1F02 - .incbin "gyorgChild/gUnk_080D1F02.bin" +gSpriteAnimations_GyorgChild_9:: @ 080D1F02 + .include "animations/gSpriteAnimations_GyorgChild_9.s" -gUnk_080D1F06:: @ 080D1F06 - .incbin "gyorgChild/gUnk_080D1F06.bin" +gSpriteAnimations_GyorgChild_10:: @ 080D1F06 + .include "animations/gSpriteAnimations_GyorgChild_10.s" -gUnk_080D1F0A:: @ 080D1F0A - .incbin "gyorgChild/gUnk_080D1F0A.bin" +gSpriteAnimations_GyorgChild_11:: @ 080D1F0A + .include "animations/gSpriteAnimations_GyorgChild_11.s" -gUnk_080D1F0E:: @ 080D1F0E - .incbin "gyorgChild/gUnk_080D1F0E.bin" +gSpriteAnimations_GyorgChild_12:: @ 080D1F0E + .include "animations/gSpriteAnimations_GyorgChild_12.s" -gUnk_080D1F12:: @ 080D1F12 - .incbin "gyorgChild/gUnk_080D1F12.bin" +gSpriteAnimations_GyorgChild_13:: @ 080D1F12 + .include "animations/gSpriteAnimations_GyorgChild_13.s" -gUnk_080D1F16:: @ 080D1F16 - .incbin "gyorgChild/gUnk_080D1F16.bin" +gSpriteAnimations_GyorgChild_14:: @ 080D1F16 + .include "animations/gSpriteAnimations_GyorgChild_14.s" -gUnk_080D1F1A:: @ 080D1F1A - .incbin "gyorgChild/gUnk_080D1F1A.bin" +gSpriteAnimations_GyorgChild_15:: @ 080D1F1A + .include "animations/gSpriteAnimations_GyorgChild_15.s" gSpriteAnimations_GyorgChild:: @ 080D1F20 - .4byte gUnk_080D1EB6 - .4byte gUnk_080D1EBF - .4byte gUnk_080D1EC8 - .4byte gUnk_080D1ED1 - .4byte gUnk_080D1EDA - .4byte gUnk_080D1EE3 - .4byte gUnk_080D1EEC - .4byte gUnk_080D1EF5 - .4byte gUnk_080D1EFE - .4byte gUnk_080D1F02 - .4byte gUnk_080D1F06 - .4byte gUnk_080D1F0A - .4byte gUnk_080D1F0E - .4byte gUnk_080D1F12 - .4byte gUnk_080D1F16 - .4byte gUnk_080D1F1A + .4byte gSpriteAnimations_GyorgChild_0 + .4byte gSpriteAnimations_GyorgChild_1 + .4byte gSpriteAnimations_GyorgChild_2 + .4byte gSpriteAnimations_GyorgChild_3 + .4byte gSpriteAnimations_GyorgChild_4 + .4byte gSpriteAnimations_GyorgChild_5 + .4byte gSpriteAnimations_GyorgChild_6 + .4byte gSpriteAnimations_GyorgChild_7 + .4byte gSpriteAnimations_GyorgChild_8 + .4byte gSpriteAnimations_GyorgChild_9 + .4byte gSpriteAnimations_GyorgChild_10 + .4byte gSpriteAnimations_GyorgChild_11 + .4byte gSpriteAnimations_GyorgChild_12 + .4byte gSpriteAnimations_GyorgChild_13 + .4byte gSpriteAnimations_GyorgChild_14 + .4byte gSpriteAnimations_GyorgChild_15 .4byte 00000000 diff --git a/data/animations/enemy/gyorgFemaleEye.s b/data/animations/enemy/gyorgFemaleEye.s index ddbb5926..a56a454c 100644 --- a/data/animations/enemy/gyorgFemaleEye.s +++ b/data/animations/enemy/gyorgFemaleEye.s @@ -4,101 +4,101 @@ .section .rodata .align 2 -gUnk_080D2050:: @ 080D2050 - .incbin "gyorgFemaleEye/gUnk_080D2050.bin" +gSpriteAnimations_GyorgFemaleEye_0:: @ 080D2050 + .include "animations/gSpriteAnimations_GyorgFemaleEye_0.s" -gUnk_080D2064:: @ 080D2064 - .incbin "gyorgFemaleEye/gUnk_080D2064.bin" +gSpriteAnimations_GyorgFemaleEye_1:: @ 080D2064 + .include "animations/gSpriteAnimations_GyorgFemaleEye_1.s" -gUnk_080D2078:: @ 080D2078 - .incbin "gyorgFemaleEye/gUnk_080D2078.bin" +gSpriteAnimations_GyorgFemaleEye_2:: @ 080D2078 + .include "animations/gSpriteAnimations_GyorgFemaleEye_2.s" -gUnk_080D208C:: @ 080D208C - .incbin "gyorgFemaleEye/gUnk_080D208C.bin" +gSpriteAnimations_GyorgFemaleEye_3:: @ 080D208C + .include "animations/gSpriteAnimations_GyorgFemaleEye_3.s" -gUnk_080D20A0:: @ 080D20A0 - .incbin "gyorgFemaleEye/gUnk_080D20A0.bin" +gSpriteAnimations_GyorgFemaleEye_4:: @ 080D20A0 + .include "animations/gSpriteAnimations_GyorgFemaleEye_4.s" -gUnk_080D20B4:: @ 080D20B4 - .incbin "gyorgFemaleEye/gUnk_080D20B4.bin" +gSpriteAnimations_GyorgFemaleEye_5:: @ 080D20B4 + .include "animations/gSpriteAnimations_GyorgFemaleEye_5.s" -gUnk_080D20C8:: @ 080D20C8 - .incbin "gyorgFemaleEye/gUnk_080D20C8.bin" +gSpriteAnimations_GyorgFemaleEye_6:: @ 080D20C8 + .include "animations/gSpriteAnimations_GyorgFemaleEye_6.s" -gUnk_080D20DC:: @ 080D20DC - .incbin "gyorgFemaleEye/gUnk_080D20DC.bin" +gSpriteAnimations_GyorgFemaleEye_7:: @ 080D20DC + .include "animations/gSpriteAnimations_GyorgFemaleEye_7.s" -gUnk_080D20F0:: @ 080D20F0 - .incbin "gyorgFemaleEye/gUnk_080D20F0.bin" +gSpriteAnimations_GyorgFemaleEye_8:: @ 080D20F0 + .include "animations/gSpriteAnimations_GyorgFemaleEye_8.s" -gUnk_080D2104:: @ 080D2104 - .incbin "gyorgFemaleEye/gUnk_080D2104.bin" +gSpriteAnimations_GyorgFemaleEye_9:: @ 080D2104 + .include "animations/gSpriteAnimations_GyorgFemaleEye_9.s" -gUnk_080D2118:: @ 080D2118 - .incbin "gyorgFemaleEye/gUnk_080D2118.bin" +gSpriteAnimations_GyorgFemaleEye_10:: @ 080D2118 + .include "animations/gSpriteAnimations_GyorgFemaleEye_10.s" -gUnk_080D212C:: @ 080D212C - .incbin "gyorgFemaleEye/gUnk_080D212C.bin" +gSpriteAnimations_GyorgFemaleEye_11:: @ 080D212C + .include "animations/gSpriteAnimations_GyorgFemaleEye_11.s" -gUnk_080D2140:: @ 080D2140 - .incbin "gyorgFemaleEye/gUnk_080D2140.bin" +gSpriteAnimations_GyorgFemaleEye_12:: @ 080D2140 + .include "animations/gSpriteAnimations_GyorgFemaleEye_12.s" -gUnk_080D2154:: @ 080D2154 - .incbin "gyorgFemaleEye/gUnk_080D2154.bin" +gSpriteAnimations_GyorgFemaleEye_13:: @ 080D2154 + .include "animations/gSpriteAnimations_GyorgFemaleEye_13.s" -gUnk_080D2168:: @ 080D2168 - .incbin "gyorgFemaleEye/gUnk_080D2168.bin" +gSpriteAnimations_GyorgFemaleEye_14:: @ 080D2168 + .include "animations/gSpriteAnimations_GyorgFemaleEye_14.s" -gUnk_080D217C:: @ 080D217C - .incbin "gyorgFemaleEye/gUnk_080D217C.bin" +gSpriteAnimations_GyorgFemaleEye_15:: @ 080D217C + .include "animations/gSpriteAnimations_GyorgFemaleEye_15.s" -gUnk_080D2190:: @ 080D2190 - .incbin "gyorgFemaleEye/gUnk_080D2190.bin" +gSpriteAnimations_GyorgFemaleEye_16:: @ 080D2190 + .include "animations/gSpriteAnimations_GyorgFemaleEye_16.s" -gUnk_080D21B9:: @ 080D21B9 - .incbin "gyorgFemaleEye/gUnk_080D21B9.bin" +gSpriteAnimations_GyorgFemaleEye_17:: @ 080D21B9 + .include "animations/gSpriteAnimations_GyorgFemaleEye_17.s" -gUnk_080D21E2:: @ 080D21E2 - .incbin "gyorgFemaleEye/gUnk_080D21E2.bin" +gSpriteAnimations_GyorgFemaleEye_18:: @ 080D21E2 + .include "animations/gSpriteAnimations_GyorgFemaleEye_18.s" -gUnk_080D220B:: @ 080D220B - .incbin "gyorgFemaleEye/gUnk_080D220B.bin" +gSpriteAnimations_GyorgFemaleEye_19:: @ 080D220B + .include "animations/gSpriteAnimations_GyorgFemaleEye_19.s" -gUnk_080D2234:: @ 080D2234 - .incbin "gyorgFemaleEye/gUnk_080D2234.bin" +gSpriteAnimations_GyorgFemaleEye_20:: @ 080D2234 + .include "animations/gSpriteAnimations_GyorgFemaleEye_20.s" -gUnk_080D2244:: @ 080D2244 - .incbin "gyorgFemaleEye/gUnk_080D2244.bin" +gSpriteAnimations_GyorgFemaleEye_21:: @ 080D2244 + .include "animations/gSpriteAnimations_GyorgFemaleEye_21.s" -gUnk_080D2254:: @ 080D2254 - .incbin "gyorgFemaleEye/gUnk_080D2254.bin" +gSpriteAnimations_GyorgFemaleEye_22:: @ 080D2254 + .include "animations/gSpriteAnimations_GyorgFemaleEye_22.s" -gUnk_080D2264:: @ 080D2264 - .incbin "gyorgFemaleEye/gUnk_080D2264.bin" +gSpriteAnimations_GyorgFemaleEye_23:: @ 080D2264 + .include "animations/gSpriteAnimations_GyorgFemaleEye_23.s" gSpriteAnimations_GyorgFemaleEye:: @ 080D2274 - .4byte gUnk_080D2050 - .4byte gUnk_080D2064 - .4byte gUnk_080D2078 - .4byte gUnk_080D208C - .4byte gUnk_080D20A0 - .4byte gUnk_080D20B4 - .4byte gUnk_080D20C8 - .4byte gUnk_080D20DC - .4byte gUnk_080D20F0 - .4byte gUnk_080D2104 - .4byte gUnk_080D2118 - .4byte gUnk_080D212C - .4byte gUnk_080D2140 - .4byte gUnk_080D2154 - .4byte gUnk_080D2168 - .4byte gUnk_080D217C - .4byte gUnk_080D2190 - .4byte gUnk_080D21B9 - .4byte gUnk_080D21E2 - .4byte gUnk_080D220B - .4byte gUnk_080D2234 - .4byte gUnk_080D2244 - .4byte gUnk_080D2254 - .4byte gUnk_080D2264 + .4byte gSpriteAnimations_GyorgFemaleEye_0 + .4byte gSpriteAnimations_GyorgFemaleEye_1 + .4byte gSpriteAnimations_GyorgFemaleEye_2 + .4byte gSpriteAnimations_GyorgFemaleEye_3 + .4byte gSpriteAnimations_GyorgFemaleEye_4 + .4byte gSpriteAnimations_GyorgFemaleEye_5 + .4byte gSpriteAnimations_GyorgFemaleEye_6 + .4byte gSpriteAnimations_GyorgFemaleEye_7 + .4byte gSpriteAnimations_GyorgFemaleEye_8 + .4byte gSpriteAnimations_GyorgFemaleEye_9 + .4byte gSpriteAnimations_GyorgFemaleEye_10 + .4byte gSpriteAnimations_GyorgFemaleEye_11 + .4byte gSpriteAnimations_GyorgFemaleEye_12 + .4byte gSpriteAnimations_GyorgFemaleEye_13 + .4byte gSpriteAnimations_GyorgFemaleEye_14 + .4byte gSpriteAnimations_GyorgFemaleEye_15 + .4byte gSpriteAnimations_GyorgFemaleEye_16 + .4byte gSpriteAnimations_GyorgFemaleEye_17 + .4byte gSpriteAnimations_GyorgFemaleEye_18 + .4byte gSpriteAnimations_GyorgFemaleEye_19 + .4byte gSpriteAnimations_GyorgFemaleEye_20 + .4byte gSpriteAnimations_GyorgFemaleEye_21 + .4byte gSpriteAnimations_GyorgFemaleEye_22 + .4byte gSpriteAnimations_GyorgFemaleEye_23 .4byte 00000000 diff --git a/data/animations/enemy/gyorgFemaleMouth.s b/data/animations/enemy/gyorgFemaleMouth.s index a30f3c01..cc30806b 100644 --- a/data/animations/enemy/gyorgFemaleMouth.s +++ b/data/animations/enemy/gyorgFemaleMouth.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_080D291C:: @ 080D291C - .incbin "gyorgFemaleMouth/gUnk_080D291C.bin" +gSpriteAnimations_GyorgFemaleMouth_0:: @ 080D291C + .include "animations/gSpriteAnimations_GyorgFemaleMouth_0.s" -gUnk_080D292D:: @ 080D292D - .incbin "gyorgFemaleMouth/gUnk_080D292D.bin" +gSpriteAnimations_GyorgFemaleMouth_1:: @ 080D292D + .include "animations/gSpriteAnimations_GyorgFemaleMouth_1.s" -gUnk_080D293E:: @ 080D293E - .incbin "gyorgFemaleMouth/gUnk_080D293E.bin" +gSpriteAnimations_GyorgFemaleMouth_2:: @ 080D293E + .include "animations/gSpriteAnimations_GyorgFemaleMouth_2.s" -gUnk_080D294F:: @ 080D294F - .incbin "gyorgFemaleMouth/gUnk_080D294F.bin" +gSpriteAnimations_GyorgFemaleMouth_3:: @ 080D294F + .include "animations/gSpriteAnimations_GyorgFemaleMouth_3.s" gSpriteAnimations_GyorgFemaleMouth:: @ 080D2960 - .4byte gUnk_080D291C - .4byte gUnk_080D292D - .4byte gUnk_080D293E - .4byte gUnk_080D294F + .4byte gSpriteAnimations_GyorgFemaleMouth_0 + .4byte gSpriteAnimations_GyorgFemaleMouth_1 + .4byte gSpriteAnimations_GyorgFemaleMouth_2 + .4byte gSpriteAnimations_GyorgFemaleMouth_3 .4byte 00000000 diff --git a/data/animations/enemy/gyorgMale.s b/data/animations/enemy/gyorgMale.s index bdb7aab7..51c4f5e2 100644 --- a/data/animations/enemy/gyorgMale.s +++ b/data/animations/enemy/gyorgMale.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_080D1C70:: @ 080D1C70 - .incbin "gyorgMale/gUnk_080D1C70.bin" +gSpriteAnimations_GyorgMale_0:: @ 080D1C70 + .include "animations/gSpriteAnimations_GyorgMale_0.s" -gUnk_080D1C91:: @ 080D1C91 - .incbin "gyorgMale/gUnk_080D1C91.bin" +gSpriteAnimations_GyorgMale_1:: @ 080D1C91 + .include "animations/gSpriteAnimations_GyorgMale_1.s" gSpriteAnimations_GyorgMale:: @ 080D1CBC - .4byte gUnk_080D1C70 - .4byte gUnk_080D1C91 + .4byte gSpriteAnimations_GyorgMale_0 + .4byte gSpriteAnimations_GyorgMale_1 .4byte 00000000 diff --git a/data/animations/enemy/helmasaur.s b/data/animations/enemy/helmasaur.s index f76e917e..4c2b4866 100644 --- a/data/animations/enemy/helmasaur.s +++ b/data/animations/enemy/helmasaur.s @@ -3,53 +3,53 @@ .section .rodata -gUnk_080CD474:: @ 080CD474 - .incbin "helmasaur/gUnk_080CD474.bin" +gSpriteAnimations_Helmasaur_0:: @ 080CD474 + .include "animations/gSpriteAnimations_Helmasaur_0.s" -gUnk_080CD485:: @ 080CD485 - .incbin "helmasaur/gUnk_080CD485.bin" +gSpriteAnimations_Helmasaur_1:: @ 080CD485 + .include "animations/gSpriteAnimations_Helmasaur_1.s" -gUnk_080CD496:: @ 080CD496 - .incbin "helmasaur/gUnk_080CD496.bin" +gSpriteAnimations_Helmasaur_2:: @ 080CD496 + .include "animations/gSpriteAnimations_Helmasaur_2.s" -gUnk_080CD4A7:: @ 080CD4A7 - .incbin "helmasaur/gUnk_080CD4A7.bin" +gSpriteAnimations_Helmasaur_3:: @ 080CD4A7 + .include "animations/gSpriteAnimations_Helmasaur_3.s" -gUnk_080CD4B8:: @ 080CD4B8 - .incbin "helmasaur/gUnk_080CD4B8.bin" +gSpriteAnimations_Helmasaur_4:: @ 080CD4B8 + .include "animations/gSpriteAnimations_Helmasaur_4.s" -gUnk_080CD4C9:: @ 080CD4C9 - .incbin "helmasaur/gUnk_080CD4C9.bin" +gSpriteAnimations_Helmasaur_5:: @ 080CD4C9 + .include "animations/gSpriteAnimations_Helmasaur_5.s" -gUnk_080CD4DA:: @ 080CD4DA - .incbin "helmasaur/gUnk_080CD4DA.bin" +gSpriteAnimations_Helmasaur_6:: @ 080CD4DA + .include "animations/gSpriteAnimations_Helmasaur_6.s" -gUnk_080CD4EB:: @ 080CD4EB - .incbin "helmasaur/gUnk_080CD4EB.bin" +gSpriteAnimations_Helmasaur_7:: @ 080CD4EB + .include "animations/gSpriteAnimations_Helmasaur_7.s" -gUnk_080CD4FC:: @ 080CD4FC - .incbin "helmasaur/gUnk_080CD4FC.bin" +gSpriteAnimations_Helmasaur_8:: @ 080CD4FC + .include "animations/gSpriteAnimations_Helmasaur_8.s" -gUnk_080CD500:: @ 080CD500 - .incbin "helmasaur/gUnk_080CD500.bin" +gSpriteAnimations_Helmasaur_9:: @ 080CD500 + .include "animations/gSpriteAnimations_Helmasaur_9.s" -gUnk_080CD504:: @ 080CD504 - .incbin "helmasaur/gUnk_080CD504.bin" +gSpriteAnimations_Helmasaur_10:: @ 080CD504 + .include "animations/gSpriteAnimations_Helmasaur_10.s" -gUnk_080CD508:: @ 080CD508 - .incbin "helmasaur/gUnk_080CD508.bin" +gSpriteAnimations_Helmasaur_11:: @ 080CD508 + .include "animations/gSpriteAnimations_Helmasaur_11.s" gSpriteAnimations_Helmasaur:: @ 080CD50C - .4byte gUnk_080CD474 - .4byte gUnk_080CD485 - .4byte gUnk_080CD496 - .4byte gUnk_080CD4A7 - .4byte gUnk_080CD4B8 - .4byte gUnk_080CD4C9 - .4byte gUnk_080CD4DA - .4byte gUnk_080CD4EB - .4byte gUnk_080CD4FC - .4byte gUnk_080CD500 - .4byte gUnk_080CD504 - .4byte gUnk_080CD508 + .4byte gSpriteAnimations_Helmasaur_0 + .4byte gSpriteAnimations_Helmasaur_1 + .4byte gSpriteAnimations_Helmasaur_2 + .4byte gSpriteAnimations_Helmasaur_3 + .4byte gSpriteAnimations_Helmasaur_4 + .4byte gSpriteAnimations_Helmasaur_5 + .4byte gSpriteAnimations_Helmasaur_6 + .4byte gSpriteAnimations_Helmasaur_7 + .4byte gSpriteAnimations_Helmasaur_8 + .4byte gSpriteAnimations_Helmasaur_9 + .4byte gSpriteAnimations_Helmasaur_10 + .4byte gSpriteAnimations_Helmasaur_11 .4byte 00000000 diff --git a/data/animations/enemy/keaton.s b/data/animations/enemy/keaton.s index 1bde80ba..a464a19c 100644 --- a/data/animations/enemy/keaton.s +++ b/data/animations/enemy/keaton.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_080CE818:: @ 080CE818 - .incbin "keaton/gUnk_080CE818.bin" +gSpriteAnimations_Keaton_0:: @ 080CE818 + .include "animations/gSpriteAnimations_Keaton_0.s" -gUnk_080CE829:: @ 080CE829 - .incbin "keaton/gUnk_080CE829.bin" +gSpriteAnimations_Keaton_1:: @ 080CE829 + .include "animations/gSpriteAnimations_Keaton_1.s" -gUnk_080CE83A:: @ 080CE83A - .incbin "keaton/gUnk_080CE83A.bin" +gSpriteAnimations_Keaton_2:: @ 080CE83A + .include "animations/gSpriteAnimations_Keaton_2.s" -gUnk_080CE84B:: @ 080CE84B - .incbin "keaton/gUnk_080CE84B.bin" +gSpriteAnimations_Keaton_3:: @ 080CE84B + .include "animations/gSpriteAnimations_Keaton_3.s" -gUnk_080CE85C:: @ 080CE85C - .incbin "keaton/gUnk_080CE85C.bin" +gSpriteAnimations_Keaton_4:: @ 080CE85C + .include "animations/gSpriteAnimations_Keaton_4.s" -gUnk_080CE86D:: @ 080CE86D - .incbin "keaton/gUnk_080CE86D.bin" +gSpriteAnimations_Keaton_5:: @ 080CE86D + .include "animations/gSpriteAnimations_Keaton_5.s" -gUnk_080CE87E:: @ 080CE87E - .incbin "keaton/gUnk_080CE87E.bin" +gSpriteAnimations_Keaton_6:: @ 080CE87E + .include "animations/gSpriteAnimations_Keaton_6.s" -gUnk_080CE88F:: @ 080CE88F - .incbin "keaton/gUnk_080CE88F.bin" +gSpriteAnimations_Keaton_7:: @ 080CE88F + .include "animations/gSpriteAnimations_Keaton_7.s" -gUnk_080CE8A0:: @ 080CE8A0 - .incbin "keaton/gUnk_080CE8A0.bin" +gSpriteAnimations_Keaton_8:: @ 080CE8A0 + .include "animations/gSpriteAnimations_Keaton_8.s" -gUnk_080CE8C9:: @ 080CE8C9 - .incbin "keaton/gUnk_080CE8C9.bin" +gSpriteAnimations_Keaton_9:: @ 080CE8C9 + .include "animations/gSpriteAnimations_Keaton_9.s" -gUnk_080CE8F2:: @ 080CE8F2 - .incbin "keaton/gUnk_080CE8F2.bin" +gSpriteAnimations_Keaton_10:: @ 080CE8F2 + .include "animations/gSpriteAnimations_Keaton_10.s" -gUnk_080CE91B:: @ 080CE91B - .incbin "keaton/gUnk_080CE91B.bin" +gSpriteAnimations_Keaton_11:: @ 080CE91B + .include "animations/gSpriteAnimations_Keaton_11.s" gSpriteAnimations_Keaton:: @ 080CE944 - .4byte gUnk_080CE818 - .4byte gUnk_080CE829 - .4byte gUnk_080CE83A - .4byte gUnk_080CE84B - .4byte gUnk_080CE85C - .4byte gUnk_080CE86D - .4byte gUnk_080CE87E - .4byte gUnk_080CE88F - .4byte gUnk_080CE8A0 - .4byte gUnk_080CE8C9 - .4byte gUnk_080CE8F2 - .4byte gUnk_080CE91B + .4byte gSpriteAnimations_Keaton_0 + .4byte gSpriteAnimations_Keaton_1 + .4byte gSpriteAnimations_Keaton_2 + .4byte gSpriteAnimations_Keaton_3 + .4byte gSpriteAnimations_Keaton_4 + .4byte gSpriteAnimations_Keaton_5 + .4byte gSpriteAnimations_Keaton_6 + .4byte gSpriteAnimations_Keaton_7 + .4byte gSpriteAnimations_Keaton_8 + .4byte gSpriteAnimations_Keaton_9 + .4byte gSpriteAnimations_Keaton_10 + .4byte gSpriteAnimations_Keaton_11 .4byte 00000000 diff --git a/data/animations/enemy/keese.s b/data/animations/enemy/keese.s index e3528e8e..ad8b0f58 100644 --- a/data/animations/enemy/keese.s +++ b/data/animations/enemy/keese.s @@ -3,13 +3,13 @@ .section .rodata -gUnk_080CB706:: @ 080CB706 - .incbin "keese/gUnk_080CB706.bin" +gSpriteAnimations_Keese_0:: @ 080CB706 + .include "animations/gSpriteAnimations_Keese_0.s" -gUnk_080CB71E:: @ 080CB71E - .incbin "keese/gUnk_080CB71E.bin" +gSpriteAnimations_Keese_1:: @ 080CB71E + .include "animations/gSpriteAnimations_Keese_1.s" gSpriteAnimations_Keese:: @ 080CB728 - .4byte gUnk_080CB706 - .4byte gUnk_080CB71E + .4byte gSpriteAnimations_Keese_0 + .4byte gSpriteAnimations_Keese_1 .4byte 00000000 diff --git a/data/animations/enemy/lakitu.s b/data/animations/enemy/lakitu.s index 7cfcbfa9..9566aa36 100644 --- a/data/animations/enemy/lakitu.s +++ b/data/animations/enemy/lakitu.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_080D015C:: @ 080D015C - .incbin "lakitu/gUnk_080D015C.bin" +gSpriteAnimations_Lakitu_0:: @ 080D015C + .include "animations/gSpriteAnimations_Lakitu_0.s" -gUnk_080D016D:: @ 080D016D - .incbin "lakitu/gUnk_080D016D.bin" +gSpriteAnimations_Lakitu_1:: @ 080D016D + .include "animations/gSpriteAnimations_Lakitu_1.s" -gUnk_080D017E:: @ 080D017E - .incbin "lakitu/gUnk_080D017E.bin" +gSpriteAnimations_Lakitu_2:: @ 080D017E + .include "animations/gSpriteAnimations_Lakitu_2.s" -gUnk_080D018F:: @ 080D018F - .incbin "lakitu/gUnk_080D018F.bin" +gSpriteAnimations_Lakitu_3:: @ 080D018F + .include "animations/gSpriteAnimations_Lakitu_3.s" -gUnk_080D01A0:: @ 080D01A0 - .incbin "lakitu/gUnk_080D01A0.bin" +gSpriteAnimations_Lakitu_4:: @ 080D01A0 + .include "animations/gSpriteAnimations_Lakitu_4.s" -gUnk_080D01B1:: @ 080D01B1 - .incbin "lakitu/gUnk_080D01B1.bin" +gSpriteAnimations_Lakitu_5:: @ 080D01B1 + .include "animations/gSpriteAnimations_Lakitu_5.s" -gUnk_080D01C2:: @ 080D01C2 - .incbin "lakitu/gUnk_080D01C2.bin" +gSpriteAnimations_Lakitu_6:: @ 080D01C2 + .include "animations/gSpriteAnimations_Lakitu_6.s" -gUnk_080D01D3:: @ 080D01D3 - .incbin "lakitu/gUnk_080D01D3.bin" +gSpriteAnimations_Lakitu_7:: @ 080D01D3 + .include "animations/gSpriteAnimations_Lakitu_7.s" -gUnk_080D01E4:: @ 080D01E4 - .incbin "lakitu/gUnk_080D01E4.bin" +gSpriteAnimations_Lakitu_8:: @ 080D01E4 + .include "animations/gSpriteAnimations_Lakitu_8.s" gUnk_080D01EF:: @ 080D01EF .incbin "lakitu/gUnk_080D01EF.bin" @@ -43,17 +43,17 @@ gUnk_080D0210:: @ 080D0210 gUnk_080D0211:: @ 080D0211 .incbin "lakitu/gUnk_080D0211.bin" -gUnk_080D0225:: @ 080D0225 - .incbin "lakitu/gUnk_080D0225.bin" +gSpriteAnimations_Lakitu_9:: @ 080D0225 + .include "animations/gSpriteAnimations_Lakitu_9.s" -gUnk_080D0266:: @ 080D0266 - .incbin "lakitu/gUnk_080D0266.bin" +gSpriteAnimations_Lakitu_10:: @ 080D0266 + .include "animations/gSpriteAnimations_Lakitu_10.s" -gUnk_080D02A7:: @ 080D02A7 - .incbin "lakitu/gUnk_080D02A7.bin" +gSpriteAnimations_Lakitu_11:: @ 080D02A7 + .include "animations/gSpriteAnimations_Lakitu_11.s" -gUnk_080D02E8:: @ 080D02E8 - .incbin "lakitu/gUnk_080D02E8.bin" +gSpriteAnimations_Lakitu_12:: @ 080D02E8 + .include "animations/gSpriteAnimations_Lakitu_12.s" gUnk_080D02F3:: @ 080D02F3 .incbin "lakitu/gUnk_080D02F3.bin" @@ -64,8 +64,8 @@ gUnk_080D02F6:: @ 080D02F6 gUnk_080D02F7:: @ 080D02F7 .incbin "lakitu/gUnk_080D02F7.bin" -gUnk_080D02F9:: @ 080D02F9 - .incbin "lakitu/gUnk_080D02F9.bin" +gSpriteAnimations_Lakitu_13:: @ 080D02F9 + .include "animations/gSpriteAnimations_Lakitu_13.s" gUnk_080D02FC:: @ 080D02FC .incbin "lakitu/gUnk_080D02FC.bin" @@ -73,8 +73,8 @@ gUnk_080D02FC:: @ 080D02FC gUnk_080D0300:: @ 080D0300 .incbin "lakitu/gUnk_080D0300.bin" -gUnk_080D030A:: @ 080D030A - .incbin "lakitu/gUnk_080D030A.bin" +gSpriteAnimations_Lakitu_14:: @ 080D030A + .include "animations/gSpriteAnimations_Lakitu_14.s" gUnk_080D031B:: @ 080D031B .incbin "lakitu/gUnk_080D031B.bin" @@ -104,21 +104,21 @@ gUnk_080D03A3:: @ 080D03A3 .incbin "lakitu/gUnk_080D03A3.bin" gSpriteAnimations_Lakitu:: @ 080D03B4 - .4byte gUnk_080D015C - .4byte gUnk_080D016D - .4byte gUnk_080D017E - .4byte gUnk_080D018F - .4byte gUnk_080D01A0 - .4byte gUnk_080D01B1 - .4byte gUnk_080D01C2 - .4byte gUnk_080D01D3 - .4byte gUnk_080D01E4 - .4byte gUnk_080D0225 - .4byte gUnk_080D0266 - .4byte gUnk_080D02A7 - .4byte gUnk_080D02E8 - .4byte gUnk_080D02F9 - .4byte gUnk_080D030A + .4byte gSpriteAnimations_Lakitu_0 + .4byte gSpriteAnimations_Lakitu_1 + .4byte gSpriteAnimations_Lakitu_2 + .4byte gSpriteAnimations_Lakitu_3 + .4byte gSpriteAnimations_Lakitu_4 + .4byte gSpriteAnimations_Lakitu_5 + .4byte gSpriteAnimations_Lakitu_6 + .4byte gSpriteAnimations_Lakitu_7 + .4byte gSpriteAnimations_Lakitu_8 + .4byte gSpriteAnimations_Lakitu_9 + .4byte gSpriteAnimations_Lakitu_10 + .4byte gSpriteAnimations_Lakitu_11 + .4byte gSpriteAnimations_Lakitu_12 + .4byte gSpriteAnimations_Lakitu_13 + .4byte gSpriteAnimations_Lakitu_14 gUnk_080D03F0:: @ 080D03F0 .4byte gUnk_080D031B diff --git a/data/animations/enemy/leever.s b/data/animations/enemy/leever.s index 055fbac0..571e84eb 100644 --- a/data/animations/enemy/leever.s +++ b/data/animations/enemy/leever.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_080CA4D4:: @ 080CA4D4 - .incbin "leever/gUnk_080CA4D4.bin" +gSpriteAnimations_Leever_0:: @ 080CA4D4 + .include "animations/gSpriteAnimations_Leever_0.s" -gUnk_080CA500:: @ 080CA500 - .incbin "leever/gUnk_080CA500.bin" +gSpriteAnimations_Leever_1:: @ 080CA500 + .include "animations/gSpriteAnimations_Leever_1.s" -gUnk_080CA51C:: @ 080CA51C - .incbin "leever/gUnk_080CA51C.bin" +gSpriteAnimations_Leever_2:: @ 080CA51C + .include "animations/gSpriteAnimations_Leever_2.s" gSpriteAnimations_Leever:: @ 080CA560 - .4byte gUnk_080CA4D4 - .4byte gUnk_080CA500 - .4byte gUnk_080CA51C + .4byte gSpriteAnimations_Leever_0 + .4byte gSpriteAnimations_Leever_1 + .4byte gSpriteAnimations_Leever_2 .4byte 00000000 diff --git a/data/animations/enemy/likeLike.s b/data/animations/enemy/likeLike.s index 17ef68ee..4e4c7c8a 100644 --- a/data/animations/enemy/likeLike.s +++ b/data/animations/enemy/likeLike.s @@ -3,17 +3,17 @@ .section .rodata -gUnk_080CC734:: @ 080CC734 - .incbin "likeLike/gUnk_080CC734.bin" +gSpriteAnimations_LikeLike_0:: @ 080CC734 + .include "animations/gSpriteAnimations_LikeLike_0.s" -gUnk_080CC759:: @ 080CC759 - .incbin "likeLike/gUnk_080CC759.bin" +gSpriteAnimations_LikeLike_1:: @ 080CC759 + .include "animations/gSpriteAnimations_LikeLike_1.s" -gUnk_080CC76E:: @ 080CC76E - .incbin "likeLike/gUnk_080CC76E.bin" +gSpriteAnimations_LikeLike_2:: @ 080CC76E + .include "animations/gSpriteAnimations_LikeLike_2.s" gSpriteAnimations_LikeLike:: @ 080CC780 - .4byte gUnk_080CC734 - .4byte gUnk_080CC759 - .4byte gUnk_080CC76E + .4byte gSpriteAnimations_LikeLike_0 + .4byte gSpriteAnimations_LikeLike_1 + .4byte gSpriteAnimations_LikeLike_2 .4byte 00000000 diff --git a/data/animations/enemy/madderpillar.s b/data/animations/enemy/madderpillar.s index 321e6235..344b85c5 100644 --- a/data/animations/enemy/madderpillar.s +++ b/data/animations/enemy/madderpillar.s @@ -3,120 +3,120 @@ .section .rodata -gUnk_080CCDDC:: @ 080CCDDC - .incbin "madderpillar/gUnk_080CCDDC.bin" +gSpriteAnimations_Madderpillar_0_0:: @ 080CCDDC + .include "animations/gSpriteAnimations_Madderpillar_0_0.s" -gUnk_080CCDED:: @ 080CCDED - .incbin "madderpillar/gUnk_080CCDED.bin" +gSpriteAnimations_Madderpillar_0_1:: @ 080CCDED + .include "animations/gSpriteAnimations_Madderpillar_0_1.s" -gUnk_080CCDFE:: @ 080CCDFE - .incbin "madderpillar/gUnk_080CCDFE.bin" +gSpriteAnimations_Madderpillar_0_2:: @ 080CCDFE + .include "animations/gSpriteAnimations_Madderpillar_0_2.s" -gUnk_080CCE0F:: @ 080CCE0F - .incbin "madderpillar/gUnk_080CCE0F.bin" +gSpriteAnimations_Madderpillar_0_3:: @ 080CCE0F + .include "animations/gSpriteAnimations_Madderpillar_0_3.s" -gUnk_080CCE20:: @ 080CCE20 - .incbin "madderpillar/gUnk_080CCE20.bin" +gSpriteAnimations_Madderpillar_0_4:: @ 080CCE20 + .include "animations/gSpriteAnimations_Madderpillar_0_4.s" -gUnk_080CCE31:: @ 080CCE31 - .incbin "madderpillar/gUnk_080CCE31.bin" +gSpriteAnimations_Madderpillar_0_5:: @ 080CCE31 + .include "animations/gSpriteAnimations_Madderpillar_0_5.s" -gUnk_080CCE42:: @ 080CCE42 - .incbin "madderpillar/gUnk_080CCE42.bin" +gSpriteAnimations_Madderpillar_0_6:: @ 080CCE42 + .include "animations/gSpriteAnimations_Madderpillar_0_6.s" -gUnk_080CCE53:: @ 080CCE53 - .incbin "madderpillar/gUnk_080CCE53.bin" +gSpriteAnimations_Madderpillar_0_7:: @ 080CCE53 + .include "animations/gSpriteAnimations_Madderpillar_0_7.s" gSpriteAnimations_Madderpillar_0:: @ 080CCE64 - .4byte gUnk_080CCDDC - .4byte gUnk_080CCDED - .4byte gUnk_080CCDFE - .4byte gUnk_080CCE0F - .4byte gUnk_080CCE20 - .4byte gUnk_080CCE31 - .4byte gUnk_080CCE42 - .4byte gUnk_080CCE53 + .4byte gSpriteAnimations_Madderpillar_0_0 + .4byte gSpriteAnimations_Madderpillar_0_1 + .4byte gSpriteAnimations_Madderpillar_0_2 + .4byte gSpriteAnimations_Madderpillar_0_3 + .4byte gSpriteAnimations_Madderpillar_0_4 + .4byte gSpriteAnimations_Madderpillar_0_5 + .4byte gSpriteAnimations_Madderpillar_0_6 + .4byte gSpriteAnimations_Madderpillar_0_7 .4byte 00000000 -gUnk_080CCE88:: @ 080CCE88 - .incbin "madderpillar/gUnk_080CCE88.bin" +gSpriteAnimations_Madderpillar_1_0:: @ 080CCE88 + .include "animations/gSpriteAnimations_Madderpillar_1_0.s" -gUnk_080CCE99:: @ 080CCE99 - .incbin "madderpillar/gUnk_080CCE99.bin" +gSpriteAnimations_Madderpillar_1_1:: @ 080CCE99 + .include "animations/gSpriteAnimations_Madderpillar_1_1.s" -gUnk_080CCEAA:: @ 080CCEAA - .incbin "madderpillar/gUnk_080CCEAA.bin" +gSpriteAnimations_Madderpillar_1_2:: @ 080CCEAA + .include "animations/gSpriteAnimations_Madderpillar_1_2.s" -gUnk_080CCEBB:: @ 080CCEBB - .incbin "madderpillar/gUnk_080CCEBB.bin" +gSpriteAnimations_Madderpillar_1_3:: @ 080CCEBB + .include "animations/gSpriteAnimations_Madderpillar_1_3.s" -gUnk_080CCECC:: @ 080CCECC - .incbin "madderpillar/gUnk_080CCECC.bin" +gSpriteAnimations_Madderpillar_1_4:: @ 080CCECC + .include "animations/gSpriteAnimations_Madderpillar_1_4.s" -gUnk_080CCEDD:: @ 080CCEDD - .incbin "madderpillar/gUnk_080CCEDD.bin" +gSpriteAnimations_Madderpillar_1_5:: @ 080CCEDD + .include "animations/gSpriteAnimations_Madderpillar_1_5.s" -gUnk_080CCEEE:: @ 080CCEEE - .incbin "madderpillar/gUnk_080CCEEE.bin" +gSpriteAnimations_Madderpillar_1_6:: @ 080CCEEE + .include "animations/gSpriteAnimations_Madderpillar_1_6.s" -gUnk_080CCEFF:: @ 080CCEFF - .incbin "madderpillar/gUnk_080CCEFF.bin" +gSpriteAnimations_Madderpillar_1_7:: @ 080CCEFF + .include "animations/gSpriteAnimations_Madderpillar_1_7.s" -gUnk_080CCF10:: @ 080CCF10 - .incbin "madderpillar/gUnk_080CCF10.bin" +gSpriteAnimations_Madderpillar_1_8:: @ 080CCF10 + .include "animations/gSpriteAnimations_Madderpillar_1_8.s" -gUnk_080CCF15:: @ 080CCF15 - .incbin "madderpillar/gUnk_080CCF15.bin" +gSpriteAnimations_Madderpillar_1_9:: @ 080CCF15 + .include "animations/gSpriteAnimations_Madderpillar_1_9.s" -gUnk_080CCF1A:: @ 080CCF1A - .incbin "madderpillar/gUnk_080CCF1A.bin" +gSpriteAnimations_Madderpillar_1_10:: @ 080CCF1A + .include "animations/gSpriteAnimations_Madderpillar_1_10.s" -gUnk_080CCF1F:: @ 080CCF1F - .incbin "madderpillar/gUnk_080CCF1F.bin" +gSpriteAnimations_Madderpillar_1_11:: @ 080CCF1F + .include "animations/gSpriteAnimations_Madderpillar_1_11.s" -gUnk_080CCF24:: @ 080CCF24 - .incbin "madderpillar/gUnk_080CCF24.bin" +gSpriteAnimations_Madderpillar_1_12:: @ 080CCF24 + .include "animations/gSpriteAnimations_Madderpillar_1_12.s" -gUnk_080CCF41:: @ 080CCF41 - .incbin "madderpillar/gUnk_080CCF41.bin" +gSpriteAnimations_Madderpillar_1_13:: @ 080CCF41 + .include "animations/gSpriteAnimations_Madderpillar_1_13.s" -gUnk_080CCF5E:: @ 080CCF5E - .incbin "madderpillar/gUnk_080CCF5E.bin" +gSpriteAnimations_Madderpillar_1_14:: @ 080CCF5E + .include "animations/gSpriteAnimations_Madderpillar_1_14.s" -gUnk_080CCF7B:: @ 080CCF7B - .incbin "madderpillar/gUnk_080CCF7B.bin" +gSpriteAnimations_Madderpillar_1_15:: @ 080CCF7B + .include "animations/gSpriteAnimations_Madderpillar_1_15.s" -gUnk_080CCF98:: @ 080CCF98 - .incbin "madderpillar/gUnk_080CCF98.bin" +gSpriteAnimations_Madderpillar_1_16:: @ 080CCF98 + .include "animations/gSpriteAnimations_Madderpillar_1_16.s" -gUnk_080CCFA9:: @ 080CCFA9 - .incbin "madderpillar/gUnk_080CCFA9.bin" +gSpriteAnimations_Madderpillar_1_17:: @ 080CCFA9 + .include "animations/gSpriteAnimations_Madderpillar_1_17.s" -gUnk_080CCFBA:: @ 080CCFBA - .incbin "madderpillar/gUnk_080CCFBA.bin" +gSpriteAnimations_Madderpillar_1_18:: @ 080CCFBA + .include "animations/gSpriteAnimations_Madderpillar_1_18.s" -gUnk_080CCFCB:: @ 080CCFCB - .incbin "madderpillar/gUnk_080CCFCB.bin" +gSpriteAnimations_Madderpillar_1_19:: @ 080CCFCB + .include "animations/gSpriteAnimations_Madderpillar_1_19.s" gSpriteAnimations_Madderpillar_1:: @ 080CCFDC - .4byte gUnk_080CCE88 - .4byte gUnk_080CCE99 - .4byte gUnk_080CCEAA - .4byte gUnk_080CCEBB - .4byte gUnk_080CCECC - .4byte gUnk_080CCEDD - .4byte gUnk_080CCEEE - .4byte gUnk_080CCEFF - .4byte gUnk_080CCF10 - .4byte gUnk_080CCF15 - .4byte gUnk_080CCF1A - .4byte gUnk_080CCF1F - .4byte gUnk_080CCF24 - .4byte gUnk_080CCF41 - .4byte gUnk_080CCF5E - .4byte gUnk_080CCF7B - .4byte gUnk_080CCF98 - .4byte gUnk_080CCFA9 - .4byte gUnk_080CCFBA - .4byte gUnk_080CCFCB + .4byte gSpriteAnimations_Madderpillar_1_0 + .4byte gSpriteAnimations_Madderpillar_1_1 + .4byte gSpriteAnimations_Madderpillar_1_2 + .4byte gSpriteAnimations_Madderpillar_1_3 + .4byte gSpriteAnimations_Madderpillar_1_4 + .4byte gSpriteAnimations_Madderpillar_1_5 + .4byte gSpriteAnimations_Madderpillar_1_6 + .4byte gSpriteAnimations_Madderpillar_1_7 + .4byte gSpriteAnimations_Madderpillar_1_8 + .4byte gSpriteAnimations_Madderpillar_1_9 + .4byte gSpriteAnimations_Madderpillar_1_10 + .4byte gSpriteAnimations_Madderpillar_1_11 + .4byte gSpriteAnimations_Madderpillar_1_12 + .4byte gSpriteAnimations_Madderpillar_1_13 + .4byte gSpriteAnimations_Madderpillar_1_14 + .4byte gSpriteAnimations_Madderpillar_1_15 + .4byte gSpriteAnimations_Madderpillar_1_16 + .4byte gSpriteAnimations_Madderpillar_1_17 + .4byte gSpriteAnimations_Madderpillar_1_18 + .4byte gSpriteAnimations_Madderpillar_1_19 .4byte 00000000 diff --git a/data/animations/enemy/mazaalBracelet.s b/data/animations/enemy/mazaalBracelet.s index d2995db4..95d31787 100644 --- a/data/animations/enemy/mazaalBracelet.s +++ b/data/animations/enemy/mazaalBracelet.s @@ -4,105 +4,105 @@ .section .rodata .align 2 -gUnk_080CFD60:: @ 080CFD60 - .incbin "mazaalBracelet/gUnk_080CFD60.bin" +gSpriteAnimations_MazaalBracelet_0:: @ 080CFD60 + .include "animations/gSpriteAnimations_MazaalBracelet_0.s" -gUnk_080CFD71:: @ 080CFD71 - .incbin "mazaalBracelet/gUnk_080CFD71.bin" +gSpriteAnimations_MazaalBracelet_1:: @ 080CFD71 + .include "animations/gSpriteAnimations_MazaalBracelet_1.s" -gUnk_080CFD82:: @ 080CFD82 - .incbin "mazaalBracelet/gUnk_080CFD82.bin" +gSpriteAnimations_MazaalBracelet_2:: @ 080CFD82 + .include "animations/gSpriteAnimations_MazaalBracelet_2.s" -gUnk_080CFDD6:: @ 080CFDD6 - .incbin "mazaalBracelet/gUnk_080CFDD6.bin" +gSpriteAnimations_MazaalBracelet_3:: @ 080CFDD6 + .include "animations/gSpriteAnimations_MazaalBracelet_3.s" -gUnk_080CFE2A:: @ 080CFE2A - .incbin "mazaalBracelet/gUnk_080CFE2A.bin" +gSpriteAnimations_MazaalBracelet_4:: @ 080CFE2A + .include "animations/gSpriteAnimations_MazaalBracelet_4.s" -gUnk_080CFE37:: @ 080CFE37 - .incbin "mazaalBracelet/gUnk_080CFE37.bin" +gSpriteAnimations_MazaalBracelet_5:: @ 080CFE37 + .include "animations/gSpriteAnimations_MazaalBracelet_5.s" -gUnk_080CFE44:: @ 080CFE44 - .incbin "mazaalBracelet/gUnk_080CFE44.bin" +gSpriteAnimations_MazaalBracelet_6:: @ 080CFE44 + .include "animations/gSpriteAnimations_MazaalBracelet_6.s" -gUnk_080CFE4C:: @ 080CFE4C - .incbin "mazaalBracelet/gUnk_080CFE4C.bin" +gSpriteAnimations_MazaalBracelet_7:: @ 080CFE4C + .include "animations/gSpriteAnimations_MazaalBracelet_7.s" -gUnk_080CFE54:: @ 080CFE54 - .incbin "mazaalBracelet/gUnk_080CFE54.bin" +gSpriteAnimations_MazaalBracelet_8:: @ 080CFE54 + .include "animations/gSpriteAnimations_MazaalBracelet_8.s" -gUnk_080CFE58:: @ 080CFE58 - .incbin "mazaalBracelet/gUnk_080CFE58.bin" +gSpriteAnimations_MazaalBracelet_9:: @ 080CFE58 + .include "animations/gSpriteAnimations_MazaalBracelet_9.s" -gUnk_080CFE5C:: @ 080CFE5C - .incbin "mazaalBracelet/gUnk_080CFE5C.bin" +gSpriteAnimations_MazaalBracelet_10:: @ 080CFE5C + .include "animations/gSpriteAnimations_MazaalBracelet_10.s" -gUnk_080CFE60:: @ 080CFE60 - .incbin "mazaalBracelet/gUnk_080CFE60.bin" +gSpriteAnimations_MazaalBracelet_11:: @ 080CFE60 + .include "animations/gSpriteAnimations_MazaalBracelet_11.s" -gUnk_080CFE71:: @ 080CFE71 - .incbin "mazaalBracelet/gUnk_080CFE71.bin" +gSpriteAnimations_MazaalBracelet_12:: @ 080CFE71 + .include "animations/gSpriteAnimations_MazaalBracelet_12.s" -gUnk_080CFE76:: @ 080CFE76 - .incbin "mazaalBracelet/gUnk_080CFE76.bin" +gSpriteAnimations_MazaalBracelet_13:: @ 080CFE76 + .include "animations/gSpriteAnimations_MazaalBracelet_13.s" -gUnk_080CFE7B:: @ 080CFE7B - .incbin "mazaalBracelet/gUnk_080CFE7B.bin" +gSpriteAnimations_MazaalBracelet_14:: @ 080CFE7B + .include "animations/gSpriteAnimations_MazaalBracelet_14.s" -gUnk_080CFE80:: @ 080CFE80 - .incbin "mazaalBracelet/gUnk_080CFE80.bin" +gSpriteAnimations_MazaalBracelet_15:: @ 080CFE80 + .include "animations/gSpriteAnimations_MazaalBracelet_15.s" -gUnk_080CFE85:: @ 080CFE85 - .incbin "mazaalBracelet/gUnk_080CFE85.bin" +gSpriteAnimations_MazaalBracelet_16:: @ 080CFE85 + .include "animations/gSpriteAnimations_MazaalBracelet_16.s" -gUnk_080CFE8A:: @ 080CFE8A - .incbin "mazaalBracelet/gUnk_080CFE8A.bin" +gSpriteAnimations_MazaalBracelet_17:: @ 080CFE8A + .include "animations/gSpriteAnimations_MazaalBracelet_17.s" -gUnk_080CFE8F:: @ 080CFE8F - .incbin "mazaalBracelet/gUnk_080CFE8F.bin" +gSpriteAnimations_MazaalBracelet_18:: @ 080CFE8F + .include "animations/gSpriteAnimations_MazaalBracelet_18.s" -gUnk_080CFE94:: @ 080CFE94 - .incbin "mazaalBracelet/gUnk_080CFE94.bin" +gSpriteAnimations_MazaalBracelet_19:: @ 080CFE94 + .include "animations/gSpriteAnimations_MazaalBracelet_19.s" -gUnk_080CFE99:: @ 080CFE99 - .incbin "mazaalBracelet/gUnk_080CFE99.bin" +gSpriteAnimations_MazaalBracelet_20:: @ 080CFE99 + .include "animations/gSpriteAnimations_MazaalBracelet_20.s" -gUnk_080CFE9E:: @ 080CFE9E - .incbin "mazaalBracelet/gUnk_080CFE9E.bin" +gSpriteAnimations_MazaalBracelet_21:: @ 080CFE9E + .include "animations/gSpriteAnimations_MazaalBracelet_21.s" -gUnk_080CFEA3:: @ 080CFEA3 - .incbin "mazaalBracelet/gUnk_080CFEA3.bin" +gSpriteAnimations_MazaalBracelet_22:: @ 080CFEA3 + .include "animations/gSpriteAnimations_MazaalBracelet_22.s" -gUnk_080CFEB0:: @ 080CFEB0 - .incbin "mazaalBracelet/gUnk_080CFEB0.bin" +gSpriteAnimations_MazaalBracelet_23:: @ 080CFEB0 + .include "animations/gSpriteAnimations_MazaalBracelet_23.s" -gUnk_080CFEC1:: @ 080CFEC1 - .incbin "mazaalBracelet/gUnk_080CFEC1.bin" +gSpriteAnimations_MazaalBracelet_24:: @ 080CFEC1 + .include "animations/gSpriteAnimations_MazaalBracelet_24.s" gSpriteAnimations_MazaalBracelet:: @ 080CFED4 - .4byte gUnk_080CFD60 - .4byte gUnk_080CFD71 - .4byte gUnk_080CFD82 - .4byte gUnk_080CFDD6 - .4byte gUnk_080CFE2A - .4byte gUnk_080CFE37 - .4byte gUnk_080CFE44 - .4byte gUnk_080CFE4C - .4byte gUnk_080CFE54 - .4byte gUnk_080CFE58 - .4byte gUnk_080CFE5C - .4byte gUnk_080CFE60 - .4byte gUnk_080CFE71 - .4byte gUnk_080CFE76 - .4byte gUnk_080CFE7B - .4byte gUnk_080CFE80 - .4byte gUnk_080CFE85 - .4byte gUnk_080CFE8A - .4byte gUnk_080CFE8F - .4byte gUnk_080CFE94 - .4byte gUnk_080CFE99 - .4byte gUnk_080CFE9E - .4byte gUnk_080CFEA3 - .4byte gUnk_080CFEB0 - .4byte gUnk_080CFEC1 + .4byte gSpriteAnimations_MazaalBracelet_0 + .4byte gSpriteAnimations_MazaalBracelet_1 + .4byte gSpriteAnimations_MazaalBracelet_2 + .4byte gSpriteAnimations_MazaalBracelet_3 + .4byte gSpriteAnimations_MazaalBracelet_4 + .4byte gSpriteAnimations_MazaalBracelet_5 + .4byte gSpriteAnimations_MazaalBracelet_6 + .4byte gSpriteAnimations_MazaalBracelet_7 + .4byte gSpriteAnimations_MazaalBracelet_8 + .4byte gSpriteAnimations_MazaalBracelet_9 + .4byte gSpriteAnimations_MazaalBracelet_10 + .4byte gSpriteAnimations_MazaalBracelet_11 + .4byte gSpriteAnimations_MazaalBracelet_12 + .4byte gSpriteAnimations_MazaalBracelet_13 + .4byte gSpriteAnimations_MazaalBracelet_14 + .4byte gSpriteAnimations_MazaalBracelet_15 + .4byte gSpriteAnimations_MazaalBracelet_16 + .4byte gSpriteAnimations_MazaalBracelet_17 + .4byte gSpriteAnimations_MazaalBracelet_18 + .4byte gSpriteAnimations_MazaalBracelet_19 + .4byte gSpriteAnimations_MazaalBracelet_20 + .4byte gSpriteAnimations_MazaalBracelet_21 + .4byte gSpriteAnimations_MazaalBracelet_22 + .4byte gSpriteAnimations_MazaalBracelet_23 + .4byte gSpriteAnimations_MazaalBracelet_24 .4byte 00000000 diff --git a/data/animations/enemy/mazaalHand.s b/data/animations/enemy/mazaalHand.s index c35b7684..28f7fffa 100644 --- a/data/animations/enemy/mazaalHand.s +++ b/data/animations/enemy/mazaalHand.s @@ -5,45 +5,45 @@ .align 2 -gUnk_080CEF7C:: @ 080CEF7C - .incbin "mazaalHand/gUnk_080CEF7C.bin" +gSpriteAnimations_MazaalHand_0:: @ 080CEF7C + .include "animations/gSpriteAnimations_MazaalHand_0.s" -gUnk_080CEF9D:: @ 080CEF9D - .incbin "mazaalHand/gUnk_080CEF9D.bin" +gSpriteAnimations_MazaalHand_1:: @ 080CEF9D + .include "animations/gSpriteAnimations_MazaalHand_1.s" -gUnk_080CEFA5:: @ 080CEFA5 - .incbin "mazaalHand/gUnk_080CEFA5.bin" +gSpriteAnimations_MazaalHand_2:: @ 080CEFA5 + .include "animations/gSpriteAnimations_MazaalHand_2.s" -gUnk_080CEFAE:: @ 080CEFAE - .incbin "mazaalHand/gUnk_080CEFAE.bin" +gSpriteAnimations_MazaalHand_3:: @ 080CEFAE + .include "animations/gSpriteAnimations_MazaalHand_3.s" -gUnk_080CEFB2:: @ 080CEFB2 - .incbin "mazaalHand/gUnk_080CEFB2.bin" +gSpriteAnimations_MazaalHand_4:: @ 080CEFB2 + .include "animations/gSpriteAnimations_MazaalHand_4.s" -gUnk_080CEFB6:: @ 080CEFB6 - .incbin "mazaalHand/gUnk_080CEFB6.bin" +gSpriteAnimations_MazaalHand_5:: @ 080CEFB6 + .include "animations/gSpriteAnimations_MazaalHand_5.s" -gUnk_080CEFCB:: @ 080CEFCB - .incbin "mazaalHand/gUnk_080CEFCB.bin" +gSpriteAnimations_MazaalHand_6:: @ 080CEFCB + .include "animations/gSpriteAnimations_MazaalHand_6.s" -gUnk_080CEFE0:: @ 080CEFE0 - .incbin "mazaalHand/gUnk_080CEFE0.bin" +gSpriteAnimations_MazaalHand_7:: @ 080CEFE0 + .include "animations/gSpriteAnimations_MazaalHand_7.s" -gUnk_080CEFE9:: @ 080CEFE9 - .incbin "mazaalHand/gUnk_080CEFE9.bin" +gSpriteAnimations_MazaalHand_8:: @ 080CEFE9 + .include "animations/gSpriteAnimations_MazaalHand_8.s" -gUnk_080CF002:: @ 080CF002 - .incbin "mazaalHand/gUnk_080CF002.bin" +gSpriteAnimations_MazaalHand_9:: @ 080CF002 + .include "animations/gSpriteAnimations_MazaalHand_9.s" gSpriteAnimations_MazaalHand:: @ 080CF014 - .4byte gUnk_080CEF7C - .4byte gUnk_080CEF9D - .4byte gUnk_080CEFA5 - .4byte gUnk_080CEFAE - .4byte gUnk_080CEFB2 - .4byte gUnk_080CEFB6 - .4byte gUnk_080CEFCB - .4byte gUnk_080CEFE0 - .4byte gUnk_080CEFE9 - .4byte gUnk_080CF002 + .4byte gSpriteAnimations_MazaalHand_0 + .4byte gSpriteAnimations_MazaalHand_1 + .4byte gSpriteAnimations_MazaalHand_2 + .4byte gSpriteAnimations_MazaalHand_3 + .4byte gSpriteAnimations_MazaalHand_4 + .4byte gSpriteAnimations_MazaalHand_5 + .4byte gSpriteAnimations_MazaalHand_6 + .4byte gSpriteAnimations_MazaalHand_7 + .4byte gSpriteAnimations_MazaalHand_8 + .4byte gSpriteAnimations_MazaalHand_9 .4byte 00000000 diff --git a/data/animations/enemy/mazaalHead.s b/data/animations/enemy/mazaalHead.s index c8ce0be1..1f97effc 100644 --- a/data/animations/enemy/mazaalHead.s +++ b/data/animations/enemy/mazaalHead.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_080CEDB0:: @ 080CEDB0 - .incbin "mazaalHead/gUnk_080CEDB0.bin" +gSpriteAnimations_MazaalHead_0:: @ 080CEDB0 + .include "animations/gSpriteAnimations_MazaalHead_0.s" -gUnk_080CEDB5:: @ 080CEDB5 - .incbin "mazaalHead/gUnk_080CEDB5.bin" +gSpriteAnimations_MazaalHead_1:: @ 080CEDB5 + .include "animations/gSpriteAnimations_MazaalHead_1.s" -gUnk_080CEDBA:: @ 080CEDBA - .incbin "mazaalHead/gUnk_080CEDBA.bin" +gSpriteAnimations_MazaalHead_2:: @ 080CEDBA + .include "animations/gSpriteAnimations_MazaalHead_2.s" -gUnk_080CEDCF:: @ 080CEDCF - .incbin "mazaalHead/gUnk_080CEDCF.bin" +gSpriteAnimations_MazaalHead_3:: @ 080CEDCF + .include "animations/gSpriteAnimations_MazaalHead_3.s" -gUnk_080CEE07:: @ 080CEE07 - .incbin "mazaalHead/gUnk_080CEE07.bin" +gSpriteAnimations_MazaalHead_4:: @ 080CEE07 + .include "animations/gSpriteAnimations_MazaalHead_4.s" -gUnk_080CEE3F:: @ 080CEE3F - .incbin "mazaalHead/gUnk_080CEE3F.bin" +gSpriteAnimations_MazaalHead_5:: @ 080CEE3F + .include "animations/gSpriteAnimations_MazaalHead_5.s" -gUnk_080CEE57:: @ 080CEE57 - .incbin "mazaalHead/gUnk_080CEE57.bin" +gSpriteAnimations_MazaalHead_6:: @ 080CEE57 + .include "animations/gSpriteAnimations_MazaalHead_6.s" gSpriteAnimations_MazaalHead:: @ 080CEE70 - .4byte gUnk_080CEDB0 - .4byte gUnk_080CEDB5 - .4byte gUnk_080CEDBA - .4byte gUnk_080CEDCF - .4byte gUnk_080CEE07 - .4byte gUnk_080CEE3F - .4byte gUnk_080CEE57 + .4byte gSpriteAnimations_MazaalHead_0 + .4byte gSpriteAnimations_MazaalHead_1 + .4byte gSpriteAnimations_MazaalHead_2 + .4byte gSpriteAnimations_MazaalHead_3 + .4byte gSpriteAnimations_MazaalHead_4 + .4byte gSpriteAnimations_MazaalHead_5 + .4byte gSpriteAnimations_MazaalHead_6 .4byte 00000000 diff --git a/data/animations/enemy/mazaalMacro.s b/data/animations/enemy/mazaalMacro.s index 4faa020b..738143ed 100644 --- a/data/animations/enemy/mazaalMacro.s +++ b/data/animations/enemy/mazaalMacro.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_080CEF08:: @ 080CEF08 - .incbin "mazaalMacro/gUnk_080CEF08.bin" +gSpriteAnimations_MazaalMacro_1:: @ 080CEF08 + .include "animations/gSpriteAnimations_MazaalMacro_1.s" -gUnk_080CEF0C:: @ 080CEF0C - .incbin "mazaalMacro/gUnk_080CEF0C.bin" +gSpriteAnimations_MazaalMacro_0:: @ 080CEF0C + .include "animations/gSpriteAnimations_MazaalMacro_0.s" -gUnk_080CEF1D:: @ 080CEF1D - .incbin "mazaalMacro/gUnk_080CEF1D.bin" +gSpriteAnimations_MazaalMacro_2:: @ 080CEF1D + .include "animations/gSpriteAnimations_MazaalMacro_2.s" gSpriteAnimations_MazaalMacro:: @ 080CEF24 - .4byte gUnk_080CEF0C - .4byte gUnk_080CEF08 - .4byte gUnk_080CEF1D + .4byte gSpriteAnimations_MazaalMacro_0 + .4byte gSpriteAnimations_MazaalMacro_1 + .4byte gSpriteAnimations_MazaalMacro_2 .4byte 00000000 diff --git a/data/animations/enemy/moldworm.s b/data/animations/enemy/moldworm.s index 54191286..483c8dfc 100644 --- a/data/animations/enemy/moldworm.s +++ b/data/animations/enemy/moldworm.s @@ -3,101 +3,101 @@ .section .rodata -gUnk_080CBCC8:: @ 080CBCC8 - .incbin "moldworm/gUnk_080CBCC8.bin" +gSpriteAnimations_Moldworm_0:: @ 080CBCC8 + .include "animations/gSpriteAnimations_Moldworm_0.s" -gUnk_080CBCCC:: @ 080CBCCC - .incbin "moldworm/gUnk_080CBCCC.bin" +gSpriteAnimations_Moldworm_1:: @ 080CBCCC + .include "animations/gSpriteAnimations_Moldworm_1.s" -gUnk_080CBCD0:: @ 080CBCD0 - .incbin "moldworm/gUnk_080CBCD0.bin" +gSpriteAnimations_Moldworm_2:: @ 080CBCD0 + .include "animations/gSpriteAnimations_Moldworm_2.s" -gUnk_080CBCD4:: @ 080CBCD4 - .incbin "moldworm/gUnk_080CBCD4.bin" +gSpriteAnimations_Moldworm_3:: @ 080CBCD4 + .include "animations/gSpriteAnimations_Moldworm_3.s" -gUnk_080CBCD8:: @ 080CBCD8 - .incbin "moldworm/gUnk_080CBCD8.bin" +gSpriteAnimations_Moldworm_4:: @ 080CBCD8 + .include "animations/gSpriteAnimations_Moldworm_4.s" -gUnk_080CBCDC:: @ 080CBCDC - .incbin "moldworm/gUnk_080CBCDC.bin" +gSpriteAnimations_Moldworm_5:: @ 080CBCDC + .include "animations/gSpriteAnimations_Moldworm_5.s" -gUnk_080CBCE0:: @ 080CBCE0 - .incbin "moldworm/gUnk_080CBCE0.bin" +gSpriteAnimations_Moldworm_6:: @ 080CBCE0 + .include "animations/gSpriteAnimations_Moldworm_6.s" -gUnk_080CBCE4:: @ 080CBCE4 - .incbin "moldworm/gUnk_080CBCE4.bin" +gSpriteAnimations_Moldworm_7:: @ 080CBCE4 + .include "animations/gSpriteAnimations_Moldworm_7.s" -gUnk_080CBCE8:: @ 080CBCE8 - .incbin "moldworm/gUnk_080CBCE8.bin" +gSpriteAnimations_Moldworm_8:: @ 080CBCE8 + .include "animations/gSpriteAnimations_Moldworm_8.s" -gUnk_080CBCEC:: @ 080CBCEC - .incbin "moldworm/gUnk_080CBCEC.bin" +gSpriteAnimations_Moldworm_9:: @ 080CBCEC + .include "animations/gSpriteAnimations_Moldworm_9.s" -gUnk_080CBCF0:: @ 080CBCF0 - .incbin "moldworm/gUnk_080CBCF0.bin" +gSpriteAnimations_Moldworm_10:: @ 080CBCF0 + .include "animations/gSpriteAnimations_Moldworm_10.s" -gUnk_080CBCF4:: @ 080CBCF4 - .incbin "moldworm/gUnk_080CBCF4.bin" +gSpriteAnimations_Moldworm_11:: @ 080CBCF4 + .include "animations/gSpriteAnimations_Moldworm_11.s" -gUnk_080CBCF8:: @ 080CBCF8 - .incbin "moldworm/gUnk_080CBCF8.bin" +gSpriteAnimations_Moldworm_12:: @ 080CBCF8 + .include "animations/gSpriteAnimations_Moldworm_12.s" -gUnk_080CBCFC:: @ 080CBCFC - .incbin "moldworm/gUnk_080CBCFC.bin" +gSpriteAnimations_Moldworm_13:: @ 080CBCFC + .include "animations/gSpriteAnimations_Moldworm_13.s" -gUnk_080CBD00:: @ 080CBD00 - .incbin "moldworm/gUnk_080CBD00.bin" +gSpriteAnimations_Moldworm_14:: @ 080CBD00 + .include "animations/gSpriteAnimations_Moldworm_14.s" -gUnk_080CBD04:: @ 080CBD04 - .incbin "moldworm/gUnk_080CBD04.bin" +gSpriteAnimations_Moldworm_15:: @ 080CBD04 + .include "animations/gSpriteAnimations_Moldworm_15.s" -gUnk_080CBD08:: @ 080CBD08 - .incbin "moldworm/gUnk_080CBD08.bin" +gSpriteAnimations_Moldworm_16:: @ 080CBD08 + .include "animations/gSpriteAnimations_Moldworm_16.s" -gUnk_080CBD0C:: @ 080CBD0C - .incbin "moldworm/gUnk_080CBD0C.bin" +gSpriteAnimations_Moldworm_17:: @ 080CBD0C + .include "animations/gSpriteAnimations_Moldworm_17.s" -gUnk_080CBD10:: @ 080CBD10 - .incbin "moldworm/gUnk_080CBD10.bin" +gSpriteAnimations_Moldworm_18:: @ 080CBD10 + .include "animations/gSpriteAnimations_Moldworm_18.s" -gUnk_080CBD14:: @ 080CBD14 - .incbin "moldworm/gUnk_080CBD14.bin" +gSpriteAnimations_Moldworm_19:: @ 080CBD14 + .include "animations/gSpriteAnimations_Moldworm_19.s" -gUnk_080CBD18:: @ 080CBD18 - .incbin "moldworm/gUnk_080CBD18.bin" +gSpriteAnimations_Moldworm_20:: @ 080CBD18 + .include "animations/gSpriteAnimations_Moldworm_20.s" -gUnk_080CBD1C:: @ 080CBD1C - .incbin "moldworm/gUnk_080CBD1C.bin" +gSpriteAnimations_Moldworm_21:: @ 080CBD1C + .include "animations/gSpriteAnimations_Moldworm_21.s" -gUnk_080CBD20:: @ 080CBD20 - .incbin "moldworm/gUnk_080CBD20.bin" +gSpriteAnimations_Moldworm_22:: @ 080CBD20 + .include "animations/gSpriteAnimations_Moldworm_22.s" -gUnk_080CBD4C:: @ 080CBD4C - .incbin "moldworm/gUnk_080CBD4C.bin" +gSpriteAnimations_Moldworm_23:: @ 080CBD4C + .include "animations/gSpriteAnimations_Moldworm_23.s" gSpriteAnimations_Moldworm:: @ 080CBD58 - .4byte gUnk_080CBCC8 - .4byte gUnk_080CBCCC - .4byte gUnk_080CBCD0 - .4byte gUnk_080CBCD4 - .4byte gUnk_080CBCD8 - .4byte gUnk_080CBCDC - .4byte gUnk_080CBCE0 - .4byte gUnk_080CBCE4 - .4byte gUnk_080CBCE8 - .4byte gUnk_080CBCEC - .4byte gUnk_080CBCF0 - .4byte gUnk_080CBCF4 - .4byte gUnk_080CBCF8 - .4byte gUnk_080CBCFC - .4byte gUnk_080CBD00 - .4byte gUnk_080CBD04 - .4byte gUnk_080CBD08 - .4byte gUnk_080CBD0C - .4byte gUnk_080CBD10 - .4byte gUnk_080CBD14 - .4byte gUnk_080CBD18 - .4byte gUnk_080CBD1C - .4byte gUnk_080CBD20 - .4byte gUnk_080CBD4C + .4byte gSpriteAnimations_Moldworm_0 + .4byte gSpriteAnimations_Moldworm_1 + .4byte gSpriteAnimations_Moldworm_2 + .4byte gSpriteAnimations_Moldworm_3 + .4byte gSpriteAnimations_Moldworm_4 + .4byte gSpriteAnimations_Moldworm_5 + .4byte gSpriteAnimations_Moldworm_6 + .4byte gSpriteAnimations_Moldworm_7 + .4byte gSpriteAnimations_Moldworm_8 + .4byte gSpriteAnimations_Moldworm_9 + .4byte gSpriteAnimations_Moldworm_10 + .4byte gSpriteAnimations_Moldworm_11 + .4byte gSpriteAnimations_Moldworm_12 + .4byte gSpriteAnimations_Moldworm_13 + .4byte gSpriteAnimations_Moldworm_14 + .4byte gSpriteAnimations_Moldworm_15 + .4byte gSpriteAnimations_Moldworm_16 + .4byte gSpriteAnimations_Moldworm_17 + .4byte gSpriteAnimations_Moldworm_18 + .4byte gSpriteAnimations_Moldworm_19 + .4byte gSpriteAnimations_Moldworm_20 + .4byte gSpriteAnimations_Moldworm_21 + .4byte gSpriteAnimations_Moldworm_22 + .4byte gSpriteAnimations_Moldworm_23 .4byte 00000000 diff --git a/data/animations/enemy/mulldozer.s b/data/animations/enemy/mulldozer.s index 22d64357..596e0914 100644 --- a/data/animations/enemy/mulldozer.s +++ b/data/animations/enemy/mulldozer.s @@ -4,53 +4,53 @@ .section .rodata @ .align 2 -gUnk_080CEA66:: @ 080CEA66 - .incbin "mulldozer/gUnk_080CEA66.bin" +gSpriteAnimations_Mulldozer_0:: @ 080CEA66 + .include "animations/gSpriteAnimations_Mulldozer_0.s" -gUnk_080CEA6B:: @ 080CEA6B - .incbin "mulldozer/gUnk_080CEA6B.bin" +gSpriteAnimations_Mulldozer_1:: @ 080CEA6B + .include "animations/gSpriteAnimations_Mulldozer_1.s" -gUnk_080CEA70:: @ 080CEA70 - .incbin "mulldozer/gUnk_080CEA70.bin" +gSpriteAnimations_Mulldozer_2:: @ 080CEA70 + .include "animations/gSpriteAnimations_Mulldozer_2.s" -gUnk_080CEA75:: @ 080CEA75 - .incbin "mulldozer/gUnk_080CEA75.bin" +gSpriteAnimations_Mulldozer_3:: @ 080CEA75 + .include "animations/gSpriteAnimations_Mulldozer_3.s" -gUnk_080CEA7A:: @ 080CEA7A - .incbin "mulldozer/gUnk_080CEA7A.bin" +gSpriteAnimations_Mulldozer_4:: @ 080CEA7A + .include "animations/gSpriteAnimations_Mulldozer_4.s" -gUnk_080CEA8B:: @ 080CEA8B - .incbin "mulldozer/gUnk_080CEA8B.bin" +gSpriteAnimations_Mulldozer_5:: @ 080CEA8B + .include "animations/gSpriteAnimations_Mulldozer_5.s" -gUnk_080CEA9C:: @ 080CEA9C - .incbin "mulldozer/gUnk_080CEA9C.bin" +gSpriteAnimations_Mulldozer_6:: @ 080CEA9C + .include "animations/gSpriteAnimations_Mulldozer_6.s" -gUnk_080CEAAD:: @ 080CEAAD - .incbin "mulldozer/gUnk_080CEAAD.bin" +gSpriteAnimations_Mulldozer_7:: @ 080CEAAD + .include "animations/gSpriteAnimations_Mulldozer_7.s" -gUnk_080CEABE:: @ 080CEABE - .incbin "mulldozer/gUnk_080CEABE.bin" +gSpriteAnimations_Mulldozer_8:: @ 080CEABE + .include "animations/gSpriteAnimations_Mulldozer_8.s" -gUnk_080CEACF:: @ 080CEACF - .incbin "mulldozer/gUnk_080CEACF.bin" +gSpriteAnimations_Mulldozer_9:: @ 080CEACF + .include "animations/gSpriteAnimations_Mulldozer_9.s" -gUnk_080CEAE0:: @ 080CEAE0 - .incbin "mulldozer/gUnk_080CEAE0.bin" +gSpriteAnimations_Mulldozer_10:: @ 080CEAE0 + .include "animations/gSpriteAnimations_Mulldozer_10.s" -gUnk_080CEAF1:: @ 080CEAF1 - .incbin "mulldozer/gUnk_080CEAF1.bin" +gSpriteAnimations_Mulldozer_11:: @ 080CEAF1 + .include "animations/gSpriteAnimations_Mulldozer_11.s" gSpriteAnimations_Mulldozer:: @ 080CEB04 - .4byte gUnk_080CEA66 - .4byte gUnk_080CEA6B - .4byte gUnk_080CEA70 - .4byte gUnk_080CEA75 - .4byte gUnk_080CEA7A - .4byte gUnk_080CEA8B - .4byte gUnk_080CEA9C - .4byte gUnk_080CEAAD - .4byte gUnk_080CEABE - .4byte gUnk_080CEACF - .4byte gUnk_080CEAE0 - .4byte gUnk_080CEAF1 + .4byte gSpriteAnimations_Mulldozer_0 + .4byte gSpriteAnimations_Mulldozer_1 + .4byte gSpriteAnimations_Mulldozer_2 + .4byte gSpriteAnimations_Mulldozer_3 + .4byte gSpriteAnimations_Mulldozer_4 + .4byte gSpriteAnimations_Mulldozer_5 + .4byte gSpriteAnimations_Mulldozer_6 + .4byte gSpriteAnimations_Mulldozer_7 + .4byte gSpriteAnimations_Mulldozer_8 + .4byte gSpriteAnimations_Mulldozer_9 + .4byte gSpriteAnimations_Mulldozer_10 + .4byte gSpriteAnimations_Mulldozer_11 .4byte 00000000 diff --git a/data/animations/enemy/octorok.s b/data/animations/enemy/octorok.s index f3df634a..8c9810d3 100644 --- a/data/animations/enemy/octorok.s +++ b/data/animations/enemy/octorok.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_080CA180:: @ 080CA180 - .incbin "octorok/gUnk_080CA180.bin" +gSpriteAnimations_Octorok_0:: @ 080CA180 + .include "animations/gSpriteAnimations_Octorok_0.s" -gUnk_080CA189:: @ 080CA189 - .incbin "octorok/gUnk_080CA189.bin" +gSpriteAnimations_Octorok_1:: @ 080CA189 + .include "animations/gSpriteAnimations_Octorok_1.s" -gUnk_080CA192:: @ 080CA192 - .incbin "octorok/gUnk_080CA192.bin" +gSpriteAnimations_Octorok_2:: @ 080CA192 + .include "animations/gSpriteAnimations_Octorok_2.s" -gUnk_080CA19B:: @ 080CA19B - .incbin "octorok/gUnk_080CA19B.bin" +gSpriteAnimations_Octorok_3:: @ 080CA19B + .include "animations/gSpriteAnimations_Octorok_3.s" -gUnk_080CA1A4:: @ 080CA1A4 - .incbin "octorok/gUnk_080CA1A4.bin" +gSpriteAnimations_Octorok_4:: @ 080CA1A4 + .include "animations/gSpriteAnimations_Octorok_4.s" -gUnk_080CA1B9:: @ 080CA1B9 - .incbin "octorok/gUnk_080CA1B9.bin" +gSpriteAnimations_Octorok_5:: @ 080CA1B9 + .include "animations/gSpriteAnimations_Octorok_5.s" -gUnk_080CA1CE:: @ 080CA1CE - .incbin "octorok/gUnk_080CA1CE.bin" +gSpriteAnimations_Octorok_6:: @ 080CA1CE + .include "animations/gSpriteAnimations_Octorok_6.s" -gUnk_080CA1E3:: @ 080CA1E3 - .incbin "octorok/gUnk_080CA1E3.bin" +gSpriteAnimations_Octorok_7:: @ 080CA1E3 + .include "animations/gSpriteAnimations_Octorok_7.s" gSpriteAnimations_Octorok:: @ 080CA1F8 - .4byte gUnk_080CA180 - .4byte gUnk_080CA189 - .4byte gUnk_080CA192 - .4byte gUnk_080CA19B - .4byte gUnk_080CA1A4 - .4byte gUnk_080CA1B9 - .4byte gUnk_080CA1CE - .4byte gUnk_080CA1E3 + .4byte gSpriteAnimations_Octorok_0 + .4byte gSpriteAnimations_Octorok_1 + .4byte gSpriteAnimations_Octorok_2 + .4byte gSpriteAnimations_Octorok_3 + .4byte gSpriteAnimations_Octorok_4 + .4byte gSpriteAnimations_Octorok_5 + .4byte gSpriteAnimations_Octorok_6 + .4byte gSpriteAnimations_Octorok_7 .4byte 00000000 diff --git a/data/animations/enemy/octorokBoss.s b/data/animations/enemy/octorokBoss.s index 9133c8bc..225d890a 100644 --- a/data/animations/enemy/octorokBoss.s +++ b/data/animations/enemy/octorokBoss.s @@ -4,64 +4,64 @@ .section .rodata .align 2 -gUnk_080CF14C:: @ 080CF14C - .incbin "octorokBoss/gUnk_080CF14C.bin" +gSpriteAnimations_OctorokBoss_1_0:: @ 080CF14C + .include "animations/gSpriteAnimations_OctorokBoss_1_0.s" -gUnk_080CF150:: @ 080CF150 - .incbin "octorokBoss/gUnk_080CF150.bin" +gSpriteAnimations_OctorokBoss_1_1:: @ 080CF150 + .include "animations/gSpriteAnimations_OctorokBoss_1_1.s" -gUnk_080CF154:: @ 080CF154 - .incbin "octorokBoss/gUnk_080CF154.bin" +gSpriteAnimations_OctorokBoss_1_2:: @ 080CF154 + .include "animations/gSpriteAnimations_OctorokBoss_1_2.s" -gUnk_080CF158:: @ 080CF158 - .incbin "octorokBoss/gUnk_080CF158.bin" +gSpriteAnimations_OctorokBoss_0_1:: @ 080CF158 + .include "animations/gSpriteAnimations_OctorokBoss_0_1.s" -gUnk_080CF16D:: @ 080CF16D - .incbin "octorokBoss/gUnk_080CF16D.bin" +gSpriteAnimations_OctorokBoss_0_2:: @ 080CF16D + .include "animations/gSpriteAnimations_OctorokBoss_0_2.s" -gUnk_080CF182:: @ 080CF182 - .incbin "octorokBoss/gUnk_080CF182.bin" +gSpriteAnimations_OctorokBoss_1_3:: @ 080CF182 + .include "animations/gSpriteAnimations_OctorokBoss_1_3.s" -gUnk_080CF186:: @ 080CF186 - .incbin "octorokBoss/gUnk_080CF186.bin" +gSpriteAnimations_OctorokBoss_0_0:: @ 080CF186 + .include "animations/gSpriteAnimations_OctorokBoss_0_0.s" -gUnk_080CF197:: @ 080CF197 - .incbin "octorokBoss/gUnk_080CF197.bin" +gSpriteAnimations_OctorokBoss_1_4:: @ 080CF197 + .include "animations/gSpriteAnimations_OctorokBoss_1_4.s" -gUnk_080CF1AC:: @ 080CF1AC - .incbin "octorokBoss/gUnk_080CF1AC.bin" +gSpriteAnimations_OctorokBoss_1_5:: @ 080CF1AC + .include "animations/gSpriteAnimations_OctorokBoss_1_5.s" -gUnk_080CF1BD:: @ 080CF1BD - .incbin "octorokBoss/gUnk_080CF1BD.bin" +gSpriteAnimations_OctorokBoss_1_6:: @ 080CF1BD + .include "animations/gSpriteAnimations_OctorokBoss_1_6.s" -gUnk_080CF1DD:: @ 080CF1DD - .incbin "octorokBoss/gUnk_080CF1DD.bin" +gSpriteAnimations_OctorokBoss_1_7:: @ 080CF1DD + .include "animations/gSpriteAnimations_OctorokBoss_1_7.s" -gUnk_080CF1E2:: @ 080CF1E2 - .incbin "octorokBoss/gUnk_080CF1E2.bin" +gSpriteAnimations_OctorokBoss_1_8:: @ 080CF1E2 + .include "animations/gSpriteAnimations_OctorokBoss_1_8.s" -gUnk_080CF1FB:: @ 080CF1FB - .incbin "octorokBoss/gUnk_080CF1FB.bin" +gSpriteAnimations_OctorokBoss_1_9:: @ 080CF1FB + .include "animations/gSpriteAnimations_OctorokBoss_1_9.s" -gUnk_080CF1FF:: @ 080CF1FF - .incbin "octorokBoss/gUnk_080CF1FF.bin" +gSpriteAnimations_OctorokBoss_1_10:: @ 080CF1FF + .include "animations/gSpriteAnimations_OctorokBoss_1_10.s" gSpriteAnimations_OctorokBoss_1:: @ 080CF204 - .4byte gUnk_080CF14C - .4byte gUnk_080CF150 - .4byte gUnk_080CF154 - .4byte gUnk_080CF182 - .4byte gUnk_080CF197 - .4byte gUnk_080CF1AC - .4byte gUnk_080CF1BD - .4byte gUnk_080CF1DD - .4byte gUnk_080CF1E2 - .4byte gUnk_080CF1FB - .4byte gUnk_080CF1FF + .4byte gSpriteAnimations_OctorokBoss_1_0 + .4byte gSpriteAnimations_OctorokBoss_1_1 + .4byte gSpriteAnimations_OctorokBoss_1_2 + .4byte gSpriteAnimations_OctorokBoss_1_3 + .4byte gSpriteAnimations_OctorokBoss_1_4 + .4byte gSpriteAnimations_OctorokBoss_1_5 + .4byte gSpriteAnimations_OctorokBoss_1_6 + .4byte gSpriteAnimations_OctorokBoss_1_7 + .4byte gSpriteAnimations_OctorokBoss_1_8 + .4byte gSpriteAnimations_OctorokBoss_1_9 + .4byte gSpriteAnimations_OctorokBoss_1_10 .4byte 00000000 gSpriteAnimations_OctorokBoss_0:: @ 080CF234 - .4byte gUnk_080CF186 - .4byte gUnk_080CF158 - .4byte gUnk_080CF16D + .4byte gSpriteAnimations_OctorokBoss_0_0 + .4byte gSpriteAnimations_OctorokBoss_0_1 + .4byte gSpriteAnimations_OctorokBoss_0_2 .4byte 00000000 diff --git a/data/animations/enemy/peahat.s b/data/animations/enemy/peahat.s index b4b86e78..dd98efe6 100644 --- a/data/animations/enemy/peahat.s +++ b/data/animations/enemy/peahat.s @@ -7,29 +7,29 @@ gUnk_080CA5D4:: @ 080CA5D4 .incbin "peahat/gUnk_080CA5D4.bin" -gUnk_080CA5D6:: @ 080CA5D6 - .incbin "peahat/gUnk_080CA5D6.bin" +gSpriteAnimations_Peahat_0:: @ 080CA5D6 + .include "animations/gSpriteAnimations_Peahat_0.s" -gUnk_080CA5E7:: @ 080CA5E7 - .incbin "peahat/gUnk_080CA5E7.bin" +gSpriteAnimations_Peahat_1:: @ 080CA5E7 + .include "animations/gSpriteAnimations_Peahat_1.s" -gUnk_080CA5F8:: @ 080CA5F8 - .incbin "peahat/gUnk_080CA5F8.bin" +gSpriteAnimations_Peahat_2:: @ 080CA5F8 + .include "animations/gSpriteAnimations_Peahat_2.s" -gUnk_080CA615:: @ 080CA615 - .incbin "peahat/gUnk_080CA615.bin" +gSpriteAnimations_Peahat_3:: @ 080CA615 + .include "animations/gSpriteAnimations_Peahat_3.s" -gUnk_080CA626:: @ 080CA626 - .incbin "peahat/gUnk_080CA626.bin" +gSpriteAnimations_Peahat_4:: @ 080CA626 + .include "animations/gSpriteAnimations_Peahat_4.s" -gUnk_080CA63A:: @ 080CA63A - .incbin "peahat/gUnk_080CA63A.bin" +gSpriteAnimations_Peahat_5:: @ 080CA63A + .include "animations/gSpriteAnimations_Peahat_5.s" gSpriteAnimations_Peahat:: @ 080CA650 - .4byte gUnk_080CA5D6 - .4byte gUnk_080CA5E7 - .4byte gUnk_080CA5F8 - .4byte gUnk_080CA615 - .4byte gUnk_080CA626 - .4byte gUnk_080CA63A + .4byte gSpriteAnimations_Peahat_0 + .4byte gSpriteAnimations_Peahat_1 + .4byte gSpriteAnimations_Peahat_2 + .4byte gSpriteAnimations_Peahat_3 + .4byte gSpriteAnimations_Peahat_4 + .4byte gSpriteAnimations_Peahat_5 .4byte 00000000 diff --git a/data/animations/enemy/pesto.s b/data/animations/enemy/pesto.s index 66c9efed..af91019e 100644 --- a/data/animations/enemy/pesto.s +++ b/data/animations/enemy/pesto.s @@ -3,37 +3,37 @@ .section .rodata -gUnk_080CBF30:: @ 080CBF30 - .incbin "pesto/gUnk_080CBF30.bin" +gSpriteAnimations_Pesto_0:: @ 080CBF30 + .include "animations/gSpriteAnimations_Pesto_0.s" -gUnk_080CBF39:: @ 080CBF39 - .incbin "pesto/gUnk_080CBF39.bin" +gSpriteAnimations_Pesto_1:: @ 080CBF39 + .include "animations/gSpriteAnimations_Pesto_1.s" -gUnk_080CBF42:: @ 080CBF42 - .incbin "pesto/gUnk_080CBF42.bin" +gSpriteAnimations_Pesto_2:: @ 080CBF42 + .include "animations/gSpriteAnimations_Pesto_2.s" -gUnk_080CBF4B:: @ 080CBF4B - .incbin "pesto/gUnk_080CBF4B.bin" +gSpriteAnimations_Pesto_3:: @ 080CBF4B + .include "animations/gSpriteAnimations_Pesto_3.s" -gUnk_080CBF54:: @ 080CBF54 - .incbin "pesto/gUnk_080CBF54.bin" +gSpriteAnimations_Pesto_4:: @ 080CBF54 + .include "animations/gSpriteAnimations_Pesto_4.s" -gUnk_080CBF5D:: @ 080CBF5D - .incbin "pesto/gUnk_080CBF5D.bin" +gSpriteAnimations_Pesto_5:: @ 080CBF5D + .include "animations/gSpriteAnimations_Pesto_5.s" -gUnk_080CBF66:: @ 080CBF66 - .incbin "pesto/gUnk_080CBF66.bin" +gSpriteAnimations_Pesto_6:: @ 080CBF66 + .include "animations/gSpriteAnimations_Pesto_6.s" -gUnk_080CBF6F:: @ 080CBF6F - .incbin "pesto/gUnk_080CBF6F.bin" +gSpriteAnimations_Pesto_7:: @ 080CBF6F + .include "animations/gSpriteAnimations_Pesto_7.s" gSpriteAnimations_Pesto:: @ 080CBF78 - .4byte gUnk_080CBF30 - .4byte gUnk_080CBF39 - .4byte gUnk_080CBF42 - .4byte gUnk_080CBF4B - .4byte gUnk_080CBF54 - .4byte gUnk_080CBF5D - .4byte gUnk_080CBF66 - .4byte gUnk_080CBF6F + .4byte gSpriteAnimations_Pesto_0 + .4byte gSpriteAnimations_Pesto_1 + .4byte gSpriteAnimations_Pesto_2 + .4byte gSpriteAnimations_Pesto_3 + .4byte gSpriteAnimations_Pesto_4 + .4byte gSpriteAnimations_Pesto_5 + .4byte gSpriteAnimations_Pesto_6 + .4byte gSpriteAnimations_Pesto_7 .4byte 00000000 diff --git a/data/animations/enemy/puffstool.s b/data/animations/enemy/puffstool.s index e8d45ac0..55a6b596 100644 --- a/data/animations/enemy/puffstool.s +++ b/data/animations/enemy/puffstool.s @@ -3,42 +3,42 @@ .section .rodata -gUnk_080CC0CA:: @ 080CC0CA - .incbin "puffstool/gUnk_080CC0CA.bin" +gSpriteAnimations_Puffstool_0:: @ 080CC0CA + .include "animations/gSpriteAnimations_Puffstool_0.s" -gUnk_080CC10B:: @ 080CC10B - .incbin "puffstool/gUnk_080CC10B.bin" +gSpriteAnimations_Puffstool_1:: @ 080CC10B + .include "animations/gSpriteAnimations_Puffstool_1.s" -gUnk_080CC118:: @ 080CC118 - .incbin "puffstool/gUnk_080CC118.bin" +gSpriteAnimations_Puffstool_2:: @ 080CC118 + .include "animations/gSpriteAnimations_Puffstool_2.s" -gUnk_080CC121:: @ 080CC121 - .incbin "puffstool/gUnk_080CC121.bin" +gSpriteAnimations_Puffstool_3:: @ 080CC121 + .include "animations/gSpriteAnimations_Puffstool_3.s" -gUnk_080CC131:: @ 080CC131 - .incbin "puffstool/gUnk_080CC131.bin" +gSpriteAnimations_Puffstool_4:: @ 080CC131 + .include "animations/gSpriteAnimations_Puffstool_4.s" -gUnk_080CC13E:: @ 080CC13E - .incbin "puffstool/gUnk_080CC13E.bin" +gSpriteAnimations_Puffstool_5:: @ 080CC13E + .include "animations/gSpriteAnimations_Puffstool_5.s" -gUnk_080CC14B:: @ 080CC14B - .incbin "puffstool/gUnk_080CC14B.bin" +gSpriteAnimations_Puffstool_6:: @ 080CC14B + .include "animations/gSpriteAnimations_Puffstool_6.s" -gUnk_080CC158:: @ 080CC158 - .incbin "puffstool/gUnk_080CC158.bin" +gSpriteAnimations_Puffstool_7:: @ 080CC158 + .include "animations/gSpriteAnimations_Puffstool_7.s" -gUnk_080CC165:: @ 080CC165 - .incbin "puffstool/gUnk_080CC165.bin" +gSpriteAnimations_Puffstool_8:: @ 080CC165 + .include "animations/gSpriteAnimations_Puffstool_8.s" gSpriteAnimations_Puffstool:: @ 080CC174 - .4byte gUnk_080CC0CA - .4byte gUnk_080CC10B - .4byte gUnk_080CC118 - .4byte gUnk_080CC121 - .4byte gUnk_080CC131 - .4byte gUnk_080CC13E - .4byte gUnk_080CC14B - .4byte gUnk_080CC158 - .4byte gUnk_080CC165 + .4byte gSpriteAnimations_Puffstool_0 + .4byte gSpriteAnimations_Puffstool_1 + .4byte gSpriteAnimations_Puffstool_2 + .4byte gSpriteAnimations_Puffstool_3 + .4byte gSpriteAnimations_Puffstool_4 + .4byte gSpriteAnimations_Puffstool_5 + .4byte gSpriteAnimations_Puffstool_6 + .4byte gSpriteAnimations_Puffstool_7 + .4byte gSpriteAnimations_Puffstool_8 .4byte 00000000 diff --git a/data/animations/enemy/rockChuchu.s b/data/animations/enemy/rockChuchu.s index 31a5677c..7cf2d55c 100644 --- a/data/animations/enemy/rockChuchu.s +++ b/data/animations/enemy/rockChuchu.s @@ -3,17 +3,17 @@ .section .rodata -gUnk_080CB96C:: @ 080CB96C - .incbin "rockChuchu/gUnk_080CB96C.bin" +gSpriteAnimations_RockChuchu_0:: @ 080CB96C + .include "animations/gSpriteAnimations_RockChuchu_0.s" -gUnk_080CB995:: @ 080CB995 - .incbin "rockChuchu/gUnk_080CB995.bin" +gSpriteAnimations_RockChuchu_1:: @ 080CB995 + .include "animations/gSpriteAnimations_RockChuchu_1.s" -gUnk_080CB9D6:: @ 080CB9D6 - .incbin "rockChuchu/gUnk_080CB9D6.bin" +gSpriteAnimations_RockChuchu_2:: @ 080CB9D6 + .include "animations/gSpriteAnimations_RockChuchu_2.s" gSpriteAnimations_RockChuchu:: @ 080CBA18 - .4byte gUnk_080CB96C - .4byte gUnk_080CB995 - .4byte gUnk_080CB9D6 + .4byte gSpriteAnimations_RockChuchu_0 + .4byte gSpriteAnimations_RockChuchu_1 + .4byte gSpriteAnimations_RockChuchu_2 .4byte 00000000 diff --git a/data/animations/enemy/rollobite.s b/data/animations/enemy/rollobite.s index f6e8b81c..fc6af82d 100644 --- a/data/animations/enemy/rollobite.s +++ b/data/animations/enemy/rollobite.s @@ -7,101 +7,101 @@ gUnk_080CA6D4:: @ 080CA6D4 .incbin "rollobite/gUnk_080CA6D4.bin" -gUnk_080CA6D7:: @ 080CA6D7 - .incbin "rollobite/gUnk_080CA6D7.bin" +gSpriteAnimations_Rollobite_0:: @ 080CA6D7 + .include "animations/gSpriteAnimations_Rollobite_0.s" -gUnk_080CA6F8:: @ 080CA6F8 - .incbin "rollobite/gUnk_080CA6F8.bin" +gSpriteAnimations_Rollobite_1:: @ 080CA6F8 + .include "animations/gSpriteAnimations_Rollobite_1.s" -gUnk_080CA719:: @ 080CA719 - .incbin "rollobite/gUnk_080CA719.bin" +gSpriteAnimations_Rollobite_2:: @ 080CA719 + .include "animations/gSpriteAnimations_Rollobite_2.s" -gUnk_080CA73A:: @ 080CA73A - .incbin "rollobite/gUnk_080CA73A.bin" +gSpriteAnimations_Rollobite_3:: @ 080CA73A + .include "animations/gSpriteAnimations_Rollobite_3.s" -gUnk_080CA75B:: @ 080CA75B - .incbin "rollobite/gUnk_080CA75B.bin" +gSpriteAnimations_Rollobite_4:: @ 080CA75B + .include "animations/gSpriteAnimations_Rollobite_4.s" -gUnk_080CA76C:: @ 080CA76C - .incbin "rollobite/gUnk_080CA76C.bin" +gSpriteAnimations_Rollobite_5:: @ 080CA76C + .include "animations/gSpriteAnimations_Rollobite_5.s" -gUnk_080CA77D:: @ 080CA77D - .incbin "rollobite/gUnk_080CA77D.bin" +gSpriteAnimations_Rollobite_6:: @ 080CA77D + .include "animations/gSpriteAnimations_Rollobite_6.s" -gUnk_080CA78E:: @ 080CA78E - .incbin "rollobite/gUnk_080CA78E.bin" +gSpriteAnimations_Rollobite_7:: @ 080CA78E + .include "animations/gSpriteAnimations_Rollobite_7.s" -gUnk_080CA79F:: @ 080CA79F - .incbin "rollobite/gUnk_080CA79F.bin" +gSpriteAnimations_Rollobite_12:: @ 080CA79F + .include "animations/gSpriteAnimations_Rollobite_12.s" -gUnk_080CA7F7:: @ 080CA7F7 - .incbin "rollobite/gUnk_080CA7F7.bin" +gSpriteAnimations_Rollobite_13:: @ 080CA7F7 + .include "animations/gSpriteAnimations_Rollobite_13.s" -gUnk_080CA84F:: @ 080CA84F - .incbin "rollobite/gUnk_080CA84F.bin" +gSpriteAnimations_Rollobite_14:: @ 080CA84F + .include "animations/gSpriteAnimations_Rollobite_14.s" -gUnk_080CA8A7:: @ 080CA8A7 - .incbin "rollobite/gUnk_080CA8A7.bin" +gSpriteAnimations_Rollobite_15:: @ 080CA8A7 + .include "animations/gSpriteAnimations_Rollobite_15.s" -gUnk_080CA8FF:: @ 080CA8FF - .incbin "rollobite/gUnk_080CA8FF.bin" +gSpriteAnimations_Rollobite_8:: @ 080CA8FF + .include "animations/gSpriteAnimations_Rollobite_8.s" -gUnk_080CA907:: @ 080CA907 - .incbin "rollobite/gUnk_080CA907.bin" +gSpriteAnimations_Rollobite_9:: @ 080CA907 + .include "animations/gSpriteAnimations_Rollobite_9.s" -gUnk_080CA90F:: @ 080CA90F - .incbin "rollobite/gUnk_080CA90F.bin" +gSpriteAnimations_Rollobite_10:: @ 080CA90F + .include "animations/gSpriteAnimations_Rollobite_10.s" -gUnk_080CA917:: @ 080CA917 - .incbin "rollobite/gUnk_080CA917.bin" +gSpriteAnimations_Rollobite_11:: @ 080CA917 + .include "animations/gSpriteAnimations_Rollobite_11.s" -gUnk_080CA91F:: @ 080CA91F - .incbin "rollobite/gUnk_080CA91F.bin" +gSpriteAnimations_Rollobite_16:: @ 080CA91F + .include "animations/gSpriteAnimations_Rollobite_16.s" -gUnk_080CA923:: @ 080CA923 - .incbin "rollobite/gUnk_080CA923.bin" +gSpriteAnimations_Rollobite_17:: @ 080CA923 + .include "animations/gSpriteAnimations_Rollobite_17.s" -gUnk_080CA927:: @ 080CA927 - .incbin "rollobite/gUnk_080CA927.bin" +gSpriteAnimations_Rollobite_18:: @ 080CA927 + .include "animations/gSpriteAnimations_Rollobite_18.s" -gUnk_080CA92B:: @ 080CA92B - .incbin "rollobite/gUnk_080CA92B.bin" +gSpriteAnimations_Rollobite_19:: @ 080CA92B + .include "animations/gSpriteAnimations_Rollobite_19.s" -gUnk_080CA92F:: @ 080CA92F - .incbin "rollobite/gUnk_080CA92F.bin" +gSpriteAnimations_Rollobite_20:: @ 080CA92F + .include "animations/gSpriteAnimations_Rollobite_20.s" -gUnk_080CA970:: @ 080CA970 - .incbin "rollobite/gUnk_080CA970.bin" +gSpriteAnimations_Rollobite_21:: @ 080CA970 + .include "animations/gSpriteAnimations_Rollobite_21.s" -gUnk_080CA9B1:: @ 080CA9B1 - .incbin "rollobite/gUnk_080CA9B1.bin" +gSpriteAnimations_Rollobite_22:: @ 080CA9B1 + .include "animations/gSpriteAnimations_Rollobite_22.s" -gUnk_080CA9F2:: @ 080CA9F2 - .incbin "rollobite/gUnk_080CA9F2.bin" +gSpriteAnimations_Rollobite_23:: @ 080CA9F2 + .include "animations/gSpriteAnimations_Rollobite_23.s" gSpriteAnimations_Rollobite:: @ 080CAA34 - .4byte gUnk_080CA6D7 - .4byte gUnk_080CA6F8 - .4byte gUnk_080CA719 - .4byte gUnk_080CA73A - .4byte gUnk_080CA75B - .4byte gUnk_080CA76C - .4byte gUnk_080CA77D - .4byte gUnk_080CA78E - .4byte gUnk_080CA8FF - .4byte gUnk_080CA907 - .4byte gUnk_080CA90F - .4byte gUnk_080CA917 - .4byte gUnk_080CA79F - .4byte gUnk_080CA7F7 - .4byte gUnk_080CA84F - .4byte gUnk_080CA8A7 - .4byte gUnk_080CA91F - .4byte gUnk_080CA923 - .4byte gUnk_080CA927 - .4byte gUnk_080CA92B - .4byte gUnk_080CA92F - .4byte gUnk_080CA970 - .4byte gUnk_080CA9B1 - .4byte gUnk_080CA9F2 + .4byte gSpriteAnimations_Rollobite_0 + .4byte gSpriteAnimations_Rollobite_1 + .4byte gSpriteAnimations_Rollobite_2 + .4byte gSpriteAnimations_Rollobite_3 + .4byte gSpriteAnimations_Rollobite_4 + .4byte gSpriteAnimations_Rollobite_5 + .4byte gSpriteAnimations_Rollobite_6 + .4byte gSpriteAnimations_Rollobite_7 + .4byte gSpriteAnimations_Rollobite_8 + .4byte gSpriteAnimations_Rollobite_9 + .4byte gSpriteAnimations_Rollobite_10 + .4byte gSpriteAnimations_Rollobite_11 + .4byte gSpriteAnimations_Rollobite_12 + .4byte gSpriteAnimations_Rollobite_13 + .4byte gSpriteAnimations_Rollobite_14 + .4byte gSpriteAnimations_Rollobite_15 + .4byte gSpriteAnimations_Rollobite_16 + .4byte gSpriteAnimations_Rollobite_17 + .4byte gSpriteAnimations_Rollobite_18 + .4byte gSpriteAnimations_Rollobite_19 + .4byte gSpriteAnimations_Rollobite_20 + .4byte gSpriteAnimations_Rollobite_21 + .4byte gSpriteAnimations_Rollobite_22 + .4byte gSpriteAnimations_Rollobite_23 .4byte 00000000 diff --git a/data/animations/enemy/rope.s b/data/animations/enemy/rope.s index 530897bd..5a403d6c 100644 --- a/data/animations/enemy/rope.s +++ b/data/animations/enemy/rope.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_080CE47C:: @ 080CE47C - .incbin "rope/gUnk_080CE47C.bin" +gSpriteAnimations_Rope_0:: @ 080CE47C + .include "animations/gSpriteAnimations_Rope_0.s" -gUnk_080CE48D:: @ 080CE48D - .incbin "rope/gUnk_080CE48D.bin" +gSpriteAnimations_Rope_1:: @ 080CE48D + .include "animations/gSpriteAnimations_Rope_1.s" -gUnk_080CE49E:: @ 080CE49E - .incbin "rope/gUnk_080CE49E.bin" +gSpriteAnimations_Rope_2:: @ 080CE49E + .include "animations/gSpriteAnimations_Rope_2.s" -gUnk_080CE4AF:: @ 080CE4AF - .incbin "rope/gUnk_080CE4AF.bin" +gSpriteAnimations_Rope_3:: @ 080CE4AF + .include "animations/gSpriteAnimations_Rope_3.s" -gUnk_080CE4C0:: @ 080CE4C0 - .incbin "rope/gUnk_080CE4C0.bin" +gSpriteAnimations_Rope_4:: @ 080CE4C0 + .include "animations/gSpriteAnimations_Rope_4.s" -gUnk_080CE4D1:: @ 080CE4D1 - .incbin "rope/gUnk_080CE4D1.bin" +gSpriteAnimations_Rope_5:: @ 080CE4D1 + .include "animations/gSpriteAnimations_Rope_5.s" -gUnk_080CE4E2:: @ 080CE4E2 - .incbin "rope/gUnk_080CE4E2.bin" +gSpriteAnimations_Rope_6:: @ 080CE4E2 + .include "animations/gSpriteAnimations_Rope_6.s" -gUnk_080CE4F3:: @ 080CE4F3 - .incbin "rope/gUnk_080CE4F3.bin" +gSpriteAnimations_Rope_7:: @ 080CE4F3 + .include "animations/gSpriteAnimations_Rope_7.s" gSpriteAnimations_Rope:: @ 080CE50C - .4byte gUnk_080CE47C - .4byte gUnk_080CE48D - .4byte gUnk_080CE49E - .4byte gUnk_080CE4AF - .4byte gUnk_080CE4C0 - .4byte gUnk_080CE4D1 - .4byte gUnk_080CE4E2 - .4byte gUnk_080CE4F3 + .4byte gSpriteAnimations_Rope_0 + .4byte gSpriteAnimations_Rope_1 + .4byte gSpriteAnimations_Rope_2 + .4byte gSpriteAnimations_Rope_3 + .4byte gSpriteAnimations_Rope_4 + .4byte gSpriteAnimations_Rope_5 + .4byte gSpriteAnimations_Rope_6 + .4byte gSpriteAnimations_Rope_7 .4byte 00000000 diff --git a/data/animations/enemy/rupeeLike.s b/data/animations/enemy/rupeeLike.s index 2c085f55..b613ae8a 100644 --- a/data/animations/enemy/rupeeLike.s +++ b/data/animations/enemy/rupeeLike.s @@ -3,37 +3,37 @@ .section .rodata -gUnk_080CCC4A:: @ 080CCC4A - .incbin "rupeeLike/gUnk_080CCC4A.bin" +gSpriteAnimations_RupeeLike_0:: @ 080CCC4A + .include "animations/gSpriteAnimations_RupeeLike_0.s" -gUnk_080CCC5F:: @ 080CCC5F - .incbin "rupeeLike/gUnk_080CCC5F.bin" +gSpriteAnimations_RupeeLike_1:: @ 080CCC5F + .include "animations/gSpriteAnimations_RupeeLike_1.s" -gUnk_080CCC74:: @ 080CCC74 - .incbin "rupeeLike/gUnk_080CCC74.bin" +gSpriteAnimations_RupeeLike_2:: @ 080CCC74 + .include "animations/gSpriteAnimations_RupeeLike_2.s" -gUnk_080CCC9C:: @ 080CCC9C - .incbin "rupeeLike/gUnk_080CCC9C.bin" +gSpriteAnimations_RupeeLike_3:: @ 080CCC9C + .include "animations/gSpriteAnimations_RupeeLike_3.s" -gUnk_080CCCB4:: @ 080CCCB4 - .incbin "rupeeLike/gUnk_080CCCB4.bin" +gSpriteAnimations_RupeeLike_4:: @ 080CCCB4 + .include "animations/gSpriteAnimations_RupeeLike_4.s" -gUnk_080CCCC9:: @ 080CCCC9 - .incbin "rupeeLike/gUnk_080CCCC9.bin" +gSpriteAnimations_RupeeLike_5:: @ 080CCCC9 + .include "animations/gSpriteAnimations_RupeeLike_5.s" -gUnk_080CCCDE:: @ 080CCCDE - .incbin "rupeeLike/gUnk_080CCCDE.bin" +gSpriteAnimations_RupeeLike_6:: @ 080CCCDE + .include "animations/gSpriteAnimations_RupeeLike_6.s" -gUnk_080CCD06:: @ 080CCD06 - .incbin "rupeeLike/gUnk_080CCD06.bin" +gSpriteAnimations_RupeeLike_7:: @ 080CCD06 + .include "animations/gSpriteAnimations_RupeeLike_7.s" gSpriteAnimations_RupeeLike:: @ 080CCD20 - .4byte gUnk_080CCC4A - .4byte gUnk_080CCC5F - .4byte gUnk_080CCC74 - .4byte gUnk_080CCC9C - .4byte gUnk_080CCCB4 - .4byte gUnk_080CCCC9 - .4byte gUnk_080CCCDE - .4byte gUnk_080CCD06 + .4byte gSpriteAnimations_RupeeLike_0 + .4byte gSpriteAnimations_RupeeLike_1 + .4byte gSpriteAnimations_RupeeLike_2 + .4byte gSpriteAnimations_RupeeLike_3 + .4byte gSpriteAnimations_RupeeLike_4 + .4byte gSpriteAnimations_RupeeLike_5 + .4byte gSpriteAnimations_RupeeLike_6 + .4byte gSpriteAnimations_RupeeLike_7 .4byte 00000000 diff --git a/data/animations/enemy/scissorsBeetle.s b/data/animations/enemy/scissorsBeetle.s index d3b95abe..0af2acb0 100644 --- a/data/animations/enemy/scissorsBeetle.s +++ b/data/animations/enemy/scissorsBeetle.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_080CF644:: @ 080CF644 - .incbin "scissorsBeetle/gUnk_080CF644.bin" +gSpriteAnimations_ScissorsBeetle_0:: @ 080CF644 + .include "animations/gSpriteAnimations_ScissorsBeetle_0.s" -gUnk_080CF649:: @ 080CF649 - .incbin "scissorsBeetle/gUnk_080CF649.bin" +gSpriteAnimations_ScissorsBeetle_1:: @ 080CF649 + .include "animations/gSpriteAnimations_ScissorsBeetle_1.s" -gUnk_080CF64E:: @ 080CF64E - .incbin "scissorsBeetle/gUnk_080CF64E.bin" +gSpriteAnimations_ScissorsBeetle_2:: @ 080CF64E + .include "animations/gSpriteAnimations_ScissorsBeetle_2.s" -gUnk_080CF653:: @ 080CF653 - .incbin "scissorsBeetle/gUnk_080CF653.bin" +gSpriteAnimations_ScissorsBeetle_3:: @ 080CF653 + .include "animations/gSpriteAnimations_ScissorsBeetle_3.s" -gUnk_080CF658:: @ 080CF658 - .incbin "scissorsBeetle/gUnk_080CF658.bin" +gSpriteAnimations_ScissorsBeetle_4:: @ 080CF658 + .include "animations/gSpriteAnimations_ScissorsBeetle_4.s" -gUnk_080CF669:: @ 080CF669 - .incbin "scissorsBeetle/gUnk_080CF669.bin" +gSpriteAnimations_ScissorsBeetle_5:: @ 080CF669 + .include "animations/gSpriteAnimations_ScissorsBeetle_5.s" -gUnk_080CF67A:: @ 080CF67A - .incbin "scissorsBeetle/gUnk_080CF67A.bin" +gSpriteAnimations_ScissorsBeetle_6:: @ 080CF67A + .include "animations/gSpriteAnimations_ScissorsBeetle_6.s" -gUnk_080CF68B:: @ 080CF68B - .incbin "scissorsBeetle/gUnk_080CF68B.bin" +gSpriteAnimations_ScissorsBeetle_7:: @ 080CF68B + .include "animations/gSpriteAnimations_ScissorsBeetle_7.s" -gUnk_080CF69C:: @ 080CF69C - .incbin "scissorsBeetle/gUnk_080CF69C.bin" +gSpriteAnimations_ScissorsBeetle_8:: @ 080CF69C + .include "animations/gSpriteAnimations_ScissorsBeetle_8.s" -gUnk_080CF6A1:: @ 080CF6A1 - .incbin "scissorsBeetle/gUnk_080CF6A1.bin" +gSpriteAnimations_ScissorsBeetle_9:: @ 080CF6A1 + .include "animations/gSpriteAnimations_ScissorsBeetle_9.s" -gUnk_080CF6A6:: @ 080CF6A6 - .incbin "scissorsBeetle/gUnk_080CF6A6.bin" +gSpriteAnimations_ScissorsBeetle_10:: @ 080CF6A6 + .include "animations/gSpriteAnimations_ScissorsBeetle_10.s" -gUnk_080CF6AB:: @ 080CF6AB - .incbin "scissorsBeetle/gUnk_080CF6AB.bin" +gSpriteAnimations_ScissorsBeetle_11:: @ 080CF6AB + .include "animations/gSpriteAnimations_ScissorsBeetle_11.s" -gUnk_080CF6B0:: @ 080CF6B0 - .incbin "scissorsBeetle/gUnk_080CF6B0.bin" +gSpriteAnimations_ScissorsBeetle_12:: @ 080CF6B0 + .include "animations/gSpriteAnimations_ScissorsBeetle_12.s" -gUnk_080CF6C1:: @ 080CF6C1 - .incbin "scissorsBeetle/gUnk_080CF6C1.bin" +gSpriteAnimations_ScissorsBeetle_13:: @ 080CF6C1 + .include "animations/gSpriteAnimations_ScissorsBeetle_13.s" -gUnk_080CF6D2:: @ 080CF6D2 - .incbin "scissorsBeetle/gUnk_080CF6D2.bin" +gSpriteAnimations_ScissorsBeetle_14:: @ 080CF6D2 + .include "animations/gSpriteAnimations_ScissorsBeetle_14.s" -gUnk_080CF6E3:: @ 080CF6E3 - .incbin "scissorsBeetle/gUnk_080CF6E3.bin" +gSpriteAnimations_ScissorsBeetle_15:: @ 080CF6E3 + .include "animations/gSpriteAnimations_ScissorsBeetle_15.s" -gUnk_080CF6F4:: @ 080CF6F4 - .incbin "scissorsBeetle/gUnk_080CF6F4.bin" +gSpriteAnimations_ScissorsBeetle_16:: @ 080CF6F4 + .include "animations/gSpriteAnimations_ScissorsBeetle_16.s" -gUnk_080CF700:: @ 080CF700 - .incbin "scissorsBeetle/gUnk_080CF700.bin" +gSpriteAnimations_ScissorsBeetle_17:: @ 080CF700 + .include "animations/gSpriteAnimations_ScissorsBeetle_17.s" -gUnk_080CF70C:: @ 080CF70C - .incbin "scissorsBeetle/gUnk_080CF70C.bin" +gSpriteAnimations_ScissorsBeetle_18:: @ 080CF70C + .include "animations/gSpriteAnimations_ScissorsBeetle_18.s" -gUnk_080CF718:: @ 080CF718 - .incbin "scissorsBeetle/gUnk_080CF718.bin" +gSpriteAnimations_ScissorsBeetle_19:: @ 080CF718 + .include "animations/gSpriteAnimations_ScissorsBeetle_19.s" gSpriteAnimations_ScissorsBeetle:: @ 080CF724 - .4byte gUnk_080CF644 - .4byte gUnk_080CF649 - .4byte gUnk_080CF64E - .4byte gUnk_080CF653 - .4byte gUnk_080CF658 - .4byte gUnk_080CF669 - .4byte gUnk_080CF67A - .4byte gUnk_080CF68B - .4byte gUnk_080CF69C - .4byte gUnk_080CF6A1 - .4byte gUnk_080CF6A6 - .4byte gUnk_080CF6AB - .4byte gUnk_080CF6B0 - .4byte gUnk_080CF6C1 - .4byte gUnk_080CF6D2 - .4byte gUnk_080CF6E3 - .4byte gUnk_080CF6F4 - .4byte gUnk_080CF700 - .4byte gUnk_080CF70C - .4byte gUnk_080CF718 + .4byte gSpriteAnimations_ScissorsBeetle_0 + .4byte gSpriteAnimations_ScissorsBeetle_1 + .4byte gSpriteAnimations_ScissorsBeetle_2 + .4byte gSpriteAnimations_ScissorsBeetle_3 + .4byte gSpriteAnimations_ScissorsBeetle_4 + .4byte gSpriteAnimations_ScissorsBeetle_5 + .4byte gSpriteAnimations_ScissorsBeetle_6 + .4byte gSpriteAnimations_ScissorsBeetle_7 + .4byte gSpriteAnimations_ScissorsBeetle_8 + .4byte gSpriteAnimations_ScissorsBeetle_9 + .4byte gSpriteAnimations_ScissorsBeetle_10 + .4byte gSpriteAnimations_ScissorsBeetle_11 + .4byte gSpriteAnimations_ScissorsBeetle_12 + .4byte gSpriteAnimations_ScissorsBeetle_13 + .4byte gSpriteAnimations_ScissorsBeetle_14 + .4byte gSpriteAnimations_ScissorsBeetle_15 + .4byte gSpriteAnimations_ScissorsBeetle_16 + .4byte gSpriteAnimations_ScissorsBeetle_17 + .4byte gSpriteAnimations_ScissorsBeetle_18 + .4byte gSpriteAnimations_ScissorsBeetle_19 .4byte 00000000 diff --git a/data/animations/enemy/slime.s b/data/animations/enemy/slime.s index 04c8f78e..de41a327 100644 --- a/data/animations/enemy/slime.s +++ b/data/animations/enemy/slime.s @@ -4,49 +4,49 @@ .section .rodata .align 2 -gUnk_080D16DC:: @ 080D16DC - .incbin "slime/gUnk_080D16DC.bin" +gSpriteAnimations_Slime_0:: @ 080D16DC + .include "animations/gSpriteAnimations_Slime_0.s" -gUnk_080D16E5:: @ 080D16E5 - .incbin "slime/gUnk_080D16E5.bin" +gSpriteAnimations_Slime_1:: @ 080D16E5 + .include "animations/gSpriteAnimations_Slime_1.s" -gUnk_080D16F5:: @ 080D16F5 - .incbin "slime/gUnk_080D16F5.bin" +gSpriteAnimations_Slime_2:: @ 080D16F5 + .include "animations/gSpriteAnimations_Slime_2.s" -gUnk_080D170D:: @ 080D170D - .incbin "slime/gUnk_080D170D.bin" +gSpriteAnimations_Slime_3:: @ 080D170D + .include "animations/gSpriteAnimations_Slime_3.s" -gUnk_080D171D:: @ 080D171D - .incbin "slime/gUnk_080D171D.bin" +gSpriteAnimations_Slime_4:: @ 080D171D + .include "animations/gSpriteAnimations_Slime_4.s" -gUnk_080D1741:: @ 080D1741 - .incbin "slime/gUnk_080D1741.bin" +gSpriteAnimations_Slime_5:: @ 080D1741 + .include "animations/gSpriteAnimations_Slime_5.s" -gUnk_080D1761:: @ 080D1761 - .incbin "slime/gUnk_080D1761.bin" +gSpriteAnimations_Slime_6:: @ 080D1761 + .include "animations/gSpriteAnimations_Slime_6.s" -gUnk_080D176A:: @ 080D176A - .incbin "slime/gUnk_080D176A.bin" +gSpriteAnimations_Slime_7:: @ 080D176A + .include "animations/gSpriteAnimations_Slime_7.s" -gUnk_080D1773:: @ 080D1773 - .incbin "slime/gUnk_080D1773.bin" +gSpriteAnimations_Slime_8:: @ 080D1773 + .include "animations/gSpriteAnimations_Slime_8.s" -gUnk_080D1778:: @ 080D1778 - .incbin "slime/gUnk_080D1778.bin" +gSpriteAnimations_Slime_9:: @ 080D1778 + .include "animations/gSpriteAnimations_Slime_9.s" -gUnk_080D177D:: @ 080D177D - .incbin "slime/gUnk_080D177D.bin" +gSpriteAnimations_Slime_10:: @ 080D177D + .include "animations/gSpriteAnimations_Slime_10.s" gSpriteAnimations_Slime:: @ 080D1790 - .4byte gUnk_080D16DC - .4byte gUnk_080D16E5 - .4byte gUnk_080D16F5 - .4byte gUnk_080D170D - .4byte gUnk_080D171D - .4byte gUnk_080D1741 - .4byte gUnk_080D1761 - .4byte gUnk_080D176A - .4byte gUnk_080D1773 - .4byte gUnk_080D1778 - .4byte gUnk_080D177D + .4byte gSpriteAnimations_Slime_0 + .4byte gSpriteAnimations_Slime_1 + .4byte gSpriteAnimations_Slime_2 + .4byte gSpriteAnimations_Slime_3 + .4byte gSpriteAnimations_Slime_4 + .4byte gSpriteAnimations_Slime_5 + .4byte gSpriteAnimations_Slime_6 + .4byte gSpriteAnimations_Slime_7 + .4byte gSpriteAnimations_Slime_8 + .4byte gSpriteAnimations_Slime_9 + .4byte gSpriteAnimations_Slime_10 .4byte 00000000 diff --git a/data/animations/enemy/sluggula.s b/data/animations/enemy/sluggula.s index f8e0bc13..3b4808e7 100644 --- a/data/animations/enemy/sluggula.s +++ b/data/animations/enemy/sluggula.s @@ -3,34 +3,34 @@ .section .rodata -gUnk_080CBE02:: @ 080CBE02 - .incbin "sluggula/gUnk_080CBE02.bin" +gSpriteAnimations_Sluggula_0:: @ 080CBE02 + .include "animations/gSpriteAnimations_Sluggula_0.s" -gUnk_080CBE1B:: @ 080CBE1B - .incbin "sluggula/gUnk_080CBE1B.bin" +gSpriteAnimations_Sluggula_1:: @ 080CBE1B + .include "animations/gSpriteAnimations_Sluggula_1.s" -gUnk_080CBE34:: @ 080CBE34 - .incbin "sluggula/gUnk_080CBE34.bin" +gSpriteAnimations_Sluggula_2:: @ 080CBE34 + .include "animations/gSpriteAnimations_Sluggula_2.s" -gUnk_080CBE4D:: @ 080CBE4D - .incbin "sluggula/gUnk_080CBE4D.bin" +gSpriteAnimations_Sluggula_3:: @ 080CBE4D + .include "animations/gSpriteAnimations_Sluggula_3.s" -gUnk_080CBE66:: @ 080CBE66 - .incbin "sluggula/gUnk_080CBE66.bin" +gSpriteAnimations_Sluggula_4:: @ 080CBE66 + .include "animations/gSpriteAnimations_Sluggula_4.s" -gUnk_080CBE8A:: @ 080CBE8A - .incbin "sluggula/gUnk_080CBE8A.bin" +gSpriteAnimations_Sluggula_5:: @ 080CBE8A + .include "animations/gSpriteAnimations_Sluggula_5.s" -gUnk_080CBE9E:: @ 080CBE9E - .incbin "sluggula/gUnk_080CBE9E.bin" +gSpriteAnimations_Sluggula_6:: @ 080CBE9E + .include "animations/gSpriteAnimations_Sluggula_6.s" gSpriteAnimations_Sluggula:: @ 080CBEA4 - .4byte gUnk_080CBE02 - .4byte gUnk_080CBE1B - .4byte gUnk_080CBE34 - .4byte gUnk_080CBE4D - .4byte gUnk_080CBE66 - .4byte gUnk_080CBE8A - .4byte gUnk_080CBE9E + .4byte gSpriteAnimations_Sluggula_0 + .4byte gSpriteAnimations_Sluggula_1 + .4byte gSpriteAnimations_Sluggula_2 + .4byte gSpriteAnimations_Sluggula_3 + .4byte gSpriteAnimations_Sluggula_4 + .4byte gSpriteAnimations_Sluggula_5 + .4byte gSpriteAnimations_Sluggula_6 .4byte 00000000 diff --git a/data/animations/enemy/spark.s b/data/animations/enemy/spark.s index 0f7b26e4..6f62aed6 100644 --- a/data/animations/enemy/spark.s +++ b/data/animations/enemy/spark.s @@ -3,9 +3,9 @@ .section .rodata -gUnk_080CD258:: @ 080CD258 - .incbin "spark/gUnk_080CD258.bin" +gSpriteAnimations_Spark_0:: @ 080CD258 + .include "animations/gSpriteAnimations_Spark_0.s" gSpriteAnimations_Spark:: @ 080CD274 - .4byte gUnk_080CD258 + .4byte gSpriteAnimations_Spark_0 .4byte 00000000 diff --git a/data/animations/enemy/spearMoblin.s b/data/animations/enemy/spearMoblin.s index 2447cca4..720a8b66 100644 --- a/data/animations/enemy/spearMoblin.s +++ b/data/animations/enemy/spearMoblin.s @@ -4,71 +4,71 @@ .section .rodata -gUnk_080CC7E0:: @ 080CC7E0 - .incbin "spearMoblin/gUnk_080CC7E0.bin" +gSpriteAnimations_SpearMoblin_0:: @ 080CC7E0 + .include "animations/gSpriteAnimations_SpearMoblin_0.s" -gUnk_080CC7E9:: @ 080CC7E9 - .incbin "spearMoblin/gUnk_080CC7E9.bin" +gSpriteAnimations_SpearMoblin_1:: @ 080CC7E9 + .include "animations/gSpriteAnimations_SpearMoblin_1.s" -gUnk_080CC7F2:: @ 080CC7F2 - .incbin "spearMoblin/gUnk_080CC7F2.bin" +gSpriteAnimations_SpearMoblin_2:: @ 080CC7F2 + .include "animations/gSpriteAnimations_SpearMoblin_2.s" -gUnk_080CC7FB:: @ 080CC7FB - .incbin "spearMoblin/gUnk_080CC7FB.bin" +gSpriteAnimations_SpearMoblin_3:: @ 080CC7FB + .include "animations/gSpriteAnimations_SpearMoblin_3.s" -gUnk_080CC804:: @ 080CC804 - .incbin "spearMoblin/gUnk_080CC804.bin" +gSpriteAnimations_SpearMoblin_4:: @ 080CC804 + .include "animations/gSpriteAnimations_SpearMoblin_4.s" -gUnk_080CC815:: @ 080CC815 - .incbin "spearMoblin/gUnk_080CC815.bin" +gSpriteAnimations_SpearMoblin_5:: @ 080CC815 + .include "animations/gSpriteAnimations_SpearMoblin_5.s" -gUnk_080CC826:: @ 080CC826 - .incbin "spearMoblin/gUnk_080CC826.bin" +gSpriteAnimations_SpearMoblin_6:: @ 080CC826 + .include "animations/gSpriteAnimations_SpearMoblin_6.s" -gUnk_080CC837:: @ 080CC837 - .incbin "spearMoblin/gUnk_080CC837.bin" +gSpriteAnimations_SpearMoblin_7:: @ 080CC837 + .include "animations/gSpriteAnimations_SpearMoblin_7.s" -gUnk_080CC848:: @ 080CC848 - .incbin "spearMoblin/gUnk_080CC848.bin" +gSpriteAnimations_SpearMoblin_8:: @ 080CC848 + .include "animations/gSpriteAnimations_SpearMoblin_8.s" -gUnk_080CC859:: @ 080CC859 - .incbin "spearMoblin/gUnk_080CC859.bin" +gSpriteAnimations_SpearMoblin_9:: @ 080CC859 + .include "animations/gSpriteAnimations_SpearMoblin_9.s" -gUnk_080CC86A:: @ 080CC86A - .incbin "spearMoblin/gUnk_080CC86A.bin" +gSpriteAnimations_SpearMoblin_10:: @ 080CC86A + .include "animations/gSpriteAnimations_SpearMoblin_10.s" -gUnk_080CC87B:: @ 080CC87B - .incbin "spearMoblin/gUnk_080CC87B.bin" +gSpriteAnimations_SpearMoblin_11:: @ 080CC87B + .include "animations/gSpriteAnimations_SpearMoblin_11.s" -gUnk_080CC88C:: @ 080CC88C - .incbin "spearMoblin/gUnk_080CC88C.bin" +gSpriteAnimations_SpearMoblin_12:: @ 080CC88C + .include "animations/gSpriteAnimations_SpearMoblin_12.s" -gUnk_080CC8A1:: @ 080CC8A1 - .incbin "spearMoblin/gUnk_080CC8A1.bin" +gSpriteAnimations_SpearMoblin_13:: @ 080CC8A1 + .include "animations/gSpriteAnimations_SpearMoblin_13.s" -gUnk_080CC8B6:: @ 080CC8B6 - .incbin "spearMoblin/gUnk_080CC8B6.bin" +gSpriteAnimations_SpearMoblin_14:: @ 080CC8B6 + .include "animations/gSpriteAnimations_SpearMoblin_14.s" -gUnk_080CC8CB:: @ 080CC8CB - .incbin "spearMoblin/gUnk_080CC8CB.bin" +gSpriteAnimations_SpearMoblin_15:: @ 080CC8CB + .include "animations/gSpriteAnimations_SpearMoblin_15.s" gSpriteAnimations_SpearMoblin:: @ 080CC8E0 - .4byte gUnk_080CC7E0 - .4byte gUnk_080CC7E9 - .4byte gUnk_080CC7F2 - .4byte gUnk_080CC7FB - .4byte gUnk_080CC804 - .4byte gUnk_080CC815 - .4byte gUnk_080CC826 - .4byte gUnk_080CC837 - .4byte gUnk_080CC848 - .4byte gUnk_080CC859 - .4byte gUnk_080CC86A - .4byte gUnk_080CC87B - .4byte gUnk_080CC88C - .4byte gUnk_080CC8A1 - .4byte gUnk_080CC8B6 - .4byte gUnk_080CC8CB + .4byte gSpriteAnimations_SpearMoblin_0 + .4byte gSpriteAnimations_SpearMoblin_1 + .4byte gSpriteAnimations_SpearMoblin_2 + .4byte gSpriteAnimations_SpearMoblin_3 + .4byte gSpriteAnimations_SpearMoblin_4 + .4byte gSpriteAnimations_SpearMoblin_5 + .4byte gSpriteAnimations_SpearMoblin_6 + .4byte gSpriteAnimations_SpearMoblin_7 + .4byte gSpriteAnimations_SpearMoblin_8 + .4byte gSpriteAnimations_SpearMoblin_9 + .4byte gSpriteAnimations_SpearMoblin_10 + .4byte gSpriteAnimations_SpearMoblin_11 + .4byte gSpriteAnimations_SpearMoblin_12 + .4byte gSpriteAnimations_SpearMoblin_13 + .4byte gSpriteAnimations_SpearMoblin_14 + .4byte gSpriteAnimations_SpearMoblin_15 .4byte 00000000 gUnk_080CC924:: @ 080CC924 diff --git a/data/animations/enemy/spikedBeetle.s b/data/animations/enemy/spikedBeetle.s index a67974f2..ed27fe57 100644 --- a/data/animations/enemy/spikedBeetle.s +++ b/data/animations/enemy/spikedBeetle.s @@ -3,45 +3,45 @@ .section .rodata -gUnk_080CD31C:: @ 080CD31C - .incbin "spikedBeetle/gUnk_080CD31C.bin" +gSpriteAnimations_SpikedBeetle_0:: @ 080CD31C + .include "animations/gSpriteAnimations_SpikedBeetle_0.s" -gUnk_080CD32D:: @ 080CD32D - .incbin "spikedBeetle/gUnk_080CD32D.bin" +gSpriteAnimations_SpikedBeetle_1:: @ 080CD32D + .include "animations/gSpriteAnimations_SpikedBeetle_1.s" -gUnk_080CD33E:: @ 080CD33E - .incbin "spikedBeetle/gUnk_080CD33E.bin" +gSpriteAnimations_SpikedBeetle_2:: @ 080CD33E + .include "animations/gSpriteAnimations_SpikedBeetle_2.s" -gUnk_080CD34F:: @ 080CD34F - .incbin "spikedBeetle/gUnk_080CD34F.bin" +gSpriteAnimations_SpikedBeetle_3:: @ 080CD34F + .include "animations/gSpriteAnimations_SpikedBeetle_3.s" -gUnk_080CD360:: @ 080CD360 - .incbin "spikedBeetle/gUnk_080CD360.bin" +gSpriteAnimations_SpikedBeetle_4:: @ 080CD360 + .include "animations/gSpriteAnimations_SpikedBeetle_4.s" -gUnk_080CD368:: @ 080CD368 - .incbin "spikedBeetle/gUnk_080CD368.bin" +gSpriteAnimations_SpikedBeetle_5:: @ 080CD368 + .include "animations/gSpriteAnimations_SpikedBeetle_5.s" -gUnk_080CD370:: @ 080CD370 - .incbin "spikedBeetle/gUnk_080CD370.bin" +gSpriteAnimations_SpikedBeetle_6:: @ 080CD370 + .include "animations/gSpriteAnimations_SpikedBeetle_6.s" -gUnk_080CD378:: @ 080CD378 - .incbin "spikedBeetle/gUnk_080CD378.bin" +gSpriteAnimations_SpikedBeetle_7:: @ 080CD378 + .include "animations/gSpriteAnimations_SpikedBeetle_7.s" -gUnk_080CD380:: @ 080CD380 - .incbin "spikedBeetle/gUnk_080CD380.bin" +gSpriteAnimations_SpikedBeetle_8:: @ 080CD380 + .include "animations/gSpriteAnimations_SpikedBeetle_8.s" -gUnk_080CD391:: @ 080CD391 - .incbin "spikedBeetle/gUnk_080CD391.bin" +gSpriteAnimations_SpikedBeetle_9:: @ 080CD391 + .include "animations/gSpriteAnimations_SpikedBeetle_9.s" gSpriteAnimations_SpikedBeetle:: @ 080CD398 - .4byte gUnk_080CD31C - .4byte gUnk_080CD32D - .4byte gUnk_080CD33E - .4byte gUnk_080CD34F - .4byte gUnk_080CD360 - .4byte gUnk_080CD368 - .4byte gUnk_080CD370 - .4byte gUnk_080CD378 - .4byte gUnk_080CD380 - .4byte gUnk_080CD391 + .4byte gSpriteAnimations_SpikedBeetle_0 + .4byte gSpriteAnimations_SpikedBeetle_1 + .4byte gSpriteAnimations_SpikedBeetle_2 + .4byte gSpriteAnimations_SpikedBeetle_3 + .4byte gSpriteAnimations_SpikedBeetle_4 + .4byte gSpriteAnimations_SpikedBeetle_5 + .4byte gSpriteAnimations_SpikedBeetle_6 + .4byte gSpriteAnimations_SpikedBeetle_7 + .4byte gSpriteAnimations_SpikedBeetle_8 + .4byte gSpriteAnimations_SpikedBeetle_9 .4byte 00000000 diff --git a/data/animations/enemy/spinyBeetle.s b/data/animations/enemy/spinyBeetle.s index dcd7498a..1ace6618 100644 --- a/data/animations/enemy/spinyBeetle.s +++ b/data/animations/enemy/spinyBeetle.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_080CEC24:: @ 080CEC24 - .incbin "spinyBeetle/gUnk_080CEC24.bin" +gSpriteAnimations_SpinyBeetle_0:: @ 080CEC24 + .include "animations/gSpriteAnimations_SpinyBeetle_0.s" -gUnk_080CEC29:: @ 080CEC29 - .incbin "spinyBeetle/gUnk_080CEC29.bin" +gSpriteAnimations_SpinyBeetle_1:: @ 080CEC29 + .include "animations/gSpriteAnimations_SpinyBeetle_1.s" -gUnk_080CEC42:: @ 080CEC42 - .incbin "spinyBeetle/gUnk_080CEC42.bin" +gSpriteAnimations_SpinyBeetle_2:: @ 080CEC42 + .include "animations/gSpriteAnimations_SpinyBeetle_2.s" -gUnk_080CEC4B:: @ 080CEC4B - .incbin "spinyBeetle/gUnk_080CEC4B.bin" +gSpriteAnimations_SpinyBeetle_3:: @ 080CEC4B + .include "animations/gSpriteAnimations_SpinyBeetle_3.s" -gUnk_080CEC5C:: @ 080CEC5C - .incbin "spinyBeetle/gUnk_080CEC5C.bin" +gSpriteAnimations_SpinyBeetle_4:: @ 080CEC5C + .include "animations/gSpriteAnimations_SpinyBeetle_4.s" gSpriteAnimations_SpinyBeetle:: @ 080CEC70 - .4byte gUnk_080CEC24 - .4byte gUnk_080CEC29 - .4byte gUnk_080CEC42 - .4byte gUnk_080CEC4B - .4byte gUnk_080CEC5C + .4byte gSpriteAnimations_SpinyBeetle_0 + .4byte gSpriteAnimations_SpinyBeetle_1 + .4byte gSpriteAnimations_SpinyBeetle_2 + .4byte gSpriteAnimations_SpinyBeetle_3 + .4byte gSpriteAnimations_SpinyBeetle_4 .4byte 00000000 diff --git a/data/animations/enemy/spinyChuchu.s b/data/animations/enemy/spinyChuchu.s index aedabc85..32278363 100644 --- a/data/animations/enemy/spinyChuchu.s +++ b/data/animations/enemy/spinyChuchu.s @@ -3,33 +3,33 @@ .section .rodata -gUnk_080CBA64:: @ 080CBA64 - .incbin "spinyChuchu/gUnk_080CBA64.bin" +gSpriteAnimations_SpinyChuchu_0:: @ 080CBA64 + .include "animations/gSpriteAnimations_SpinyChuchu_0.s" -gUnk_080CBAA5:: @ 080CBAA5 - .incbin "spinyChuchu/gUnk_080CBAA5.bin" +gSpriteAnimations_SpinyChuchu_1:: @ 080CBAA5 + .include "animations/gSpriteAnimations_SpinyChuchu_1.s" -gUnk_080CBAE5:: @ 080CBAE5 - .incbin "spinyChuchu/gUnk_080CBAE5.bin" +gSpriteAnimations_SpinyChuchu_2:: @ 080CBAE5 + .include "animations/gSpriteAnimations_SpinyChuchu_2.s" -gUnk_080CBAFD:: @ 080CBAFD - .incbin "spinyChuchu/gUnk_080CBAFD.bin" +gSpriteAnimations_SpinyChuchu_3:: @ 080CBAFD + .include "animations/gSpriteAnimations_SpinyChuchu_3.s" -gUnk_080CBB21:: @ 080CBB21 - .incbin "spinyChuchu/gUnk_080CBB21.bin" +gSpriteAnimations_SpinyChuchu_4:: @ 080CBB21 + .include "animations/gSpriteAnimations_SpinyChuchu_4.s" -gUnk_080CBB32:: @ 080CBB32 - .incbin "spinyChuchu/gUnk_080CBB32.bin" +gSpriteAnimations_SpinyChuchu_5:: @ 080CBB32 + .include "animations/gSpriteAnimations_SpinyChuchu_5.s" -gUnk_080CBB3F:: @ 080CBB3F - .incbin "spinyChuchu/gUnk_080CBB3F.bin" +gSpriteAnimations_SpinyChuchu_6:: @ 080CBB3F + .include "animations/gSpriteAnimations_SpinyChuchu_6.s" gSpriteAnimations_SpinyChuchu:: @ 080CBB44 - .4byte gUnk_080CBA64 - .4byte gUnk_080CBAA5 - .4byte gUnk_080CBAE5 - .4byte gUnk_080CBAFD - .4byte gUnk_080CBB21 - .4byte gUnk_080CBB32 - .4byte gUnk_080CBB3F + .4byte gSpriteAnimations_SpinyChuchu_0 + .4byte gSpriteAnimations_SpinyChuchu_1 + .4byte gSpriteAnimations_SpinyChuchu_2 + .4byte gSpriteAnimations_SpinyChuchu_3 + .4byte gSpriteAnimations_SpinyChuchu_4 + .4byte gSpriteAnimations_SpinyChuchu_5 + .4byte gSpriteAnimations_SpinyChuchu_6 .4byte 00000000 diff --git a/data/animations/enemy/stalfos.s b/data/animations/enemy/stalfos.s index fb47cac7..ee411bf0 100644 --- a/data/animations/enemy/stalfos.s +++ b/data/animations/enemy/stalfos.s @@ -4,149 +4,149 @@ .section .rodata @ .align 2 -gUnk_080CF942:: @ 080CF942 - .incbin "stalfos/gUnk_080CF942.bin" +gSpriteAnimations_Stalfos_0:: @ 080CF942 + .include "animations/gSpriteAnimations_Stalfos_0.s" -gUnk_080CF946:: @ 080CF946 - .incbin "stalfos/gUnk_080CF946.bin" +gSpriteAnimations_Stalfos_1:: @ 080CF946 + .include "animations/gSpriteAnimations_Stalfos_1.s" -gUnk_080CF94A:: @ 080CF94A - .incbin "stalfos/gUnk_080CF94A.bin" +gSpriteAnimations_Stalfos_2:: @ 080CF94A + .include "animations/gSpriteAnimations_Stalfos_2.s" -gUnk_080CF94E:: @ 080CF94E - .incbin "stalfos/gUnk_080CF94E.bin" +gSpriteAnimations_Stalfos_3:: @ 080CF94E + .include "animations/gSpriteAnimations_Stalfos_3.s" -gUnk_080CF952:: @ 080CF952 - .incbin "stalfos/gUnk_080CF952.bin" +gSpriteAnimations_Stalfos_4:: @ 080CF952 + .include "animations/gSpriteAnimations_Stalfos_4.s" -gUnk_080CF96B:: @ 080CF96B - .incbin "stalfos/gUnk_080CF96B.bin" +gSpriteAnimations_Stalfos_5:: @ 080CF96B + .include "animations/gSpriteAnimations_Stalfos_5.s" -gUnk_080CF984:: @ 080CF984 - .incbin "stalfos/gUnk_080CF984.bin" +gSpriteAnimations_Stalfos_6:: @ 080CF984 + .include "animations/gSpriteAnimations_Stalfos_6.s" -gUnk_080CF99D:: @ 080CF99D - .incbin "stalfos/gUnk_080CF99D.bin" +gSpriteAnimations_Stalfos_7:: @ 080CF99D + .include "animations/gSpriteAnimations_Stalfos_7.s" -gUnk_080CF9B6:: @ 080CF9B6 - .incbin "stalfos/gUnk_080CF9B6.bin" +gSpriteAnimations_Stalfos_8:: @ 080CF9B6 + .include "animations/gSpriteAnimations_Stalfos_8.s" -gUnk_080CF9BA:: @ 080CF9BA - .incbin "stalfos/gUnk_080CF9BA.bin" +gSpriteAnimations_Stalfos_9:: @ 080CF9BA + .include "animations/gSpriteAnimations_Stalfos_9.s" -gUnk_080CF9BE:: @ 080CF9BE - .incbin "stalfos/gUnk_080CF9BE.bin" +gSpriteAnimations_Stalfos_10:: @ 080CF9BE + .include "animations/gSpriteAnimations_Stalfos_10.s" -gUnk_080CF9C2:: @ 080CF9C2 - .incbin "stalfos/gUnk_080CF9C2.bin" +gSpriteAnimations_Stalfos_11:: @ 080CF9C2 + .include "animations/gSpriteAnimations_Stalfos_11.s" -gUnk_080CF9C6:: @ 080CF9C6 - .incbin "stalfos/gUnk_080CF9C6.bin" +gSpriteAnimations_Stalfos_12:: @ 080CF9C6 + .include "animations/gSpriteAnimations_Stalfos_12.s" -gUnk_080CF9D7:: @ 080CF9D7 - .incbin "stalfos/gUnk_080CF9D7.bin" +gSpriteAnimations_Stalfos_13:: @ 080CF9D7 + .include "animations/gSpriteAnimations_Stalfos_13.s" -gUnk_080CF9E8:: @ 080CF9E8 - .incbin "stalfos/gUnk_080CF9E8.bin" +gSpriteAnimations_Stalfos_14:: @ 080CF9E8 + .include "animations/gSpriteAnimations_Stalfos_14.s" -gUnk_080CF9F9:: @ 080CF9F9 - .incbin "stalfos/gUnk_080CF9F9.bin" +gSpriteAnimations_Stalfos_15:: @ 080CF9F9 + .include "animations/gSpriteAnimations_Stalfos_15.s" -gUnk_080CFA0A:: @ 080CFA0A - .incbin "stalfos/gUnk_080CFA0A.bin" +gSpriteAnimations_Stalfos_16:: @ 080CFA0A + .include "animations/gSpriteAnimations_Stalfos_16.s" -gUnk_080CFA0E:: @ 080CFA0E - .incbin "stalfos/gUnk_080CFA0E.bin" +gSpriteAnimations_Stalfos_17:: @ 080CFA0E + .include "animations/gSpriteAnimations_Stalfos_17.s" -gUnk_080CFA12:: @ 080CFA12 - .incbin "stalfos/gUnk_080CFA12.bin" +gSpriteAnimations_Stalfos_18:: @ 080CFA12 + .include "animations/gSpriteAnimations_Stalfos_18.s" -gUnk_080CFA16:: @ 080CFA16 - .incbin "stalfos/gUnk_080CFA16.bin" +gSpriteAnimations_Stalfos_19:: @ 080CFA16 + .include "animations/gSpriteAnimations_Stalfos_19.s" -gUnk_080CFA1A:: @ 080CFA1A - .incbin "stalfos/gUnk_080CFA1A.bin" +gSpriteAnimations_Stalfos_20:: @ 080CFA1A + .include "animations/gSpriteAnimations_Stalfos_20.s" -gUnk_080CFA33:: @ 080CFA33 - .incbin "stalfos/gUnk_080CFA33.bin" +gSpriteAnimations_Stalfos_21:: @ 080CFA33 + .include "animations/gSpriteAnimations_Stalfos_21.s" -gUnk_080CFA4C:: @ 080CFA4C - .incbin "stalfos/gUnk_080CFA4C.bin" +gSpriteAnimations_Stalfos_22:: @ 080CFA4C + .include "animations/gSpriteAnimations_Stalfos_22.s" -gUnk_080CFA65:: @ 080CFA65 - .incbin "stalfos/gUnk_080CFA65.bin" +gSpriteAnimations_Stalfos_23:: @ 080CFA65 + .include "animations/gSpriteAnimations_Stalfos_23.s" -gUnk_080CFA7E:: @ 080CFA7E - .incbin "stalfos/gUnk_080CFA7E.bin" +gSpriteAnimations_Stalfos_24:: @ 080CFA7E + .include "animations/gSpriteAnimations_Stalfos_24.s" -gUnk_080CFA92:: @ 080CFA92 - .incbin "stalfos/gUnk_080CFA92.bin" +gSpriteAnimations_Stalfos_25:: @ 080CFA92 + .include "animations/gSpriteAnimations_Stalfos_25.s" -gUnk_080CFAA6:: @ 080CFAA6 - .incbin "stalfos/gUnk_080CFAA6.bin" +gSpriteAnimations_Stalfos_26:: @ 080CFAA6 + .include "animations/gSpriteAnimations_Stalfos_26.s" -gUnk_080CFABA:: @ 080CFABA - .incbin "stalfos/gUnk_080CFABA.bin" +gSpriteAnimations_Stalfos_27:: @ 080CFABA + .include "animations/gSpriteAnimations_Stalfos_27.s" -gUnk_080CFACE:: @ 080CFACE - .incbin "stalfos/gUnk_080CFACE.bin" +gSpriteAnimations_Stalfos_28:: @ 080CFACE + .include "animations/gSpriteAnimations_Stalfos_28.s" -gUnk_080CFAD2:: @ 080CFAD2 - .incbin "stalfos/gUnk_080CFAD2.bin" +gSpriteAnimations_Stalfos_29:: @ 080CFAD2 + .include "animations/gSpriteAnimations_Stalfos_29.s" -gUnk_080CFAD6:: @ 080CFAD6 - .incbin "stalfos/gUnk_080CFAD6.bin" +gSpriteAnimations_Stalfos_30:: @ 080CFAD6 + .include "animations/gSpriteAnimations_Stalfos_30.s" -gUnk_080CFADA:: @ 080CFADA - .incbin "stalfos/gUnk_080CFADA.bin" +gSpriteAnimations_Stalfos_31:: @ 080CFADA + .include "animations/gSpriteAnimations_Stalfos_31.s" -gUnk_080CFADE:: @ 080CFADE - .incbin "stalfos/gUnk_080CFADE.bin" +gSpriteAnimations_Stalfos_32:: @ 080CFADE + .include "animations/gSpriteAnimations_Stalfos_32.s" -gUnk_080CFAE2:: @ 080CFAE2 - .incbin "stalfos/gUnk_080CFAE2.bin" +gSpriteAnimations_Stalfos_33:: @ 080CFAE2 + .include "animations/gSpriteAnimations_Stalfos_33.s" -gUnk_080CFAE6:: @ 080CFAE6 - .incbin "stalfos/gUnk_080CFAE6.bin" +gSpriteAnimations_Stalfos_34:: @ 080CFAE6 + .include "animations/gSpriteAnimations_Stalfos_34.s" -gUnk_080CFAEA:: @ 080CFAEA - .incbin "stalfos/gUnk_080CFAEA.bin" +gSpriteAnimations_Stalfos_35:: @ 080CFAEA + .include "animations/gSpriteAnimations_Stalfos_35.s" gSpriteAnimations_Stalfos:: @ 080CFAF0 - .4byte gUnk_080CF942 - .4byte gUnk_080CF946 - .4byte gUnk_080CF94A - .4byte gUnk_080CF94E - .4byte gUnk_080CF952 - .4byte gUnk_080CF96B - .4byte gUnk_080CF984 - .4byte gUnk_080CF99D - .4byte gUnk_080CF9B6 - .4byte gUnk_080CF9BA - .4byte gUnk_080CF9BE - .4byte gUnk_080CF9C2 - .4byte gUnk_080CF9C6 - .4byte gUnk_080CF9D7 - .4byte gUnk_080CF9E8 - .4byte gUnk_080CF9F9 - .4byte gUnk_080CFA0A - .4byte gUnk_080CFA0E - .4byte gUnk_080CFA12 - .4byte gUnk_080CFA16 - .4byte gUnk_080CFA1A - .4byte gUnk_080CFA33 - .4byte gUnk_080CFA4C - .4byte gUnk_080CFA65 - .4byte gUnk_080CFA7E - .4byte gUnk_080CFA92 - .4byte gUnk_080CFAA6 - .4byte gUnk_080CFABA - .4byte gUnk_080CFACE - .4byte gUnk_080CFAD2 - .4byte gUnk_080CFAD6 - .4byte gUnk_080CFADA - .4byte gUnk_080CFADE - .4byte gUnk_080CFAE2 - .4byte gUnk_080CFAE6 - .4byte gUnk_080CFAEA + .4byte gSpriteAnimations_Stalfos_0 + .4byte gSpriteAnimations_Stalfos_1 + .4byte gSpriteAnimations_Stalfos_2 + .4byte gSpriteAnimations_Stalfos_3 + .4byte gSpriteAnimations_Stalfos_4 + .4byte gSpriteAnimations_Stalfos_5 + .4byte gSpriteAnimations_Stalfos_6 + .4byte gSpriteAnimations_Stalfos_7 + .4byte gSpriteAnimations_Stalfos_8 + .4byte gSpriteAnimations_Stalfos_9 + .4byte gSpriteAnimations_Stalfos_10 + .4byte gSpriteAnimations_Stalfos_11 + .4byte gSpriteAnimations_Stalfos_12 + .4byte gSpriteAnimations_Stalfos_13 + .4byte gSpriteAnimations_Stalfos_14 + .4byte gSpriteAnimations_Stalfos_15 + .4byte gSpriteAnimations_Stalfos_16 + .4byte gSpriteAnimations_Stalfos_17 + .4byte gSpriteAnimations_Stalfos_18 + .4byte gSpriteAnimations_Stalfos_19 + .4byte gSpriteAnimations_Stalfos_20 + .4byte gSpriteAnimations_Stalfos_21 + .4byte gSpriteAnimations_Stalfos_22 + .4byte gSpriteAnimations_Stalfos_23 + .4byte gSpriteAnimations_Stalfos_24 + .4byte gSpriteAnimations_Stalfos_25 + .4byte gSpriteAnimations_Stalfos_26 + .4byte gSpriteAnimations_Stalfos_27 + .4byte gSpriteAnimations_Stalfos_28 + .4byte gSpriteAnimations_Stalfos_29 + .4byte gSpriteAnimations_Stalfos_30 + .4byte gSpriteAnimations_Stalfos_31 + .4byte gSpriteAnimations_Stalfos_32 + .4byte gSpriteAnimations_Stalfos_33 + .4byte gSpriteAnimations_Stalfos_34 + .4byte gSpriteAnimations_Stalfos_35 .4byte 00000000 diff --git a/data/animations/enemy/tektite.s b/data/animations/enemy/tektite.s index 59b1aaed..59d00807 100644 --- a/data/animations/enemy/tektite.s +++ b/data/animations/enemy/tektite.s @@ -6,25 +6,25 @@ -gUnk_080CDEFC:: @ 080CDEFC - .incbin "tektite/gUnk_080CDEFC.bin" +gSpriteAnimations_Tektite_0:: @ 080CDEFC + .include "animations/gSpriteAnimations_Tektite_0.s" -gUnk_080CDF09:: @ 080CDF09 - .incbin "tektite/gUnk_080CDF09.bin" +gSpriteAnimations_Tektite_1:: @ 080CDF09 + .include "animations/gSpriteAnimations_Tektite_1.s" -gUnk_080CDF1A:: @ 080CDF1A - .incbin "tektite/gUnk_080CDF1A.bin" +gSpriteAnimations_Tektite_2:: @ 080CDF1A + .include "animations/gSpriteAnimations_Tektite_2.s" -gUnk_080CDF27:: @ 080CDF27 - .incbin "tektite/gUnk_080CDF27.bin" +gSpriteAnimations_Tektite_3:: @ 080CDF27 + .include "animations/gSpriteAnimations_Tektite_3.s" -gUnk_080CDF33:: @ 080CDF33 - .incbin "tektite/gUnk_080CDF33.bin" +gSpriteAnimations_Tektite_4:: @ 080CDF33 + .include "animations/gSpriteAnimations_Tektite_4.s" gSpriteAnimations_Tektite:: @ 080CDF38 - .4byte gUnk_080CDEFC - .4byte gUnk_080CDF09 - .4byte gUnk_080CDF1A - .4byte gUnk_080CDF27 - .4byte gUnk_080CDF33 + .4byte gSpriteAnimations_Tektite_0 + .4byte gSpriteAnimations_Tektite_1 + .4byte gSpriteAnimations_Tektite_2 + .4byte gSpriteAnimations_Tektite_3 + .4byte gSpriteAnimations_Tektite_4 .4byte 00000000 diff --git a/data/animations/enemy/vaatiArm.s b/data/animations/enemy/vaatiArm.s index b4192456..e98185cd 100644 --- a/data/animations/enemy/vaatiArm.s +++ b/data/animations/enemy/vaatiArm.s @@ -4,89 +4,89 @@ .section .rodata @ .align 2 -gUnk_080D141E:: @ 080D141E - .incbin "vaatiArm/gUnk_080D141E.bin" +gSpriteAnimations_VaatiArm_0:: @ 080D141E + .include "animations/gSpriteAnimations_VaatiArm_0.s" -gUnk_080D142B:: @ 080D142B - .incbin "vaatiArm/gUnk_080D142B.bin" +gSpriteAnimations_VaatiArm_1:: @ 080D142B + .include "animations/gSpriteAnimations_VaatiArm_1.s" -gUnk_080D1430:: @ 080D1430 - .incbin "vaatiArm/gUnk_080D1430.bin" +gSpriteAnimations_VaatiArm_2:: @ 080D1430 + .include "animations/gSpriteAnimations_VaatiArm_2.s" -gUnk_080D1435:: @ 080D1435 - .incbin "vaatiArm/gUnk_080D1435.bin" +gSpriteAnimations_VaatiArm_3:: @ 080D1435 + .include "animations/gSpriteAnimations_VaatiArm_3.s" -gUnk_080D143A:: @ 080D143A - .incbin "vaatiArm/gUnk_080D143A.bin" +gSpriteAnimations_VaatiArm_4:: @ 080D143A + .include "animations/gSpriteAnimations_VaatiArm_4.s" -gUnk_080D143F:: @ 080D143F - .incbin "vaatiArm/gUnk_080D143F.bin" +gSpriteAnimations_VaatiArm_5:: @ 080D143F + .include "animations/gSpriteAnimations_VaatiArm_5.s" -gUnk_080D1444:: @ 080D1444 - .incbin "vaatiArm/gUnk_080D1444.bin" +gSpriteAnimations_VaatiArm_6:: @ 080D1444 + .include "animations/gSpriteAnimations_VaatiArm_6.s" -gUnk_080D1449:: @ 080D1449 - .incbin "vaatiArm/gUnk_080D1449.bin" +gSpriteAnimations_VaatiArm_7:: @ 080D1449 + .include "animations/gSpriteAnimations_VaatiArm_7.s" -gUnk_080D144E:: @ 080D144E - .incbin "vaatiArm/gUnk_080D144E.bin" +gSpriteAnimations_VaatiArm_8:: @ 080D144E + .include "animations/gSpriteAnimations_VaatiArm_8.s" -gUnk_080D1453:: @ 080D1453 - .incbin "vaatiArm/gUnk_080D1453.bin" +gSpriteAnimations_VaatiArm_9:: @ 080D1453 + .include "animations/gSpriteAnimations_VaatiArm_9.s" -gUnk_080D1458:: @ 080D1458 - .incbin "vaatiArm/gUnk_080D1458.bin" +gSpriteAnimations_VaatiArm_10:: @ 080D1458 + .include "animations/gSpriteAnimations_VaatiArm_10.s" -gUnk_080D145D:: @ 080D145D - .incbin "vaatiArm/gUnk_080D145D.bin" +gSpriteAnimations_VaatiArm_11:: @ 080D145D + .include "animations/gSpriteAnimations_VaatiArm_11.s" -gUnk_080D1462:: @ 080D1462 - .incbin "vaatiArm/gUnk_080D1462.bin" +gSpriteAnimations_VaatiArm_12:: @ 080D1462 + .include "animations/gSpriteAnimations_VaatiArm_12.s" -gUnk_080D1467:: @ 080D1467 - .incbin "vaatiArm/gUnk_080D1467.bin" +gSpriteAnimations_VaatiArm_13:: @ 080D1467 + .include "animations/gSpriteAnimations_VaatiArm_13.s" -gUnk_080D1488:: @ 080D1488 - .incbin "vaatiArm/gUnk_080D1488.bin" +gSpriteAnimations_VaatiArm_14:: @ 080D1488 + .include "animations/gSpriteAnimations_VaatiArm_14.s" -gUnk_080D148D:: @ 080D148D - .incbin "vaatiArm/gUnk_080D148D.bin" +gSpriteAnimations_VaatiArm_15:: @ 080D148D + .include "animations/gSpriteAnimations_VaatiArm_15.s" -gUnk_080D14DE:: @ 080D14DE - .incbin "vaatiArm/gUnk_080D14DE.bin" +gSpriteAnimations_VaatiArm_16:: @ 080D14DE + .include "animations/gSpriteAnimations_VaatiArm_16.s" -gUnk_080D14F3:: @ 080D14F3 - .incbin "vaatiArm/gUnk_080D14F3.bin" +gSpriteAnimations_VaatiArm_17:: @ 080D14F3 + .include "animations/gSpriteAnimations_VaatiArm_17.s" -gUnk_080D150C:: @ 080D150C - .incbin "vaatiArm/gUnk_080D150C.bin" +gSpriteAnimations_VaatiArm_18:: @ 080D150C + .include "animations/gSpriteAnimations_VaatiArm_18.s" -gUnk_080D1525:: @ 080D1525 - .incbin "vaatiArm/gUnk_080D1525.bin" +gSpriteAnimations_VaatiArm_19:: @ 080D1525 + .include "animations/gSpriteAnimations_VaatiArm_19.s" -gUnk_080D152A:: @ 080D152A - .incbin "vaatiArm/gUnk_080D152A.bin" +gSpriteAnimations_VaatiArm_20:: @ 080D152A + .include "animations/gSpriteAnimations_VaatiArm_20.s" gSpriteAnimations_VaatiArm:: @ 080D1530 - .4byte gUnk_080D141E - .4byte gUnk_080D142B - .4byte gUnk_080D1430 - .4byte gUnk_080D1435 - .4byte gUnk_080D143A - .4byte gUnk_080D143F - .4byte gUnk_080D1444 - .4byte gUnk_080D1449 - .4byte gUnk_080D144E - .4byte gUnk_080D1453 - .4byte gUnk_080D1458 - .4byte gUnk_080D145D - .4byte gUnk_080D1462 - .4byte gUnk_080D1467 - .4byte gUnk_080D1488 - .4byte gUnk_080D148D - .4byte gUnk_080D14DE - .4byte gUnk_080D14F3 - .4byte gUnk_080D150C - .4byte gUnk_080D1525 - .4byte gUnk_080D152A + .4byte gSpriteAnimations_VaatiArm_0 + .4byte gSpriteAnimations_VaatiArm_1 + .4byte gSpriteAnimations_VaatiArm_2 + .4byte gSpriteAnimations_VaatiArm_3 + .4byte gSpriteAnimations_VaatiArm_4 + .4byte gSpriteAnimations_VaatiArm_5 + .4byte gSpriteAnimations_VaatiArm_6 + .4byte gSpriteAnimations_VaatiArm_7 + .4byte gSpriteAnimations_VaatiArm_8 + .4byte gSpriteAnimations_VaatiArm_9 + .4byte gSpriteAnimations_VaatiArm_10 + .4byte gSpriteAnimations_VaatiArm_11 + .4byte gSpriteAnimations_VaatiArm_12 + .4byte gSpriteAnimations_VaatiArm_13 + .4byte gSpriteAnimations_VaatiArm_14 + .4byte gSpriteAnimations_VaatiArm_15 + .4byte gSpriteAnimations_VaatiArm_16 + .4byte gSpriteAnimations_VaatiArm_17 + .4byte gSpriteAnimations_VaatiArm_18 + .4byte gSpriteAnimations_VaatiArm_19 + .4byte gSpriteAnimations_VaatiArm_20 .4byte 00000000 diff --git a/data/animations/enemy/vaatiBall.s b/data/animations/enemy/vaatiBall.s index a5fdb8f3..26dc4186 100644 --- a/data/animations/enemy/vaatiBall.s +++ b/data/animations/enemy/vaatiBall.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_080D1638:: @ 080D1638 - .incbin "vaatiBall/gUnk_080D1638.bin" +gSpriteAnimations_VaatiBall_0:: @ 080D1638 + .include "animations/gSpriteAnimations_VaatiBall_0.s" -gUnk_080D163D:: @ 080D163D - .incbin "vaatiBall/gUnk_080D163D.bin" +gSpriteAnimations_VaatiBall_1:: @ 080D163D + .include "animations/gSpriteAnimations_VaatiBall_1.s" -gUnk_080D166E:: @ 080D166E - .incbin "vaatiBall/gUnk_080D166E.bin" +gSpriteAnimations_VaatiBall_2:: @ 080D166E + .include "animations/gSpriteAnimations_VaatiBall_2.s" gSpriteAnimations_VaatiBall:: @ 080D1694 - .4byte gUnk_080D1638 - .4byte gUnk_080D163D - .4byte gUnk_080D166E + .4byte gSpriteAnimations_VaatiBall_0 + .4byte gSpriteAnimations_VaatiBall_1 + .4byte gSpriteAnimations_VaatiBall_2 .4byte 00000000 diff --git a/data/animations/enemy/vaatiEyesMacro.s b/data/animations/enemy/vaatiEyesMacro.s index 04b728e0..01248ba8 100644 --- a/data/animations/enemy/vaatiEyesMacro.s +++ b/data/animations/enemy/vaatiEyesMacro.s @@ -6,13 +6,13 @@ -gUnk_080CDEA0:: @ 080CDEA0 - .incbin "vaatiEyesMacro/gUnk_080CDEA0.bin" +gSpriteAnimations_VaatiEyesMacro_0:: @ 080CDEA0 + .include "animations/gSpriteAnimations_VaatiEyesMacro_0.s" -gUnk_080CDEB1:: @ 080CDEB1 - .incbin "vaatiEyesMacro/gUnk_080CDEB1.bin" +gSpriteAnimations_VaatiEyesMacro_1:: @ 080CDEB1 + .include "animations/gSpriteAnimations_VaatiEyesMacro_1.s" gSpriteAnimations_VaatiEyesMacro:: @ 080CDEC4 - .4byte gUnk_080CDEA0 - .4byte gUnk_080CDEB1 + .4byte gSpriteAnimations_VaatiEyesMacro_0 + .4byte gSpriteAnimations_VaatiEyesMacro_1 .4byte 00000000 diff --git a/data/animations/enemy/vaatiProjectile.s b/data/animations/enemy/vaatiProjectile.s index 9235a99e..17dbedf4 100644 --- a/data/animations/enemy/vaatiProjectile.s +++ b/data/animations/enemy/vaatiProjectile.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_080D0688:: @ 080D0688 - .incbin "vaatiProjectile/gUnk_080D0688.bin" +gSpriteAnimations_VaatiProjectile_0:: @ 080D0688 + .include "animations/gSpriteAnimations_VaatiProjectile_0.s" -gUnk_080D06A1:: @ 080D06A1 - .incbin "vaatiProjectile/gUnk_080D06A1.bin" +gSpriteAnimations_VaatiProjectile_1:: @ 080D06A1 + .include "animations/gSpriteAnimations_VaatiProjectile_1.s" -gUnk_080D06B2:: @ 080D06B2 - .incbin "vaatiProjectile/gUnk_080D06B2.bin" +gSpriteAnimations_VaatiProjectile_2:: @ 080D06B2 + .include "animations/gSpriteAnimations_VaatiProjectile_2.s" gSpriteAnimations_VaatiProjectile:: @ 080D06D0 - .4byte gUnk_080D0688 - .4byte gUnk_080D06A1 - .4byte gUnk_080D06B2 + .4byte gSpriteAnimations_VaatiProjectile_0 + .4byte gSpriteAnimations_VaatiProjectile_1 + .4byte gSpriteAnimations_VaatiProjectile_2 .4byte 00000000 diff --git a/data/animations/enemy/vaatiRebornEnemy.s b/data/animations/enemy/vaatiRebornEnemy.s index 5c2a099f..12799c59 100644 --- a/data/animations/enemy/vaatiRebornEnemy.s +++ b/data/animations/enemy/vaatiRebornEnemy.s @@ -4,75 +4,75 @@ .section .rodata @ .align 2 -gUnk_080D04D7:: @ 080D04D7 - .incbin "vaatiRebornEnemy/gUnk_080D04D7.bin" +gSpriteAnimations_VaatiRebornEnemy_0_0:: @ 080D04D7 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_0.s" -gUnk_080D04E8:: @ 080D04E8 - .incbin "vaatiRebornEnemy/gUnk_080D04E8.bin" +gSpriteAnimations_VaatiRebornEnemy_0_1:: @ 080D04E8 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_1.s" -gUnk_080D0501:: @ 080D0501 - .incbin "vaatiRebornEnemy/gUnk_080D0501.bin" +gSpriteAnimations_VaatiRebornEnemy_0_2:: @ 080D0501 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_2.s" -gUnk_080D050D:: @ 080D050D - .incbin "vaatiRebornEnemy/gUnk_080D050D.bin" +gSpriteAnimations_VaatiRebornEnemy_0_3:: @ 080D050D + .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_3.s" -gUnk_080D0531:: @ 080D0531 - .incbin "vaatiRebornEnemy/gUnk_080D0531.bin" +gSpriteAnimations_VaatiRebornEnemy_0_4:: @ 080D0531 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_0_4.s" gSpriteAnimations_VaatiRebornEnemy_0:: @ 080D0558 - .4byte gUnk_080D04D7 - .4byte gUnk_080D04E8 - .4byte gUnk_080D0501 - .4byte gUnk_080D050D - .4byte gUnk_080D0531 + .4byte gSpriteAnimations_VaatiRebornEnemy_0_0 + .4byte gSpriteAnimations_VaatiRebornEnemy_0_1 + .4byte gSpriteAnimations_VaatiRebornEnemy_0_2 + .4byte gSpriteAnimations_VaatiRebornEnemy_0_3 + .4byte gSpriteAnimations_VaatiRebornEnemy_0_4 .4byte 00000000 -gUnk_080D0570:: @ 080D0570 - .incbin "vaatiRebornEnemy/gUnk_080D0570.bin" +gSpriteAnimations_VaatiRebornEnemy_1_0:: @ 080D0570 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_1_0.s" -gUnk_080D0575:: @ 080D0575 - .incbin "vaatiRebornEnemy/gUnk_080D0575.bin" +gSpriteAnimations_VaatiRebornEnemy_1_1:: @ 080D0575 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_1_1.s" -gUnk_080D0585:: @ 080D0585 - .incbin "vaatiRebornEnemy/gUnk_080D0585.bin" +gSpriteAnimations_VaatiRebornEnemy_1_2:: @ 080D0585 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_1_2.s" gSpriteAnimations_VaatiRebornEnemy_1:: @ 080D058C - .4byte gUnk_080D0570 - .4byte gUnk_080D0575 - .4byte gUnk_080D0585 + .4byte gSpriteAnimations_VaatiRebornEnemy_1_0 + .4byte gSpriteAnimations_VaatiRebornEnemy_1_1 + .4byte gSpriteAnimations_VaatiRebornEnemy_1_2 .4byte 00000000 -gUnk_080D059C:: @ 080D059C - .incbin "vaatiRebornEnemy/gUnk_080D059C.bin" +gSpriteAnimations_VaatiRebornEnemy_2_0:: @ 080D059C + .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_0.s" -gUnk_080D05AD:: @ 080D05AD - .incbin "vaatiRebornEnemy/gUnk_080D05AD.bin" +gSpriteAnimations_VaatiRebornEnemy_2_2:: @ 080D05AD + .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_2.s" -gUnk_080D05BE:: @ 080D05BE - .incbin "vaatiRebornEnemy/gUnk_080D05BE.bin" +gSpriteAnimations_VaatiRebornEnemy_2_1:: @ 080D05BE + .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_1.s" -gUnk_080D05CF:: @ 080D05CF - .incbin "vaatiRebornEnemy/gUnk_080D05CF.bin" +gSpriteAnimations_VaatiRebornEnemy_2_3:: @ 080D05CF + .include "animations/gSpriteAnimations_VaatiRebornEnemy_2_3.s" gSpriteAnimations_VaatiRebornEnemy_2:: @ 080D05E0 - .4byte gUnk_080D059C - .4byte gUnk_080D05BE - .4byte gUnk_080D05AD - .4byte gUnk_080D05CF + .4byte gSpriteAnimations_VaatiRebornEnemy_2_0 + .4byte gSpriteAnimations_VaatiRebornEnemy_2_1 + .4byte gSpriteAnimations_VaatiRebornEnemy_2_2 + .4byte gSpriteAnimations_VaatiRebornEnemy_2_3 .4byte 00000000 -gUnk_080D05F4:: @ 080D05F4 - .incbin "vaatiRebornEnemy/gUnk_080D05F4.bin" +gSpriteAnimations_VaatiRebornEnemy_3_0:: @ 080D05F4 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_3_0.s" -gUnk_080D0609:: @ 080D0609 - .incbin "vaatiRebornEnemy/gUnk_080D0609.bin" +gSpriteAnimations_VaatiRebornEnemy_3_1:: @ 080D0609 + .include "animations/gSpriteAnimations_VaatiRebornEnemy_3_1.s" -gUnk_080D061E:: @ 080D061E - .incbin "vaatiRebornEnemy/gUnk_080D061E.bin" +gSpriteAnimations_VaatiRebornEnemy_3_3:: @ 080D061E + .include "animations/gSpriteAnimations_VaatiRebornEnemy_3_3.s" gSpriteAnimations_VaatiRebornEnemy_3:: @ 080D0634 - .4byte gUnk_080D05F4 - .4byte gUnk_080D0609 - .4byte gUnk_080D05F4 - .4byte gUnk_080D061E + .4byte gSpriteAnimations_VaatiRebornEnemy_3_0 + .4byte gSpriteAnimations_VaatiRebornEnemy_3_1 + .4byte gSpriteAnimations_VaatiRebornEnemy_3_0 + .4byte gSpriteAnimations_VaatiRebornEnemy_3_3 .4byte 00000000 diff --git a/data/animations/enemy/vaatiTransfigured.s b/data/animations/enemy/vaatiTransfigured.s index 805fa8ed..8e776ade 100644 --- a/data/animations/enemy/vaatiTransfigured.s +++ b/data/animations/enemy/vaatiTransfigured.s @@ -4,106 +4,106 @@ .section .rodata .align 2 -gUnk_080D0BA4:: @ 080D0BA4 - .incbin "vaatiTransfigured/gUnk_080D0BA4.bin" +gSpriteAnimations_VaatiTransfigured_0_0:: @ 080D0BA4 + .include "animations/gSpriteAnimations_VaatiTransfigured_0_0.s" -gUnk_080D0BB5:: @ 080D0BB5 - .incbin "vaatiTransfigured/gUnk_080D0BB5.bin" +gSpriteAnimations_VaatiTransfigured_0_4:: @ 080D0BB5 + .include "animations/gSpriteAnimations_VaatiTransfigured_0_4.s" gSpriteAnimations_VaatiTransfigured_0:: @ 080D0BC4 - .4byte gUnk_080D0BA4 - .4byte gUnk_080D0BA4 - .4byte gUnk_080D0BA4 - .4byte gUnk_080D0BA4 - .4byte gUnk_080D0BB5 + .4byte gSpriteAnimations_VaatiTransfigured_0_0 + .4byte gSpriteAnimations_VaatiTransfigured_0_0 + .4byte gSpriteAnimations_VaatiTransfigured_0_0 + .4byte gSpriteAnimations_VaatiTransfigured_0_0 + .4byte gSpriteAnimations_VaatiTransfigured_0_4 .4byte 00000000 -gUnk_080D0BDC:: @ 080D0BDC - .incbin "vaatiTransfigured/gUnk_080D0BDC.bin" +gSpriteAnimations_VaatiTransfigured_2_0:: @ 080D0BDC + .include "animations/gSpriteAnimations_VaatiTransfigured_2_0.s" -gUnk_080D0BE1:: @ 080D0BE1 - .incbin "vaatiTransfigured/gUnk_080D0BE1.bin" +gSpriteAnimations_VaatiTransfigured_2_4:: @ 080D0BE1 + .include "animations/gSpriteAnimations_VaatiTransfigured_2_4.s" -gUnk_080D0BED:: @ 080D0BED - .incbin "vaatiTransfigured/gUnk_080D0BED.bin" +gSpriteAnimations_VaatiTransfigured_2_5:: @ 080D0BED + .include "animations/gSpriteAnimations_VaatiTransfigured_2_5.s" -gUnk_080D0BF2:: @ 080D0BF2 - .incbin "vaatiTransfigured/gUnk_080D0BF2.bin" +gSpriteAnimations_VaatiTransfigured_2_6:: @ 080D0BF2 + .include "animations/gSpriteAnimations_VaatiTransfigured_2_6.s" -gUnk_080D0BF7:: @ 080D0BF7 - .incbin "vaatiTransfigured/gUnk_080D0BF7.bin" +gSpriteAnimations_VaatiTransfigured_2_7:: @ 080D0BF7 + .include "animations/gSpriteAnimations_VaatiTransfigured_2_7.s" -gUnk_080D0BFC:: @ 080D0BFC - .incbin "vaatiTransfigured/gUnk_080D0BFC.bin" +gSpriteAnimations_VaatiTransfigured_2_8:: @ 080D0BFC + .include "animations/gSpriteAnimations_VaatiTransfigured_2_8.s" gSpriteAnimations_VaatiTransfigured_2:: @ 080D0C0C - .4byte gUnk_080D0BDC - .4byte gUnk_080D0BDC - .4byte gUnk_080D0BDC - .4byte gUnk_080D0BDC - .4byte gUnk_080D0BE1 - .4byte gUnk_080D0BED - .4byte gUnk_080D0BF2 - .4byte gUnk_080D0BF7 - .4byte gUnk_080D0BFC + .4byte gSpriteAnimations_VaatiTransfigured_2_0 + .4byte gSpriteAnimations_VaatiTransfigured_2_0 + .4byte gSpriteAnimations_VaatiTransfigured_2_0 + .4byte gSpriteAnimations_VaatiTransfigured_2_0 + .4byte gSpriteAnimations_VaatiTransfigured_2_4 + .4byte gSpriteAnimations_VaatiTransfigured_2_5 + .4byte gSpriteAnimations_VaatiTransfigured_2_6 + .4byte gSpriteAnimations_VaatiTransfigured_2_7 + .4byte gSpriteAnimations_VaatiTransfigured_2_8 .4byte 00000000 -gUnk_080D0C34:: @ 080D0C34 - .incbin "vaatiTransfigured/gUnk_080D0C34.bin" +gSpriteAnimations_VaatiTransfigured_1_0:: @ 080D0C34 + .include "animations/gSpriteAnimations_VaatiTransfigured_1_0.s" -gUnk_080D0C55:: @ 080D0C55 - .incbin "vaatiTransfigured/gUnk_080D0C55.bin" +gSpriteAnimations_VaatiTransfigured_1_1:: @ 080D0C55 + .include "animations/gSpriteAnimations_VaatiTransfigured_1_1.s" gSpriteAnimations_VaatiTransfigured_1:: @ 080D0C88 - .4byte gUnk_080D0C34 - .4byte gUnk_080D0C55 - .4byte gUnk_080D0C34 - .4byte gUnk_080D0C34 - .4byte gUnk_080D0C34 + .4byte gSpriteAnimations_VaatiTransfigured_1_0 + .4byte gSpriteAnimations_VaatiTransfigured_1_1 + .4byte gSpriteAnimations_VaatiTransfigured_1_0 + .4byte gSpriteAnimations_VaatiTransfigured_1_0 + .4byte gSpriteAnimations_VaatiTransfigured_1_0 .4byte 00000000 -gUnk_080D0CA0:: @ 080D0CA0 - .incbin "vaatiTransfigured/gUnk_080D0CA0.bin" +gSpriteAnimations_VaatiTransfigured_3_0:: @ 080D0CA0 + .include "animations/gSpriteAnimations_VaatiTransfigured_3_0.s" -gUnk_080D0CA5:: @ 080D0CA5 - .incbin "vaatiTransfigured/gUnk_080D0CA5.bin" +gSpriteAnimations_VaatiTransfigured_3_2:: @ 080D0CA5 + .include "animations/gSpriteAnimations_VaatiTransfigured_3_2.s" -gUnk_080D0CD5:: @ 080D0CD5 - .incbin "vaatiTransfigured/gUnk_080D0CD5.bin" +gSpriteAnimations_VaatiTransfigured_3_3:: @ 080D0CD5 + .include "animations/gSpriteAnimations_VaatiTransfigured_3_3.s" -gUnk_080D0CE6:: @ 080D0CE6 - .incbin "vaatiTransfigured/gUnk_080D0CE6.bin" +gSpriteAnimations_VaatiTransfigured_3_4:: @ 080D0CE6 + .include "animations/gSpriteAnimations_VaatiTransfigured_3_4.s" gSpriteAnimations_VaatiTransfigured_3:: @ 080D0CF4 - .4byte gUnk_080D0CA0 - .4byte gUnk_080D0CA0 - .4byte gUnk_080D0CA5 - .4byte gUnk_080D0CD5 - .4byte gUnk_080D0CE6 + .4byte gSpriteAnimations_VaatiTransfigured_3_0 + .4byte gSpriteAnimations_VaatiTransfigured_3_0 + .4byte gSpriteAnimations_VaatiTransfigured_3_2 + .4byte gSpriteAnimations_VaatiTransfigured_3_3 + .4byte gSpriteAnimations_VaatiTransfigured_3_4 .4byte 00000000 -gUnk_080D0D0C:: @ 080D0D0C - .incbin "vaatiTransfigured/gUnk_080D0D0C.bin" +gSpriteAnimations_VaatiTransfigured_4_0:: @ 080D0D0C + .include "animations/gSpriteAnimations_VaatiTransfigured_4_0.s" gSpriteAnimations_VaatiTransfigured_4:: @ 080D0D40 - .4byte gUnk_080D0D0C - .incbin "vaatiTransfigured/gSpriteAnimations_VaatiTransfigured_4.bin" + .4byte gSpriteAnimations_VaatiTransfigured_4_0 + .include "animations/gSpriteAnimations_VaatiTransfigured_4.s" -gUnk_080D0D48:: @ 080D0D48 - .incbin "vaatiTransfigured/gUnk_080D0D48.bin" +gSpriteAnimations_VaatiTransfigured_5_0:: @ 080D0D48 + .include "animations/gSpriteAnimations_VaatiTransfigured_5_0.s" -gUnk_080D0D78:: @ 080D0D78 - .incbin "vaatiTransfigured/gUnk_080D0D78.bin" +gSpriteAnimations_VaatiTransfigured_5_1:: @ 080D0D78 + .include "animations/gSpriteAnimations_VaatiTransfigured_5_1.s" -gUnk_080D0D91:: @ 080D0D91 - .incbin "vaatiTransfigured/gUnk_080D0D91.bin" +gSpriteAnimations_VaatiTransfigured_5_2:: @ 080D0D91 + .include "animations/gSpriteAnimations_VaatiTransfigured_5_2.s" -gUnk_080D0DA1:: @ 080D0DA1 - .incbin "vaatiTransfigured/gUnk_080D0DA1.bin" +gSpriteAnimations_VaatiTransfigured_5_3:: @ 080D0DA1 + .include "animations/gSpriteAnimations_VaatiTransfigured_5_3.s" gSpriteAnimations_VaatiTransfigured_5:: @ 080D0DB0 - .4byte gUnk_080D0D48 - .4byte gUnk_080D0D78 - .4byte gUnk_080D0D91 - .4byte gUnk_080D0DA1 + .4byte gSpriteAnimations_VaatiTransfigured_5_0 + .4byte gSpriteAnimations_VaatiTransfigured_5_1 + .4byte gSpriteAnimations_VaatiTransfigured_5_2 + .4byte gSpriteAnimations_VaatiTransfigured_5_3 .4byte 00000000 diff --git a/data/animations/enemy/vaatiTransfiguredEye.s b/data/animations/enemy/vaatiTransfiguredEye.s index 90368ee6..dab1e9f0 100644 --- a/data/animations/enemy/vaatiTransfiguredEye.s +++ b/data/animations/enemy/vaatiTransfiguredEye.s @@ -4,63 +4,63 @@ .section .rodata .align 2 -gUnk_080D18C4:: @ 080D18C4 - .incbin "enemy5A/gUnk_080D18C4.bin" +gSpriteAnimations_Enemy5A_0:: @ 080D18C4 + .include "animations/gSpriteAnimations_Enemy5A_0.s" -gUnk_080D18C9:: @ 080D18C9 - .incbin "enemy5A/gUnk_080D18C9.bin" +gSpriteAnimations_Enemy5A_1:: @ 080D18C9 + .include "animations/gSpriteAnimations_Enemy5A_1.s" -gUnk_080D18DA:: @ 080D18DA - .incbin "enemy5A/gUnk_080D18DA.bin" +gSpriteAnimations_Enemy5A_2:: @ 080D18DA + .include "animations/gSpriteAnimations_Enemy5A_2.s" -gUnk_080D18F3:: @ 080D18F3 - .incbin "enemy5A/gUnk_080D18F3.bin" +gSpriteAnimations_Enemy5A_3:: @ 080D18F3 + .include "animations/gSpriteAnimations_Enemy5A_3.s" -gUnk_080D1914:: @ 080D1914 - .incbin "enemy5A/gUnk_080D1914.bin" +gSpriteAnimations_Enemy5A_4:: @ 080D1914 + .include "animations/gSpriteAnimations_Enemy5A_4.s" -gUnk_080D191D:: @ 080D191D - .incbin "enemy5A/gUnk_080D191D.bin" +gSpriteAnimations_Enemy5A_5:: @ 080D191D + .include "animations/gSpriteAnimations_Enemy5A_5.s" -gUnk_080D1926:: @ 080D1926 - .incbin "enemy5A/gUnk_080D1926.bin" +gSpriteAnimations_Enemy5A_6:: @ 080D1926 + .include "animations/gSpriteAnimations_Enemy5A_6.s" -gUnk_080D192F:: @ 080D192F - .incbin "enemy5A/gUnk_080D192F.bin" +gSpriteAnimations_Enemy5A_8:: @ 080D192F + .include "animations/gSpriteAnimations_Enemy5A_8.s" -gUnk_080D1934:: @ 080D1934 - .incbin "enemy5A/gUnk_080D1934.bin" +gSpriteAnimations_Enemy5A_9:: @ 080D1934 + .include "animations/gSpriteAnimations_Enemy5A_9.s" -gUnk_080D1945:: @ 080D1945 - .incbin "enemy5A/gUnk_080D1945.bin" +gSpriteAnimations_Enemy5A_10:: @ 080D1945 + .include "animations/gSpriteAnimations_Enemy5A_10.s" -gUnk_080D195A:: @ 080D195A - .incbin "enemy5A/gUnk_080D195A.bin" +gSpriteAnimations_Enemy5A_11:: @ 080D195A + .include "animations/gSpriteAnimations_Enemy5A_11.s" -gUnk_080D1967:: @ 080D1967 - .incbin "enemy5A/gUnk_080D1967.bin" +gSpriteAnimations_Enemy5A_12:: @ 080D1967 + .include "animations/gSpriteAnimations_Enemy5A_12.s" -gUnk_080D1988:: @ 080D1988 - .incbin "enemy5A/gUnk_080D1988.bin" +gSpriteAnimations_Enemy5A_13:: @ 080D1988 + .include "animations/gSpriteAnimations_Enemy5A_13.s" -gUnk_080D19AD:: @ 080D19AD - .incbin "enemy5A/gUnk_080D19AD.bin" +gSpriteAnimations_Enemy5A_14:: @ 080D19AD + .include "animations/gSpriteAnimations_Enemy5A_14.s" gSpriteAnimations_Enemy5A:: @ 080D19B8 - .4byte gUnk_080D18C4 - .4byte gUnk_080D18C9 - .4byte gUnk_080D18DA - .4byte gUnk_080D18F3 - .4byte gUnk_080D1914 - .4byte gUnk_080D191D - .4byte gUnk_080D1926 - .4byte gUnk_080D18DA - .4byte gUnk_080D192F - .4byte gUnk_080D1934 - .4byte gUnk_080D1945 - .4byte gUnk_080D195A - .4byte gUnk_080D1967 - .4byte gUnk_080D1988 - .4byte gUnk_080D19AD - .4byte gUnk_080D1945 + .4byte gSpriteAnimations_Enemy5A_0 + .4byte gSpriteAnimations_Enemy5A_1 + .4byte gSpriteAnimations_Enemy5A_2 + .4byte gSpriteAnimations_Enemy5A_3 + .4byte gSpriteAnimations_Enemy5A_4 + .4byte gSpriteAnimations_Enemy5A_5 + .4byte gSpriteAnimations_Enemy5A_6 + .4byte gSpriteAnimations_Enemy5A_2 + .4byte gSpriteAnimations_Enemy5A_8 + .4byte gSpriteAnimations_Enemy5A_9 + .4byte gSpriteAnimations_Enemy5A_10 + .4byte gSpriteAnimations_Enemy5A_11 + .4byte gSpriteAnimations_Enemy5A_12 + .4byte gSpriteAnimations_Enemy5A_13 + .4byte gSpriteAnimations_Enemy5A_14 + .4byte gSpriteAnimations_Enemy5A_10 .4byte 00000000 diff --git a/data/animations/enemy/vaatiWrath.s b/data/animations/enemy/vaatiWrath.s index 20a5e7f9..07e1d4f6 100644 --- a/data/animations/enemy/vaatiWrath.s +++ b/data/animations/enemy/vaatiWrath.s @@ -4,134 +4,134 @@ .section .rodata .align 2 -gUnk_080D0ED0:: @ 080D0ED0 - .incbin "vaatiWrath/gUnk_080D0ED0.bin" +gSpriteAnimations_VaatiWrath_0:: @ 080D0ED0 + .include "animations/gSpriteAnimations_VaatiWrath_0.s" -gUnk_080D0EE9:: @ 080D0EE9 - .incbin "vaatiWrath/gUnk_080D0EE9.bin" +gSpriteAnimations_VaatiWrath_1:: @ 080D0EE9 + .include "animations/gSpriteAnimations_VaatiWrath_1.s" -gUnk_080D0F02:: @ 080D0F02 - .incbin "vaatiWrath/gUnk_080D0F02.bin" +gSpriteAnimations_VaatiWrath_2:: @ 080D0F02 + .include "animations/gSpriteAnimations_VaatiWrath_2.s" -gUnk_080D0F13:: @ 080D0F13 - .incbin "vaatiWrath/gUnk_080D0F13.bin" +gSpriteAnimations_VaatiWrath_3:: @ 080D0F13 + .include "animations/gSpriteAnimations_VaatiWrath_3.s" -gUnk_080D0F28:: @ 080D0F28 - .incbin "vaatiWrath/gUnk_080D0F28.bin" +gSpriteAnimations_VaatiWrath_4:: @ 080D0F28 + .include "animations/gSpriteAnimations_VaatiWrath_4.s" -gUnk_080D0F6D:: @ 080D0F6D - .incbin "vaatiWrath/gUnk_080D0F6D.bin" +gSpriteAnimations_VaatiWrath_5:: @ 080D0F6D + .include "animations/gSpriteAnimations_VaatiWrath_5.s" -gUnk_080D0F82:: @ 080D0F82 - .incbin "vaatiWrath/gUnk_080D0F82.bin" +gSpriteAnimations_VaatiWrath_6:: @ 080D0F82 + .include "animations/gSpriteAnimations_VaatiWrath_6.s" -gUnk_080D0F9B:: @ 080D0F9B - .incbin "vaatiWrath/gUnk_080D0F9B.bin" +gSpriteAnimations_VaatiWrath_7:: @ 080D0F9B + .include "animations/gSpriteAnimations_VaatiWrath_7.s" -gUnk_080D0FB0:: @ 080D0FB0 - .incbin "vaatiWrath/gUnk_080D0FB0.bin" +gSpriteAnimations_VaatiWrath_8:: @ 080D0FB0 + .include "animations/gSpriteAnimations_VaatiWrath_8.s" -gUnk_080D0FC1:: @ 080D0FC1 - .incbin "vaatiWrath/gUnk_080D0FC1.bin" +gSpriteAnimations_VaatiWrath_9:: @ 080D0FC1 + .include "animations/gSpriteAnimations_VaatiWrath_9.s" -gUnk_080D0FD6:: @ 080D0FD6 - .incbin "vaatiWrath/gUnk_080D0FD6.bin" +gSpriteAnimations_VaatiWrath_10:: @ 080D0FD6 + .include "animations/gSpriteAnimations_VaatiWrath_10.s" -gUnk_080D0FF3:: @ 080D0FF3 - .incbin "vaatiWrath/gUnk_080D0FF3.bin" +gSpriteAnimations_VaatiWrath_11:: @ 080D0FF3 + .include "animations/gSpriteAnimations_VaatiWrath_11.s" -gUnk_080D0FF8:: @ 080D0FF8 - .incbin "vaatiWrath/gUnk_080D0FF8.bin" +gSpriteAnimations_VaatiWrath_12:: @ 080D0FF8 + .include "animations/gSpriteAnimations_VaatiWrath_12.s" -gUnk_080D1019:: @ 080D1019 - .incbin "vaatiWrath/gUnk_080D1019.bin" +gSpriteAnimations_VaatiWrath_13:: @ 080D1019 + .include "animations/gSpriteAnimations_VaatiWrath_13.s" -gUnk_080D1036:: @ 080D1036 - .incbin "vaatiWrath/gUnk_080D1036.bin" +gSpriteAnimations_VaatiWrath_14:: @ 080D1036 + .include "animations/gSpriteAnimations_VaatiWrath_14.s" -gUnk_080D104F:: @ 080D104F - .incbin "vaatiWrath/gUnk_080D104F.bin" +gSpriteAnimations_VaatiWrath_15:: @ 080D104F + .include "animations/gSpriteAnimations_VaatiWrath_15.s" -gUnk_080D1060:: @ 080D1060 - .incbin "vaatiWrath/gUnk_080D1060.bin" +gSpriteAnimations_VaatiWrath_16:: @ 080D1060 + .include "animations/gSpriteAnimations_VaatiWrath_16.s" -gUnk_080D106D:: @ 080D106D - .incbin "vaatiWrath/gUnk_080D106D.bin" +gSpriteAnimations_VaatiWrath_17:: @ 080D106D + .include "animations/gSpriteAnimations_VaatiWrath_17.s" -gUnk_080D107A:: @ 080D107A - .incbin "vaatiWrath/gUnk_080D107A.bin" +gSpriteAnimations_VaatiWrath_18:: @ 080D107A + .include "animations/gSpriteAnimations_VaatiWrath_18.s" -gUnk_080D107F:: @ 080D107F - .incbin "vaatiWrath/gUnk_080D107F.bin" +gSpriteAnimations_VaatiWrath_19:: @ 080D107F + .include "animations/gSpriteAnimations_VaatiWrath_19.s" -gUnk_080D10A0:: @ 080D10A0 - .incbin "vaatiWrath/gUnk_080D10A0.bin" +gSpriteAnimations_VaatiWrath_20:: @ 080D10A0 + .include "animations/gSpriteAnimations_VaatiWrath_20.s" -gUnk_080D10B5:: @ 080D10B5 - .incbin "vaatiWrath/gUnk_080D10B5.bin" +gSpriteAnimations_VaatiWrath_21:: @ 080D10B5 + .include "animations/gSpriteAnimations_VaatiWrath_21.s" -gUnk_080D10C6:: @ 080D10C6 - .incbin "vaatiWrath/gUnk_080D10C6.bin" +gSpriteAnimations_VaatiWrath_22:: @ 080D10C6 + .include "animations/gSpriteAnimations_VaatiWrath_22.s" -gUnk_080D10D7:: @ 080D10D7 - .incbin "vaatiWrath/gUnk_080D10D7.bin" +gSpriteAnimations_VaatiWrath_23:: @ 080D10D7 + .include "animations/gSpriteAnimations_VaatiWrath_23.s" -gUnk_080D10EC:: @ 080D10EC - .incbin "vaatiWrath/gUnk_080D10EC.bin" +gSpriteAnimations_VaatiWrath_24:: @ 080D10EC + .include "animations/gSpriteAnimations_VaatiWrath_24.s" -gUnk_080D10F1:: @ 080D10F1 - .incbin "vaatiWrath/gUnk_080D10F1.bin" +gSpriteAnimations_VaatiWrath_25:: @ 080D10F1 + .include "animations/gSpriteAnimations_VaatiWrath_25.s" -gUnk_080D1106:: @ 080D1106 - .incbin "vaatiWrath/gUnk_080D1106.bin" +gSpriteAnimations_VaatiWrath_26:: @ 080D1106 + .include "animations/gSpriteAnimations_VaatiWrath_26.s" -gUnk_080D1117:: @ 080D1117 - .incbin "vaatiWrath/gUnk_080D1117.bin" +gSpriteAnimations_VaatiWrath_27:: @ 080D1117 + .include "animations/gSpriteAnimations_VaatiWrath_27.s" -gUnk_080D1138:: @ 080D1138 - .incbin "vaatiWrath/gUnk_080D1138.bin" +gSpriteAnimations_VaatiWrath_28:: @ 080D1138 + .include "animations/gSpriteAnimations_VaatiWrath_28.s" -gUnk_080D114D:: @ 080D114D - .incbin "vaatiWrath/gUnk_080D114D.bin" +gSpriteAnimations_VaatiWrath_29:: @ 080D114D + .include "animations/gSpriteAnimations_VaatiWrath_29.s" -gUnk_080D117E:: @ 080D117E - .incbin "vaatiWrath/gUnk_080D117E.bin" +gSpriteAnimations_VaatiWrath_30:: @ 080D117E + .include "animations/gSpriteAnimations_VaatiWrath_30.s" -gUnk_080D1197:: @ 080D1197 - .incbin "vaatiWrath/gUnk_080D1197.bin" +gSpriteAnimations_VaatiWrath_31:: @ 080D1197 + .include "animations/gSpriteAnimations_VaatiWrath_31.s" gSpriteAnimations_VaatiWrath:: @ 080D11AC - .4byte gUnk_080D0ED0 - .4byte gUnk_080D0EE9 - .4byte gUnk_080D0F02 - .4byte gUnk_080D0F13 - .4byte gUnk_080D0F28 - .4byte gUnk_080D0F6D - .4byte gUnk_080D0F82 - .4byte gUnk_080D0F9B - .4byte gUnk_080D0FB0 - .4byte gUnk_080D0FC1 - .4byte gUnk_080D0FD6 - .4byte gUnk_080D0FF3 - .4byte gUnk_080D0FF8 - .4byte gUnk_080D1019 - .4byte gUnk_080D1036 - .4byte gUnk_080D104F - .4byte gUnk_080D1060 - .4byte gUnk_080D106D - .4byte gUnk_080D107A - .4byte gUnk_080D107F - .4byte gUnk_080D10A0 - .4byte gUnk_080D10B5 - .4byte gUnk_080D10C6 - .4byte gUnk_080D10D7 - .4byte gUnk_080D10EC - .4byte gUnk_080D10F1 - .4byte gUnk_080D1106 - .4byte gUnk_080D1117 - .4byte gUnk_080D1138 - .4byte gUnk_080D114D - .4byte gUnk_080D117E - .4byte gUnk_080D1197 + .4byte gSpriteAnimations_VaatiWrath_0 + .4byte gSpriteAnimations_VaatiWrath_1 + .4byte gSpriteAnimations_VaatiWrath_2 + .4byte gSpriteAnimations_VaatiWrath_3 + .4byte gSpriteAnimations_VaatiWrath_4 + .4byte gSpriteAnimations_VaatiWrath_5 + .4byte gSpriteAnimations_VaatiWrath_6 + .4byte gSpriteAnimations_VaatiWrath_7 + .4byte gSpriteAnimations_VaatiWrath_8 + .4byte gSpriteAnimations_VaatiWrath_9 + .4byte gSpriteAnimations_VaatiWrath_10 + .4byte gSpriteAnimations_VaatiWrath_11 + .4byte gSpriteAnimations_VaatiWrath_12 + .4byte gSpriteAnimations_VaatiWrath_13 + .4byte gSpriteAnimations_VaatiWrath_14 + .4byte gSpriteAnimations_VaatiWrath_15 + .4byte gSpriteAnimations_VaatiWrath_16 + .4byte gSpriteAnimations_VaatiWrath_17 + .4byte gSpriteAnimations_VaatiWrath_18 + .4byte gSpriteAnimations_VaatiWrath_19 + .4byte gSpriteAnimations_VaatiWrath_20 + .4byte gSpriteAnimations_VaatiWrath_21 + .4byte gSpriteAnimations_VaatiWrath_22 + .4byte gSpriteAnimations_VaatiWrath_23 + .4byte gSpriteAnimations_VaatiWrath_24 + .4byte gSpriteAnimations_VaatiWrath_25 + .4byte gSpriteAnimations_VaatiWrath_26 + .4byte gSpriteAnimations_VaatiWrath_27 + .4byte gSpriteAnimations_VaatiWrath_28 + .4byte gSpriteAnimations_VaatiWrath_29 + .4byte gSpriteAnimations_VaatiWrath_30 + .4byte gSpriteAnimations_VaatiWrath_31 .4byte 00000000 diff --git a/data/animations/enemy/vaatiWrathEye.s b/data/animations/enemy/vaatiWrathEye.s index 6852d4bf..e7e49b14 100644 --- a/data/animations/enemy/vaatiWrathEye.s +++ b/data/animations/enemy/vaatiWrathEye.s @@ -4,41 +4,41 @@ .section .rodata .align 2 -gUnk_080D1DA0:: @ 080D1DA0 - .incbin "enemy5F/gUnk_080D1DA0.bin" +gSpriteAnimations_Enemy5F_0:: @ 080D1DA0 + .include "animations/gSpriteAnimations_Enemy5F_0.s" -gUnk_080D1DC8:: @ 080D1DC8 - .incbin "enemy5F/gUnk_080D1DC8.bin" +gSpriteAnimations_Enemy5F_1:: @ 080D1DC8 + .include "animations/gSpriteAnimations_Enemy5F_1.s" -gUnk_080D1DCC:: @ 080D1DCC - .incbin "enemy5F/gUnk_080D1DCC.bin" +gSpriteAnimations_Enemy5F_2:: @ 080D1DCC + .include "animations/gSpriteAnimations_Enemy5F_2.s" -gUnk_080D1DD0:: @ 080D1DD0 - .incbin "enemy5F/gUnk_080D1DD0.bin" +gSpriteAnimations_Enemy5F_4:: @ 080D1DD0 + .include "animations/gSpriteAnimations_Enemy5F_4.s" -gUnk_080D1DDC:: @ 080D1DDC - .incbin "enemy5F/gUnk_080D1DDC.bin" +gSpriteAnimations_Enemy5F_3:: @ 080D1DDC + .include "animations/gSpriteAnimations_Enemy5F_3.s" -gUnk_080D1DE8:: @ 080D1DE8 - .incbin "enemy5F/gUnk_080D1DE8.bin" +gSpriteAnimations_Enemy5F_5:: @ 080D1DE8 + .include "animations/gSpriteAnimations_Enemy5F_5.s" -gUnk_080D1E05:: @ 080D1E05 - .incbin "enemy5F/gUnk_080D1E05.bin" +gSpriteAnimations_Enemy5F_6:: @ 080D1E05 + .include "animations/gSpriteAnimations_Enemy5F_6.s" -gUnk_080D1E21:: @ 080D1E21 - .incbin "enemy5F/gUnk_080D1E21.bin" +gSpriteAnimations_Enemy5F_7:: @ 080D1E21 + .include "animations/gSpriteAnimations_Enemy5F_7.s" -gUnk_080D1E32:: @ 080D1E32 - .incbin "enemy5F/gUnk_080D1E32.bin" +gSpriteAnimations_Enemy5F_8:: @ 080D1E32 + .include "animations/gSpriteAnimations_Enemy5F_8.s" gSpriteAnimations_Enemy5F:: @ 080D1E44 - .4byte gUnk_080D1DA0 - .4byte gUnk_080D1DC8 - .4byte gUnk_080D1DCC - .4byte gUnk_080D1DDC - .4byte gUnk_080D1DD0 - .4byte gUnk_080D1DE8 - .4byte gUnk_080D1E05 - .4byte gUnk_080D1E21 - .4byte gUnk_080D1E32 + .4byte gSpriteAnimations_Enemy5F_0 + .4byte gSpriteAnimations_Enemy5F_1 + .4byte gSpriteAnimations_Enemy5F_2 + .4byte gSpriteAnimations_Enemy5F_3 + .4byte gSpriteAnimations_Enemy5F_4 + .4byte gSpriteAnimations_Enemy5F_5 + .4byte gSpriteAnimations_Enemy5F_6 + .4byte gSpriteAnimations_Enemy5F_7 + .4byte gSpriteAnimations_Enemy5F_8 .4byte 00000000 diff --git a/data/animations/enemy/wallMaster.s b/data/animations/enemy/wallMaster.s index 4d83662c..644232f2 100644 --- a/data/animations/enemy/wallMaster.s +++ b/data/animations/enemy/wallMaster.s @@ -3,17 +3,17 @@ .section .rodata -gUnk_080CD0B8:: @ 080CD0B8 - .incbin "wallMaster/gUnk_080CD0B8.bin" +gSpriteAnimations_WallMaster_0:: @ 080CD0B8 + .include "animations/gSpriteAnimations_WallMaster_0.s" -gUnk_080CD0C5:: @ 080CD0C5 - .incbin "wallMaster/gUnk_080CD0C5.bin" +gSpriteAnimations_WallMaster_1:: @ 080CD0C5 + .include "animations/gSpriteAnimations_WallMaster_1.s" -gUnk_080CD0DA:: @ 080CD0DA - .incbin "wallMaster/gUnk_080CD0DA.bin" +gSpriteAnimations_WallMaster_2:: @ 080CD0DA + .include "animations/gSpriteAnimations_WallMaster_2.s" gSpriteAnimations_WallMaster:: @ 080CD0E0 - .4byte gUnk_080CD0B8 - .4byte gUnk_080CD0C5 - .4byte gUnk_080CD0DA + .4byte gSpriteAnimations_WallMaster_0 + .4byte gSpriteAnimations_WallMaster_1 + .4byte gSpriteAnimations_WallMaster_2 .4byte 00000000 diff --git a/data/animations/enemy/waterDrop.s b/data/animations/enemy/waterDrop.s index 77ac9e9e..d973fd07 100644 --- a/data/animations/enemy/waterDrop.s +++ b/data/animations/enemy/waterDrop.s @@ -3,18 +3,13 @@ .section .rodata -gUnk_080CD044:: @ 080CD044 -.ifdef EU - @ TODO only small differences - .incbin "waterDrop/gUnk_080CD044_EU.bin" -.else - .incbin "waterDrop/gUnk_080CD044_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif +gSpriteAnimations_WaterDrop_0:: @ 080CD044 + .include "animations/gSpriteAnimations_WaterDrop_0.s" -gUnk_080CD069:: @ 080CD069 - .incbin "waterDrop/gUnk_080CD069.bin" +gSpriteAnimations_WaterDrop_1:: @ 080CD069 + .include "animations/gSpriteAnimations_WaterDrop_1.s" gSpriteAnimations_WaterDrop:: @ 080CD070 - .4byte gUnk_080CD044 - .4byte gUnk_080CD069 + .4byte gSpriteAnimations_WaterDrop_0 + .4byte gSpriteAnimations_WaterDrop_1 .4byte 00000000 diff --git a/data/animations/enemy/wisp.s b/data/animations/enemy/wisp.s index ec2e9bc8..8a9a6953 100644 --- a/data/animations/enemy/wisp.s +++ b/data/animations/enemy/wisp.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_080CEBAC:: @ 080CEBAC - .incbin "wisp/gUnk_080CEBAC.bin" +gSpriteAnimations_Wisp_0:: @ 080CEBAC + .include "animations/gSpriteAnimations_Wisp_0.s" -gUnk_080CEBBD:: @ 080CEBBD - .incbin "wisp/gUnk_080CEBBD.bin" +gSpriteAnimations_Wisp_1:: @ 080CEBBD + .include "animations/gSpriteAnimations_Wisp_1.s" gSpriteAnimations_Wisp:: @ 080CEBD0 - .4byte gUnk_080CEBAC - .4byte gUnk_080CEBBD + .4byte gSpriteAnimations_Wisp_0 + .4byte gSpriteAnimations_Wisp_1 .4byte 00000000 diff --git a/data/animations/enemy/wizzrobeFire.s b/data/animations/enemy/wizzrobeFire.s index a9dd1dc1..2e1fd92f 100644 --- a/data/animations/enemy/wizzrobeFire.s +++ b/data/animations/enemy/wizzrobeFire.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_080CDFE8:: @ 080CDFE8 - .incbin "wizzrobeFire/gUnk_080CDFE8.bin" +gSpriteAnimations_WizzrobeFire_0:: @ 080CDFE8 + .include "animations/gSpriteAnimations_WizzrobeFire_0.s" -gUnk_080CDFF5:: @ 080CDFF5 - .incbin "wizzrobeFire/gUnk_080CDFF5.bin" +gSpriteAnimations_WizzrobeFire_1:: @ 080CDFF5 + .include "animations/gSpriteAnimations_WizzrobeFire_1.s" -gUnk_080CE002:: @ 080CE002 - .incbin "wizzrobeFire/gUnk_080CE002.bin" +gSpriteAnimations_WizzrobeFire_2:: @ 080CE002 + .include "animations/gSpriteAnimations_WizzrobeFire_2.s" -gUnk_080CE00F:: @ 080CE00F - .incbin "wizzrobeFire/gUnk_080CE00F.bin" +gSpriteAnimations_WizzrobeFire_3:: @ 080CE00F + .include "animations/gSpriteAnimations_WizzrobeFire_3.s" -gUnk_080CE01C:: @ 080CE01C - .incbin "wizzrobeFire/gUnk_080CE01C.bin" +gSpriteAnimations_WizzrobeFire_4:: @ 080CE01C + .include "animations/gSpriteAnimations_WizzrobeFire_4.s" -gUnk_080CE029:: @ 080CE029 - .incbin "wizzrobeFire/gUnk_080CE029.bin" +gSpriteAnimations_WizzrobeFire_5:: @ 080CE029 + .include "animations/gSpriteAnimations_WizzrobeFire_5.s" -gUnk_080CE036:: @ 080CE036 - .incbin "wizzrobeFire/gUnk_080CE036.bin" +gSpriteAnimations_WizzrobeFire_6:: @ 080CE036 + .include "animations/gSpriteAnimations_WizzrobeFire_6.s" -gUnk_080CE043:: @ 080CE043 - .incbin "wizzrobeFire/gUnk_080CE043.bin" +gSpriteAnimations_WizzrobeFire_7:: @ 080CE043 + .include "animations/gSpriteAnimations_WizzrobeFire_7.s" gSpriteAnimations_WizzrobeFire:: @ 080CE050 - .4byte gUnk_080CDFE8 - .4byte gUnk_080CDFF5 - .4byte gUnk_080CE002 - .4byte gUnk_080CE00F - .4byte gUnk_080CE01C - .4byte gUnk_080CE029 - .4byte gUnk_080CE036 - .4byte gUnk_080CE043 + .4byte gSpriteAnimations_WizzrobeFire_0 + .4byte gSpriteAnimations_WizzrobeFire_1 + .4byte gSpriteAnimations_WizzrobeFire_2 + .4byte gSpriteAnimations_WizzrobeFire_3 + .4byte gSpriteAnimations_WizzrobeFire_4 + .4byte gSpriteAnimations_WizzrobeFire_5 + .4byte gSpriteAnimations_WizzrobeFire_6 + .4byte gSpriteAnimations_WizzrobeFire_7 .4byte 00000000 diff --git a/data/animations/enemy/wizzrobeIce.s b/data/animations/enemy/wizzrobeIce.s index fac3de9d..3a0efa37 100644 --- a/data/animations/enemy/wizzrobeIce.s +++ b/data/animations/enemy/wizzrobeIce.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_080CE098:: @ 080CE098 - .incbin "wizzrobeIce/gUnk_080CE098.bin" +gSpriteAnimations_WizzrobeIce_0:: @ 080CE098 + .include "animations/gSpriteAnimations_WizzrobeIce_0.s" -gUnk_080CE0A5:: @ 080CE0A5 - .incbin "wizzrobeIce/gUnk_080CE0A5.bin" +gSpriteAnimations_WizzrobeIce_1:: @ 080CE0A5 + .include "animations/gSpriteAnimations_WizzrobeIce_1.s" -gUnk_080CE0B2:: @ 080CE0B2 - .incbin "wizzrobeIce/gUnk_080CE0B2.bin" +gSpriteAnimations_WizzrobeIce_2:: @ 080CE0B2 + .include "animations/gSpriteAnimations_WizzrobeIce_2.s" -gUnk_080CE0BF:: @ 080CE0BF - .incbin "wizzrobeIce/gUnk_080CE0BF.bin" +gSpriteAnimations_WizzrobeIce_3:: @ 080CE0BF + .include "animations/gSpriteAnimations_WizzrobeIce_3.s" -gUnk_080CE0CC:: @ 080CE0CC - .incbin "wizzrobeIce/gUnk_080CE0CC.bin" +gSpriteAnimations_WizzrobeIce_4:: @ 080CE0CC + .include "animations/gSpriteAnimations_WizzrobeIce_4.s" -gUnk_080CE0D9:: @ 080CE0D9 - .incbin "wizzrobeIce/gUnk_080CE0D9.bin" +gSpriteAnimations_WizzrobeIce_5:: @ 080CE0D9 + .include "animations/gSpriteAnimations_WizzrobeIce_5.s" -gUnk_080CE0E6:: @ 080CE0E6 - .incbin "wizzrobeIce/gUnk_080CE0E6.bin" +gSpriteAnimations_WizzrobeIce_6:: @ 080CE0E6 + .include "animations/gSpriteAnimations_WizzrobeIce_6.s" -gUnk_080CE0F3:: @ 080CE0F3 - .incbin "wizzrobeIce/gUnk_080CE0F3.bin" +gSpriteAnimations_WizzrobeIce_7:: @ 080CE0F3 + .include "animations/gSpriteAnimations_WizzrobeIce_7.s" gSpriteAnimations_WizzrobeIce:: @ 080CE100 - .4byte gUnk_080CE098 - .4byte gUnk_080CE0A5 - .4byte gUnk_080CE0B2 - .4byte gUnk_080CE0BF - .4byte gUnk_080CE0CC - .4byte gUnk_080CE0D9 - .4byte gUnk_080CE0E6 - .4byte gUnk_080CE0F3 + .4byte gSpriteAnimations_WizzrobeIce_0 + .4byte gSpriteAnimations_WizzrobeIce_1 + .4byte gSpriteAnimations_WizzrobeIce_2 + .4byte gSpriteAnimations_WizzrobeIce_3 + .4byte gSpriteAnimations_WizzrobeIce_4 + .4byte gSpriteAnimations_WizzrobeIce_5 + .4byte gSpriteAnimations_WizzrobeIce_6 + .4byte gSpriteAnimations_WizzrobeIce_7 .4byte 00000000 diff --git a/data/animations/enemy/wizzrobeWind.s b/data/animations/enemy/wizzrobeWind.s index 92e9f3b7..37a4959f 100644 --- a/data/animations/enemy/wizzrobeWind.s +++ b/data/animations/enemy/wizzrobeWind.s @@ -5,37 +5,37 @@ .align 2 -gUnk_080CDF78:: @ 080CDF78 - .incbin "wizzrobeWind/gUnk_080CDF78.bin" +gSpriteAnimations_WizzrobeWind_0:: @ 080CDF78 + .include "animations/gSpriteAnimations_WizzrobeWind_0.s" -gUnk_080CDF7D:: @ 080CDF7D - .incbin "wizzrobeWind/gUnk_080CDF7D.bin" +gSpriteAnimations_WizzrobeWind_1:: @ 080CDF7D + .include "animations/gSpriteAnimations_WizzrobeWind_1.s" -gUnk_080CDF82:: @ 080CDF82 - .incbin "wizzrobeWind/gUnk_080CDF82.bin" +gSpriteAnimations_WizzrobeWind_2:: @ 080CDF82 + .include "animations/gSpriteAnimations_WizzrobeWind_2.s" -gUnk_080CDF87:: @ 080CDF87 - .incbin "wizzrobeWind/gUnk_080CDF87.bin" +gSpriteAnimations_WizzrobeWind_3:: @ 080CDF87 + .include "animations/gSpriteAnimations_WizzrobeWind_3.s" -gUnk_080CDF8C:: @ 080CDF8C - .incbin "wizzrobeWind/gUnk_080CDF8C.bin" +gSpriteAnimations_WizzrobeWind_4:: @ 080CDF8C + .include "animations/gSpriteAnimations_WizzrobeWind_4.s" -gUnk_080CDF91:: @ 080CDF91 - .incbin "wizzrobeWind/gUnk_080CDF91.bin" +gSpriteAnimations_WizzrobeWind_5:: @ 080CDF91 + .include "animations/gSpriteAnimations_WizzrobeWind_5.s" -gUnk_080CDF96:: @ 080CDF96 - .incbin "wizzrobeWind/gUnk_080CDF96.bin" +gSpriteAnimations_WizzrobeWind_6:: @ 080CDF96 + .include "animations/gSpriteAnimations_WizzrobeWind_6.s" -gUnk_080CDF9B:: @ 080CDF9B - .incbin "wizzrobeWind/gUnk_080CDF9B.bin" +gSpriteAnimations_WizzrobeWind_7:: @ 080CDF9B + .include "animations/gSpriteAnimations_WizzrobeWind_7.s" gSpriteAnimations_WizzrobeWind:: @ 080CDFA0 - .4byte gUnk_080CDF78 - .4byte gUnk_080CDF7D - .4byte gUnk_080CDF82 - .4byte gUnk_080CDF87 - .4byte gUnk_080CDF8C - .4byte gUnk_080CDF91 - .4byte gUnk_080CDF96 - .4byte gUnk_080CDF9B + .4byte gSpriteAnimations_WizzrobeWind_0 + .4byte gSpriteAnimations_WizzrobeWind_1 + .4byte gSpriteAnimations_WizzrobeWind_2 + .4byte gSpriteAnimations_WizzrobeWind_3 + .4byte gSpriteAnimations_WizzrobeWind_4 + .4byte gSpriteAnimations_WizzrobeWind_5 + .4byte gSpriteAnimations_WizzrobeWind_6 + .4byte gSpriteAnimations_WizzrobeWind_7 .4byte 00000000 diff --git a/data/animations/npc/anju.s b/data/animations/npc/anju.s index e8aa3d50..1ef6bd90 100644 --- a/data/animations/npc/anju.s +++ b/data/animations/npc/anju.s @@ -5,37 +5,37 @@ .align 2 -gUnk_081136D8:: @ 081136D8 - .incbin "anju/gUnk_081136D8.bin" +gSpriteAnimations_Anju_4:: @ 081136D8 + .include "animations/gSpriteAnimations_Anju_4.s" -gUnk_081136E9:: @ 081136E9 - .incbin "anju/gUnk_081136E9.bin" +gSpriteAnimations_Anju_5:: @ 081136E9 + .include "animations/gSpriteAnimations_Anju_5.s" -gUnk_081136FA:: @ 081136FA - .incbin "anju/gUnk_081136FA.bin" +gSpriteAnimations_Anju_6:: @ 081136FA + .include "animations/gSpriteAnimations_Anju_6.s" -gUnk_0811370B:: @ 0811370B - .incbin "anju/gUnk_0811370B.bin" +gSpriteAnimations_Anju_7:: @ 0811370B + .include "animations/gSpriteAnimations_Anju_7.s" -gUnk_0811371C:: @ 0811371C - .incbin "anju/gUnk_0811371C.bin" +gSpriteAnimations_Anju_0:: @ 0811371C + .include "animations/gSpriteAnimations_Anju_0.s" -gUnk_08113721:: @ 08113721 - .incbin "anju/gUnk_08113721.bin" +gSpriteAnimations_Anju_1:: @ 08113721 + .include "animations/gSpriteAnimations_Anju_1.s" -gUnk_08113726:: @ 08113726 - .incbin "anju/gUnk_08113726.bin" +gSpriteAnimations_Anju_2:: @ 08113726 + .include "animations/gSpriteAnimations_Anju_2.s" -gUnk_0811372B:: @ 0811372B - .incbin "anju/gUnk_0811372B.bin" +gSpriteAnimations_Anju_3:: @ 0811372B + .include "animations/gSpriteAnimations_Anju_3.s" gSpriteAnimations_Anju:: @ 08113730 - .4byte gUnk_0811371C - .4byte gUnk_08113721 - .4byte gUnk_08113726 - .4byte gUnk_0811372B - .4byte gUnk_081136D8 - .4byte gUnk_081136E9 - .4byte gUnk_081136FA - .4byte gUnk_0811370B + .4byte gSpriteAnimations_Anju_0 + .4byte gSpriteAnimations_Anju_1 + .4byte gSpriteAnimations_Anju_2 + .4byte gSpriteAnimations_Anju_3 + .4byte gSpriteAnimations_Anju_4 + .4byte gSpriteAnimations_Anju_5 + .4byte gSpriteAnimations_Anju_6 + .4byte gSpriteAnimations_Anju_7 .4byte 00000000 diff --git a/data/animations/npc/beedle.s b/data/animations/npc/beedle.s index dc755047..a66f2582 100644 --- a/data/animations/npc/beedle.s +++ b/data/animations/npc/beedle.s @@ -4,38 +4,38 @@ .section .rodata .align 2 -gUnk_0810C968:: @ 0810C968 - .incbin "beedle/gUnk_0810C968.bin" +gSpriteAnimations_Beedle_0:: @ 0810C968 + .include "animations/gSpriteAnimations_Beedle_0.s" -gUnk_0810C9A5:: @ 0810C9A5 - .incbin "beedle/gUnk_0810C9A5.bin" +gSpriteAnimations_Beedle_4:: @ 0810C9A5 + .include "animations/gSpriteAnimations_Beedle_4.s" -gUnk_0810C9AA:: @ 0810C9AA - .incbin "beedle/gUnk_0810C9AA.bin" +gSpriteAnimations_Beedle_5:: @ 0810C9AA + .include "animations/gSpriteAnimations_Beedle_5.s" -gUnk_0810C9AF:: @ 0810C9AF - .incbin "beedle/gUnk_0810C9AF.bin" +gSpriteAnimations_Beedle_7:: @ 0810C9AF + .include "animations/gSpriteAnimations_Beedle_7.s" -gUnk_0810C9B4:: @ 0810C9B4 - .incbin "beedle/gUnk_0810C9B4.bin" +gSpriteAnimations_Beedle_8:: @ 0810C9B4 + .include "animations/gSpriteAnimations_Beedle_8.s" -gUnk_0810C9F1:: @ 0810C9F1 - .incbin "beedle/gUnk_0810C9F1.bin" +gSpriteAnimations_Beedle_9:: @ 0810C9F1 + .include "animations/gSpriteAnimations_Beedle_9.s" -gUnk_0810CA2E:: @ 0810CA2E - .incbin "beedle/gUnk_0810CA2E.bin" +gSpriteAnimations_Beedle_11:: @ 0810CA2E + .include "animations/gSpriteAnimations_Beedle_11.s" gSpriteAnimations_Beedle:: @ 0810CA6C - .4byte gUnk_0810C968 - .4byte gUnk_0810C968 - .4byte gUnk_0810C968 - .4byte gUnk_0810C968 - .4byte gUnk_0810C9A5 - .4byte gUnk_0810C9AA - .4byte gUnk_0810C9A5 - .4byte gUnk_0810C9AF - .4byte gUnk_0810C9B4 - .4byte gUnk_0810C9F1 - .4byte gUnk_0810C9B4 - .4byte gUnk_0810CA2E + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_4 + .4byte gSpriteAnimations_Beedle_5 + .4byte gSpriteAnimations_Beedle_4 + .4byte gSpriteAnimations_Beedle_7 + .4byte gSpriteAnimations_Beedle_8 + .4byte gSpriteAnimations_Beedle_9 + .4byte gSpriteAnimations_Beedle_8 + .4byte gSpriteAnimations_Beedle_11 .4byte 00000000 diff --git a/data/animations/npc/bladeBrothers.s b/data/animations/npc/bladeBrothers.s index cb102381..4ae287d6 100644 --- a/data/animations/npc/bladeBrothers.s +++ b/data/animations/npc/bladeBrothers.s @@ -4,45 +4,45 @@ .section .rodata @ .align 2 -gUnk_08111771:: @ 08111771 - .incbin "bladeBrothers/gUnk_08111771.bin" +gSpriteAnimations_BladeBrothers_1_0:: @ 08111771 + .include "animations/gSpriteAnimations_BladeBrothers_1_0.s" -gUnk_08111776:: @ 08111776 - .incbin "bladeBrothers/gUnk_08111776.bin" +gSpriteAnimations_BladeBrothers_1_3:: @ 08111776 + .include "animations/gSpriteAnimations_BladeBrothers_1_3.s" -gUnk_0811177B:: @ 0811177B - .incbin "bladeBrothers/gUnk_0811177B.bin" +gSpriteAnimations_BladeBrothers_1_4:: @ 0811177B + .include "animations/gSpriteAnimations_BladeBrothers_1_4.s" -gUnk_081117C8:: @ 081117C8 - .incbin "bladeBrothers/gUnk_081117C8.bin" +gSpriteAnimations_BladeBrothers_0_1:: @ 081117C8 + .include "animations/gSpriteAnimations_BladeBrothers_0_1.s" -gUnk_081117F9:: @ 081117F9 - .incbin "bladeBrothers/gUnk_081117F9.bin" +gSpriteAnimations_BladeBrothers_0_0:: @ 081117F9 + .include "animations/gSpriteAnimations_BladeBrothers_0_0.s" -gUnk_0811182A:: @ 0811182A - .incbin "bladeBrothers/gUnk_0811182A.bin" +gSpriteAnimations_BladeBrothers_0_3:: @ 0811182A + .include "animations/gSpriteAnimations_BladeBrothers_0_3.s" -gUnk_0811185B:: @ 0811185B - .incbin "bladeBrothers/gUnk_0811185B.bin" +gSpriteAnimations_BladeBrothers_0_4:: @ 0811185B + .include "animations/gSpriteAnimations_BladeBrothers_0_4.s" gSpriteAnimations_BladeBrothers_1:: @ 081118CC - .4byte gUnk_08111771 - .4byte gUnk_0811176C - .4byte gUnk_08111771 - .4byte gUnk_08111776 - .4byte gUnk_0811177B - .4byte gUnk_0811177B - .4byte gUnk_0811177B - .4byte gUnk_0811177B + .4byte gSpriteAnimations_BladeBrothers_1_0 + .4byte gSpriteAnimations_BladeBrothers_1_1 + .4byte gSpriteAnimations_BladeBrothers_1_0 + .4byte gSpriteAnimations_BladeBrothers_1_3 + .4byte gSpriteAnimations_BladeBrothers_1_4 + .4byte gSpriteAnimations_BladeBrothers_1_4 + .4byte gSpriteAnimations_BladeBrothers_1_4 + .4byte gSpriteAnimations_BladeBrothers_1_4 .4byte 00000000 gSpriteAnimations_BladeBrothers_0:: @ 081118F0 - .4byte gUnk_081117F9 - .4byte gUnk_081117C8 - .4byte gUnk_081117F9 - .4byte gUnk_0811182A - .4byte gUnk_0811185B - .4byte gUnk_0811185B - .4byte gUnk_0811185B - .4byte gUnk_0811185B + .4byte gSpriteAnimations_BladeBrothers_0_0 + .4byte gSpriteAnimations_BladeBrothers_0_1 + .4byte gSpriteAnimations_BladeBrothers_0_0 + .4byte gSpriteAnimations_BladeBrothers_0_3 + .4byte gSpriteAnimations_BladeBrothers_0_4 + .4byte gSpriteAnimations_BladeBrothers_0_4 + .4byte gSpriteAnimations_BladeBrothers_0_4 + .4byte gSpriteAnimations_BladeBrothers_0_4 .4byte 00000000 diff --git a/data/animations/npc/brocco.s b/data/animations/npc/brocco.s index b8564444..bacf5940 100644 --- a/data/animations/npc/brocco.s +++ b/data/animations/npc/brocco.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810CAFC:: @ 0810CAFC - .incbin "brocco/gUnk_0810CAFC.bin" +gSpriteAnimations_Brocco_0:: @ 0810CAFC + .include "animations/gSpriteAnimations_Brocco_0.s" -gUnk_0810CB45:: @ 0810CB45 - .incbin "brocco/gUnk_0810CB45.bin" +gSpriteAnimations_Brocco_4:: @ 0810CB45 + .include "animations/gSpriteAnimations_Brocco_4.s" -gUnk_0810CB4A:: @ 0810CB4A - .incbin "brocco/gUnk_0810CB4A.bin" +gSpriteAnimations_Brocco_5:: @ 0810CB4A + .include "animations/gSpriteAnimations_Brocco_5.s" -gUnk_0810CB4F:: @ 0810CB4F - .incbin "brocco/gUnk_0810CB4F.bin" +gSpriteAnimations_Brocco_7:: @ 0810CB4F + .include "animations/gSpriteAnimations_Brocco_7.s" gSpriteAnimations_Brocco:: @ 0810CB54 - .4byte gUnk_0810CAFC - .4byte gUnk_0810CAFC - .4byte gUnk_0810CAFC - .4byte gUnk_0810CAFC - .4byte gUnk_0810CB45 - .4byte gUnk_0810CB4A - .4byte gUnk_0810CB45 - .4byte gUnk_0810CB4F + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_4 + .4byte gSpriteAnimations_Brocco_5 + .4byte gSpriteAnimations_Brocco_4 + .4byte gSpriteAnimations_Brocco_7 .4byte 00000000 diff --git a/data/animations/npc/carlov.s b/data/animations/npc/carlov.s index 525a9bd6..259aac80 100644 --- a/data/animations/npc/carlov.s +++ b/data/animations/npc/carlov.s @@ -4,42 +4,42 @@ .section .rodata .align 2 -gUnk_08113258:: @ 08113258 - .incbin "carlov/gUnk_08113258.bin" +gSpriteAnimations_Carlov_0_0:: @ 08113258 + .include "animations/gSpriteAnimations_Carlov_0_0.s" -gUnk_0811325D:: @ 0811325D - .incbin "carlov/gUnk_0811325D.bin" +gSpriteAnimations_Carlov_0_8:: @ 0811325D + .include "animations/gSpriteAnimations_Carlov_0_8.s" -gUnk_0811326E:: @ 0811326E - .incbin "carlov/gUnk_0811326E.bin" +gSpriteAnimations_Carlov_0_9:: @ 0811326E + .include "animations/gSpriteAnimations_Carlov_0_9.s" -gUnk_0811329F:: @ 0811329F - .incbin "carlov/gUnk_0811329F.bin" +gSpriteAnimations_Carlov_0_10:: @ 0811329F + .include "animations/gSpriteAnimations_Carlov_0_10.s" gSpriteAnimations_Carlov_0:: @ 081132E4 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_0811325D - .4byte gUnk_0811326E - .4byte gUnk_0811329F + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_8 + .4byte gSpriteAnimations_Carlov_0_9 + .4byte gSpriteAnimations_Carlov_0_10 .4byte 00000000 gSpriteAnimations_Carlov_1:: @ 08113314 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_0811325D - .4byte gUnk_0811326E - .4byte gUnk_0811329F - .4byte gUnk_08113258 - .4byte gUnk_0811325D - .4byte gUnk_0811326E - .4byte gUnk_0811329F + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_8 + .4byte gSpriteAnimations_Carlov_0_9 + .4byte gSpriteAnimations_Carlov_0_10 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_8 + .4byte gSpriteAnimations_Carlov_0_9 + .4byte gSpriteAnimations_Carlov_0_10 .4byte 00000000 diff --git a/data/animations/npc/carpenter.s b/data/animations/npc/carpenter.s index 6d2457bd..1391c48b 100644 --- a/data/animations/npc/carpenter.s +++ b/data/animations/npc/carpenter.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_08110D08:: @ 08110D08 - .incbin "carpenter/gUnk_08110D08.bin" +gSpriteAnimations_Carpenter_0:: @ 08110D08 + .include "animations/gSpriteAnimations_Carpenter_0.s" -gUnk_08110D2D:: @ 08110D2D - .incbin "carpenter/gUnk_08110D2D.bin" +gSpriteAnimations_Carpenter_5:: @ 08110D2D + .include "animations/gSpriteAnimations_Carpenter_5.s" -gUnk_08110D32:: @ 08110D32 - .incbin "carpenter/gUnk_08110D32.bin" +gSpriteAnimations_Carpenter_7:: @ 08110D32 + .include "animations/gSpriteAnimations_Carpenter_7.s" -gUnk_08110D37:: @ 08110D37 - .incbin "carpenter/gUnk_08110D37.bin" +gSpriteAnimations_Carpenter_4:: @ 08110D37 + .include "animations/gSpriteAnimations_Carpenter_4.s" -gUnk_08110D3C:: @ 08110D3C - .incbin "carpenter/gUnk_08110D3C.bin" +gSpriteAnimations_Carpenter_8:: @ 08110D3C + .include "animations/gSpriteAnimations_Carpenter_8.s" -gUnk_08110D61:: @ 08110D61 - .incbin "carpenter/gUnk_08110D61.bin" +gSpriteAnimations_Carpenter_13:: @ 08110D61 + .include "animations/gSpriteAnimations_Carpenter_13.s" -gUnk_08110D66:: @ 08110D66 - .incbin "carpenter/gUnk_08110D66.bin" +gSpriteAnimations_Carpenter_15:: @ 08110D66 + .include "animations/gSpriteAnimations_Carpenter_15.s" -gUnk_08110D6B:: @ 08110D6B - .incbin "carpenter/gUnk_08110D6B.bin" +gSpriteAnimations_Carpenter_12:: @ 08110D6B + .include "animations/gSpriteAnimations_Carpenter_12.s" -gUnk_08110D70:: @ 08110D70 - .incbin "carpenter/gUnk_08110D70.bin" +gSpriteAnimations_Carpenter_16:: @ 08110D70 + .include "animations/gSpriteAnimations_Carpenter_16.s" -gUnk_08110D8D:: @ 08110D8D - .incbin "carpenter/gUnk_08110D8D.bin" +gSpriteAnimations_Carpenter_20:: @ 08110D8D + .include "animations/gSpriteAnimations_Carpenter_20.s" -gUnk_08110D92:: @ 08110D92 - .incbin "carpenter/gUnk_08110D92.bin" +gSpriteAnimations_Carpenter_23:: @ 08110D92 + .include "animations/gSpriteAnimations_Carpenter_23.s" -gUnk_08110D97:: @ 08110D97 - .incbin "carpenter/gUnk_08110D97.bin" +gSpriteAnimations_Carpenter_21:: @ 08110D97 + .include "animations/gSpriteAnimations_Carpenter_21.s" -gUnk_08110D9C:: @ 08110D9C - .incbin "carpenter/gUnk_08110D9C.bin" +gSpriteAnimations_Carpenter_24:: @ 08110D9C + .include "animations/gSpriteAnimations_Carpenter_24.s" -gUnk_08110DB9:: @ 08110DB9 - .incbin "carpenter/gUnk_08110DB9.bin" +gSpriteAnimations_Carpenter_28:: @ 08110DB9 + .include "animations/gSpriteAnimations_Carpenter_28.s" -gUnk_08110DBE:: @ 08110DBE - .incbin "carpenter/gUnk_08110DBE.bin" +gSpriteAnimations_Carpenter_31:: @ 08110DBE + .include "animations/gSpriteAnimations_Carpenter_31.s" -gUnk_08110DC3:: @ 08110DC3 - .incbin "carpenter/gUnk_08110DC3.bin" +gSpriteAnimations_Carpenter_29:: @ 08110DC3 + .include "animations/gSpriteAnimations_Carpenter_29.s" gSpriteAnimations_Carpenter:: @ 08110DC8 - .4byte gUnk_08110D08 - .4byte gUnk_08110D08 - .4byte gUnk_08110D08 - .4byte gUnk_08110D08 - .4byte gUnk_08110D37 - .4byte gUnk_08110D2D - .4byte gUnk_08110D2D - .4byte gUnk_08110D32 - .4byte gUnk_08110D3C - .4byte gUnk_08110D3C - .4byte gUnk_08110D3C - .4byte gUnk_08110D3C - .4byte gUnk_08110D6B - .4byte gUnk_08110D61 - .4byte gUnk_08110D61 - .4byte gUnk_08110D66 - .4byte gUnk_08110D70 - .4byte gUnk_08110D70 - .4byte gUnk_08110D70 - .4byte gUnk_08110D70 - .4byte gUnk_08110D8D - .4byte gUnk_08110D97 - .4byte gUnk_08110D8D - .4byte gUnk_08110D92 - .4byte gUnk_08110D9C - .4byte gUnk_08110D9C - .4byte gUnk_08110D9C - .4byte gUnk_08110D9C - .4byte gUnk_08110DB9 - .4byte gUnk_08110DC3 - .4byte gUnk_08110DB9 - .4byte gUnk_08110DBE + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_4 + .4byte gSpriteAnimations_Carpenter_5 + .4byte gSpriteAnimations_Carpenter_5 + .4byte gSpriteAnimations_Carpenter_7 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_12 + .4byte gSpriteAnimations_Carpenter_13 + .4byte gSpriteAnimations_Carpenter_13 + .4byte gSpriteAnimations_Carpenter_15 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_20 + .4byte gSpriteAnimations_Carpenter_21 + .4byte gSpriteAnimations_Carpenter_20 + .4byte gSpriteAnimations_Carpenter_23 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_28 + .4byte gSpriteAnimations_Carpenter_29 + .4byte gSpriteAnimations_Carpenter_28 + .4byte gSpriteAnimations_Carpenter_31 .4byte 00000000 diff --git a/data/animations/npc/castorWildsStatue.s b/data/animations/npc/castorWildsStatue.s index ca5ce721..a8fc1e8b 100644 --- a/data/animations/npc/castorWildsStatue.s +++ b/data/animations/npc/castorWildsStatue.s @@ -4,30 +4,30 @@ .section .rodata .align 2 -gUnk_08110E9C:: @ 08110E9C - .incbin "castorWildsStatue/gUnk_08110E9C.bin" +gSpriteAnimations_CastorWildsStatue_0:: @ 08110E9C + .include "animations/gSpriteAnimations_CastorWildsStatue_0.s" -gUnk_08110EA1:: @ 08110EA1 - .incbin "castorWildsStatue/gUnk_08110EA1.bin" +gSpriteAnimations_CastorWildsStatue_4:: @ 08110EA1 + .include "animations/gSpriteAnimations_CastorWildsStatue_4.s" -gUnk_08110EA6:: @ 08110EA6 - .incbin "castorWildsStatue/gUnk_08110EA6.bin" +gSpriteAnimations_CastorWildsStatue_1:: @ 08110EA6 + .include "animations/gSpriteAnimations_CastorWildsStatue_1.s" gSpriteAnimations_CastorWildsStatue:: @ 08110EAC - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 .4byte 00000000 diff --git a/data/animations/npc/cat.s b/data/animations/npc/cat.s index f65b540f..6e5a05ba 100644 --- a/data/animations/npc/cat.s +++ b/data/animations/npc/cat.s @@ -38,41 +38,41 @@ gUnk_08111154:: @ 08111154 .4byte gUnk_08111144 .4byte gUnk_0811114C -gUnk_08111174:: @ 08111174 - .incbin "cat/gUnk_08111174.bin" +gSpriteAnimations_Cat_0:: @ 08111174 + .include "animations/gSpriteAnimations_Cat_0.s" -gUnk_081111B0:: @ 081111B0 - .incbin "cat/gUnk_081111B0.bin" +gSpriteAnimations_Cat_1:: @ 081111B0 + .include "animations/gSpriteAnimations_Cat_1.s" -gUnk_081111B9:: @ 081111B9 - .incbin "cat/gUnk_081111B9.bin" +gSpriteAnimations_Cat_2:: @ 081111B9 + .include "animations/gSpriteAnimations_Cat_2.s" -gUnk_081111C2:: @ 081111C2 - .incbin "cat/gUnk_081111C2.bin" +gSpriteAnimations_Cat_3:: @ 081111C2 + .include "animations/gSpriteAnimations_Cat_3.s" -gUnk_081111D3:: @ 081111D3 - .incbin "cat/gUnk_081111D3.bin" +gSpriteAnimations_Cat_4:: @ 081111D3 + .include "animations/gSpriteAnimations_Cat_4.s" -gUnk_081111EB:: @ 081111EB - .incbin "cat/gUnk_081111EB.bin" +gSpriteAnimations_Cat_5:: @ 081111EB + .include "animations/gSpriteAnimations_Cat_5.s" -gUnk_08111204:: @ 08111204 - .incbin "cat/gUnk_08111204.bin" +gSpriteAnimations_Cat_6:: @ 08111204 + .include "animations/gSpriteAnimations_Cat_6.s" -gUnk_0811122C:: @ 0811122C - .incbin "cat/gUnk_0811122C.bin" +gSpriteAnimations_Cat_7:: @ 0811122C + .include "animations/gSpriteAnimations_Cat_7.s" -gUnk_08111238:: @ 08111238 - .incbin "cat/gUnk_08111238.bin" +gSpriteAnimations_Cat_8:: @ 08111238 + .include "animations/gSpriteAnimations_Cat_8.s" gSpriteAnimations_Cat:: @ 0811125C - .4byte gUnk_08111174 - .4byte gUnk_081111B0 - .4byte gUnk_081111B9 - .4byte gUnk_081111C2 - .4byte gUnk_081111D3 - .4byte gUnk_081111EB - .4byte gUnk_08111204 - .4byte gUnk_0811122C - .4byte gUnk_08111238 + .4byte gSpriteAnimations_Cat_0 + .4byte gSpriteAnimations_Cat_1 + .4byte gSpriteAnimations_Cat_2 + .4byte gSpriteAnimations_Cat_3 + .4byte gSpriteAnimations_Cat_4 + .4byte gSpriteAnimations_Cat_5 + .4byte gSpriteAnimations_Cat_6 + .4byte gSpriteAnimations_Cat_7 + .4byte gSpriteAnimations_Cat_8 .4byte 00000000 diff --git a/data/animations/npc/clothesRack.s b/data/animations/npc/clothesRack.s index 916c2af7..9bd53b95 100644 --- a/data/animations/npc/clothesRack.s +++ b/data/animations/npc/clothesRack.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_08114244:: @ 08114244 - .incbin "clothesRack/gUnk_08114244.bin" +gSpriteAnimations_ClothesRack_0:: @ 08114244 + .include "animations/gSpriteAnimations_ClothesRack_0.s" -gUnk_0811425D:: @ 0811425D - .incbin "clothesRack/gUnk_0811425D.bin" +gSpriteAnimations_ClothesRack_1:: @ 0811425D + .include "animations/gSpriteAnimations_ClothesRack_1.s" -gUnk_08114276:: @ 08114276 - .incbin "clothesRack/gUnk_08114276.bin" +gSpriteAnimations_ClothesRack_2:: @ 08114276 + .include "animations/gSpriteAnimations_ClothesRack_2.s" -gUnk_0811428F:: @ 0811428F - .incbin "clothesRack/gUnk_0811428F.bin" +gSpriteAnimations_ClothesRack_3:: @ 0811428F + .include "animations/gSpriteAnimations_ClothesRack_3.s" gSpriteAnimations_ClothesRack:: @ 081142A8 - .4byte gUnk_08114244 - .4byte gUnk_0811425D - .4byte gUnk_08114276 - .4byte gUnk_0811428F + .4byte gSpriteAnimations_ClothesRack_0 + .4byte gSpriteAnimations_ClothesRack_1 + .4byte gSpriteAnimations_ClothesRack_2 + .4byte gSpriteAnimations_ClothesRack_3 .4byte 00000000 diff --git a/data/animations/npc/cow.s b/data/animations/npc/cow.s index 12bb372b..063a4402 100644 --- a/data/animations/npc/cow.s +++ b/data/animations/npc/cow.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_08111960:: @ 08111960 - .incbin "cow/gUnk_08111960.bin" +gSpriteAnimations_Cow_0:: @ 08111960 + .include "animations/gSpriteAnimations_Cow_0.s" -gUnk_08111965:: @ 08111965 - .incbin "cow/gUnk_08111965.bin" +gSpriteAnimations_Cow_1:: @ 08111965 + .include "animations/gSpriteAnimations_Cow_1.s" -gUnk_0811196A:: @ 0811196A - .incbin "cow/gUnk_0811196A.bin" +gSpriteAnimations_Cow_2:: @ 0811196A + .include "animations/gSpriteAnimations_Cow_2.s" -gUnk_0811196F:: @ 0811196F - .incbin "cow/gUnk_0811196F.bin" +gSpriteAnimations_Cow_3:: @ 0811196F + .include "animations/gSpriteAnimations_Cow_3.s" -gUnk_08111974:: @ 08111974 - .incbin "cow/gUnk_08111974.bin" +gSpriteAnimations_Cow_4:: @ 08111974 + .include "animations/gSpriteAnimations_Cow_4.s" -gUnk_08111985:: @ 08111985 - .incbin "cow/gUnk_08111985.bin" +gSpriteAnimations_Cow_5:: @ 08111985 + .include "animations/gSpriteAnimations_Cow_5.s" -gUnk_08111996:: @ 08111996 - .incbin "cow/gUnk_08111996.bin" +gSpriteAnimations_Cow_6:: @ 08111996 + .include "animations/gSpriteAnimations_Cow_6.s" -gUnk_081119A7:: @ 081119A7 - .incbin "cow/gUnk_081119A7.bin" +gSpriteAnimations_Cow_7:: @ 081119A7 + .include "animations/gSpriteAnimations_Cow_7.s" -gUnk_081119B8:: @ 081119B8 - .incbin "cow/gUnk_081119B8.bin" +gSpriteAnimations_Cow_8:: @ 081119B8 + .include "animations/gSpriteAnimations_Cow_8.s" -gUnk_081119C4:: @ 081119C4 - .incbin "cow/gUnk_081119C4.bin" +gSpriteAnimations_Cow_9:: @ 081119C4 + .include "animations/gSpriteAnimations_Cow_9.s" -gUnk_081119D0:: @ 081119D0 - .incbin "cow/gUnk_081119D0.bin" +gSpriteAnimations_Cow_10:: @ 081119D0 + .include "animations/gSpriteAnimations_Cow_10.s" -gUnk_081119DC:: @ 081119DC - .incbin "cow/gUnk_081119DC.bin" +gSpriteAnimations_Cow_11:: @ 081119DC + .include "animations/gSpriteAnimations_Cow_11.s" -gUnk_081119E8:: @ 081119E8 - .incbin "cow/gUnk_081119E8.bin" +gSpriteAnimations_Cow_12:: @ 081119E8 + .include "animations/gSpriteAnimations_Cow_12.s" -gUnk_081119F1:: @ 081119F1 - .incbin "cow/gUnk_081119F1.bin" +gSpriteAnimations_Cow_13:: @ 081119F1 + .include "animations/gSpriteAnimations_Cow_13.s" -gUnk_081119FA:: @ 081119FA - .incbin "cow/gUnk_081119FA.bin" +gSpriteAnimations_Cow_14:: @ 081119FA + .include "animations/gSpriteAnimations_Cow_14.s" -gUnk_08111A03:: @ 08111A03 - .incbin "cow/gUnk_08111A03.bin" +gSpriteAnimations_Cow_15:: @ 08111A03 + .include "animations/gSpriteAnimations_Cow_15.s" -gUnk_08111A0C:: @ 08111A0C - .incbin "cow/gUnk_08111A0C.bin" +gSpriteAnimations_Cow_16:: @ 08111A0C + .include "animations/gSpriteAnimations_Cow_16.s" -gUnk_08111A14:: @ 08111A14 - .incbin "cow/gUnk_08111A14.bin" +gSpriteAnimations_Cow_17:: @ 08111A14 + .include "animations/gSpriteAnimations_Cow_17.s" -gUnk_08111A1C:: @ 08111A1C - .incbin "cow/gUnk_08111A1C.bin" +gSpriteAnimations_Cow_18:: @ 08111A1C + .include "animations/gSpriteAnimations_Cow_18.s" -gUnk_08111A24:: @ 08111A24 - .incbin "cow/gUnk_08111A24.bin" +gSpriteAnimations_Cow_19:: @ 08111A24 + .include "animations/gSpriteAnimations_Cow_19.s" gSpriteAnimations_Cow:: @ 08111A2C - .4byte gUnk_08111960 - .4byte gUnk_08111965 - .4byte gUnk_0811196A - .4byte gUnk_0811196F - .4byte gUnk_08111974 - .4byte gUnk_08111985 - .4byte gUnk_08111996 - .4byte gUnk_081119A7 - .4byte gUnk_081119B8 - .4byte gUnk_081119C4 - .4byte gUnk_081119D0 - .4byte gUnk_081119DC - .4byte gUnk_081119E8 - .4byte gUnk_081119F1 - .4byte gUnk_081119FA - .4byte gUnk_08111A03 - .4byte gUnk_08111A0C - .4byte gUnk_08111A14 - .4byte gUnk_08111A1C - .4byte gUnk_08111A24 + .4byte gSpriteAnimations_Cow_0 + .4byte gSpriteAnimations_Cow_1 + .4byte gSpriteAnimations_Cow_2 + .4byte gSpriteAnimations_Cow_3 + .4byte gSpriteAnimations_Cow_4 + .4byte gSpriteAnimations_Cow_5 + .4byte gSpriteAnimations_Cow_6 + .4byte gSpriteAnimations_Cow_7 + .4byte gSpriteAnimations_Cow_8 + .4byte gSpriteAnimations_Cow_9 + .4byte gSpriteAnimations_Cow_10 + .4byte gSpriteAnimations_Cow_11 + .4byte gSpriteAnimations_Cow_12 + .4byte gSpriteAnimations_Cow_13 + .4byte gSpriteAnimations_Cow_14 + .4byte gSpriteAnimations_Cow_15 + .4byte gSpriteAnimations_Cow_16 + .4byte gSpriteAnimations_Cow_17 + .4byte gSpriteAnimations_Cow_18 + .4byte gSpriteAnimations_Cow_19 .4byte 00000000 diff --git a/data/animations/npc/dampe.s b/data/animations/npc/dampe.s index 4847aa50..f420d9a5 100644 --- a/data/animations/npc/dampe.s +++ b/data/animations/npc/dampe.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_08113350:: @ 08113350 - .incbin "dampe/gUnk_08113350.bin" +gSpriteAnimations_Dampe_0:: @ 08113350 + .include "animations/gSpriteAnimations_Dampe_0.s" -gUnk_08113369:: @ 08113369 - .incbin "dampe/gUnk_08113369.bin" +gSpriteAnimations_Dampe_4:: @ 08113369 + .include "animations/gSpriteAnimations_Dampe_4.s" -gUnk_0811336E:: @ 0811336E - .incbin "dampe/gUnk_0811336E.bin" +gSpriteAnimations_Dampe_5:: @ 0811336E + .include "animations/gSpriteAnimations_Dampe_5.s" -gUnk_08113377:: @ 08113377 - .incbin "dampe/gUnk_08113377.bin" +gSpriteAnimations_Dampe_7:: @ 08113377 + .include "animations/gSpriteAnimations_Dampe_7.s" gSpriteAnimations_Dampe:: @ 08113380 - .4byte gUnk_08113350 - .4byte gUnk_08113350 - .4byte gUnk_08113350 - .4byte gUnk_08113350 - .4byte gUnk_08113369 - .4byte gUnk_0811336E - .4byte gUnk_08113369 - .4byte gUnk_08113377 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_4 + .4byte gSpriteAnimations_Dampe_5 + .4byte gSpriteAnimations_Dampe_4 + .4byte gSpriteAnimations_Dampe_7 .4byte 00000000 diff --git a/data/animations/npc/din.s b/data/animations/npc/din.s index 02145055..2ae22d95 100644 --- a/data/animations/npc/din.s +++ b/data/animations/npc/din.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810F96C:: @ 0810F96C - .incbin "din/gUnk_0810F96C.bin" +gSpriteAnimations_Din_0:: @ 0810F96C + .include "animations/gSpriteAnimations_Din_0.s" -gUnk_0810F971:: @ 0810F971 - .incbin "din/gUnk_0810F971.bin" +gSpriteAnimations_Din_3:: @ 0810F971 + .include "animations/gSpriteAnimations_Din_3.s" -gUnk_0810F976:: @ 0810F976 - .incbin "din/gUnk_0810F976.bin" +gSpriteAnimations_Din_1:: @ 0810F976 + .include "animations/gSpriteAnimations_Din_1.s" -gUnk_0810F97B:: @ 0810F97B - .incbin "din/gUnk_0810F97B.bin" +gSpriteAnimations_Din_4:: @ 0810F97B + .include "animations/gSpriteAnimations_Din_4.s" gSpriteAnimations_Din:: @ 0810F98C - .4byte gUnk_0810F96C - .4byte gUnk_0810F976 - .4byte gUnk_0810F96C - .4byte gUnk_0810F971 - .4byte gUnk_0810F97B - .4byte gUnk_0810F97B - .4byte gUnk_0810F97B - .4byte gUnk_0810F97B + .4byte gSpriteAnimations_Din_0 + .4byte gSpriteAnimations_Din_1 + .4byte gSpriteAnimations_Din_0 + .4byte gSpriteAnimations_Din_3 + .4byte gSpriteAnimations_Din_4 + .4byte gSpriteAnimations_Din_4 + .4byte gSpriteAnimations_Din_4 + .4byte gSpriteAnimations_Din_4 .4byte 00000000 diff --git a/data/animations/npc/dog.s b/data/animations/npc/dog.s index 4df1cfc9..6b340583 100644 --- a/data/animations/npc/dog.s +++ b/data/animations/npc/dog.s @@ -4,142 +4,142 @@ .section .rodata @ .align 2 -gUnk_08111FE2:: @ 08111FE2 - .incbin "dog/gUnk_08111FE2.bin" +gSpriteAnimations_Dog_0:: @ 08111FE2 + .include "animations/gSpriteAnimations_Dog_0.s" -gUnk_08111FE7:: @ 08111FE7 - .incbin "dog/gUnk_08111FE7.bin" +gSpriteAnimations_Dog_1:: @ 08111FE7 + .include "animations/gSpriteAnimations_Dog_1.s" -gUnk_08111FEC:: @ 08111FEC - .incbin "dog/gUnk_08111FEC.bin" +gSpriteAnimations_Dog_2:: @ 08111FEC + .include "animations/gSpriteAnimations_Dog_2.s" -gUnk_08111FF1:: @ 08111FF1 - .incbin "dog/gUnk_08111FF1.bin" +gSpriteAnimations_Dog_3:: @ 08111FF1 + .include "animations/gSpriteAnimations_Dog_3.s" -gUnk_08111FF6:: @ 08111FF6 - .incbin "dog/gUnk_08111FF6.bin" +gSpriteAnimations_Dog_4:: @ 08111FF6 + .include "animations/gSpriteAnimations_Dog_4.s" -gUnk_08112007:: @ 08112007 - .incbin "dog/gUnk_08112007.bin" +gSpriteAnimations_Dog_6:: @ 08112007 + .include "animations/gSpriteAnimations_Dog_6.s" -gUnk_08112018:: @ 08112018 - .incbin "dog/gUnk_08112018.bin" +gSpriteAnimations_Dog_10:: @ 08112018 + .include "animations/gSpriteAnimations_Dog_10.s" -gUnk_0811201D:: @ 0811201D - .incbin "dog/gUnk_0811201D.bin" +gSpriteAnimations_Dog_11:: @ 0811201D + .include "animations/gSpriteAnimations_Dog_11.s" -gUnk_08112022:: @ 08112022 - .incbin "dog/gUnk_08112022.bin" +gSpriteAnimations_Dog_9:: @ 08112022 + .include "animations/gSpriteAnimations_Dog_9.s" -gUnk_08112027:: @ 08112027 - .incbin "dog/gUnk_08112027.bin" +gSpriteAnimations_Dog_8:: @ 08112027 + .include "animations/gSpriteAnimations_Dog_8.s" -gUnk_0811202C:: @ 0811202C - .incbin "dog/gUnk_0811202C.bin" +gSpriteAnimations_Dog_16:: @ 0811202C + .include "animations/gSpriteAnimations_Dog_16.s" -gUnk_08112031:: @ 08112031 - .incbin "dog/gUnk_08112031.bin" +gSpriteAnimations_Dog_19:: @ 08112031 + .include "animations/gSpriteAnimations_Dog_19.s" -gUnk_08112036:: @ 08112036 - .incbin "dog/gUnk_08112036.bin" +gSpriteAnimations_Dog_17:: @ 08112036 + .include "animations/gSpriteAnimations_Dog_17.s" -gUnk_0811203B:: @ 0811203B - .incbin "dog/gUnk_0811203B.bin" +gSpriteAnimations_Dog_21:: @ 0811203B + .include "animations/gSpriteAnimations_Dog_21.s" -gUnk_08112040:: @ 08112040 - .incbin "dog/gUnk_08112040.bin" +gSpriteAnimations_Dog_22:: @ 08112040 + .include "animations/gSpriteAnimations_Dog_22.s" -gUnk_08112045:: @ 08112045 - .incbin "dog/gUnk_08112045.bin" +gSpriteAnimations_Dog_20:: @ 08112045 + .include "animations/gSpriteAnimations_Dog_20.s" -gUnk_0811204A:: @ 0811204A - .incbin "dog/gUnk_0811204A.bin" +gSpriteAnimations_Dog_13:: @ 0811204A + .include "animations/gSpriteAnimations_Dog_13.s" -gUnk_0811204F:: @ 0811204F - .incbin "dog/gUnk_0811204F.bin" +gSpriteAnimations_Dog_14:: @ 0811204F + .include "animations/gSpriteAnimations_Dog_14.s" -gUnk_08112054:: @ 08112054 - .incbin "dog/gUnk_08112054.bin" +gSpriteAnimations_Dog_12:: @ 08112054 + .include "animations/gSpriteAnimations_Dog_12.s" -gUnk_08112059:: @ 08112059 - .incbin "dog/gUnk_08112059.bin" +gSpriteAnimations_Dog_24:: @ 08112059 + .include "animations/gSpriteAnimations_Dog_24.s" -gUnk_0811205E:: @ 0811205E - .incbin "dog/gUnk_0811205E.bin" +gSpriteAnimations_Dog_27:: @ 0811205E + .include "animations/gSpriteAnimations_Dog_27.s" -gUnk_08112063:: @ 08112063 - .incbin "dog/gUnk_08112063.bin" +gSpriteAnimations_Dog_25:: @ 08112063 + .include "animations/gSpriteAnimations_Dog_25.s" -gUnk_08112068:: @ 08112068 - .incbin "dog/gUnk_08112068.bin" +gSpriteAnimations_Dog_30:: @ 08112068 + .include "animations/gSpriteAnimations_Dog_30.s" -gUnk_08112075:: @ 08112075 - .incbin "dog/gUnk_08112075.bin" +gSpriteAnimations_Dog_31:: @ 08112075 + .include "animations/gSpriteAnimations_Dog_31.s" -gUnk_08112082:: @ 08112082 - .incbin "dog/gUnk_08112082.bin" +gSpriteAnimations_Dog_29:: @ 08112082 + .include "animations/gSpriteAnimations_Dog_29.s" -gUnk_0811208F:: @ 0811208F - .incbin "dog/gUnk_0811208F.bin" +gSpriteAnimations_Dog_28:: @ 0811208F + .include "animations/gSpriteAnimations_Dog_28.s" -gUnk_0811209C:: @ 0811209C - .incbin "dog/gUnk_0811209C.bin" +gSpriteAnimations_Dog_32:: @ 0811209C + .include "animations/gSpriteAnimations_Dog_32.s" -gUnk_081120AD:: @ 081120AD - .incbin "dog/gUnk_081120AD.bin" +gSpriteAnimations_Dog_34:: @ 081120AD + .include "animations/gSpriteAnimations_Dog_34.s" -gUnk_081120BE:: @ 081120BE - .incbin "dog/gUnk_081120BE.bin" +gSpriteAnimations_Dog_36:: @ 081120BE + .include "animations/gSpriteAnimations_Dog_36.s" -gUnk_081120CF:: @ 081120CF - .incbin "dog/gUnk_081120CF.bin" +gSpriteAnimations_Dog_38:: @ 081120CF + .include "animations/gSpriteAnimations_Dog_38.s" -gUnk_081120E0:: @ 081120E0 - .incbin "dog/gUnk_081120E0.bin" +gSpriteAnimations_Dog_40:: @ 081120E0 + .include "animations/gSpriteAnimations_Dog_40.s" gSpriteAnimations_Dog:: @ 08112100 - .4byte gUnk_08111FE2 - .4byte gUnk_08111FE7 - .4byte gUnk_08111FEC - .4byte gUnk_08111FF1 - .4byte gUnk_08111FF6 - .4byte gUnk_08111FF6 - .4byte gUnk_08112007 - .4byte gUnk_08112007 - .4byte gUnk_08112027 - .4byte gUnk_08112022 - .4byte gUnk_08112018 - .4byte gUnk_0811201D - .4byte gUnk_08112054 - .4byte gUnk_0811204A - .4byte gUnk_0811204F - .4byte gUnk_0811204A - .4byte gUnk_0811202C - .4byte gUnk_08112036 - .4byte gUnk_0811202C - .4byte gUnk_08112031 - .4byte gUnk_08112045 - .4byte gUnk_0811203B - .4byte gUnk_08112040 - .4byte gUnk_0811203B - .4byte gUnk_08112059 - .4byte gUnk_08112063 - .4byte gUnk_08112059 - .4byte gUnk_0811205E - .4byte gUnk_0811208F - .4byte gUnk_08112082 - .4byte gUnk_08112068 - .4byte gUnk_08112075 - .4byte gUnk_0811209C - .4byte gUnk_0811209C - .4byte gUnk_081120AD - .4byte gUnk_081120AD - .4byte gUnk_081120BE - .4byte gUnk_081120BE - .4byte gUnk_081120CF - .4byte gUnk_081120CF - .4byte gUnk_081120E0 - .4byte gUnk_081120E0 - .4byte gUnk_081120E0 - .4byte gUnk_081120E0 + .4byte gSpriteAnimations_Dog_0 + .4byte gSpriteAnimations_Dog_1 + .4byte gSpriteAnimations_Dog_2 + .4byte gSpriteAnimations_Dog_3 + .4byte gSpriteAnimations_Dog_4 + .4byte gSpriteAnimations_Dog_4 + .4byte gSpriteAnimations_Dog_6 + .4byte gSpriteAnimations_Dog_6 + .4byte gSpriteAnimations_Dog_8 + .4byte gSpriteAnimations_Dog_9 + .4byte gSpriteAnimations_Dog_10 + .4byte gSpriteAnimations_Dog_11 + .4byte gSpriteAnimations_Dog_12 + .4byte gSpriteAnimations_Dog_13 + .4byte gSpriteAnimations_Dog_14 + .4byte gSpriteAnimations_Dog_13 + .4byte gSpriteAnimations_Dog_16 + .4byte gSpriteAnimations_Dog_17 + .4byte gSpriteAnimations_Dog_16 + .4byte gSpriteAnimations_Dog_19 + .4byte gSpriteAnimations_Dog_20 + .4byte gSpriteAnimations_Dog_21 + .4byte gSpriteAnimations_Dog_22 + .4byte gSpriteAnimations_Dog_21 + .4byte gSpriteAnimations_Dog_24 + .4byte gSpriteAnimations_Dog_25 + .4byte gSpriteAnimations_Dog_24 + .4byte gSpriteAnimations_Dog_27 + .4byte gSpriteAnimations_Dog_28 + .4byte gSpriteAnimations_Dog_29 + .4byte gSpriteAnimations_Dog_30 + .4byte gSpriteAnimations_Dog_31 + .4byte gSpriteAnimations_Dog_32 + .4byte gSpriteAnimations_Dog_32 + .4byte gSpriteAnimations_Dog_34 + .4byte gSpriteAnimations_Dog_34 + .4byte gSpriteAnimations_Dog_36 + .4byte gSpriteAnimations_Dog_36 + .4byte gSpriteAnimations_Dog_38 + .4byte gSpriteAnimations_Dog_38 + .4byte gSpriteAnimations_Dog_40 + .4byte gSpriteAnimations_Dog_40 + .4byte gSpriteAnimations_Dog_40 + .4byte gSpriteAnimations_Dog_40 .4byte 00000000 diff --git a/data/animations/npc/drLeft.s b/data/animations/npc/drLeft.s index 7bbd42f5..15cf67d5 100644 --- a/data/animations/npc/drLeft.s +++ b/data/animations/npc/drLeft.s @@ -4,45 +4,45 @@ .section .rodata .align 2 -gUnk_081133B8:: @ 081133B8 - .incbin "drLeft/gUnk_081133B8.bin" +gSpriteAnimations_DrLeft_0:: @ 081133B8 + .include "animations/gSpriteAnimations_DrLeft_0.s" -gUnk_081133E9:: @ 081133E9 - .incbin "drLeft/gUnk_081133E9.bin" +gSpriteAnimations_DrLeft_12:: @ 081133E9 + .include "animations/gSpriteAnimations_DrLeft_12.s" -gUnk_081133FA:: @ 081133FA - .incbin "drLeft/gUnk_081133FA.bin" +gSpriteAnimations_DrLeft_13:: @ 081133FA + .include "animations/gSpriteAnimations_DrLeft_13.s" -gUnk_08113413:: @ 08113413 - .incbin "drLeft/gUnk_08113413.bin" +gSpriteAnimations_DrLeft_14:: @ 08113413 + .include "animations/gSpriteAnimations_DrLeft_14.s" -gUnk_08113434:: @ 08113434 - .incbin "drLeft/gUnk_08113434.bin" +gSpriteAnimations_DrLeft_5:: @ 08113434 + .include "animations/gSpriteAnimations_DrLeft_5.s" -gUnk_0811343D:: @ 0811343D - .incbin "drLeft/gUnk_0811343D.bin" +gSpriteAnimations_DrLeft_4:: @ 0811343D + .include "animations/gSpriteAnimations_DrLeft_4.s" -gUnk_08113446:: @ 08113446 - .incbin "drLeft/gUnk_08113446.bin" +gSpriteAnimations_DrLeft_7:: @ 08113446 + .include "animations/gSpriteAnimations_DrLeft_7.s" -gUnk_0811344F:: @ 0811344F - .incbin "drLeft/gUnk_0811344F.bin" +gSpriteAnimations_DrLeft_8:: @ 0811344F + .include "animations/gSpriteAnimations_DrLeft_8.s" gSpriteAnimations_DrLeft:: @ 08113490 - .4byte gUnk_081133B8 - .4byte gUnk_081133B8 - .4byte gUnk_081133B8 - .4byte gUnk_081133B8 - .4byte gUnk_0811343D - .4byte gUnk_08113434 - .4byte gUnk_0811343D - .4byte gUnk_08113446 - .4byte gUnk_0811344F - .4byte gUnk_0811344F - .4byte gUnk_0811344F - .4byte gUnk_0811344F - .4byte gUnk_081133E9 - .4byte gUnk_081133FA - .4byte gUnk_08113413 - .4byte gUnk_081133FA + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_4 + .4byte gSpriteAnimations_DrLeft_5 + .4byte gSpriteAnimations_DrLeft_4 + .4byte gSpriteAnimations_DrLeft_7 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_12 + .4byte gSpriteAnimations_DrLeft_13 + .4byte gSpriteAnimations_DrLeft_14 + .4byte gSpriteAnimations_DrLeft_13 .4byte 00000000 diff --git a/data/animations/npc/emma.s b/data/animations/npc/emma.s index 3c583d91..ecccfbde 100644 --- a/data/animations/npc/emma.s +++ b/data/animations/npc/emma.s @@ -4,15 +4,15 @@ .section .rodata .align 2 -gUnk_081138DC:: @ 081138DC - .incbin "emma/gUnk_081138DC.bin" +gSpriteAnimations_Emma_0:: @ 081138DC + .include "animations/gSpriteAnimations_Emma_0.s" -gUnk_081138E1:: @ 081138E1 - .incbin "emma/gUnk_081138E1.bin" +gSpriteAnimations_Emma_2:: @ 081138E1 + .include "animations/gSpriteAnimations_Emma_2.s" gSpriteAnimations_Emma:: @ 081138FC - .4byte gUnk_081138DC - .4byte gUnk_081138DC - .4byte gUnk_081138E1 - .4byte gUnk_081138DC + .4byte gSpriteAnimations_Emma_0 + .4byte gSpriteAnimations_Emma_0 + .4byte gSpriteAnimations_Emma_2 + .4byte gSpriteAnimations_Emma_0 .4byte 00000000 diff --git a/data/animations/npc/epona.s b/data/animations/npc/epona.s index 7a1a2b9f..07e145ac 100644 --- a/data/animations/npc/epona.s +++ b/data/animations/npc/epona.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_08110088:: @ 08110088 - .incbin "epona/gUnk_08110088.bin" +gSpriteAnimations_Epona_0:: @ 08110088 + .include "animations/gSpriteAnimations_Epona_0.s" -gUnk_0811008D:: @ 0811008D - .incbin "epona/gUnk_0811008D.bin" +gSpriteAnimations_Epona_2:: @ 0811008D + .include "animations/gSpriteAnimations_Epona_2.s" -gUnk_08110092:: @ 08110092 - .incbin "epona/gUnk_08110092.bin" +gSpriteAnimations_Epona_1:: @ 08110092 + .include "animations/gSpriteAnimations_Epona_1.s" -gUnk_08110097:: @ 08110097 - .incbin "epona/gUnk_08110097.bin" +gSpriteAnimations_Epona_4:: @ 08110097 + .include "animations/gSpriteAnimations_Epona_4.s" -gUnk_081100B8:: @ 081100B8 - .incbin "epona/gUnk_081100B8.bin" +gSpriteAnimations_Epona_8:: @ 081100B8 + .include "animations/gSpriteAnimations_Epona_8.s" gSpriteAnimations_Epona:: @ 081100E4 - .4byte gUnk_08110088 - .4byte gUnk_08110092 - .4byte gUnk_0811008D - .4byte gUnk_08110092 - .4byte gUnk_08110097 - .4byte gUnk_08110097 - .4byte gUnk_08110097 - .4byte gUnk_08110097 - .4byte gUnk_081100B8 - .4byte gUnk_081100B8 - .4byte gUnk_081100B8 - .4byte gUnk_081100B8 + .4byte gSpriteAnimations_Epona_0 + .4byte gSpriteAnimations_Epona_1 + .4byte gSpriteAnimations_Epona_2 + .4byte gSpriteAnimations_Epona_1 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_8 + .4byte gSpriteAnimations_Epona_8 + .4byte gSpriteAnimations_Epona_8 + .4byte gSpriteAnimations_Epona_8 .4byte 00000000 diff --git a/data/animations/npc/farmers.s b/data/animations/npc/farmers.s index 659776f6..f506329d 100644 --- a/data/animations/npc/farmers.s +++ b/data/animations/npc/farmers.s @@ -4,64 +4,64 @@ .section .rodata .align 2 -gUnk_08113168:: @ 08113168 - .incbin "farmers/gUnk_08113168.bin" +gSpriteAnimations_Farmers_0_0:: @ 08113168 + .include "animations/gSpriteAnimations_Farmers_0_0.s" -gUnk_0811318D:: @ 0811318D - .incbin "farmers/gUnk_0811318D.bin" +gSpriteAnimations_Farmers_0_4:: @ 0811318D + .include "animations/gSpriteAnimations_Farmers_0_4.s" -gUnk_08113192:: @ 08113192 - .incbin "farmers/gUnk_08113192.bin" +gSpriteAnimations_Farmers_0_5:: @ 08113192 + .include "animations/gSpriteAnimations_Farmers_0_5.s" -gUnk_08113197:: @ 08113197 - .incbin "farmers/gUnk_08113197.bin" +gSpriteAnimations_Farmers_0_7:: @ 08113197 + .include "animations/gSpriteAnimations_Farmers_0_7.s" gSpriteAnimations_Farmers_0:: @ 0811319C - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_0811318D - .4byte gUnk_08113192 - .4byte gUnk_08113192 - .4byte gUnk_08113197 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_0811318D - .4byte gUnk_08113197 - .4byte gUnk_08113192 - .4byte gUnk_08113192 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_4 + .4byte gSpriteAnimations_Farmers_0_5 + .4byte gSpriteAnimations_Farmers_0_5 + .4byte gSpriteAnimations_Farmers_0_7 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_4 + .4byte gSpriteAnimations_Farmers_0_7 + .4byte gSpriteAnimations_Farmers_0_5 + .4byte gSpriteAnimations_Farmers_0_5 .4byte 00000000 -gUnk_081131E0:: @ 081131E0 - .incbin "farmers/gUnk_081131E0.bin" +gSpriteAnimations_Farmers_1_0:: @ 081131E0 + .include "animations/gSpriteAnimations_Farmers_1_0.s" -gUnk_08113205:: @ 08113205 - .incbin "farmers/gUnk_08113205.bin" +gSpriteAnimations_Farmers_1_4:: @ 08113205 + .include "animations/gSpriteAnimations_Farmers_1_4.s" -gUnk_0811320A:: @ 0811320A - .incbin "farmers/gUnk_0811320A.bin" +gSpriteAnimations_Farmers_1_5:: @ 0811320A + .include "animations/gSpriteAnimations_Farmers_1_5.s" -gUnk_0811320F:: @ 0811320F - .incbin "farmers/gUnk_0811320F.bin" +gSpriteAnimations_Farmers_1_7:: @ 0811320F + .include "animations/gSpriteAnimations_Farmers_1_7.s" gSpriteAnimations_Farmers_1:: @ 08113214 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_08113205 - .4byte gUnk_0811320A - .4byte gUnk_0811320A - .4byte gUnk_0811320F - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_08113205 - .4byte gUnk_0811320F - .4byte gUnk_0811320A - .4byte gUnk_0811320A + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_4 + .4byte gSpriteAnimations_Farmers_1_5 + .4byte gSpriteAnimations_Farmers_1_5 + .4byte gSpriteAnimations_Farmers_1_7 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_4 + .4byte gSpriteAnimations_Farmers_1_7 + .4byte gSpriteAnimations_Farmers_1_5 + .4byte gSpriteAnimations_Farmers_1_5 .4byte 00000000 diff --git a/data/animations/npc/farore.s b/data/animations/npc/farore.s index 2b7fefc7..c305a8e4 100644 --- a/data/animations/npc/farore.s +++ b/data/animations/npc/farore.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810F9F4:: @ 0810F9F4 - .incbin "farore/gUnk_0810F9F4.bin" +gSpriteAnimations_Farore_0:: @ 0810F9F4 + .include "animations/gSpriteAnimations_Farore_0.s" -gUnk_0810F9F9:: @ 0810F9F9 - .incbin "farore/gUnk_0810F9F9.bin" +gSpriteAnimations_Farore_3:: @ 0810F9F9 + .include "animations/gSpriteAnimations_Farore_3.s" -gUnk_0810F9FE:: @ 0810F9FE - .incbin "farore/gUnk_0810F9FE.bin" +gSpriteAnimations_Farore_1:: @ 0810F9FE + .include "animations/gSpriteAnimations_Farore_1.s" -gUnk_0810FA03:: @ 0810FA03 - .incbin "farore/gUnk_0810FA03.bin" +gSpriteAnimations_Farore_4:: @ 0810FA03 + .include "animations/gSpriteAnimations_Farore_4.s" gSpriteAnimations_Farore:: @ 0810FA14 - .4byte gUnk_0810F9F4 - .4byte gUnk_0810F9FE - .4byte gUnk_0810F9F4 - .4byte gUnk_0810F9F9 - .4byte gUnk_0810FA03 - .4byte gUnk_0810FA03 - .4byte gUnk_0810FA03 - .4byte gUnk_0810FA03 + .4byte gSpriteAnimations_Farore_0 + .4byte gSpriteAnimations_Farore_1 + .4byte gSpriteAnimations_Farore_0 + .4byte gSpriteAnimations_Farore_3 + .4byte gSpriteAnimations_Farore_4 + .4byte gSpriteAnimations_Farore_4 + .4byte gSpriteAnimations_Farore_4 + .4byte gSpriteAnimations_Farore_4 .4byte 00000000 diff --git a/data/animations/npc/festari.s b/data/animations/npc/festari.s index 511fb6e2..60b184ed 100644 --- a/data/animations/npc/festari.s +++ b/data/animations/npc/festari.s @@ -4,48 +4,48 @@ .section .rodata .align 2 -gUnk_08109BC8:: @ 08109BC8 - .incbin "festari/gUnk_08109BC8.bin" +gSpriteAnimations_Festari_1:: @ 08109BC8 + .include "animations/gSpriteAnimations_Festari_1.s" -gUnk_08109BCD:: @ 08109BCD - .incbin "festari/gUnk_08109BCD.bin" +gSpriteAnimations_Festari_0:: @ 08109BCD + .include "animations/gSpriteAnimations_Festari_0.s" -gUnk_08109BD2:: @ 08109BD2 - .incbin "festari/gUnk_08109BD2.bin" +gSpriteAnimations_Festari_3:: @ 08109BD2 + .include "animations/gSpriteAnimations_Festari_3.s" -gUnk_08109BD7:: @ 08109BD7 - .incbin "festari/gUnk_08109BD7.bin" +gSpriteAnimations_Festari_4:: @ 08109BD7 + .include "animations/gSpriteAnimations_Festari_4.s" -gUnk_08109BE8:: @ 08109BE8 - .incbin "festari/gUnk_08109BE8.bin" +gSpriteAnimations_Festari_7:: @ 08109BE8 + .include "animations/gSpriteAnimations_Festari_7.s" -gUnk_08109BF9:: @ 08109BF9 - .incbin "festari/gUnk_08109BF9.bin" +gSpriteAnimations_Festari_9:: @ 08109BF9 + .include "animations/gSpriteAnimations_Festari_9.s" -gUnk_08109C2E:: @ 08109C2E - .incbin "festari/gUnk_08109C2E.bin" +gSpriteAnimations_Festari_8:: @ 08109C2E + .include "animations/gSpriteAnimations_Festari_8.s" -gUnk_08109C4B:: @ 08109C4B - .incbin "festari/gUnk_08109C4B.bin" +gSpriteAnimations_Festari_10:: @ 08109C4B + .include "animations/gSpriteAnimations_Festari_10.s" -gUnk_08109C54:: @ 08109C54 - .incbin "festari/gUnk_08109C54.bin" +gSpriteAnimations_Festari_11:: @ 08109C54 + .include "animations/gSpriteAnimations_Festari_11.s" -gUnk_08109C59:: @ 08109C59 - .incbin "festari/gUnk_08109C59.bin" +gSpriteAnimations_Festari_12:: @ 08109C59 + .include "animations/gSpriteAnimations_Festari_12.s" gSpriteAnimations_Festari:: @ 08109C60 - .4byte gUnk_08109BCD - .4byte gUnk_08109BC8 - .4byte gUnk_08109BCD - .4byte gUnk_08109BD2 - .4byte gUnk_08109BD7 - .4byte gUnk_08109BD7 - .4byte gUnk_08109BD7 - .4byte gUnk_08109BE8 - .4byte gUnk_08109C2E - .4byte gUnk_08109BF9 - .4byte gUnk_08109C4B - .4byte gUnk_08109C54 - .4byte gUnk_08109C59 + .4byte gSpriteAnimations_Festari_0 + .4byte gSpriteAnimations_Festari_1 + .4byte gSpriteAnimations_Festari_0 + .4byte gSpriteAnimations_Festari_3 + .4byte gSpriteAnimations_Festari_4 + .4byte gSpriteAnimations_Festari_4 + .4byte gSpriteAnimations_Festari_4 + .4byte gSpriteAnimations_Festari_7 + .4byte gSpriteAnimations_Festari_8 + .4byte gSpriteAnimations_Festari_9 + .4byte gSpriteAnimations_Festari_10 + .4byte gSpriteAnimations_Festari_11 + .4byte gSpriteAnimations_Festari_12 .4byte 00000000 diff --git a/data/animations/npc/forestMinish.s b/data/animations/npc/forestMinish.s index b0eda8e7..e5413d59 100644 --- a/data/animations/npc/forestMinish.s +++ b/data/animations/npc/forestMinish.s @@ -4,181 +4,181 @@ .section .rodata @ .align 2 -gUnk_0810A36A:: @ 0810A36A - .incbin "forestMinish/gUnk_0810A36A.bin" +gSpriteAnimations_ForestMinish_0:: @ 0810A36A + .include "animations/gSpriteAnimations_ForestMinish_0.s" -gUnk_0810A36F:: @ 0810A36F - .incbin "forestMinish/gUnk_0810A36F.bin" +gSpriteAnimations_ForestMinish_1:: @ 0810A36F + .include "animations/gSpriteAnimations_ForestMinish_1.s" -gUnk_0810A374:: @ 0810A374 - .incbin "forestMinish/gUnk_0810A374.bin" +gSpriteAnimations_ForestMinish_2:: @ 0810A374 + .include "animations/gSpriteAnimations_ForestMinish_2.s" -gUnk_0810A379:: @ 0810A379 - .incbin "forestMinish/gUnk_0810A379.bin" +gSpriteAnimations_ForestMinish_3:: @ 0810A379 + .include "animations/gSpriteAnimations_ForestMinish_3.s" -gUnk_0810A37E:: @ 0810A37E - .incbin "forestMinish/gUnk_0810A37E.bin" +gSpriteAnimations_ForestMinish_4:: @ 0810A37E + .include "animations/gSpriteAnimations_ForestMinish_4.s" -gUnk_0810A39F:: @ 0810A39F - .incbin "forestMinish/gUnk_0810A39F.bin" +gSpriteAnimations_ForestMinish_5:: @ 0810A39F + .include "animations/gSpriteAnimations_ForestMinish_5.s" -gUnk_0810A3C0:: @ 0810A3C0 - .incbin "forestMinish/gUnk_0810A3C0.bin" +gSpriteAnimations_ForestMinish_6:: @ 0810A3C0 + .include "animations/gSpriteAnimations_ForestMinish_6.s" -gUnk_0810A3E1:: @ 0810A3E1 - .incbin "forestMinish/gUnk_0810A3E1.bin" +gSpriteAnimations_ForestMinish_7:: @ 0810A3E1 + .include "animations/gSpriteAnimations_ForestMinish_7.s" -gUnk_0810A402:: @ 0810A402 - .incbin "forestMinish/gUnk_0810A402.bin" +gSpriteAnimations_ForestMinish_8:: @ 0810A402 + .include "animations/gSpriteAnimations_ForestMinish_8.s" -gUnk_0810A407:: @ 0810A407 - .incbin "forestMinish/gUnk_0810A407.bin" +gSpriteAnimations_ForestMinish_9:: @ 0810A407 + .include "animations/gSpriteAnimations_ForestMinish_9.s" -gUnk_0810A40C:: @ 0810A40C - .incbin "forestMinish/gUnk_0810A40C.bin" +gSpriteAnimations_ForestMinish_10:: @ 0810A40C + .include "animations/gSpriteAnimations_ForestMinish_10.s" -gUnk_0810A411:: @ 0810A411 - .incbin "forestMinish/gUnk_0810A411.bin" +gSpriteAnimations_ForestMinish_11:: @ 0810A411 + .include "animations/gSpriteAnimations_ForestMinish_11.s" -gUnk_0810A416:: @ 0810A416 - .incbin "forestMinish/gUnk_0810A416.bin" +gSpriteAnimations_ForestMinish_12:: @ 0810A416 + .include "animations/gSpriteAnimations_ForestMinish_12.s" -gUnk_0810A423:: @ 0810A423 - .incbin "forestMinish/gUnk_0810A423.bin" +gSpriteAnimations_ForestMinish_13:: @ 0810A423 + .include "animations/gSpriteAnimations_ForestMinish_13.s" -gUnk_0810A430:: @ 0810A430 - .incbin "forestMinish/gUnk_0810A430.bin" +gSpriteAnimations_ForestMinish_14:: @ 0810A430 + .include "animations/gSpriteAnimations_ForestMinish_14.s" -gUnk_0810A43D:: @ 0810A43D - .incbin "forestMinish/gUnk_0810A43D.bin" +gSpriteAnimations_ForestMinish_15:: @ 0810A43D + .include "animations/gSpriteAnimations_ForestMinish_15.s" -gUnk_0810A44A:: @ 0810A44A - .incbin "forestMinish/gUnk_0810A44A.bin" +gSpriteAnimations_ForestMinish_16:: @ 0810A44A + .include "animations/gSpriteAnimations_ForestMinish_16.s" -gUnk_0810A457:: @ 0810A457 - .incbin "forestMinish/gUnk_0810A457.bin" +gSpriteAnimations_ForestMinish_17:: @ 0810A457 + .include "animations/gSpriteAnimations_ForestMinish_17.s" -gUnk_0810A464:: @ 0810A464 - .incbin "forestMinish/gUnk_0810A464.bin" +gSpriteAnimations_ForestMinish_18:: @ 0810A464 + .include "animations/gSpriteAnimations_ForestMinish_18.s" -gUnk_0810A471:: @ 0810A471 - .incbin "forestMinish/gUnk_0810A471.bin" +gSpriteAnimations_ForestMinish_19:: @ 0810A471 + .include "animations/gSpriteAnimations_ForestMinish_19.s" -gUnk_0810A47E:: @ 0810A47E - .incbin "forestMinish/gUnk_0810A47E.bin" +gSpriteAnimations_ForestMinish_20:: @ 0810A47E + .include "animations/gSpriteAnimations_ForestMinish_20.s" -gUnk_0810A48B:: @ 0810A48B - .incbin "forestMinish/gUnk_0810A48B.bin" +gSpriteAnimations_ForestMinish_21:: @ 0810A48B + .include "animations/gSpriteAnimations_ForestMinish_21.s" -gUnk_0810A498:: @ 0810A498 - .incbin "forestMinish/gUnk_0810A498.bin" +gSpriteAnimations_ForestMinish_22:: @ 0810A498 + .include "animations/gSpriteAnimations_ForestMinish_22.s" -gUnk_0810A4A5:: @ 0810A4A5 - .incbin "forestMinish/gUnk_0810A4A5.bin" +gSpriteAnimations_ForestMinish_23:: @ 0810A4A5 + .include "animations/gSpriteAnimations_ForestMinish_23.s" -gUnk_0810A4B2:: @ 0810A4B2 - .incbin "forestMinish/gUnk_0810A4B2.bin" +gSpriteAnimations_ForestMinish_24:: @ 0810A4B2 + .include "animations/gSpriteAnimations_ForestMinish_24.s" -gUnk_0810A4BF:: @ 0810A4BF - .incbin "forestMinish/gUnk_0810A4BF.bin" +gSpriteAnimations_ForestMinish_25:: @ 0810A4BF + .include "animations/gSpriteAnimations_ForestMinish_25.s" -gUnk_0810A4CC:: @ 0810A4CC - .incbin "forestMinish/gUnk_0810A4CC.bin" +gSpriteAnimations_ForestMinish_26:: @ 0810A4CC + .include "animations/gSpriteAnimations_ForestMinish_26.s" -gUnk_0810A4D9:: @ 0810A4D9 - .incbin "forestMinish/gUnk_0810A4D9.bin" +gSpriteAnimations_ForestMinish_27:: @ 0810A4D9 + .include "animations/gSpriteAnimations_ForestMinish_27.s" -gUnk_0810A4E6:: @ 0810A4E6 - .incbin "forestMinish/gUnk_0810A4E6.bin" +gSpriteAnimations_ForestMinish_28:: @ 0810A4E6 + .include "animations/gSpriteAnimations_ForestMinish_28.s" -gUnk_0810A4F3:: @ 0810A4F3 - .incbin "forestMinish/gUnk_0810A4F3.bin" +gSpriteAnimations_ForestMinish_29:: @ 0810A4F3 + .include "animations/gSpriteAnimations_ForestMinish_29.s" -gUnk_0810A500:: @ 0810A500 - .incbin "forestMinish/gUnk_0810A500.bin" +gSpriteAnimations_ForestMinish_30:: @ 0810A500 + .include "animations/gSpriteAnimations_ForestMinish_30.s" -gUnk_0810A50D:: @ 0810A50D - .incbin "forestMinish/gUnk_0810A50D.bin" +gSpriteAnimations_ForestMinish_31:: @ 0810A50D + .include "animations/gSpriteAnimations_ForestMinish_31.s" -gUnk_0810A51A:: @ 0810A51A - .incbin "forestMinish/gUnk_0810A51A.bin" +gSpriteAnimations_ForestMinish_32:: @ 0810A51A + .include "animations/gSpriteAnimations_ForestMinish_32.s" -gUnk_0810A527:: @ 0810A527 - .incbin "forestMinish/gUnk_0810A527.bin" +gSpriteAnimations_ForestMinish_33:: @ 0810A527 + .include "animations/gSpriteAnimations_ForestMinish_33.s" -gUnk_0810A534:: @ 0810A534 - .incbin "forestMinish/gUnk_0810A534.bin" +gSpriteAnimations_ForestMinish_34:: @ 0810A534 + .include "animations/gSpriteAnimations_ForestMinish_34.s" -gUnk_0810A541:: @ 0810A541 - .incbin "forestMinish/gUnk_0810A541.bin" +gSpriteAnimations_ForestMinish_35:: @ 0810A541 + .include "animations/gSpriteAnimations_ForestMinish_35.s" -gUnk_0810A54E:: @ 0810A54E - .incbin "forestMinish/gUnk_0810A54E.bin" +gSpriteAnimations_ForestMinish_36:: @ 0810A54E + .include "animations/gSpriteAnimations_ForestMinish_36.s" -gUnk_0810A55B:: @ 0810A55B - .incbin "forestMinish/gUnk_0810A55B.bin" +gSpriteAnimations_ForestMinish_37:: @ 0810A55B + .include "animations/gSpriteAnimations_ForestMinish_37.s" -gUnk_0810A568:: @ 0810A568 - .incbin "forestMinish/gUnk_0810A568.bin" +gSpriteAnimations_ForestMinish_38:: @ 0810A568 + .include "animations/gSpriteAnimations_ForestMinish_38.s" -gUnk_0810A575:: @ 0810A575 - .incbin "forestMinish/gUnk_0810A575.bin" +gSpriteAnimations_ForestMinish_39:: @ 0810A575 + .include "animations/gSpriteAnimations_ForestMinish_39.s" -gUnk_0810A582:: @ 0810A582 - .incbin "forestMinish/gUnk_0810A582.bin" +gSpriteAnimations_ForestMinish_40:: @ 0810A582 + .include "animations/gSpriteAnimations_ForestMinish_40.s" -gUnk_0810A58F:: @ 0810A58F - .incbin "forestMinish/gUnk_0810A58F.bin" +gSpriteAnimations_ForestMinish_41:: @ 0810A58F + .include "animations/gSpriteAnimations_ForestMinish_41.s" -gUnk_0810A59C:: @ 0810A59C - .incbin "forestMinish/gUnk_0810A59C.bin" +gSpriteAnimations_ForestMinish_42:: @ 0810A59C + .include "animations/gSpriteAnimations_ForestMinish_42.s" -gUnk_0810A5A9:: @ 0810A5A9 - .incbin "forestMinish/gUnk_0810A5A9.bin" +gSpriteAnimations_ForestMinish_43:: @ 0810A5A9 + .include "animations/gSpriteAnimations_ForestMinish_43.s" gSpriteAnimations_ForestMinish:: @ 0810A5B8 - .4byte gUnk_0810A36A - .4byte gUnk_0810A36F - .4byte gUnk_0810A374 - .4byte gUnk_0810A379 - .4byte gUnk_0810A37E - .4byte gUnk_0810A39F - .4byte gUnk_0810A3C0 - .4byte gUnk_0810A3E1 - .4byte gUnk_0810A402 - .4byte gUnk_0810A407 - .4byte gUnk_0810A40C - .4byte gUnk_0810A411 - .4byte gUnk_0810A416 - .4byte gUnk_0810A423 - .4byte gUnk_0810A430 - .4byte gUnk_0810A43D - .4byte gUnk_0810A44A - .4byte gUnk_0810A457 - .4byte gUnk_0810A464 - .4byte gUnk_0810A471 - .4byte gUnk_0810A47E - .4byte gUnk_0810A48B - .4byte gUnk_0810A498 - .4byte gUnk_0810A4A5 - .4byte gUnk_0810A4B2 - .4byte gUnk_0810A4BF - .4byte gUnk_0810A4CC - .4byte gUnk_0810A4D9 - .4byte gUnk_0810A4E6 - .4byte gUnk_0810A4F3 - .4byte gUnk_0810A500 - .4byte gUnk_0810A50D - .4byte gUnk_0810A51A - .4byte gUnk_0810A527 - .4byte gUnk_0810A534 - .4byte gUnk_0810A541 - .4byte gUnk_0810A54E - .4byte gUnk_0810A55B - .4byte gUnk_0810A568 - .4byte gUnk_0810A575 - .4byte gUnk_0810A582 - .4byte gUnk_0810A58F - .4byte gUnk_0810A59C - .4byte gUnk_0810A5A9 + .4byte gSpriteAnimations_ForestMinish_0 + .4byte gSpriteAnimations_ForestMinish_1 + .4byte gSpriteAnimations_ForestMinish_2 + .4byte gSpriteAnimations_ForestMinish_3 + .4byte gSpriteAnimations_ForestMinish_4 + .4byte gSpriteAnimations_ForestMinish_5 + .4byte gSpriteAnimations_ForestMinish_6 + .4byte gSpriteAnimations_ForestMinish_7 + .4byte gSpriteAnimations_ForestMinish_8 + .4byte gSpriteAnimations_ForestMinish_9 + .4byte gSpriteAnimations_ForestMinish_10 + .4byte gSpriteAnimations_ForestMinish_11 + .4byte gSpriteAnimations_ForestMinish_12 + .4byte gSpriteAnimations_ForestMinish_13 + .4byte gSpriteAnimations_ForestMinish_14 + .4byte gSpriteAnimations_ForestMinish_15 + .4byte gSpriteAnimations_ForestMinish_16 + .4byte gSpriteAnimations_ForestMinish_17 + .4byte gSpriteAnimations_ForestMinish_18 + .4byte gSpriteAnimations_ForestMinish_19 + .4byte gSpriteAnimations_ForestMinish_20 + .4byte gSpriteAnimations_ForestMinish_21 + .4byte gSpriteAnimations_ForestMinish_22 + .4byte gSpriteAnimations_ForestMinish_23 + .4byte gSpriteAnimations_ForestMinish_24 + .4byte gSpriteAnimations_ForestMinish_25 + .4byte gSpriteAnimations_ForestMinish_26 + .4byte gSpriteAnimations_ForestMinish_27 + .4byte gSpriteAnimations_ForestMinish_28 + .4byte gSpriteAnimations_ForestMinish_29 + .4byte gSpriteAnimations_ForestMinish_30 + .4byte gSpriteAnimations_ForestMinish_31 + .4byte gSpriteAnimations_ForestMinish_32 + .4byte gSpriteAnimations_ForestMinish_33 + .4byte gSpriteAnimations_ForestMinish_34 + .4byte gSpriteAnimations_ForestMinish_35 + .4byte gSpriteAnimations_ForestMinish_36 + .4byte gSpriteAnimations_ForestMinish_37 + .4byte gSpriteAnimations_ForestMinish_38 + .4byte gSpriteAnimations_ForestMinish_39 + .4byte gSpriteAnimations_ForestMinish_40 + .4byte gSpriteAnimations_ForestMinish_41 + .4byte gSpriteAnimations_ForestMinish_42 + .4byte gSpriteAnimations_ForestMinish_43 .4byte 00000000 diff --git a/data/animations/npc/gentari.s b/data/animations/npc/gentari.s index e7040ddc..66907138 100644 --- a/data/animations/npc/gentari.s +++ b/data/animations/npc/gentari.s @@ -4,46 +4,46 @@ .section .rodata .align 2 -gUnk_08109AD8:: @ 08109AD8 - .incbin "gentari/gUnk_08109AD8.bin" +gSpriteAnimations_Gentari_0:: @ 08109AD8 + .include "animations/gSpriteAnimations_Gentari_0.s" -gUnk_08109ADD:: @ 08109ADD - .incbin "gentari/gUnk_08109ADD.bin" +gSpriteAnimations_Gentari_1:: @ 08109ADD + .include "animations/gSpriteAnimations_Gentari_1.s" -gUnk_08109AE2:: @ 08109AE2 - .incbin "gentari/gUnk_08109AE2.bin" +gSpriteAnimations_Gentari_2:: @ 08109AE2 + .include "animations/gSpriteAnimations_Gentari_2.s" -gUnk_08109AE7:: @ 08109AE7 - .incbin "gentari/gUnk_08109AE7.bin" +gSpriteAnimations_Gentari_3:: @ 08109AE7 + .include "animations/gSpriteAnimations_Gentari_3.s" -gUnk_08109AEC:: @ 08109AEC - .incbin "gentari/gUnk_08109AEC.bin" +gSpriteAnimations_Gentari_4:: @ 08109AEC + .include "animations/gSpriteAnimations_Gentari_4.s" -gUnk_08109AFD:: @ 08109AFD - .incbin "gentari/gUnk_08109AFD.bin" +gSpriteAnimations_Gentari_7:: @ 08109AFD + .include "animations/gSpriteAnimations_Gentari_7.s" -gUnk_08109B0E:: @ 08109B0E - .incbin "gentari/gUnk_08109B0E.bin" +gSpriteAnimations_Gentari_8:: @ 08109B0E + .include "animations/gSpriteAnimations_Gentari_8.s" -gUnk_08109B3B:: @ 08109B3B - .incbin "gentari/gUnk_08109B3B.bin" +gSpriteAnimations_Gentari_12:: @ 08109B3B + .include "animations/gSpriteAnimations_Gentari_12.s" -gUnk_08109B60:: @ 08109B60 - .incbin "gentari/gUnk_08109B60.bin" +gSpriteAnimations_Gentari_13:: @ 08109B60 + .include "animations/gSpriteAnimations_Gentari_13.s" gSpriteAnimations_Gentari:: @ 08109B80 - .4byte gUnk_08109AD8 - .4byte gUnk_08109ADD - .4byte gUnk_08109AE2 - .4byte gUnk_08109AE7 - .4byte gUnk_08109AEC - .4byte gUnk_08109AEC - .4byte gUnk_08109AEC - .4byte gUnk_08109AFD - .4byte gUnk_08109B0E - .4byte gUnk_08109ADD - .4byte gUnk_08109B0E - .4byte gUnk_08109AE7 - .4byte gUnk_08109B3B - .4byte gUnk_08109B60 + .4byte gSpriteAnimations_Gentari_0 + .4byte gSpriteAnimations_Gentari_1 + .4byte gSpriteAnimations_Gentari_2 + .4byte gSpriteAnimations_Gentari_3 + .4byte gSpriteAnimations_Gentari_4 + .4byte gSpriteAnimations_Gentari_4 + .4byte gSpriteAnimations_Gentari_4 + .4byte gSpriteAnimations_Gentari_7 + .4byte gSpriteAnimations_Gentari_8 + .4byte gSpriteAnimations_Gentari_1 + .4byte gSpriteAnimations_Gentari_8 + .4byte gSpriteAnimations_Gentari_3 + .4byte gSpriteAnimations_Gentari_12 + .4byte gSpriteAnimations_Gentari_13 .4byte 00000000 diff --git a/data/animations/npc/ghostBrothers.s b/data/animations/npc/ghostBrothers.s index 397aee6b..bdf81b21 100644 --- a/data/animations/npc/ghostBrothers.s +++ b/data/animations/npc/ghostBrothers.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_08110300:: @ 08110300 - .incbin "ghostBrothers/gUnk_08110300.bin" +gSpriteAnimations_GhostBrothers_0:: @ 08110300 + .include "animations/gSpriteAnimations_GhostBrothers_0.s" -gUnk_08110311:: @ 08110311 - .incbin "ghostBrothers/gUnk_08110311.bin" +gSpriteAnimations_GhostBrothers_3:: @ 08110311 + .include "animations/gSpriteAnimations_GhostBrothers_3.s" -gUnk_08110322:: @ 08110322 - .incbin "ghostBrothers/gUnk_08110322.bin" +gSpriteAnimations_GhostBrothers_1:: @ 08110322 + .include "animations/gSpriteAnimations_GhostBrothers_1.s" -gUnk_08110333:: @ 08110333 - .incbin "ghostBrothers/gUnk_08110333.bin" +gSpriteAnimations_GhostBrothers_4:: @ 08110333 + .include "animations/gSpriteAnimations_GhostBrothers_4.s" gSpriteAnimations_GhostBrothers:: @ 0811033C - .4byte gUnk_08110300 - .4byte gUnk_08110322 - .4byte gUnk_08110300 - .4byte gUnk_08110311 - .4byte gUnk_08110333 + .4byte gSpriteAnimations_GhostBrothers_0 + .4byte gSpriteAnimations_GhostBrothers_1 + .4byte gSpriteAnimations_GhostBrothers_0 + .4byte gSpriteAnimations_GhostBrothers_3 + .4byte gSpriteAnimations_GhostBrothers_4 .4byte 00000000 diff --git a/data/animations/npc/gina.s b/data/animations/npc/gina.s index 5e377610..c30790cc 100644 --- a/data/animations/npc/gina.s +++ b/data/animations/npc/gina.s @@ -5,42 +5,42 @@ .align 2 -gUnk_0811352C:: @ 0811352C - .incbin "gina/gUnk_0811352C.bin" +gSpriteAnimations_Gina_0:: @ 0811352C + .include "animations/gSpriteAnimations_Gina_0.s" -gUnk_0811354D:: @ 0811354D - .incbin "gina/gUnk_0811354D.bin" +gSpriteAnimations_Gina_1:: @ 0811354D + .include "animations/gSpriteAnimations_Gina_1.s" -gUnk_0811356E:: @ 0811356E - .incbin "gina/gUnk_0811356E.bin" +gSpriteAnimations_Gina_3:: @ 0811356E + .include "animations/gSpriteAnimations_Gina_3.s" -gUnk_0811358F:: @ 0811358F - .incbin "gina/gUnk_0811358F.bin" +gSpriteAnimations_Gina_8:: @ 0811358F + .include "animations/gSpriteAnimations_Gina_8.s" -gUnk_081135B0:: @ 081135B0 - .incbin "gina/gUnk_081135B0.bin" +gSpriteAnimations_Gina_12:: @ 081135B0 + .include "animations/gSpriteAnimations_Gina_12.s" -gUnk_081135DD:: @ 081135DD - .incbin "gina/gUnk_081135DD.bin" +gSpriteAnimations_Gina_5:: @ 081135DD + .include "animations/gSpriteAnimations_Gina_5.s" -gUnk_081135E2:: @ 081135E2 - .incbin "gina/gUnk_081135E2.bin" +gSpriteAnimations_Gina_4:: @ 081135E2 + .include "animations/gSpriteAnimations_Gina_4.s" gSpriteAnimations_Gina:: @ 081135E8 - .4byte gUnk_0811352C - .4byte gUnk_0811354D - .4byte gUnk_0811352C - .4byte gUnk_0811356E - .4byte gUnk_081135E2 - .4byte gUnk_081135DD - .4byte gUnk_081135E2 - .4byte gUnk_081135E2 - .4byte gUnk_0811358F - .4byte gUnk_0811358F - .4byte gUnk_0811358F - .4byte gUnk_0811358F - .4byte gUnk_081135B0 - .4byte gUnk_081135B0 - .4byte gUnk_081135B0 - .4byte gUnk_081135B0 + .4byte gSpriteAnimations_Gina_0 + .4byte gSpriteAnimations_Gina_1 + .4byte gSpriteAnimations_Gina_0 + .4byte gSpriteAnimations_Gina_3 + .4byte gSpriteAnimations_Gina_4 + .4byte gSpriteAnimations_Gina_5 + .4byte gSpriteAnimations_Gina_4 + .4byte gSpriteAnimations_Gina_4 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_12 + .4byte gSpriteAnimations_Gina_12 + .4byte gSpriteAnimations_Gina_12 + .4byte gSpriteAnimations_Gina_12 .4byte 00000000 diff --git a/data/animations/npc/gorman.s b/data/animations/npc/gorman.s index d13c74d9..647036de 100644 --- a/data/animations/npc/gorman.s +++ b/data/animations/npc/gorman.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_08111CBC:: @ 08111CBC - .incbin "gorman/gUnk_08111CBC.bin" +gSpriteAnimations_Gorman_0:: @ 08111CBC + .include "animations/gSpriteAnimations_Gorman_0.s" -gUnk_08111CC1:: @ 08111CC1 - .incbin "gorman/gUnk_08111CC1.bin" +gSpriteAnimations_Gorman_1:: @ 08111CC1 + .include "animations/gSpriteAnimations_Gorman_1.s" -gUnk_08111CC6:: @ 08111CC6 - .incbin "gorman/gUnk_08111CC6.bin" +gSpriteAnimations_Gorman_2:: @ 08111CC6 + .include "animations/gSpriteAnimations_Gorman_2.s" -gUnk_08111CCB:: @ 08111CCB - .incbin "gorman/gUnk_08111CCB.bin" +gSpriteAnimations_Gorman_3:: @ 08111CCB + .include "animations/gSpriteAnimations_Gorman_3.s" -gUnk_08111CD0:: @ 08111CD0 - .incbin "gorman/gUnk_08111CD0.bin" +gSpriteAnimations_Gorman_4:: @ 08111CD0 + .include "animations/gSpriteAnimations_Gorman_4.s" -gUnk_08111CE9:: @ 08111CE9 - .incbin "gorman/gUnk_08111CE9.bin" +gSpriteAnimations_Gorman_6:: @ 08111CE9 + .include "animations/gSpriteAnimations_Gorman_6.s" -gUnk_08111D02:: @ 08111D02 - .incbin "gorman/gUnk_08111D02.bin" +gSpriteAnimations_Gorman_7:: @ 08111D02 + .include "animations/gSpriteAnimations_Gorman_7.s" -gUnk_08111D1B:: @ 08111D1B - .incbin "gorman/gUnk_08111D1B.bin" +gSpriteAnimations_Gorman_5:: @ 08111D1B + .include "animations/gSpriteAnimations_Gorman_5.s" gSpriteAnimations_Gorman:: @ 08111D34 - .4byte gUnk_08111CBC - .4byte gUnk_08111CC1 - .4byte gUnk_08111CC6 - .4byte gUnk_08111CCB - .4byte gUnk_08111CD0 - .4byte gUnk_08111D1B - .4byte gUnk_08111CE9 - .4byte gUnk_08111D02 + .4byte gSpriteAnimations_Gorman_0 + .4byte gSpriteAnimations_Gorman_1 + .4byte gSpriteAnimations_Gorman_2 + .4byte gSpriteAnimations_Gorman_3 + .4byte gSpriteAnimations_Gorman_4 + .4byte gSpriteAnimations_Gorman_5 + .4byte gSpriteAnimations_Gorman_6 + .4byte gSpriteAnimations_Gorman_7 .4byte 00000000 diff --git a/data/animations/npc/goron.s b/data/animations/npc/goron.s index 048f2f7d..643b65a2 100644 --- a/data/animations/npc/goron.s +++ b/data/animations/npc/goron.s @@ -4,38 +4,38 @@ .section .rodata .align 2 -gUnk_08111AC4:: @ 08111AC4 - .incbin "goron/gUnk_08111AC4.bin" +gSpriteAnimations_Goron_0:: @ 08111AC4 + .include "animations/gSpriteAnimations_Goron_0.s" -gUnk_08111AC9:: @ 08111AC9 - .incbin "goron/gUnk_08111AC9.bin" +gSpriteAnimations_Goron_1:: @ 08111AC9 + .include "animations/gSpriteAnimations_Goron_1.s" -gUnk_08111ACE:: @ 08111ACE - .incbin "goron/gUnk_08111ACE.bin" +gSpriteAnimations_Goron_2:: @ 08111ACE + .include "animations/gSpriteAnimations_Goron_2.s" -gUnk_08111AD3:: @ 08111AD3 - .incbin "goron/gUnk_08111AD3.bin" +gSpriteAnimations_Goron_3:: @ 08111AD3 + .include "animations/gSpriteAnimations_Goron_3.s" -gUnk_08111AD8:: @ 08111AD8 - .incbin "goron/gUnk_08111AD8.bin" +gSpriteAnimations_Goron_5:: @ 08111AD8 + .include "animations/gSpriteAnimations_Goron_5.s" -gUnk_08111AF9:: @ 08111AF9 - .incbin "goron/gUnk_08111AF9.bin" +gSpriteAnimations_Goron_7:: @ 08111AF9 + .include "animations/gSpriteAnimations_Goron_7.s" -gUnk_08111B1A:: @ 08111B1A - .incbin "goron/gUnk_08111B1A.bin" +gSpriteAnimations_Goron_4:: @ 08111B1A + .include "animations/gSpriteAnimations_Goron_4.s" -gUnk_08111B3B:: @ 08111B3B - .incbin "goron/gUnk_08111B3B.bin" +gSpriteAnimations_Goron_8:: @ 08111B3B + .include "animations/gSpriteAnimations_Goron_8.s" gSpriteAnimations_Goron:: @ 08111B60 - .4byte gUnk_08111AC4 - .4byte gUnk_08111AC9 - .4byte gUnk_08111ACE - .4byte gUnk_08111AD3 - .4byte gUnk_08111B1A - .4byte gUnk_08111AD8 - .4byte gUnk_08111ACE - .4byte gUnk_08111AF9 - .4byte gUnk_08111B3B + .4byte gSpriteAnimations_Goron_0 + .4byte gSpriteAnimations_Goron_1 + .4byte gSpriteAnimations_Goron_2 + .4byte gSpriteAnimations_Goron_3 + .4byte gSpriteAnimations_Goron_4 + .4byte gSpriteAnimations_Goron_5 + .4byte gSpriteAnimations_Goron_2 + .4byte gSpriteAnimations_Goron_7 + .4byte gSpriteAnimations_Goron_8 .4byte 00000000 diff --git a/data/animations/npc/goronMerchant.s b/data/animations/npc/goronMerchant.s index 63e39b37..aecfd0b3 100644 --- a/data/animations/npc/goronMerchant.s +++ b/data/animations/npc/goronMerchant.s @@ -4,28 +4,28 @@ .section .rodata @ .align 2 -gUnk_08111BBE:: @ 08111BBE - .incbin "goronMerchant/gUnk_08111BBE.bin" +gSpriteAnimations_GoronMerchant_1:: @ 08111BBE + .include "animations/gSpriteAnimations_GoronMerchant_1.s" -gUnk_08111BC3:: @ 08111BC3 - .incbin "goronMerchant/gUnk_08111BC3.bin" +gSpriteAnimations_GoronMerchant_0:: @ 08111BC3 + .include "animations/gSpriteAnimations_GoronMerchant_0.s" -gUnk_08111BC8:: @ 08111BC8 - .incbin "goronMerchant/gUnk_08111BC8.bin" +gSpriteAnimations_GoronMerchant_3:: @ 08111BC8 + .include "animations/gSpriteAnimations_GoronMerchant_3.s" -gUnk_08111BCD:: @ 08111BCD - .incbin "goronMerchant/gUnk_08111BCD.bin" +gSpriteAnimations_GoronMerchant_5:: @ 08111BCD + .include "animations/gSpriteAnimations_GoronMerchant_5.s" -gUnk_08111BF2:: @ 08111BF2 - .incbin "goronMerchant/gUnk_08111BF2.bin" +gSpriteAnimations_GoronMerchant_7:: @ 08111BF2 + .include "animations/gSpriteAnimations_GoronMerchant_7.s" gSpriteAnimations_GoronMerchant:: @ 08111C18 - .4byte gUnk_08111BC3 - .4byte gUnk_08111BBE - .4byte gUnk_08111BC3 - .4byte gUnk_08111BC8 - .4byte gUnk_08111BC3 - .4byte gUnk_08111BCD - .4byte gUnk_08111BC3 - .4byte gUnk_08111BF2 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_1 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_3 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_5 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_7 .4byte 00000000 diff --git a/data/animations/npc/greatFairy.s b/data/animations/npc/greatFairy.s index b96a4be6..c2f2282d 100644 --- a/data/animations/npc/greatFairy.s +++ b/data/animations/npc/greatFairy.s @@ -14,44 +14,44 @@ gUnk_081207A4:: @ 081207A4 gUnk_081207AC:: @ 081207AC .incbin "greatFairy/gUnk_081207AC.bin" -gUnk_081207B0:: @ 081207B0 - .incbin "greatFairy/gUnk_081207B0.bin" +gSpriteAnimations_GreatFairy_0:: @ 081207B0 + .include "animations/gSpriteAnimations_GreatFairy_0.s" -gUnk_081207C1:: @ 081207C1 - .incbin "greatFairy/gUnk_081207C1.bin" +gSpriteAnimations_GreatFairy_2:: @ 081207C1 + .include "animations/gSpriteAnimations_GreatFairy_2.s" -gUnk_081207D2:: @ 081207D2 - .incbin "greatFairy/gUnk_081207D2.bin" +gSpriteAnimations_GreatFairy_1:: @ 081207D2 + .include "animations/gSpriteAnimations_GreatFairy_1.s" -gUnk_081207D7:: @ 081207D7 - .incbin "greatFairy/gUnk_081207D7.bin" +gSpriteAnimations_GreatFairy_9:: @ 081207D7 + .include "animations/gSpriteAnimations_GreatFairy_9.s" -gUnk_081207F4:: @ 081207F4 - .incbin "greatFairy/gUnk_081207F4.bin" +gSpriteAnimations_GreatFairy_5:: @ 081207F4 + .include "animations/gSpriteAnimations_GreatFairy_5.s" -gUnk_08120819:: @ 08120819 - .incbin "greatFairy/gUnk_08120819.bin" +gSpriteAnimations_GreatFairy_6:: @ 08120819 + .include "animations/gSpriteAnimations_GreatFairy_6.s" -gUnk_08120826:: @ 08120826 - .incbin "greatFairy/gUnk_08120826.bin" +gSpriteAnimations_GreatFairy_7:: @ 08120826 + .include "animations/gSpriteAnimations_GreatFairy_7.s" -gUnk_0812082F:: @ 0812082F - .incbin "greatFairy/gUnk_0812082F.bin" +gSpriteAnimations_GreatFairy_3:: @ 0812082F + .include "animations/gSpriteAnimations_GreatFairy_3.s" -gUnk_08120850:: @ 08120850 - .incbin "greatFairy/gUnk_08120850.bin" +gSpriteAnimations_GreatFairy_4:: @ 08120850 + .include "animations/gSpriteAnimations_GreatFairy_4.s" -gUnk_08120855:: @ 08120855 - .incbin "greatFairy/gUnk_08120855.bin" +gSpriteAnimations_GreatFairy_8:: @ 08120855 + .include "animations/gSpriteAnimations_GreatFairy_8.s" gSpriteAnimations_GreatFairy:: @ 08120878 - .4byte gUnk_081207B0 - .4byte gUnk_081207D2 - .4byte gUnk_081207C1 - .4byte gUnk_0812082F - .4byte gUnk_08120850 - .4byte gUnk_081207F4 - .4byte gUnk_08120819 - .4byte gUnk_08120826 - .4byte gUnk_08120855 - .4byte gUnk_081207D7 + .4byte gSpriteAnimations_GreatFairy_0 + .4byte gSpriteAnimations_GreatFairy_1 + .4byte gSpriteAnimations_GreatFairy_2 + .4byte gSpriteAnimations_GreatFairy_3 + .4byte gSpriteAnimations_GreatFairy_4 + .4byte gSpriteAnimations_GreatFairy_5 + .4byte gSpriteAnimations_GreatFairy_6 + .4byte gSpriteAnimations_GreatFairy_7 + .4byte gSpriteAnimations_GreatFairy_8 + .4byte gSpriteAnimations_GreatFairy_9 diff --git a/data/animations/npc/gregal.s b/data/animations/npc/gregal.s index 959c89f0..0cc23ba8 100644 --- a/data/animations/npc/gregal.s +++ b/data/animations/npc/gregal.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_08113D9C:: @ 08113D9C - .incbin "gregal/gUnk_08113D9C.bin" +gSpriteAnimations_Gregal_0:: @ 08113D9C + .include "animations/gSpriteAnimations_Gregal_0.s" -gUnk_08113DAD:: @ 08113DAD - .incbin "gregal/gUnk_08113DAD.bin" +gSpriteAnimations_Gregal_16:: @ 08113DAD + .include "animations/gSpriteAnimations_Gregal_16.s" -gUnk_08113DB2:: @ 08113DB2 - .incbin "gregal/gUnk_08113DB2.bin" +gSpriteAnimations_Gregal_17:: @ 08113DB2 + .include "animations/gSpriteAnimations_Gregal_17.s" -gUnk_08113DDB:: @ 08113DDB - .incbin "gregal/gUnk_08113DDB.bin" +gSpriteAnimations_Gregal_4:: @ 08113DDB + .include "animations/gSpriteAnimations_Gregal_4.s" -gUnk_08113EB4:: @ 08113EB4 - .incbin "gregal/gUnk_08113EB4.bin" +gSpriteAnimations_Gregal_12:: @ 08113EB4 + .include "animations/gSpriteAnimations_Gregal_12.s" -gUnk_08113EC5:: @ 08113EC5 - .incbin "gregal/gUnk_08113EC5.bin" +gSpriteAnimations_Gregal_15:: @ 08113EC5 + .include "animations/gSpriteAnimations_Gregal_15.s" -gUnk_08113ED6:: @ 08113ED6 - .incbin "gregal/gUnk_08113ED6.bin" +gSpriteAnimations_Gregal_13:: @ 08113ED6 + .include "animations/gSpriteAnimations_Gregal_13.s" -gUnk_08113EE7:: @ 08113EE7 - .incbin "gregal/gUnk_08113EE7.bin" +gSpriteAnimations_Gregal_8:: @ 08113EE7 + .include "animations/gSpriteAnimations_Gregal_8.s" -gUnk_08113EEC:: @ 08113EEC - .incbin "gregal/gUnk_08113EEC.bin" +gSpriteAnimations_Gregal_11:: @ 08113EEC + .include "animations/gSpriteAnimations_Gregal_11.s" -gUnk_08113EF1:: @ 08113EF1 - .incbin "gregal/gUnk_08113EF1.bin" +gSpriteAnimations_Gregal_9:: @ 08113EF1 + .include "animations/gSpriteAnimations_Gregal_9.s" gSpriteAnimations_Gregal:: @ 08113EF8 - .4byte gUnk_08113D9C - .4byte gUnk_08113D9C - .4byte gUnk_08113D9C - .4byte gUnk_08113D9C - .4byte gUnk_08113DDB - .4byte gUnk_08113DDB - .4byte gUnk_08113DDB - .4byte gUnk_08113DDB - .4byte gUnk_08113EE7 - .4byte gUnk_08113EF1 - .4byte gUnk_08113EE7 - .4byte gUnk_08113EEC - .4byte gUnk_08113EB4 - .4byte gUnk_08113ED6 - .4byte gUnk_08113EB4 - .4byte gUnk_08113EC5 - .4byte gUnk_08113DAD - .4byte gUnk_08113DB2 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_8 + .4byte gSpriteAnimations_Gregal_9 + .4byte gSpriteAnimations_Gregal_8 + .4byte gSpriteAnimations_Gregal_11 + .4byte gSpriteAnimations_Gregal_12 + .4byte gSpriteAnimations_Gregal_13 + .4byte gSpriteAnimations_Gregal_12 + .4byte gSpriteAnimations_Gregal_15 + .4byte gSpriteAnimations_Gregal_16 + .4byte gSpriteAnimations_Gregal_17 .4byte 00000000 diff --git a/data/animations/npc/guard.s b/data/animations/npc/guard.s deleted file mode 100644 index a24050c0..00000000 --- a/data/animations/npc/guard.s +++ /dev/null @@ -1,51 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0810F560:: @ 0810F560 - .incbin "guard/gUnk_0810F560.bin" - -gUnk_0810F59A:: @ 0810F59A - .incbin "guard/gUnk_0810F59A.bin" - -gUnk_0810F5D4:: @ 0810F5D4 - .incbin "guard/gUnk_0810F5D4.bin" - -gUnk_0810F60E:: @ 0810F60E - .incbin "guard/gUnk_0810F60E.bin" -.ifdef JP - @ TODO only small differences - .incbin "guard/gUnk_0810F60E_1_JP.bin" -.else -.ifdef EU - .incbin "guard/gUnk_0810F60E_2_EU.bin" -.else - .incbin "guard/gUnk_0810F60E_3_USA-DEMO_USA-DEMO_JP.bin" -.endif -.endif -.ifdef JP - @ TODO only small differences - .incbin "guard/gUnk_0810F60E_4_JP.bin" -.else -.ifdef EU - .incbin "guard/gUnk_0810F60E_5_EU.bin" -.else - .incbin "guard/gUnk_0810F60E_6_USA-DEMO_USA-DEMO_JP.bin" -.endif -.endif - -gUnk_0810F648:: @ 0810F648 - .incbin "guard/gUnk_0810F648.bin" - -gUnk_0810F682:: @ 0810F682 - .incbin "guard/gUnk_0810F682.bin" - -gUnk_0810F6BC:: @ 0810F6BC - .4byte gUnk_0810F560 - .4byte gUnk_0810F59A - .4byte gUnk_0810F5D4 - .4byte gUnk_0810F60E - .4byte gUnk_0810F648 - .4byte gUnk_0810F682 diff --git a/data/animations/npc/guardWithSpear.s b/data/animations/npc/guardWithSpear.s index d407ceee..b942ee50 100644 --- a/data/animations/npc/guardWithSpear.s +++ b/data/animations/npc/guardWithSpear.s @@ -4,97 +4,97 @@ .section .rodata .align 2 -gUnk_0810F6E4:: @ 0810F6E4 - .incbin "guardWithSpear/gUnk_0810F6E4.bin" +gSpriteAnimations_GuardWithSpear_0:: @ 0810F6E4 + .include "animations/gSpriteAnimations_GuardWithSpear_0.s" -gUnk_0810F6E9:: @ 0810F6E9 - .incbin "guardWithSpear/gUnk_0810F6E9.bin" +gSpriteAnimations_GuardWithSpear_1:: @ 0810F6E9 + .include "animations/gSpriteAnimations_GuardWithSpear_1.s" -gUnk_0810F6EE:: @ 0810F6EE - .incbin "guardWithSpear/gUnk_0810F6EE.bin" +gSpriteAnimations_GuardWithSpear_2:: @ 0810F6EE + .include "animations/gSpriteAnimations_GuardWithSpear_2.s" -gUnk_0810F6F3:: @ 0810F6F3 - .incbin "guardWithSpear/gUnk_0810F6F3.bin" +gSpriteAnimations_GuardWithSpear_3:: @ 0810F6F3 + .include "animations/gSpriteAnimations_GuardWithSpear_3.s" -gUnk_0810F6F8:: @ 0810F6F8 - .incbin "guardWithSpear/gUnk_0810F6F8.bin" +gSpriteAnimations_GuardWithSpear_8:: @ 0810F6F8 + .include "animations/gSpriteAnimations_GuardWithSpear_8.s" -gUnk_0810F6FD:: @ 0810F6FD - .incbin "guardWithSpear/gUnk_0810F6FD.bin" +gSpriteAnimations_GuardWithSpear_9:: @ 0810F6FD + .include "animations/gSpriteAnimations_GuardWithSpear_9.s" -gUnk_0810F702:: @ 0810F702 - .incbin "guardWithSpear/gUnk_0810F702.bin" +gSpriteAnimations_GuardWithSpear_10:: @ 0810F702 + .include "animations/gSpriteAnimations_GuardWithSpear_10.s" -gUnk_0810F707:: @ 0810F707 - .incbin "guardWithSpear/gUnk_0810F707.bin" +gSpriteAnimations_GuardWithSpear_11:: @ 0810F707 + .include "animations/gSpriteAnimations_GuardWithSpear_11.s" -gUnk_0810F70C:: @ 0810F70C - .incbin "guardWithSpear/gUnk_0810F70C.bin" +gSpriteAnimations_GuardWithSpear_4:: @ 0810F70C + .include "animations/gSpriteAnimations_GuardWithSpear_4.s" -gUnk_0810F71D:: @ 0810F71D - .incbin "guardWithSpear/gUnk_0810F71D.bin" +gSpriteAnimations_GuardWithSpear_5:: @ 0810F71D + .include "animations/gSpriteAnimations_GuardWithSpear_5.s" -gUnk_0810F72E:: @ 0810F72E - .incbin "guardWithSpear/gUnk_0810F72E.bin" +gSpriteAnimations_GuardWithSpear_6:: @ 0810F72E + .include "animations/gSpriteAnimations_GuardWithSpear_6.s" -gUnk_0810F73F:: @ 0810F73F - .incbin "guardWithSpear/gUnk_0810F73F.bin" +gSpriteAnimations_GuardWithSpear_7:: @ 0810F73F + .include "animations/gSpriteAnimations_GuardWithSpear_7.s" -gUnk_0810F750:: @ 0810F750 - .incbin "guardWithSpear/gUnk_0810F750.bin" +gSpriteAnimations_GuardWithSpear_12:: @ 0810F750 + .include "animations/gSpriteAnimations_GuardWithSpear_12.s" -gUnk_0810F761:: @ 0810F761 - .incbin "guardWithSpear/gUnk_0810F761.bin" +gSpriteAnimations_GuardWithSpear_13:: @ 0810F761 + .include "animations/gSpriteAnimations_GuardWithSpear_13.s" -gUnk_0810F772:: @ 0810F772 - .incbin "guardWithSpear/gUnk_0810F772.bin" +gSpriteAnimations_GuardWithSpear_14:: @ 0810F772 + .include "animations/gSpriteAnimations_GuardWithSpear_14.s" -gUnk_0810F783:: @ 0810F783 - .incbin "guardWithSpear/gUnk_0810F783.bin" +gSpriteAnimations_GuardWithSpear_15:: @ 0810F783 + .include "animations/gSpriteAnimations_GuardWithSpear_15.s" -gUnk_0810F794:: @ 0810F794 - .incbin "guardWithSpear/gUnk_0810F794.bin" +gSpriteAnimations_GuardWithSpear_16:: @ 0810F794 + .include "animations/gSpriteAnimations_GuardWithSpear_16.s" -gUnk_0810F799:: @ 0810F799 - .incbin "guardWithSpear/gUnk_0810F799.bin" +gSpriteAnimations_GuardWithSpear_21:: @ 0810F799 + .include "animations/gSpriteAnimations_GuardWithSpear_21.s" -gUnk_0810F7BE:: @ 0810F7BE - .incbin "guardWithSpear/gUnk_0810F7BE.bin" +gSpriteAnimations_GuardWithSpear_17:: @ 0810F7BE + .include "animations/gSpriteAnimations_GuardWithSpear_17.s" -gUnk_0810F7C3:: @ 0810F7C3 - .incbin "guardWithSpear/gUnk_0810F7C3.bin" +gSpriteAnimations_GuardWithSpear_22:: @ 0810F7C3 + .include "animations/gSpriteAnimations_GuardWithSpear_22.s" -gUnk_0810F7E8:: @ 0810F7E8 - .incbin "guardWithSpear/gUnk_0810F7E8.bin" +gSpriteAnimations_GuardWithSpear_18:: @ 0810F7E8 + .include "animations/gSpriteAnimations_GuardWithSpear_18.s" -gUnk_0810F7FD:: @ 0810F7FD - .incbin "guardWithSpear/gUnk_0810F7FD.bin" +gSpriteAnimations_GuardWithSpear_19:: @ 0810F7FD + .include "animations/gSpriteAnimations_GuardWithSpear_19.s" -gUnk_0810F802:: @ 0810F802 - .incbin "guardWithSpear/gUnk_0810F802.bin" +gSpriteAnimations_GuardWithSpear_20:: @ 0810F802 + .include "animations/gSpriteAnimations_GuardWithSpear_20.s" gSpriteAnimations_GuardWithSpear:: @ 0810F814 - .4byte gUnk_0810F6E4 - .4byte gUnk_0810F6E9 - .4byte gUnk_0810F6EE - .4byte gUnk_0810F6F3 - .4byte gUnk_0810F70C - .4byte gUnk_0810F71D - .4byte gUnk_0810F72E - .4byte gUnk_0810F73F - .4byte gUnk_0810F6F8 - .4byte gUnk_0810F6FD - .4byte gUnk_0810F702 - .4byte gUnk_0810F707 - .4byte gUnk_0810F750 - .4byte gUnk_0810F761 - .4byte gUnk_0810F772 - .4byte gUnk_0810F783 - .4byte gUnk_0810F794 - .4byte gUnk_0810F7BE - .4byte gUnk_0810F7E8 - .4byte gUnk_0810F7FD - .4byte gUnk_0810F802 - .4byte gUnk_0810F799 - .4byte gUnk_0810F7C3 + .4byte gSpriteAnimations_GuardWithSpear_0 + .4byte gSpriteAnimations_GuardWithSpear_1 + .4byte gSpriteAnimations_GuardWithSpear_2 + .4byte gSpriteAnimations_GuardWithSpear_3 + .4byte gSpriteAnimations_GuardWithSpear_4 + .4byte gSpriteAnimations_GuardWithSpear_5 + .4byte gSpriteAnimations_GuardWithSpear_6 + .4byte gSpriteAnimations_GuardWithSpear_7 + .4byte gSpriteAnimations_GuardWithSpear_8 + .4byte gSpriteAnimations_GuardWithSpear_9 + .4byte gSpriteAnimations_GuardWithSpear_10 + .4byte gSpriteAnimations_GuardWithSpear_11 + .4byte gSpriteAnimations_GuardWithSpear_12 + .4byte gSpriteAnimations_GuardWithSpear_13 + .4byte gSpriteAnimations_GuardWithSpear_14 + .4byte gSpriteAnimations_GuardWithSpear_15 + .4byte gSpriteAnimations_GuardWithSpear_16 + .4byte gSpriteAnimations_GuardWithSpear_17 + .4byte gSpriteAnimations_GuardWithSpear_18 + .4byte gSpriteAnimations_GuardWithSpear_19 + .4byte gSpriteAnimations_GuardWithSpear_20 + .4byte gSpriteAnimations_GuardWithSpear_21 + .4byte gSpriteAnimations_GuardWithSpear_22 .4byte 00000000 diff --git a/data/animations/npc/hurdyGurdyMan.s b/data/animations/npc/hurdyGurdyMan.s index 1c525357..c8fc4728 100644 --- a/data/animations/npc/hurdyGurdyMan.s +++ b/data/animations/npc/hurdyGurdyMan.s @@ -4,35 +4,35 @@ .section .rodata .align 2 -gUnk_0811453C:: @ 0811453C - .incbin "hurdyGurdyMan/gUnk_0811453C.bin" +gSpriteAnimations_HurdyGurdyMan_8:: @ 0811453C + .include "animations/gSpriteAnimations_HurdyGurdyMan_8.s" -gUnk_0811454D:: @ 0811454D - .incbin "hurdyGurdyMan/gUnk_0811454D.bin" +gSpriteAnimations_HurdyGurdyMan_7:: @ 0811454D + .include "animations/gSpriteAnimations_HurdyGurdyMan_7.s" -gUnk_0811455E:: @ 0811455E - .incbin "hurdyGurdyMan/gUnk_0811455E.bin" +gSpriteAnimations_HurdyGurdyMan_4:: @ 0811455E + .include "animations/gSpriteAnimations_HurdyGurdyMan_4.s" -gUnk_0811456F:: @ 0811456F - .incbin "hurdyGurdyMan/gUnk_0811456F.bin" +gSpriteAnimations_HurdyGurdyMan_0:: @ 0811456F + .include "animations/gSpriteAnimations_HurdyGurdyMan_0.s" -gUnk_08114574:: @ 08114574 - .incbin "hurdyGurdyMan/gUnk_08114574.bin" +gSpriteAnimations_HurdyGurdyMan_1:: @ 08114574 + .include "animations/gSpriteAnimations_HurdyGurdyMan_1.s" -gUnk_08114579:: @ 08114579 - .incbin "hurdyGurdyMan/gUnk_08114579.bin" +gSpriteAnimations_HurdyGurdyMan_3:: @ 08114579 + .include "animations/gSpriteAnimations_HurdyGurdyMan_3.s" gSpriteAnimations_HurdyGurdyMan:: @ 08114580 - .4byte gUnk_0811456F - .4byte gUnk_08114574 - .4byte gUnk_0811456F - .4byte gUnk_08114579 - .4byte gUnk_0811455E - .4byte gUnk_0811455E - .4byte gUnk_0811455E - .4byte gUnk_0811454D - .4byte gUnk_0811453C - .4byte gUnk_0811453C - .4byte gUnk_0811453C - .4byte gUnk_0811453C + .4byte gSpriteAnimations_HurdyGurdyMan_0 + .4byte gSpriteAnimations_HurdyGurdyMan_1 + .4byte gSpriteAnimations_HurdyGurdyMan_0 + .4byte gSpriteAnimations_HurdyGurdyMan_3 + .4byte gSpriteAnimations_HurdyGurdyMan_4 + .4byte gSpriteAnimations_HurdyGurdyMan_4 + .4byte gSpriteAnimations_HurdyGurdyMan_4 + .4byte gSpriteAnimations_HurdyGurdyMan_7 + .4byte gSpriteAnimations_HurdyGurdyMan_8 + .4byte gSpriteAnimations_HurdyGurdyMan_8 + .4byte gSpriteAnimations_HurdyGurdyMan_8 + .4byte gSpriteAnimations_HurdyGurdyMan_8 .4byte 00000000 diff --git a/data/animations/npc/kid.s b/data/animations/npc/kid.s index 27bc544b..7c0ab4e6 100644 --- a/data/animations/npc/kid.s +++ b/data/animations/npc/kid.s @@ -4,90 +4,90 @@ .section .rodata .align 2 -gUnk_0810C0C4:: @ 0810C0C4 - .incbin "kid/gUnk_0810C0C4.bin" +gSpriteAnimations_Kid_0:: @ 0810C0C4 + .include "animations/gSpriteAnimations_Kid_0.s" -gUnk_0810C0C9:: @ 0810C0C9 - .incbin "kid/gUnk_0810C0C9.bin" +gSpriteAnimations_Kid_1:: @ 0810C0C9 + .include "animations/gSpriteAnimations_Kid_1.s" -gUnk_0810C0CE:: @ 0810C0CE - .incbin "kid/gUnk_0810C0CE.bin" +gSpriteAnimations_Kid_2:: @ 0810C0CE + .include "animations/gSpriteAnimations_Kid_2.s" -gUnk_0810C0D3:: @ 0810C0D3 - .incbin "kid/gUnk_0810C0D3.bin" +gSpriteAnimations_Kid_3:: @ 0810C0D3 + .include "animations/gSpriteAnimations_Kid_3.s" -gUnk_0810C0D8:: @ 0810C0D8 - .incbin "kid/gUnk_0810C0D8.bin" +gSpriteAnimations_Kid_4:: @ 0810C0D8 + .include "animations/gSpriteAnimations_Kid_4.s" -gUnk_0810C0E9:: @ 0810C0E9 - .incbin "kid/gUnk_0810C0E9.bin" +gSpriteAnimations_Kid_5:: @ 0810C0E9 + .include "animations/gSpriteAnimations_Kid_5.s" -gUnk_0810C0FA:: @ 0810C0FA - .incbin "kid/gUnk_0810C0FA.bin" +gSpriteAnimations_Kid_6:: @ 0810C0FA + .include "animations/gSpriteAnimations_Kid_6.s" -gUnk_0810C10B:: @ 0810C10B - .incbin "kid/gUnk_0810C10B.bin" +gSpriteAnimations_Kid_7:: @ 0810C10B + .include "animations/gSpriteAnimations_Kid_7.s" -gUnk_0810C11C:: @ 0810C11C - .incbin "kid/gUnk_0810C11C.bin" +gSpriteAnimations_Kid_20:: @ 0810C11C + .include "animations/gSpriteAnimations_Kid_20.s" -gUnk_0810C135:: @ 0810C135 - .incbin "kid/gUnk_0810C135.bin" +gSpriteAnimations_Kid_21:: @ 0810C135 + .include "animations/gSpriteAnimations_Kid_21.s" -gUnk_0810C14E:: @ 0810C14E - .incbin "kid/gUnk_0810C14E.bin" +gSpriteAnimations_Kid_22:: @ 0810C14E + .include "animations/gSpriteAnimations_Kid_22.s" -gUnk_0810C167:: @ 0810C167 - .incbin "kid/gUnk_0810C167.bin" +gSpriteAnimations_Kid_23:: @ 0810C167 + .include "animations/gSpriteAnimations_Kid_23.s" -gUnk_0810C180:: @ 0810C180 - .incbin "kid/gUnk_0810C180.bin" +gSpriteAnimations_Kid_8:: @ 0810C180 + .include "animations/gSpriteAnimations_Kid_8.s" -gUnk_0810C199:: @ 0810C199 - .incbin "kid/gUnk_0810C199.bin" +gSpriteAnimations_Kid_9:: @ 0810C199 + .include "animations/gSpriteAnimations_Kid_9.s" -gUnk_0810C1A6:: @ 0810C1A6 - .incbin "kid/gUnk_0810C1A6.bin" +gSpriteAnimations_Kid_11:: @ 0810C1A6 + .include "animations/gSpriteAnimations_Kid_11.s" -gUnk_0810C1D7:: @ 0810C1D7 - .incbin "kid/gUnk_0810C1D7.bin" +gSpriteAnimations_Kid_12:: @ 0810C1D7 + .include "animations/gSpriteAnimations_Kid_12.s" -gUnk_0810C1DC:: @ 0810C1DC - .incbin "kid/gUnk_0810C1DC.bin" +gSpriteAnimations_Kid_13:: @ 0810C1DC + .include "animations/gSpriteAnimations_Kid_13.s" gSpriteAnimations_Kid:: @ 0810C1E4 - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C9 - .4byte gUnk_0810C0CE - .4byte gUnk_0810C0D3 - .4byte gUnk_0810C0D8 - .4byte gUnk_0810C0E9 - .4byte gUnk_0810C0FA - .4byte gUnk_0810C10B - .4byte gUnk_0810C180 - .4byte gUnk_0810C199 - .4byte gUnk_0810C199 - .4byte gUnk_0810C1A6 - .4byte gUnk_0810C1D7 - .4byte gUnk_0810C1DC - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C9 - .4byte gUnk_0810C0CE - .4byte gUnk_0810C0D3 - .4byte gUnk_0810C11C - .4byte gUnk_0810C135 - .4byte gUnk_0810C14E - .4byte gUnk_0810C167 - .4byte gUnk_0810C180 - .4byte gUnk_0810C199 - .4byte gUnk_0810C199 - .4byte gUnk_0810C1A6 - .4byte gUnk_0810C1D7 - .4byte gUnk_0810C1DC - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C4 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_1 + .4byte gSpriteAnimations_Kid_2 + .4byte gSpriteAnimations_Kid_3 + .4byte gSpriteAnimations_Kid_4 + .4byte gSpriteAnimations_Kid_5 + .4byte gSpriteAnimations_Kid_6 + .4byte gSpriteAnimations_Kid_7 + .4byte gSpriteAnimations_Kid_8 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_11 + .4byte gSpriteAnimations_Kid_12 + .4byte gSpriteAnimations_Kid_13 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_1 + .4byte gSpriteAnimations_Kid_2 + .4byte gSpriteAnimations_Kid_3 + .4byte gSpriteAnimations_Kid_20 + .4byte gSpriteAnimations_Kid_21 + .4byte gSpriteAnimations_Kid_22 + .4byte gSpriteAnimations_Kid_23 + .4byte gSpriteAnimations_Kid_8 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_11 + .4byte gSpriteAnimations_Kid_12 + .4byte gSpriteAnimations_Kid_13 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_0 .4byte 00000000 gUnk_0810C268:: @ 0810C268 diff --git a/data/animations/npc/kingDaltus.s b/data/animations/npc/kingDaltus.s index 093d265b..b3d022ce 100644 --- a/data/animations/npc/kingDaltus.s +++ b/data/animations/npc/kingDaltus.s @@ -4,61 +4,61 @@ .section .rodata .align 2 -gUnk_08110500:: @ 08110500 - .incbin "kingDaltus/gUnk_08110500.bin" +gSpriteAnimations_KingDaltus_0:: @ 08110500 + .include "animations/gSpriteAnimations_KingDaltus_0.s" -gUnk_08110505:: @ 08110505 - .incbin "kingDaltus/gUnk_08110505.bin" +gSpriteAnimations_KingDaltus_1:: @ 08110505 + .include "animations/gSpriteAnimations_KingDaltus_1.s" -gUnk_0811050A:: @ 0811050A - .incbin "kingDaltus/gUnk_0811050A.bin" +gSpriteAnimations_KingDaltus_2:: @ 0811050A + .include "animations/gSpriteAnimations_KingDaltus_2.s" -gUnk_0811050F:: @ 0811050F - .incbin "kingDaltus/gUnk_0811050F.bin" +gSpriteAnimations_KingDaltus_3:: @ 0811050F + .include "animations/gSpriteAnimations_KingDaltus_3.s" -gUnk_08110514:: @ 08110514 - .incbin "kingDaltus/gUnk_08110514.bin" +gSpriteAnimations_KingDaltus_5:: @ 08110514 + .include "animations/gSpriteAnimations_KingDaltus_5.s" -gUnk_08110535:: @ 08110535 - .incbin "kingDaltus/gUnk_08110535.bin" +gSpriteAnimations_KingDaltus_6:: @ 08110535 + .include "animations/gSpriteAnimations_KingDaltus_6.s" -gUnk_08110556:: @ 08110556 - .incbin "kingDaltus/gUnk_08110556.bin" +gSpriteAnimations_KingDaltus_7:: @ 08110556 + .include "animations/gSpriteAnimations_KingDaltus_7.s" -gUnk_08110577:: @ 08110577 - .incbin "kingDaltus/gUnk_08110577.bin" +gSpriteAnimations_KingDaltus_4:: @ 08110577 + .include "animations/gSpriteAnimations_KingDaltus_4.s" -gUnk_08110598:: @ 08110598 - .incbin "kingDaltus/gUnk_08110598.bin" +gSpriteAnimations_KingDaltus_9:: @ 08110598 + .include "animations/gSpriteAnimations_KingDaltus_9.s" -gUnk_081105A9:: @ 081105A9 - .incbin "kingDaltus/gUnk_081105A9.bin" +gSpriteAnimations_KingDaltus_10:: @ 081105A9 + .include "animations/gSpriteAnimations_KingDaltus_10.s" -gUnk_081105BA:: @ 081105BA - .incbin "kingDaltus/gUnk_081105BA.bin" +gSpriteAnimations_KingDaltus_11:: @ 081105BA + .include "animations/gSpriteAnimations_KingDaltus_11.s" -gUnk_081105CB:: @ 081105CB - .incbin "kingDaltus/gUnk_081105CB.bin" +gSpriteAnimations_KingDaltus_8:: @ 081105CB + .include "animations/gSpriteAnimations_KingDaltus_8.s" -gUnk_081105DC:: @ 081105DC - .incbin "kingDaltus/gUnk_081105DC.bin" +gSpriteAnimations_KingDaltus_12:: @ 081105DC + .include "animations/gSpriteAnimations_KingDaltus_12.s" -gUnk_081105E1:: @ 081105E1 - .incbin "kingDaltus/gUnk_081105E1.bin" +gSpriteAnimations_KingDaltus_13:: @ 081105E1 + .include "animations/gSpriteAnimations_KingDaltus_13.s" gSpriteAnimations_KingDaltus:: @ 08110608 - .4byte gUnk_08110500 - .4byte gUnk_08110505 - .4byte gUnk_0811050A - .4byte gUnk_0811050F - .4byte gUnk_08110577 - .4byte gUnk_08110514 - .4byte gUnk_08110535 - .4byte gUnk_08110556 - .4byte gUnk_081105CB - .4byte gUnk_08110598 - .4byte gUnk_081105A9 - .4byte gUnk_081105BA - .4byte gUnk_081105DC - .4byte gUnk_081105E1 + .4byte gSpriteAnimations_KingDaltus_0 + .4byte gSpriteAnimations_KingDaltus_1 + .4byte gSpriteAnimations_KingDaltus_2 + .4byte gSpriteAnimations_KingDaltus_3 + .4byte gSpriteAnimations_KingDaltus_4 + .4byte gSpriteAnimations_KingDaltus_5 + .4byte gSpriteAnimations_KingDaltus_6 + .4byte gSpriteAnimations_KingDaltus_7 + .4byte gSpriteAnimations_KingDaltus_8 + .4byte gSpriteAnimations_KingDaltus_9 + .4byte gSpriteAnimations_KingDaltus_10 + .4byte gSpriteAnimations_KingDaltus_11 + .4byte gSpriteAnimations_KingDaltus_12 + .4byte gSpriteAnimations_KingDaltus_13 .4byte 00000000 diff --git a/data/animations/npc/kingGustaf.s b/data/animations/npc/kingGustaf.s index d216e9df..cd3a36cc 100644 --- a/data/animations/npc/kingGustaf.s +++ b/data/animations/npc/kingGustaf.s @@ -4,16 +4,16 @@ .section .rodata .align 2 -gUnk_081134D4:: @ 081134D4 - .incbin "kingGustaf/gUnk_081134D4.bin" +gSpriteAnimations_KingGustaf_0:: @ 081134D4 + .include "animations/gSpriteAnimations_KingGustaf_0.s" gSpriteAnimations_KingGustaf:: @ 08113508 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 .4byte 00000000 diff --git a/data/animations/npc/librari.s b/data/animations/npc/librari.s index 2a1038c5..d261ff10 100644 --- a/data/animations/npc/librari.s +++ b/data/animations/npc/librari.s @@ -4,34 +4,34 @@ .section .rodata @ .align 2 -gUnk_08112D5A:: @ 08112D5A - .incbin "librari/gUnk_08112D5A.bin" +gSpriteAnimations_Librari_0:: @ 08112D5A + .include "animations/gSpriteAnimations_Librari_0.s" -gUnk_08112D6F:: @ 08112D6F - .incbin "librari/gUnk_08112D6F.bin" +gSpriteAnimations_Librari_8:: @ 08112D6F + .include "animations/gSpriteAnimations_Librari_8.s" -gUnk_08112D78:: @ 08112D78 - .incbin "librari/gUnk_08112D78.bin" +gSpriteAnimations_Librari_4:: @ 08112D78 + .include "animations/gSpriteAnimations_Librari_4.s" -gUnk_08112D89:: @ 08112D89 - .incbin "librari/gUnk_08112D89.bin" +gSpriteAnimations_Librari_6:: @ 08112D89 + .include "animations/gSpriteAnimations_Librari_6.s" -gUnk_08112D9A:: @ 08112D9A - .incbin "librari/gUnk_08112D9A.bin" +gSpriteAnimations_Librari_9:: @ 08112D9A + .include "animations/gSpriteAnimations_Librari_9.s" -gUnk_08112DE7:: @ 08112DE7 - .incbin "librari/gUnk_08112DE7.bin" +gSpriteAnimations_Librari_10:: @ 08112DE7 + .include "animations/gSpriteAnimations_Librari_10.s" gSpriteAnimations_Librari:: @ 08112DEC - .4byte gUnk_08112D5A - .4byte gUnk_08112D5A - .4byte gUnk_08112D5A - .4byte gUnk_08112D5A - .4byte gUnk_08112D78 - .4byte gUnk_08112D78 - .4byte gUnk_08112D89 - .4byte gUnk_08112D89 - .4byte gUnk_08112D6F - .4byte gUnk_08112D9A - .4byte gUnk_08112DE7 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_4 + .4byte gSpriteAnimations_Librari_4 + .4byte gSpriteAnimations_Librari_6 + .4byte gSpriteAnimations_Librari_6 + .4byte gSpriteAnimations_Librari_8 + .4byte gSpriteAnimations_Librari_9 + .4byte gSpriteAnimations_Librari_10 .4byte 00000000 diff --git a/data/animations/npc/librarians.s b/data/animations/npc/librarians.s index aef631fd..a7972a32 100644 --- a/data/animations/npc/librarians.s +++ b/data/animations/npc/librarians.s @@ -4,55 +4,55 @@ .section .rodata @ .align 2 -gUnk_0811307E:: @ 0811307E - .incbin "librarians/gUnk_0811307E.bin" +gSpriteAnimations_Librarians_0_0:: @ 0811307E + .include "animations/gSpriteAnimations_Librarians_0_0.s" -gUnk_08113083:: @ 08113083 - .incbin "librarians/gUnk_08113083.bin" +gSpriteAnimations_Librarians_0_4:: @ 08113083 + .include "animations/gSpriteAnimations_Librarians_0_4.s" -gUnk_08113090:: @ 08113090 - .incbin "librarians/gUnk_08113090.bin" +gSpriteAnimations_Librarians_0_8:: @ 08113090 + .include "animations/gSpriteAnimations_Librarians_0_8.s" gSpriteAnimations_Librarians_0:: @ 081130A0 - .4byte gUnk_0811307E - .4byte gUnk_0811307E - .4byte gUnk_0811307E - .4byte gUnk_0811307E - .4byte gUnk_08113083 - .4byte gUnk_08113083 - .4byte gUnk_08113083 - .4byte gUnk_08113083 - .4byte gUnk_08113090 - .4byte gUnk_08113090 - .4byte gUnk_08113090 - .4byte gUnk_08113090 - .4byte gUnk_0811307E + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_0 .4byte 00000000 -gUnk_081130D8:: @ 081130D8 - .incbin "librarians/gUnk_081130D8.bin" +gSpriteAnimations_Librarians_1_0:: @ 081130D8 + .include "animations/gSpriteAnimations_Librarians_1_0.s" -gUnk_081130DD:: @ 081130DD - .incbin "librarians/gUnk_081130DD.bin" +gSpriteAnimations_Librarians_1_4:: @ 081130DD + .include "animations/gSpriteAnimations_Librarians_1_4.s" -gUnk_081130EA:: @ 081130EA - .incbin "librarians/gUnk_081130EA.bin" +gSpriteAnimations_Librarians_1_8:: @ 081130EA + .include "animations/gSpriteAnimations_Librarians_1_8.s" -gUnk_081130F7:: @ 081130F7 - .incbin "librarians/gUnk_081130F7.bin" +gSpriteAnimations_Librarians_1_12:: @ 081130F7 + .include "animations/gSpriteAnimations_Librarians_1_12.s" gSpriteAnimations_Librarians_1:: @ 08113108 - .4byte gUnk_081130D8 - .4byte gUnk_081130D8 - .4byte gUnk_081130D8 - .4byte gUnk_081130D8 - .4byte gUnk_081130DD - .4byte gUnk_081130DD - .4byte gUnk_081130DD - .4byte gUnk_081130DD - .4byte gUnk_081130EA - .4byte gUnk_081130EA - .4byte gUnk_081130EA - .4byte gUnk_081130EA - .4byte gUnk_081130F7 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_12 .4byte 00000000 diff --git a/data/animations/npc/maid.s b/data/animations/npc/maid.s index 47cfff6c..bcd5d8f0 100644 --- a/data/animations/npc/maid.s +++ b/data/animations/npc/maid.s @@ -5,41 +5,41 @@ .align 2 -gUnk_0810F8E4:: @ 0810F8E4 - .incbin "maid/gUnk_0810F8E4.bin" +gSpriteAnimations_Maid_0:: @ 0810F8E4 + .include "animations/gSpriteAnimations_Maid_0.s" -gUnk_0810F8E9:: @ 0810F8E9 - .incbin "maid/gUnk_0810F8E9.bin" +gSpriteAnimations_Maid_1:: @ 0810F8E9 + .include "animations/gSpriteAnimations_Maid_1.s" -gUnk_0810F8EE:: @ 0810F8EE - .incbin "maid/gUnk_0810F8EE.bin" +gSpriteAnimations_Maid_2:: @ 0810F8EE + .include "animations/gSpriteAnimations_Maid_2.s" -gUnk_0810F8F3:: @ 0810F8F3 - .incbin "maid/gUnk_0810F8F3.bin" +gSpriteAnimations_Maid_3:: @ 0810F8F3 + .include "animations/gSpriteAnimations_Maid_3.s" -gUnk_0810F8F8:: @ 0810F8F8 - .incbin "maid/gUnk_0810F8F8.bin" +gSpriteAnimations_Maid_4:: @ 0810F8F8 + .include "animations/gSpriteAnimations_Maid_4.s" -gUnk_0810F909:: @ 0810F909 - .incbin "maid/gUnk_0810F909.bin" +gSpriteAnimations_Maid_5:: @ 0810F909 + .include "animations/gSpriteAnimations_Maid_5.s" -gUnk_0810F91A:: @ 0810F91A - .incbin "maid/gUnk_0810F91A.bin" +gSpriteAnimations_Maid_6:: @ 0810F91A + .include "animations/gSpriteAnimations_Maid_6.s" -gUnk_0810F92B:: @ 0810F92B - .incbin "maid/gUnk_0810F92B.bin" +gSpriteAnimations_Maid_7:: @ 0810F92B + .include "animations/gSpriteAnimations_Maid_7.s" -gUnk_0810F93C:: @ 0810F93C - .incbin "maid/gUnk_0810F93C.bin" +gSpriteAnimations_Maid_8:: @ 0810F93C + .include "animations/gSpriteAnimations_Maid_8.s" gSpriteAnimations_Maid:: @ 0810F944 - .4byte gUnk_0810F8E4 - .4byte gUnk_0810F8E9 - .4byte gUnk_0810F8EE - .4byte gUnk_0810F8F3 - .4byte gUnk_0810F8F8 - .4byte gUnk_0810F909 - .4byte gUnk_0810F91A - .4byte gUnk_0810F92B - .4byte gUnk_0810F93C + .4byte gSpriteAnimations_Maid_0 + .4byte gSpriteAnimations_Maid_1 + .4byte gSpriteAnimations_Maid_2 + .4byte gSpriteAnimations_Maid_3 + .4byte gSpriteAnimations_Maid_4 + .4byte gSpriteAnimations_Maid_5 + .4byte gSpriteAnimations_Maid_6 + .4byte gSpriteAnimations_Maid_7 + .4byte gSpriteAnimations_Maid_8 .4byte 00000000 diff --git a/data/animations/npc/mailbox.s b/data/animations/npc/mailbox.s index 8013f5f6..3c6b24ca 100644 --- a/data/animations/npc/mailbox.s +++ b/data/animations/npc/mailbox.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_0810C814:: @ 0810C814 - .incbin "mailbox/gUnk_0810C814.bin" +gSpriteAnimations_Mailbox_0:: @ 0810C814 + .include "animations/gSpriteAnimations_Mailbox_0.s" -gUnk_0810C819:: @ 0810C819 - .incbin "mailbox/gUnk_0810C819.bin" +gSpriteAnimations_Mailbox_4:: @ 0810C819 + .include "animations/gSpriteAnimations_Mailbox_4.s" -gUnk_0810C84A:: @ 0810C84A - .incbin "mailbox/gUnk_0810C84A.bin" +gSpriteAnimations_Mailbox_8:: @ 0810C84A + .include "animations/gSpriteAnimations_Mailbox_8.s" gSpriteAnimations_Mailbox:: @ 0810C868 - .4byte gUnk_0810C814 - .4byte gUnk_0810C814 - .4byte gUnk_0810C814 - .4byte gUnk_0810C814 - .4byte gUnk_0810C819 - .4byte gUnk_0810C819 - .4byte gUnk_0810C819 - .4byte gUnk_0810C819 - .4byte gUnk_0810C84A + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_8 diff --git a/data/animations/npc/malon.s b/data/animations/npc/malon.s index f334fc62..fb26e233 100644 --- a/data/animations/npc/malon.s +++ b/data/animations/npc/malon.s @@ -4,48 +4,48 @@ .section .rodata .align 2 -gUnk_0810FF70:: @ 0810FF70 - .incbin "malon/gUnk_0810FF70.bin" +gSpriteAnimations_Malon_0:: @ 0810FF70 + .include "animations/gSpriteAnimations_Malon_0.s" -gUnk_0810FF75:: @ 0810FF75 - .incbin "malon/gUnk_0810FF75.bin" +gSpriteAnimations_Malon_1:: @ 0810FF75 + .include "animations/gSpriteAnimations_Malon_1.s" -gUnk_0810FF7A:: @ 0810FF7A - .incbin "malon/gUnk_0810FF7A.bin" +gSpriteAnimations_Malon_2:: @ 0810FF7A + .include "animations/gSpriteAnimations_Malon_2.s" -gUnk_0810FF7F:: @ 0810FF7F - .incbin "malon/gUnk_0810FF7F.bin" +gSpriteAnimations_Malon_3:: @ 0810FF7F + .include "animations/gSpriteAnimations_Malon_3.s" -gUnk_0810FF84:: @ 0810FF84 - .incbin "malon/gUnk_0810FF84.bin" +gSpriteAnimations_Malon_5:: @ 0810FF84 + .include "animations/gSpriteAnimations_Malon_5.s" -gUnk_0810FFA5:: @ 0810FFA5 - .incbin "malon/gUnk_0810FFA5.bin" +gSpriteAnimations_Malon_6:: @ 0810FFA5 + .include "animations/gSpriteAnimations_Malon_6.s" -gUnk_0810FFB6:: @ 0810FFB6 - .incbin "malon/gUnk_0810FFB6.bin" +gSpriteAnimations_Malon_4:: @ 0810FFB6 + .include "animations/gSpriteAnimations_Malon_4.s" -gUnk_0810FFD7:: @ 0810FFD7 - .incbin "malon/gUnk_0810FFD7.bin" +gSpriteAnimations_Malon_12:: @ 0810FFD7 + .include "animations/gSpriteAnimations_Malon_12.s" -gUnk_08110014:: @ 08110014 - .incbin "malon/gUnk_08110014.bin" +gSpriteAnimations_Malon_10:: @ 08110014 + .include "animations/gSpriteAnimations_Malon_10.s" gSpriteAnimations_Malon:: @ 08110028 - .4byte gUnk_0810FF70 - .4byte gUnk_0810FF75 - .4byte gUnk_0810FF7A - .4byte gUnk_0810FF7F - .4byte gUnk_0810FFB6 - .4byte gUnk_0810FF84 - .4byte gUnk_0810FFA5 - .4byte gUnk_0810FFB6 - .4byte gUnk_0810FF70 - .4byte gUnk_0810FF75 - .4byte gUnk_08110014 - .4byte gUnk_0810FF7F - .4byte gUnk_0810FFD7 - .4byte gUnk_0810FFD7 - .4byte gUnk_0810FFD7 - .4byte gUnk_0810FFD7 + .4byte gSpriteAnimations_Malon_0 + .4byte gSpriteAnimations_Malon_1 + .4byte gSpriteAnimations_Malon_2 + .4byte gSpriteAnimations_Malon_3 + .4byte gSpriteAnimations_Malon_4 + .4byte gSpriteAnimations_Malon_5 + .4byte gSpriteAnimations_Malon_6 + .4byte gSpriteAnimations_Malon_4 + .4byte gSpriteAnimations_Malon_0 + .4byte gSpriteAnimations_Malon_1 + .4byte gSpriteAnimations_Malon_10 + .4byte gSpriteAnimations_Malon_3 + .4byte gSpriteAnimations_Malon_12 + .4byte gSpriteAnimations_Malon_12 + .4byte gSpriteAnimations_Malon_12 + .4byte gSpriteAnimations_Malon_12 .4byte 00000000 diff --git a/data/animations/npc/mama.s b/data/animations/npc/mama.s index 7e5e1dc2..052345d1 100644 --- a/data/animations/npc/mama.s +++ b/data/animations/npc/mama.s @@ -4,28 +4,28 @@ .section .rodata .align 2 -gUnk_081137B0:: @ 081137B0 - .incbin "mama/gUnk_081137B0.bin" +gSpriteAnimations_Mama_4:: @ 081137B0 + .include "animations/gSpriteAnimations_Mama_4.s" -gUnk_081137E9:: @ 081137E9 - .incbin "mama/gUnk_081137E9.bin" +gSpriteAnimations_Mama_0:: @ 081137E9 + .include "animations/gSpriteAnimations_Mama_0.s" -gUnk_08113892:: @ 08113892 - .incbin "mama/gUnk_08113892.bin" +gSpriteAnimations_Mama_1:: @ 08113892 + .include "animations/gSpriteAnimations_Mama_1.s" -gUnk_08113897:: @ 08113897 - .incbin "mama/gUnk_08113897.bin" +gSpriteAnimations_Mama_2:: @ 08113897 + .include "animations/gSpriteAnimations_Mama_2.s" -gUnk_081138B0:: @ 081138B0 - .incbin "mama/gUnk_081138B0.bin" +gSpriteAnimations_Mama_3:: @ 081138B0 + .include "animations/gSpriteAnimations_Mama_3.s" gSpriteAnimations_Mama:: @ 081138B8 - .4byte gUnk_081137E9 - .4byte gUnk_08113892 - .4byte gUnk_08113897 - .4byte gUnk_081138B0 - .4byte gUnk_081137B0 - .4byte gUnk_081137B0 - .4byte gUnk_081137B0 - .4byte gUnk_081137B0 + .4byte gSpriteAnimations_Mama_0 + .4byte gSpriteAnimations_Mama_1 + .4byte gSpriteAnimations_Mama_2 + .4byte gSpriteAnimations_Mama_3 + .4byte gSpriteAnimations_Mama_4 + .4byte gSpriteAnimations_Mama_4 + .4byte gSpriteAnimations_Mama_4 + .4byte gSpriteAnimations_Mama_4 .4byte 00000000 diff --git a/data/animations/npc/marcy.s b/data/animations/npc/marcy.s index f21da381..ff2711ce 100644 --- a/data/animations/npc/marcy.s +++ b/data/animations/npc/marcy.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810C360:: @ 0810C360 - .incbin "marcy/gUnk_0810C360.bin" +gSpriteAnimations_Marcy_0:: @ 0810C360 + .include "animations/gSpriteAnimations_Marcy_0.s" -gUnk_0810C365:: @ 0810C365 - .incbin "marcy/gUnk_0810C365.bin" +gSpriteAnimations_Marcy_4:: @ 0810C365 + .include "animations/gSpriteAnimations_Marcy_4.s" -gUnk_0810C382:: @ 0810C382 - .incbin "marcy/gUnk_0810C382.bin" +gSpriteAnimations_Marcy_8:: @ 0810C382 + .include "animations/gSpriteAnimations_Marcy_8.s" gSpriteAnimations_Marcy:: @ 0810C390 - .4byte gUnk_0810C360 - .4byte gUnk_0810C360 - .4byte gUnk_0810C360 - .4byte gUnk_0810C360 - .4byte gUnk_0810C365 - .4byte gUnk_0810C365 - .4byte gUnk_0810C365 - .4byte gUnk_0810C365 - .4byte gUnk_0810C382 - .4byte gUnk_0810C382 - .4byte gUnk_0810C382 - .4byte gUnk_0810C382 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_8 + .4byte gSpriteAnimations_Marcy_8 + .4byte gSpriteAnimations_Marcy_8 + .4byte gSpriteAnimations_Marcy_8 diff --git a/data/animations/npc/mayorHagen.s b/data/animations/npc/mayorHagen.s index f293cc27..5a03c43b 100644 --- a/data/animations/npc/mayorHagen.s +++ b/data/animations/npc/mayorHagen.s @@ -4,50 +4,50 @@ .section .rodata .align 2 -gUnk_08113FC0:: @ 08113FC0 - .incbin "mayorHagen/gUnk_08113FC0.bin" +gSpriteAnimations_MayorHagen_0:: @ 08113FC0 + .include "animations/gSpriteAnimations_MayorHagen_0.s" -gUnk_08113FC5:: @ 08113FC5 - .incbin "mayorHagen/gUnk_08113FC5.bin" +gSpriteAnimations_MayorHagen_1:: @ 08113FC5 + .include "animations/gSpriteAnimations_MayorHagen_1.s" -gUnk_08113FCA:: @ 08113FCA - .incbin "mayorHagen/gUnk_08113FCA.bin" +gSpriteAnimations_MayorHagen_2:: @ 08113FCA + .include "animations/gSpriteAnimations_MayorHagen_2.s" -gUnk_08113FCF:: @ 08113FCF - .incbin "mayorHagen/gUnk_08113FCF.bin" +gSpriteAnimations_MayorHagen_3:: @ 08113FCF + .include "animations/gSpriteAnimations_MayorHagen_3.s" -gUnk_08113FD4:: @ 08113FD4 - .incbin "mayorHagen/gUnk_08113FD4.bin" +gSpriteAnimations_MayorHagen_11:: @ 08113FD4 + .include "animations/gSpriteAnimations_MayorHagen_11.s" -gUnk_08113FE5:: @ 08113FE5 - .incbin "mayorHagen/gUnk_08113FE5.bin" +gSpriteAnimations_MayorHagen_8:: @ 08113FE5 + .include "animations/gSpriteAnimations_MayorHagen_8.s" -gUnk_08114032:: @ 08114032 - .incbin "mayorHagen/gUnk_08114032.bin" +gSpriteAnimations_MayorHagen_4:: @ 08114032 + .include "animations/gSpriteAnimations_MayorHagen_4.s" -gUnk_0811403F:: @ 0811403F - .incbin "mayorHagen/gUnk_0811403F.bin" +gSpriteAnimations_MayorHagen_7:: @ 0811403F + .include "animations/gSpriteAnimations_MayorHagen_7.s" -gUnk_08114050:: @ 08114050 - .incbin "mayorHagen/gUnk_08114050.bin" +gSpriteAnimations_MayorHagen_5:: @ 08114050 + .include "animations/gSpriteAnimations_MayorHagen_5.s" -gUnk_08114061:: @ 08114061 - .incbin "mayorHagen/gUnk_08114061.bin" +gSpriteAnimations_MayorHagen_9:: @ 08114061 + .include "animations/gSpriteAnimations_MayorHagen_9.s" -gUnk_0811408A:: @ 0811408A - .incbin "mayorHagen/gUnk_0811408A.bin" +gSpriteAnimations_MayorHagen_10:: @ 0811408A + .include "animations/gSpriteAnimations_MayorHagen_10.s" gSpriteAnimations_MayorHagen:: @ 08114098 - .4byte gUnk_08113FC0 - .4byte gUnk_08113FC5 - .4byte gUnk_08113FCA - .4byte gUnk_08113FCF - .4byte gUnk_08114032 - .4byte gUnk_08114050 - .4byte gUnk_08114032 - .4byte gUnk_0811403F - .4byte gUnk_08113FE5 - .4byte gUnk_08114061 - .4byte gUnk_0811408A - .4byte gUnk_08113FD4 + .4byte gSpriteAnimations_MayorHagen_0 + .4byte gSpriteAnimations_MayorHagen_1 + .4byte gSpriteAnimations_MayorHagen_2 + .4byte gSpriteAnimations_MayorHagen_3 + .4byte gSpriteAnimations_MayorHagen_4 + .4byte gSpriteAnimations_MayorHagen_5 + .4byte gSpriteAnimations_MayorHagen_4 + .4byte gSpriteAnimations_MayorHagen_7 + .4byte gSpriteAnimations_MayorHagen_8 + .4byte gSpriteAnimations_MayorHagen_9 + .4byte gSpriteAnimations_MayorHagen_10 + .4byte gSpriteAnimations_MayorHagen_11 .4byte 00000000 diff --git a/data/animations/npc/melari.s b/data/animations/npc/melari.s index dc94658c..cbdd7a0f 100644 --- a/data/animations/npc/melari.s +++ b/data/animations/npc/melari.s @@ -4,31 +4,31 @@ .section .rodata .align 2 -gUnk_08111544:: @ 08111544 - .incbin "melari/gUnk_08111544.bin" +gSpriteAnimations_Melari_1:: @ 08111544 + .include "animations/gSpriteAnimations_Melari_1.s" -gUnk_08111549:: @ 08111549 - .incbin "melari/gUnk_08111549.bin" +gSpriteAnimations_Melari_0:: @ 08111549 + .include "animations/gSpriteAnimations_Melari_0.s" -gUnk_0811154E:: @ 0811154E - .incbin "melari/gUnk_0811154E.bin" +gSpriteAnimations_Melari_3:: @ 0811154E + .include "animations/gSpriteAnimations_Melari_3.s" -gUnk_08111553:: @ 08111553 - .incbin "melari/gUnk_08111553.bin" +gSpriteAnimations_Melari_8:: @ 08111553 + .include "animations/gSpriteAnimations_Melari_8.s" -gUnk_0811158C:: @ 0811158C - .incbin "melari/gUnk_0811158C.bin" +gSpriteAnimations_Melari_9:: @ 0811158C + .include "animations/gSpriteAnimations_Melari_9.s" gSpriteAnimations_Melari:: @ 08111594 - .4byte gUnk_08111549 - .4byte gUnk_08111544 - .4byte gUnk_08111549 - .4byte gUnk_0811154E - .4byte gUnk_08111549 - .4byte gUnk_08111544 - .4byte gUnk_08111549 - .4byte gUnk_0811154E - .4byte gUnk_08111553 - .4byte gUnk_0811158C + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_1 + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_3 + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_1 + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_3 + .4byte gSpriteAnimations_Melari_8 + .4byte gSpriteAnimations_Melari_9 .4byte 00000000 diff --git a/data/animations/npc/milkCart.s b/data/animations/npc/milkCart.s index ab0f3df1..28690e3f 100644 --- a/data/animations/npc/milkCart.s +++ b/data/animations/npc/milkCart.s @@ -4,19 +4,19 @@ .section .rodata .align 2 -gUnk_08110120:: @ 08110120 - .incbin "milkCart/gUnk_08110120.bin" +gSpriteAnimations_MilkCart_0:: @ 08110120 + .include "animations/gSpriteAnimations_MilkCart_0.s" -gUnk_08110125:: @ 08110125 - .incbin "milkCart/gUnk_08110125.bin" +gSpriteAnimations_MilkCart_4:: @ 08110125 + .include "animations/gSpriteAnimations_MilkCart_4.s" gSpriteAnimations_MilkCart:: @ 08110138 - .4byte gUnk_08110120 - .4byte gUnk_08110120 - .4byte gUnk_08110120 - .4byte gUnk_08110120 - .4byte gUnk_08110125 - .4byte gUnk_08110125 - .4byte gUnk_08110125 - .4byte gUnk_08110125 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_4 + .4byte gSpriteAnimations_MilkCart_4 + .4byte gSpriteAnimations_MilkCart_4 + .4byte gSpriteAnimations_MilkCart_4 .4byte 00000000 diff --git a/data/animations/npc/minishEzlo.s b/data/animations/npc/minishEzlo.s index 78956a44..a232737f 100644 --- a/data/animations/npc/minishEzlo.s +++ b/data/animations/npc/minishEzlo.s @@ -4,63 +4,63 @@ .section .rodata .align 2 -gUnk_0810C4A0:: @ 0810C4A0 - .incbin "minishEzlo/gUnk_0810C4A0.bin" +gSpriteAnimations_MinishEzlo_2:: @ 0810C4A0 + .include "animations/gSpriteAnimations_MinishEzlo_2.s" -gUnk_0810C4A5:: @ 0810C4A5 - .incbin "minishEzlo/gUnk_0810C4A5.bin" +gSpriteAnimations_MinishEzlo_3:: @ 0810C4A5 + .include "animations/gSpriteAnimations_MinishEzlo_3.s" -gUnk_0810C4AA:: @ 0810C4AA - .incbin "minishEzlo/gUnk_0810C4AA.bin" +gSpriteAnimations_MinishEzlo_1:: @ 0810C4AA + .include "animations/gSpriteAnimations_MinishEzlo_1.s" -gUnk_0810C4AF:: @ 0810C4AF - .incbin "minishEzlo/gUnk_0810C4AF.bin" +gSpriteAnimations_MinishEzlo_0:: @ 0810C4AF + .include "animations/gSpriteAnimations_MinishEzlo_0.s" -gUnk_0810C4B4:: @ 0810C4B4 - .incbin "minishEzlo/gUnk_0810C4B4.bin" +gSpriteAnimations_MinishEzlo_5:: @ 0810C4B4 + .include "animations/gSpriteAnimations_MinishEzlo_5.s" -gUnk_0810C4C9:: @ 0810C4C9 - .incbin "minishEzlo/gUnk_0810C4C9.bin" +gSpriteAnimations_MinishEzlo_4:: @ 0810C4C9 + .include "animations/gSpriteAnimations_MinishEzlo_4.s" -gUnk_0810C4DE:: @ 0810C4DE - .incbin "minishEzlo/gUnk_0810C4DE.bin" +gSpriteAnimations_MinishEzlo_13:: @ 0810C4DE + .include "animations/gSpriteAnimations_MinishEzlo_13.s" -gUnk_0810C5BB:: @ 0810C5BB - .incbin "minishEzlo/gUnk_0810C5BB.bin" +gSpriteAnimations_MinishEzlo_14:: @ 0810C5BB + .include "animations/gSpriteAnimations_MinishEzlo_14.s" -gUnk_0810C698:: @ 0810C698 - .incbin "minishEzlo/gUnk_0810C698.bin" +gSpriteAnimations_MinishEzlo_12:: @ 0810C698 + .include "animations/gSpriteAnimations_MinishEzlo_12.s" -gUnk_0810C6E5:: @ 0810C6E5 - .incbin "minishEzlo/gUnk_0810C6E5.bin" +gSpriteAnimations_MinishEzlo_18:: @ 0810C6E5 + .include "animations/gSpriteAnimations_MinishEzlo_18.s" -gUnk_0810C772:: @ 0810C772 - .incbin "minishEzlo/gUnk_0810C772.bin" +gSpriteAnimations_MinishEzlo_15:: @ 0810C772 + .include "animations/gSpriteAnimations_MinishEzlo_15.s" -gUnk_0810C77F:: @ 0810C77F - .incbin "minishEzlo/gUnk_0810C77F.bin" +gSpriteAnimations_MinishEzlo_16:: @ 0810C77F + .include "animations/gSpriteAnimations_MinishEzlo_16.s" -gUnk_0810C7AC:: @ 0810C7AC - .incbin "minishEzlo/gUnk_0810C7AC.bin" +gSpriteAnimations_MinishEzlo_17:: @ 0810C7AC + .include "animations/gSpriteAnimations_MinishEzlo_17.s" gSpriteAnimations_MinishEzlo:: @ 0810C7B4 - .4byte gUnk_0810C4AF - .4byte gUnk_0810C4AA - .4byte gUnk_0810C4A0 - .4byte gUnk_0810C4A5 - .4byte gUnk_0810C4C9 - .4byte gUnk_0810C4B4 - .4byte gUnk_0810C4B4 - .4byte gUnk_0810C4B4 - .4byte gUnk_0810C4AF - .4byte gUnk_0810C4AA - .4byte gUnk_0810C4A0 - .4byte gUnk_0810C4A5 - .4byte gUnk_0810C698 - .4byte gUnk_0810C4DE - .4byte gUnk_0810C5BB - .4byte gUnk_0810C772 - .4byte gUnk_0810C77F - .4byte gUnk_0810C7AC - .4byte gUnk_0810C6E5 + .4byte gSpriteAnimations_MinishEzlo_0 + .4byte gSpriteAnimations_MinishEzlo_1 + .4byte gSpriteAnimations_MinishEzlo_2 + .4byte gSpriteAnimations_MinishEzlo_3 + .4byte gSpriteAnimations_MinishEzlo_4 + .4byte gSpriteAnimations_MinishEzlo_5 + .4byte gSpriteAnimations_MinishEzlo_5 + .4byte gSpriteAnimations_MinishEzlo_5 + .4byte gSpriteAnimations_MinishEzlo_0 + .4byte gSpriteAnimations_MinishEzlo_1 + .4byte gSpriteAnimations_MinishEzlo_2 + .4byte gSpriteAnimations_MinishEzlo_3 + .4byte gSpriteAnimations_MinishEzlo_12 + .4byte gSpriteAnimations_MinishEzlo_13 + .4byte gSpriteAnimations_MinishEzlo_14 + .4byte gSpriteAnimations_MinishEzlo_15 + .4byte gSpriteAnimations_MinishEzlo_16 + .4byte gSpriteAnimations_MinishEzlo_17 + .4byte gSpriteAnimations_MinishEzlo_18 .4byte 00000000 diff --git a/data/animations/npc/ministerPotho.s b/data/animations/npc/ministerPotho.s index 8404affc..1dc7cbd3 100644 --- a/data/animations/npc/ministerPotho.s +++ b/data/animations/npc/ministerPotho.s @@ -4,36 +4,36 @@ .section .rodata .align 2 -gUnk_08110658:: @ 08110658 - .incbin "ministerPotho/gUnk_08110658.bin" +gSpriteAnimations_MinisterPotho_0:: @ 08110658 + .include "animations/gSpriteAnimations_MinisterPotho_0.s" -gUnk_0811065D:: @ 0811065D - .incbin "ministerPotho/gUnk_0811065D.bin" +gSpriteAnimations_MinisterPotho_1:: @ 0811065D + .include "animations/gSpriteAnimations_MinisterPotho_1.s" -gUnk_08110662:: @ 08110662 - .incbin "ministerPotho/gUnk_08110662.bin" +gSpriteAnimations_MinisterPotho_2:: @ 08110662 + .include "animations/gSpriteAnimations_MinisterPotho_2.s" -gUnk_08110667:: @ 08110667 - .incbin "ministerPotho/gUnk_08110667.bin" +gSpriteAnimations_MinisterPotho_3:: @ 08110667 + .include "animations/gSpriteAnimations_MinisterPotho_3.s" -gUnk_0811066C:: @ 0811066C - .incbin "ministerPotho/gUnk_0811066C.bin" +gSpriteAnimations_MinisterPotho_4:: @ 0811066C + .include "animations/gSpriteAnimations_MinisterPotho_4.s" -gUnk_0811067D:: @ 0811067D - .incbin "ministerPotho/gUnk_0811067D.bin" +gSpriteAnimations_MinisterPotho_8:: @ 0811067D + .include "animations/gSpriteAnimations_MinisterPotho_8.s" -gUnk_08110682:: @ 08110682 - .incbin "ministerPotho/gUnk_08110682.bin" +gSpriteAnimations_MinisterPotho_9:: @ 08110682 + .include "animations/gSpriteAnimations_MinisterPotho_9.s" gSpriteAnimations_MinisterPotho:: @ 081106A8 - .4byte gUnk_08110658 - .4byte gUnk_0811065D - .4byte gUnk_08110662 - .4byte gUnk_08110667 - .4byte gUnk_0811066C - .4byte gUnk_0811066C - .4byte gUnk_0811066C - .4byte gUnk_0811066C - .4byte gUnk_0811067D - .4byte gUnk_08110682 + .4byte gSpriteAnimations_MinisterPotho_0 + .4byte gSpriteAnimations_MinisterPotho_1 + .4byte gSpriteAnimations_MinisterPotho_2 + .4byte gSpriteAnimations_MinisterPotho_3 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_8 + .4byte gSpriteAnimations_MinisterPotho_9 .4byte 00000000 diff --git a/data/animations/npc/moblinLady.s b/data/animations/npc/moblinLady.s index b04067ad..2dc460b4 100644 --- a/data/animations/npc/moblinLady.s +++ b/data/animations/npc/moblinLady.s @@ -4,16 +4,16 @@ .section .rodata .align 2 -gUnk_08113004:: @ 08113004 - .incbin "moblinLady/gUnk_08113004.bin" +gSpriteAnimations_MoblinLady_1_0:: @ 08113004 + .include "animations/gSpriteAnimations_MoblinLady_1_0.s" gSpriteAnimations_MoblinLady_1:: @ 08113024 - .4byte gUnk_08113004 - .incbin "moblinLady/gSpriteAnimations_MoblinLady_1.bin" + .4byte gSpriteAnimations_MoblinLady_1_0 + .include "animations/gSpriteAnimations_MoblinLady_1.s" -gUnk_0811302C:: @ 0811302C - .incbin "moblinLady/gUnk_0811302C.bin" +gSpriteAnimations_MoblinLady_0:: @ 0811302C + .include "animations/gSpriteAnimations_MoblinLady_0.s" gSpriteAnimations_MoblinLady:: @ 08113070 - .4byte gUnk_0811302C + .4byte gSpriteAnimations_MoblinLady_0 .4byte 00000000 diff --git a/data/animations/npc/mountainMinish.s b/data/animations/npc/mountainMinish.s index 5a219e1e..64fd232c 100644 --- a/data/animations/npc/mountainMinish.s +++ b/data/animations/npc/mountainMinish.s @@ -4,54 +4,54 @@ .section .rodata .align 2 -gUnk_08111380:: @ 08111380 - .incbin "mountainMinish/gUnk_08111380.bin" +gSpriteAnimations_MountainMinish_0:: @ 08111380 + .include "animations/gSpriteAnimations_MountainMinish_0.s" -gUnk_08111385:: @ 08111385 - .incbin "mountainMinish/gUnk_08111385.bin" +gSpriteAnimations_MountainMinish_1:: @ 08111385 + .include "animations/gSpriteAnimations_MountainMinish_1.s" -gUnk_0811138A:: @ 0811138A - .incbin "mountainMinish/gUnk_0811138A.bin" +gSpriteAnimations_MountainMinish_2:: @ 0811138A + .include "animations/gSpriteAnimations_MountainMinish_2.s" -gUnk_0811138F:: @ 0811138F - .incbin "mountainMinish/gUnk_0811138F.bin" +gSpriteAnimations_MountainMinish_3:: @ 0811138F + .include "animations/gSpriteAnimations_MountainMinish_3.s" -gUnk_08111394:: @ 08111394 - .incbin "mountainMinish/gUnk_08111394.bin" +gSpriteAnimations_MountainMinish_7:: @ 08111394 + .include "animations/gSpriteAnimations_MountainMinish_7.s" -gUnk_081113B9:: @ 081113B9 - .incbin "mountainMinish/gUnk_081113B9.bin" +gSpriteAnimations_MountainMinish_5:: @ 081113B9 + .include "animations/gSpriteAnimations_MountainMinish_5.s" -gUnk_081113DE:: @ 081113DE - .incbin "mountainMinish/gUnk_081113DE.bin" +gSpriteAnimations_MountainMinish_4:: @ 081113DE + .include "animations/gSpriteAnimations_MountainMinish_4.s" -gUnk_081113FF:: @ 081113FF - .incbin "mountainMinish/gUnk_081113FF.bin" +gSpriteAnimations_MountainMinish_8:: @ 081113FF + .include "animations/gSpriteAnimations_MountainMinish_8.s" -gUnk_08111424:: @ 08111424 - .incbin "mountainMinish/gUnk_08111424.bin" +gSpriteAnimations_MountainMinish_9:: @ 08111424 + .include "animations/gSpriteAnimations_MountainMinish_9.s" -gUnk_08111449:: @ 08111449 - .incbin "mountainMinish/gUnk_08111449.bin" +gSpriteAnimations_MountainMinish_10:: @ 08111449 + .include "animations/gSpriteAnimations_MountainMinish_10.s" -gUnk_081114BA:: @ 081114BA - .incbin "mountainMinish/gUnk_081114BA.bin" +gSpriteAnimations_MountainMinish_11:: @ 081114BA + .include "animations/gSpriteAnimations_MountainMinish_11.s" -gUnk_081114E3:: @ 081114E3 - .incbin "mountainMinish/gUnk_081114E3.bin" +gSpriteAnimations_MountainMinish_12:: @ 081114E3 + .include "animations/gSpriteAnimations_MountainMinish_12.s" gSpriteAnimations_MountainMinish:: @ 081114E8 - .4byte gUnk_08111380 - .4byte gUnk_08111385 - .4byte gUnk_0811138A - .4byte gUnk_0811138F - .4byte gUnk_081113DE - .4byte gUnk_081113B9 - .4byte gUnk_081113DE - .4byte gUnk_08111394 - .4byte gUnk_081113FF - .4byte gUnk_08111424 - .4byte gUnk_08111449 - .4byte gUnk_081114BA - .4byte gUnk_081114E3 + .4byte gSpriteAnimations_MountainMinish_0 + .4byte gSpriteAnimations_MountainMinish_1 + .4byte gSpriteAnimations_MountainMinish_2 + .4byte gSpriteAnimations_MountainMinish_3 + .4byte gSpriteAnimations_MountainMinish_4 + .4byte gSpriteAnimations_MountainMinish_5 + .4byte gSpriteAnimations_MountainMinish_4 + .4byte gSpriteAnimations_MountainMinish_7 + .4byte gSpriteAnimations_MountainMinish_8 + .4byte gSpriteAnimations_MountainMinish_9 + .4byte gSpriteAnimations_MountainMinish_10 + .4byte gSpriteAnimations_MountainMinish_11 + .4byte gSpriteAnimations_MountainMinish_12 .4byte 00000000 diff --git a/data/animations/npc/mutoh.s b/data/animations/npc/mutoh.s index b41e3132..dcefce3d 100644 --- a/data/animations/npc/mutoh.s +++ b/data/animations/npc/mutoh.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_08110C60:: @ 08110C60 - .incbin "mutoh/gUnk_08110C60.bin" +gSpriteAnimations_Mutoh_0:: @ 08110C60 + .include "animations/gSpriteAnimations_Mutoh_0.s" -gUnk_08110C75:: @ 08110C75 - .incbin "mutoh/gUnk_08110C75.bin" +gSpriteAnimations_Mutoh_5:: @ 08110C75 + .include "animations/gSpriteAnimations_Mutoh_5.s" -gUnk_08110C7A:: @ 08110C7A - .incbin "mutoh/gUnk_08110C7A.bin" +gSpriteAnimations_Mutoh_4:: @ 08110C7A + .include "animations/gSpriteAnimations_Mutoh_4.s" -gUnk_08110C7F:: @ 08110C7F - .incbin "mutoh/gUnk_08110C7F.bin" +gSpriteAnimations_Mutoh_7:: @ 08110C7F + .include "animations/gSpriteAnimations_Mutoh_7.s" gSpriteAnimations_Mutoh:: @ 08110C84 - .4byte gUnk_08110C60 - .4byte gUnk_08110C60 - .4byte gUnk_08110C60 - .4byte gUnk_08110C60 - .4byte gUnk_08110C7A - .4byte gUnk_08110C75 - .4byte gUnk_08110C7A - .4byte gUnk_08110C7F + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_4 + .4byte gSpriteAnimations_Mutoh_5 + .4byte gSpriteAnimations_Mutoh_4 + .4byte gSpriteAnimations_Mutoh_7 .4byte 00000000 diff --git a/data/animations/npc/nayru.s b/data/animations/npc/nayru.s index 635dea46..cdc148d9 100644 --- a/data/animations/npc/nayru.s +++ b/data/animations/npc/nayru.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810F9B0:: @ 0810F9B0 - .incbin "nayru/gUnk_0810F9B0.bin" +gSpriteAnimations_Nayru_0:: @ 0810F9B0 + .include "animations/gSpriteAnimations_Nayru_0.s" -gUnk_0810F9B5:: @ 0810F9B5 - .incbin "nayru/gUnk_0810F9B5.bin" +gSpriteAnimations_Nayru_3:: @ 0810F9B5 + .include "animations/gSpriteAnimations_Nayru_3.s" -gUnk_0810F9BA:: @ 0810F9BA - .incbin "nayru/gUnk_0810F9BA.bin" +gSpriteAnimations_Nayru_1:: @ 0810F9BA + .include "animations/gSpriteAnimations_Nayru_1.s" -gUnk_0810F9BF:: @ 0810F9BF - .incbin "nayru/gUnk_0810F9BF.bin" +gSpriteAnimations_Nayru_4:: @ 0810F9BF + .include "animations/gSpriteAnimations_Nayru_4.s" gSpriteAnimations_Nayru:: @ 0810F9D0 - .4byte gUnk_0810F9B0 - .4byte gUnk_0810F9BA - .4byte gUnk_0810F9B0 - .4byte gUnk_0810F9B5 - .4byte gUnk_0810F9BF - .4byte gUnk_0810F9BF - .4byte gUnk_0810F9BF - .4byte gUnk_0810F9BF + .4byte gSpriteAnimations_Nayru_0 + .4byte gSpriteAnimations_Nayru_1 + .4byte gSpriteAnimations_Nayru_0 + .4byte gSpriteAnimations_Nayru_3 + .4byte gSpriteAnimations_Nayru_4 + .4byte gSpriteAnimations_Nayru_4 + .4byte gSpriteAnimations_Nayru_4 + .4byte gSpriteAnimations_Nayru_4 .4byte 00000000 diff --git a/data/animations/npc/npc26.s b/data/animations/npc/npc26.s index 30fa061b..6ae8d029 100644 --- a/data/animations/npc/npc26.s +++ b/data/animations/npc/npc26.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_081106E8:: @ 081106E8 - .incbin "npc26/gUnk_081106E8.bin" +gSpriteAnimations_Npc26_0:: @ 081106E8 + .include "animations/gSpriteAnimations_Npc26_0.s" -gUnk_081106ED:: @ 081106ED - .incbin "npc26/gUnk_081106ED.bin" +gSpriteAnimations_Npc26_4:: @ 081106ED + .include "animations/gSpriteAnimations_Npc26_4.s" -gUnk_081106FE:: @ 081106FE - .incbin "npc26/gUnk_081106FE.bin" +gSpriteAnimations_Npc26_6:: @ 081106FE + .include "animations/gSpriteAnimations_Npc26_6.s" gSpriteAnimations_Npc26:: @ 08110710 - .4byte gUnk_081106E8 - .4byte gUnk_081106E8 - .4byte gUnk_081106E8 - .4byte gUnk_081106E8 - .4byte gUnk_081106ED - .4byte gUnk_081106ED - .4byte gUnk_081106FE - .4byte gUnk_081106FE + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_4 + .4byte gSpriteAnimations_Npc26_4 + .4byte gSpriteAnimations_Npc26_6 + .4byte gSpriteAnimations_Npc26_6 .4byte 00000000 diff --git a/data/animations/npc/npc4F.s b/data/animations/npc/npc4F.s index fcd7d9ba..a4e1ed1f 100644 --- a/data/animations/npc/npc4F.s +++ b/data/animations/npc/npc4F.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_08114208:: @ 08114208 - .incbin "npc4F/gUnk_08114208.bin" +gSpriteAnimations_Npc4F_0:: @ 08114208 + .include "animations/gSpriteAnimations_Npc4F_0.s" -gUnk_0811420D:: @ 0811420D - .incbin "npc4F/gUnk_0811420D.bin" +gSpriteAnimations_Npc4F_1:: @ 0811420D + .include "animations/gSpriteAnimations_Npc4F_1.s" -gUnk_08114216:: @ 08114216 - .incbin "npc4F/gUnk_08114216.bin" +gSpriteAnimations_Npc4F_2:: @ 08114216 + .include "animations/gSpriteAnimations_Npc4F_2.s" -gUnk_0811421F:: @ 0811421F - .incbin "npc4F/gUnk_0811421F.bin" +gSpriteAnimations_Npc4F_3:: @ 0811421F + .include "animations/gSpriteAnimations_Npc4F_3.s" gSpriteAnimations_Npc4F:: @ 08114228 - .4byte gUnk_08114208 - .4byte gUnk_0811420D - .4byte gUnk_08114216 - .4byte gUnk_0811421F + .4byte gSpriteAnimations_Npc4F_0 + .4byte gSpriteAnimations_Npc4F_1 + .4byte gSpriteAnimations_Npc4F_2 + .4byte gSpriteAnimations_Npc4F_3 .4byte 00000000 diff --git a/data/animations/npc/npc5.s b/data/animations/npc/npc5.s index 64b51230..7bd4a442 100644 --- a/data/animations/npc/npc5.s +++ b/data/animations/npc/npc5.s @@ -4,314 +4,314 @@ .section .rodata .align 2 -gUnk_0810AC78:: @ 0810AC78 - .incbin "npc5/gUnk_0810AC78.bin" +gSpriteAnimations_Npc5_0:: @ 0810AC78 + .include "animations/gSpriteAnimations_Npc5_0.s" -gUnk_0810AC81:: @ 0810AC81 - .incbin "npc5/gUnk_0810AC81.bin" +gSpriteAnimations_Npc5_1:: @ 0810AC81 + .include "animations/gSpriteAnimations_Npc5_1.s" -gUnk_0810AC9A:: @ 0810AC9A - .incbin "npc5/gUnk_0810AC9A.bin" +gSpriteAnimations_Npc5_2:: @ 0810AC9A + .include "animations/gSpriteAnimations_Npc5_2.s" -gUnk_0810ACB3:: @ 0810ACB3 - .incbin "npc5/gUnk_0810ACB3.bin" +gSpriteAnimations_Npc5_3:: @ 0810ACB3 + .include "animations/gSpriteAnimations_Npc5_3.s" -gUnk_0810ACCC:: @ 0810ACCC - .incbin "npc5/gUnk_0810ACCC.bin" +gSpriteAnimations_Npc5_4:: @ 0810ACCC + .include "animations/gSpriteAnimations_Npc5_4.s" -gUnk_0810ACED:: @ 0810ACED - .incbin "npc5/gUnk_0810ACED.bin" +gSpriteAnimations_Npc5_5:: @ 0810ACED + .include "animations/gSpriteAnimations_Npc5_5.s" -gUnk_0810AD0E:: @ 0810AD0E - .incbin "npc5/gUnk_0810AD0E.bin" +gSpriteAnimations_Npc5_6:: @ 0810AD0E + .include "animations/gSpriteAnimations_Npc5_6.s" -gUnk_0810AD2F:: @ 0810AD2F - .incbin "npc5/gUnk_0810AD2F.bin" +gSpriteAnimations_Npc5_7:: @ 0810AD2F + .include "animations/gSpriteAnimations_Npc5_7.s" -gUnk_0810AD50:: @ 0810AD50 - .incbin "npc5/gUnk_0810AD50.bin" +gSpriteAnimations_Npc5_8:: @ 0810AD50 + .include "animations/gSpriteAnimations_Npc5_8.s" -gUnk_0810AD71:: @ 0810AD71 - .incbin "npc5/gUnk_0810AD71.bin" +gSpriteAnimations_Npc5_9:: @ 0810AD71 + .include "animations/gSpriteAnimations_Npc5_9.s" -gUnk_0810AD92:: @ 0810AD92 - .incbin "npc5/gUnk_0810AD92.bin" +gSpriteAnimations_Npc5_10:: @ 0810AD92 + .include "animations/gSpriteAnimations_Npc5_10.s" -gUnk_0810ADB3:: @ 0810ADB3 - .incbin "npc5/gUnk_0810ADB3.bin" +gSpriteAnimations_Npc5_11:: @ 0810ADB3 + .include "animations/gSpriteAnimations_Npc5_11.s" -gUnk_0810ADD4:: @ 0810ADD4 - .incbin "npc5/gUnk_0810ADD4.bin" +gSpriteAnimations_Npc5_12:: @ 0810ADD4 + .include "animations/gSpriteAnimations_Npc5_12.s" -gUnk_0810ADF5:: @ 0810ADF5 - .incbin "npc5/gUnk_0810ADF5.bin" +gSpriteAnimations_Npc5_13:: @ 0810ADF5 + .include "animations/gSpriteAnimations_Npc5_13.s" -gUnk_0810AE16:: @ 0810AE16 - .incbin "npc5/gUnk_0810AE16.bin" +gSpriteAnimations_Npc5_14:: @ 0810AE16 + .include "animations/gSpriteAnimations_Npc5_14.s" -gUnk_0810AE37:: @ 0810AE37 - .incbin "npc5/gUnk_0810AE37.bin" +gSpriteAnimations_Npc5_15:: @ 0810AE37 + .include "animations/gSpriteAnimations_Npc5_15.s" -gUnk_0810AE58:: @ 0810AE58 - .incbin "npc5/gUnk_0810AE58.bin" +gSpriteAnimations_Npc5_16:: @ 0810AE58 + .include "animations/gSpriteAnimations_Npc5_16.s" -gUnk_0810AE7C:: @ 0810AE7C - .incbin "npc5/gUnk_0810AE7C.bin" +gSpriteAnimations_Npc5_17:: @ 0810AE7C + .include "animations/gSpriteAnimations_Npc5_17.s" -gUnk_0810AEA0:: @ 0810AEA0 - .incbin "npc5/gUnk_0810AEA0.bin" +gSpriteAnimations_Npc5_18:: @ 0810AEA0 + .include "animations/gSpriteAnimations_Npc5_18.s" -gUnk_0810AEC4:: @ 0810AEC4 - .incbin "npc5/gUnk_0810AEC4.bin" +gSpriteAnimations_Npc5_19:: @ 0810AEC4 + .include "animations/gSpriteAnimations_Npc5_19.s" -gUnk_0810AEE8:: @ 0810AEE8 - .incbin "npc5/gUnk_0810AEE8.bin" +gSpriteAnimations_Npc5_20:: @ 0810AEE8 + .include "animations/gSpriteAnimations_Npc5_20.s" -gUnk_0810AF19:: @ 0810AF19 - .incbin "npc5/gUnk_0810AF19.bin" +gSpriteAnimations_Npc5_21:: @ 0810AF19 + .include "animations/gSpriteAnimations_Npc5_21.s" -gUnk_0810AF4A:: @ 0810AF4A - .incbin "npc5/gUnk_0810AF4A.bin" +gSpriteAnimations_Npc5_22:: @ 0810AF4A + .include "animations/gSpriteAnimations_Npc5_22.s" -gUnk_0810AF7B:: @ 0810AF7B - .incbin "npc5/gUnk_0810AF7B.bin" +gSpriteAnimations_Npc5_23:: @ 0810AF7B + .include "animations/gSpriteAnimations_Npc5_23.s" -gUnk_0810AFAC:: @ 0810AFAC - .incbin "npc5/gUnk_0810AFAC.bin" +gSpriteAnimations_Npc5_24:: @ 0810AFAC + .include "animations/gSpriteAnimations_Npc5_24.s" -gUnk_0810AFCD:: @ 0810AFCD - .incbin "npc5/gUnk_0810AFCD.bin" +gSpriteAnimations_Npc5_25:: @ 0810AFCD + .include "animations/gSpriteAnimations_Npc5_25.s" -gUnk_0810AFEE:: @ 0810AFEE - .incbin "npc5/gUnk_0810AFEE.bin" +gSpriteAnimations_Npc5_26:: @ 0810AFEE + .include "animations/gSpriteAnimations_Npc5_26.s" -gUnk_0810B00F:: @ 0810B00F - .incbin "npc5/gUnk_0810B00F.bin" +gSpriteAnimations_Npc5_27:: @ 0810B00F + .include "animations/gSpriteAnimations_Npc5_27.s" -gUnk_0810B030:: @ 0810B030 - .incbin "npc5/gUnk_0810B030.bin" +gSpriteAnimations_Npc5_28:: @ 0810B030 + .include "animations/gSpriteAnimations_Npc5_28.s" -gUnk_0810B03C:: @ 0810B03C - .incbin "npc5/gUnk_0810B03C.bin" +gSpriteAnimations_Npc5_29:: @ 0810B03C + .include "animations/gSpriteAnimations_Npc5_29.s" -gUnk_0810B048:: @ 0810B048 - .incbin "npc5/gUnk_0810B048.bin" +gSpriteAnimations_Npc5_30:: @ 0810B048 + .include "animations/gSpriteAnimations_Npc5_30.s" -gUnk_0810B054:: @ 0810B054 - .incbin "npc5/gUnk_0810B054.bin" +gSpriteAnimations_Npc5_31:: @ 0810B054 + .include "animations/gSpriteAnimations_Npc5_31.s" -gUnk_0810B060:: @ 0810B060 - .incbin "npc5/gUnk_0810B060.bin" +gSpriteAnimations_Npc5_32:: @ 0810B060 + .include "animations/gSpriteAnimations_Npc5_32.s" -gUnk_0810B071:: @ 0810B071 - .incbin "npc5/gUnk_0810B071.bin" +gSpriteAnimations_Npc5_33:: @ 0810B071 + .include "animations/gSpriteAnimations_Npc5_33.s" -gUnk_0810B082:: @ 0810B082 - .incbin "npc5/gUnk_0810B082.bin" +gSpriteAnimations_Npc5_34:: @ 0810B082 + .include "animations/gSpriteAnimations_Npc5_34.s" -gUnk_0810B093:: @ 0810B093 - .incbin "npc5/gUnk_0810B093.bin" +gSpriteAnimations_Npc5_35:: @ 0810B093 + .include "animations/gSpriteAnimations_Npc5_35.s" -gUnk_0810B0A4:: @ 0810B0A4 - .incbin "npc5/gUnk_0810B0A4.bin" +gSpriteAnimations_Npc5_36:: @ 0810B0A4 + .include "animations/gSpriteAnimations_Npc5_36.s" -gUnk_0810B0B5:: @ 0810B0B5 - .incbin "npc5/gUnk_0810B0B5.bin" +gSpriteAnimations_Npc5_37:: @ 0810B0B5 + .include "animations/gSpriteAnimations_Npc5_37.s" -gUnk_0810B0C6:: @ 0810B0C6 - .incbin "npc5/gUnk_0810B0C6.bin" +gSpriteAnimations_Npc5_38:: @ 0810B0C6 + .include "animations/gSpriteAnimations_Npc5_38.s" -gUnk_0810B0D7:: @ 0810B0D7 - .incbin "npc5/gUnk_0810B0D7.bin" +gSpriteAnimations_Npc5_39:: @ 0810B0D7 + .include "animations/gSpriteAnimations_Npc5_39.s" -gUnk_0810B0E8:: @ 0810B0E8 - .incbin "npc5/gUnk_0810B0E8.bin" +gSpriteAnimations_Npc5_40:: @ 0810B0E8 + .include "animations/gSpriteAnimations_Npc5_40.s" -gUnk_0810B0F9:: @ 0810B0F9 - .incbin "npc5/gUnk_0810B0F9.bin" +gSpriteAnimations_Npc5_47:: @ 0810B0F9 + .include "animations/gSpriteAnimations_Npc5_47.s" -gUnk_0810B10A:: @ 0810B10A - .incbin "npc5/gUnk_0810B10A.bin" +gSpriteAnimations_Npc5_46:: @ 0810B10A + .include "animations/gSpriteAnimations_Npc5_46.s" -gUnk_0810B11B:: @ 0810B11B - .incbin "npc5/gUnk_0810B11B.bin" +gSpriteAnimations_Npc5_45:: @ 0810B11B + .include "animations/gSpriteAnimations_Npc5_45.s" -gUnk_0810B12C:: @ 0810B12C - .incbin "npc5/gUnk_0810B12C.bin" +gSpriteAnimations_Npc5_44:: @ 0810B12C + .include "animations/gSpriteAnimations_Npc5_44.s" -gUnk_0810B13D:: @ 0810B13D - .incbin "npc5/gUnk_0810B13D.bin" +gSpriteAnimations_Npc5_43:: @ 0810B13D + .include "animations/gSpriteAnimations_Npc5_43.s" -gUnk_0810B14E:: @ 0810B14E - .incbin "npc5/gUnk_0810B14E.bin" +gSpriteAnimations_Npc5_42:: @ 0810B14E + .include "animations/gSpriteAnimations_Npc5_42.s" -gUnk_0810B15F:: @ 0810B15F - .incbin "npc5/gUnk_0810B15F.bin" +gSpriteAnimations_Npc5_41:: @ 0810B15F + .include "animations/gSpriteAnimations_Npc5_41.s" -gUnk_0810B170:: @ 0810B170 - .incbin "npc5/gUnk_0810B170.bin" +gSpriteAnimations_Npc5_48:: @ 0810B170 + .include "animations/gSpriteAnimations_Npc5_48.s" -gUnk_0810B18C:: @ 0810B18C - .incbin "npc5/gUnk_0810B18C.bin" +gSpriteAnimations_Npc5_49:: @ 0810B18C + .include "animations/gSpriteAnimations_Npc5_49.s" -gUnk_0810B1A8:: @ 0810B1A8 - .incbin "npc5/gUnk_0810B1A8.bin" +gSpriteAnimations_Npc5_50:: @ 0810B1A8 + .include "animations/gSpriteAnimations_Npc5_50.s" -gUnk_0810B1C4:: @ 0810B1C4 - .incbin "npc5/gUnk_0810B1C4.bin" +gSpriteAnimations_Npc5_51:: @ 0810B1C4 + .include "animations/gSpriteAnimations_Npc5_51.s" -gUnk_0810B1E0:: @ 0810B1E0 - .incbin "npc5/gUnk_0810B1E0.bin" +gSpriteAnimations_Npc5_52:: @ 0810B1E0 + .include "animations/gSpriteAnimations_Npc5_52.s" -gUnk_0810B1FC:: @ 0810B1FC - .incbin "npc5/gUnk_0810B1FC.bin" +gSpriteAnimations_Npc5_53:: @ 0810B1FC + .include "animations/gSpriteAnimations_Npc5_53.s" -gUnk_0810B218:: @ 0810B218 - .incbin "npc5/gUnk_0810B218.bin" +gSpriteAnimations_Npc5_54:: @ 0810B218 + .include "animations/gSpriteAnimations_Npc5_54.s" -gUnk_0810B234:: @ 0810B234 - .incbin "npc5/gUnk_0810B234.bin" +gSpriteAnimations_Npc5_55:: @ 0810B234 + .include "animations/gSpriteAnimations_Npc5_55.s" -gUnk_0810B250:: @ 0810B250 - .incbin "npc5/gUnk_0810B250.bin" +gSpriteAnimations_Npc5_56:: @ 0810B250 + .include "animations/gSpriteAnimations_Npc5_56.s" -gUnk_0810B280:: @ 0810B280 - .incbin "npc5/gUnk_0810B280.bin" +gSpriteAnimations_Npc5_57:: @ 0810B280 + .include "animations/gSpriteAnimations_Npc5_57.s" -gUnk_0810B2B0:: @ 0810B2B0 - .incbin "npc5/gUnk_0810B2B0.bin" +gSpriteAnimations_Npc5_58:: @ 0810B2B0 + .include "animations/gSpriteAnimations_Npc5_58.s" -gUnk_0810B2E0:: @ 0810B2E0 - .incbin "npc5/gUnk_0810B2E0.bin" +gSpriteAnimations_Npc5_59:: @ 0810B2E0 + .include "animations/gSpriteAnimations_Npc5_59.s" -gUnk_0810B310:: @ 0810B310 - .incbin "npc5/gUnk_0810B310.bin" +gSpriteAnimations_Npc5_60:: @ 0810B310 + .include "animations/gSpriteAnimations_Npc5_60.s" -gUnk_0810B340:: @ 0810B340 - .incbin "npc5/gUnk_0810B340.bin" +gSpriteAnimations_Npc5_61:: @ 0810B340 + .include "animations/gSpriteAnimations_Npc5_61.s" -gUnk_0810B370:: @ 0810B370 - .incbin "npc5/gUnk_0810B370.bin" +gSpriteAnimations_Npc5_62:: @ 0810B370 + .include "animations/gSpriteAnimations_Npc5_62.s" -gUnk_0810B3A0:: @ 0810B3A0 - .incbin "npc5/gUnk_0810B3A0.bin" +gSpriteAnimations_Npc5_63:: @ 0810B3A0 + .include "animations/gSpriteAnimations_Npc5_63.s" -gUnk_0810B3D0:: @ 0810B3D0 - .incbin "npc5/gUnk_0810B3D0.bin" +gSpriteAnimations_Npc5_64:: @ 0810B3D0 + .include "animations/gSpriteAnimations_Npc5_64.s" -gUnk_0810B3F8:: @ 0810B3F8 - .incbin "npc5/gUnk_0810B3F8.bin" +gSpriteAnimations_Npc5_65:: @ 0810B3F8 + .include "animations/gSpriteAnimations_Npc5_65.s" -gUnk_0810B420:: @ 0810B420 - .incbin "npc5/gUnk_0810B420.bin" +gSpriteAnimations_Npc5_66:: @ 0810B420 + .include "animations/gSpriteAnimations_Npc5_66.s" -gUnk_0810B448:: @ 0810B448 - .incbin "npc5/gUnk_0810B448.bin" +gSpriteAnimations_Npc5_67:: @ 0810B448 + .include "animations/gSpriteAnimations_Npc5_67.s" -gUnk_0810B470:: @ 0810B470 - .incbin "npc5/gUnk_0810B470.bin" +gSpriteAnimations_Npc5_68:: @ 0810B470 + .include "animations/gSpriteAnimations_Npc5_68.s" -gUnk_0810B489:: @ 0810B489 - .incbin "npc5/gUnk_0810B489.bin" +gSpriteAnimations_Npc5_72:: @ 0810B489 + .include "animations/gSpriteAnimations_Npc5_72.s" -gUnk_0810B48E:: @ 0810B48E - .incbin "npc5/gUnk_0810B48E.bin" +gSpriteAnimations_Npc5_76:: @ 0810B48E + .include "animations/gSpriteAnimations_Npc5_76.s" -gUnk_0810B4A7:: @ 0810B4A7 - .incbin "npc5/gUnk_0810B4A7.bin" +gSpriteAnimations_Npc5_80:: @ 0810B4A7 + .include "animations/gSpriteAnimations_Npc5_80.s" -gUnk_0810B4DC:: @ 0810B4DC - .incbin "npc5/gUnk_0810B4DC.bin" +gSpriteAnimations_Npc5_84:: @ 0810B4DC + .include "animations/gSpriteAnimations_Npc5_84.s" gSpriteAnimations_Npc5:: @ 0810B4EC - .4byte gUnk_0810AC78 - .4byte gUnk_0810AC81 - .4byte gUnk_0810AC9A - .4byte gUnk_0810ACB3 - .4byte gUnk_0810ACCC - .4byte gUnk_0810ACED - .4byte gUnk_0810AD0E - .4byte gUnk_0810AD2F - .4byte gUnk_0810AD50 - .4byte gUnk_0810AD71 - .4byte gUnk_0810AD92 - .4byte gUnk_0810ADB3 - .4byte gUnk_0810ADD4 - .4byte gUnk_0810ADF5 - .4byte gUnk_0810AE16 - .4byte gUnk_0810AE37 - .4byte gUnk_0810AE58 - .4byte gUnk_0810AE7C - .4byte gUnk_0810AEA0 - .4byte gUnk_0810AEC4 - .4byte gUnk_0810AEE8 - .4byte gUnk_0810AF19 - .4byte gUnk_0810AF4A - .4byte gUnk_0810AF7B - .4byte gUnk_0810AFAC - .4byte gUnk_0810AFCD - .4byte gUnk_0810AFEE - .4byte gUnk_0810B00F - .4byte gUnk_0810B030 - .4byte gUnk_0810B03C - .4byte gUnk_0810B048 - .4byte gUnk_0810B054 - .4byte gUnk_0810B060 - .4byte gUnk_0810B071 - .4byte gUnk_0810B082 - .4byte gUnk_0810B093 - .4byte gUnk_0810B0A4 - .4byte gUnk_0810B0B5 - .4byte gUnk_0810B0C6 - .4byte gUnk_0810B0D7 - .4byte gUnk_0810B0E8 - .4byte gUnk_0810B15F - .4byte gUnk_0810B14E - .4byte gUnk_0810B13D - .4byte gUnk_0810B12C - .4byte gUnk_0810B11B - .4byte gUnk_0810B10A - .4byte gUnk_0810B0F9 - .4byte gUnk_0810B170 - .4byte gUnk_0810B18C - .4byte gUnk_0810B1A8 - .4byte gUnk_0810B1C4 - .4byte gUnk_0810B1E0 - .4byte gUnk_0810B1FC - .4byte gUnk_0810B218 - .4byte gUnk_0810B234 - .4byte gUnk_0810B250 - .4byte gUnk_0810B280 - .4byte gUnk_0810B2B0 - .4byte gUnk_0810B2E0 - .4byte gUnk_0810B310 - .4byte gUnk_0810B340 - .4byte gUnk_0810B370 - .4byte gUnk_0810B3A0 - .4byte gUnk_0810B3D0 - .4byte gUnk_0810B3F8 - .4byte gUnk_0810B420 - .4byte gUnk_0810B448 - .4byte gUnk_0810B470 - .4byte gUnk_0810B470 - .4byte gUnk_0810B470 - .4byte gUnk_0810B470 - .4byte gUnk_0810B489 - .4byte gUnk_0810B489 - .4byte gUnk_0810B489 - .4byte gUnk_0810B489 - .4byte gUnk_0810B48E - .4byte gUnk_0810B48E - .4byte gUnk_0810B48E - .4byte gUnk_0810B48E - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4DC - .4byte gUnk_0810B4DC - .4byte gUnk_0810B4DC - .4byte gUnk_0810B4DC + .4byte gSpriteAnimations_Npc5_0 + .4byte gSpriteAnimations_Npc5_1 + .4byte gSpriteAnimations_Npc5_2 + .4byte gSpriteAnimations_Npc5_3 + .4byte gSpriteAnimations_Npc5_4 + .4byte gSpriteAnimations_Npc5_5 + .4byte gSpriteAnimations_Npc5_6 + .4byte gSpriteAnimations_Npc5_7 + .4byte gSpriteAnimations_Npc5_8 + .4byte gSpriteAnimations_Npc5_9 + .4byte gSpriteAnimations_Npc5_10 + .4byte gSpriteAnimations_Npc5_11 + .4byte gSpriteAnimations_Npc5_12 + .4byte gSpriteAnimations_Npc5_13 + .4byte gSpriteAnimations_Npc5_14 + .4byte gSpriteAnimations_Npc5_15 + .4byte gSpriteAnimations_Npc5_16 + .4byte gSpriteAnimations_Npc5_17 + .4byte gSpriteAnimations_Npc5_18 + .4byte gSpriteAnimations_Npc5_19 + .4byte gSpriteAnimations_Npc5_20 + .4byte gSpriteAnimations_Npc5_21 + .4byte gSpriteAnimations_Npc5_22 + .4byte gSpriteAnimations_Npc5_23 + .4byte gSpriteAnimations_Npc5_24 + .4byte gSpriteAnimations_Npc5_25 + .4byte gSpriteAnimations_Npc5_26 + .4byte gSpriteAnimations_Npc5_27 + .4byte gSpriteAnimations_Npc5_28 + .4byte gSpriteAnimations_Npc5_29 + .4byte gSpriteAnimations_Npc5_30 + .4byte gSpriteAnimations_Npc5_31 + .4byte gSpriteAnimations_Npc5_32 + .4byte gSpriteAnimations_Npc5_33 + .4byte gSpriteAnimations_Npc5_34 + .4byte gSpriteAnimations_Npc5_35 + .4byte gSpriteAnimations_Npc5_36 + .4byte gSpriteAnimations_Npc5_37 + .4byte gSpriteAnimations_Npc5_38 + .4byte gSpriteAnimations_Npc5_39 + .4byte gSpriteAnimations_Npc5_40 + .4byte gSpriteAnimations_Npc5_41 + .4byte gSpriteAnimations_Npc5_42 + .4byte gSpriteAnimations_Npc5_43 + .4byte gSpriteAnimations_Npc5_44 + .4byte gSpriteAnimations_Npc5_45 + .4byte gSpriteAnimations_Npc5_46 + .4byte gSpriteAnimations_Npc5_47 + .4byte gSpriteAnimations_Npc5_48 + .4byte gSpriteAnimations_Npc5_49 + .4byte gSpriteAnimations_Npc5_50 + .4byte gSpriteAnimations_Npc5_51 + .4byte gSpriteAnimations_Npc5_52 + .4byte gSpriteAnimations_Npc5_53 + .4byte gSpriteAnimations_Npc5_54 + .4byte gSpriteAnimations_Npc5_55 + .4byte gSpriteAnimations_Npc5_56 + .4byte gSpriteAnimations_Npc5_57 + .4byte gSpriteAnimations_Npc5_58 + .4byte gSpriteAnimations_Npc5_59 + .4byte gSpriteAnimations_Npc5_60 + .4byte gSpriteAnimations_Npc5_61 + .4byte gSpriteAnimations_Npc5_62 + .4byte gSpriteAnimations_Npc5_63 + .4byte gSpriteAnimations_Npc5_64 + .4byte gSpriteAnimations_Npc5_65 + .4byte gSpriteAnimations_Npc5_66 + .4byte gSpriteAnimations_Npc5_67 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_84 + .4byte gSpriteAnimations_Npc5_84 + .4byte gSpriteAnimations_Npc5_84 + .4byte gSpriteAnimations_Npc5_84 .4byte 00000000 diff --git a/data/animations/npc/percy.s b/data/animations/npc/percy.s index 21363341..c5ff4d88 100644 --- a/data/animations/npc/percy.s +++ b/data/animations/npc/percy.s @@ -4,45 +4,45 @@ .section .rodata .align 2 -gUnk_08112E5C:: @ 08112E5C - .incbin "percy/gUnk_08112E5C.bin" +gSpriteAnimations_Percy_0:: @ 08112E5C + .include "animations/gSpriteAnimations_Percy_0.s" -gUnk_08112EA5:: @ 08112EA5 - .incbin "percy/gUnk_08112EA5.bin" +gSpriteAnimations_Percy_4:: @ 08112EA5 + .include "animations/gSpriteAnimations_Percy_4.s" -gUnk_08112EAA:: @ 08112EAA - .incbin "percy/gUnk_08112EAA.bin" +gSpriteAnimations_Percy_7:: @ 08112EAA + .include "animations/gSpriteAnimations_Percy_7.s" -gUnk_08112EAF:: @ 08112EAF - .incbin "percy/gUnk_08112EAF.bin" +gSpriteAnimations_Percy_5:: @ 08112EAF + .include "animations/gSpriteAnimations_Percy_5.s" -gUnk_08112EB4:: @ 08112EB4 - .incbin "percy/gUnk_08112EB4.bin" +gSpriteAnimations_Percy_8:: @ 08112EB4 + .include "animations/gSpriteAnimations_Percy_8.s" -gUnk_08112F25:: @ 08112F25 - .incbin "percy/gUnk_08112F25.bin" +gSpriteAnimations_Percy_12:: @ 08112F25 + .include "animations/gSpriteAnimations_Percy_12.s" -gUnk_08112F2A:: @ 08112F2A - .incbin "percy/gUnk_08112F2A.bin" +gSpriteAnimations_Percy_15:: @ 08112F2A + .include "animations/gSpriteAnimations_Percy_15.s" -gUnk_08112F2F:: @ 08112F2F - .incbin "percy/gUnk_08112F2F.bin" +gSpriteAnimations_Percy_13:: @ 08112F2F + .include "animations/gSpriteAnimations_Percy_13.s" gSpriteAnimations_Percy:: @ 08112F34 - .4byte gUnk_08112E5C - .4byte gUnk_08112E5C - .4byte gUnk_08112E5C - .4byte gUnk_08112E5C - .4byte gUnk_08112EA5 - .4byte gUnk_08112EAF - .4byte gUnk_08112EA5 - .4byte gUnk_08112EAA - .4byte gUnk_08112EB4 - .4byte gUnk_08112EB4 - .4byte gUnk_08112EB4 - .4byte gUnk_08112EB4 - .4byte gUnk_08112F25 - .4byte gUnk_08112F2F - .4byte gUnk_08112F25 - .4byte gUnk_08112F2A + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_4 + .4byte gSpriteAnimations_Percy_5 + .4byte gSpriteAnimations_Percy_4 + .4byte gSpriteAnimations_Percy_7 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_12 + .4byte gSpriteAnimations_Percy_13 + .4byte gSpriteAnimations_Percy_12 + .4byte gSpriteAnimations_Percy_15 .4byte 00000000 diff --git a/data/animations/npc/pina.s b/data/animations/npc/pina.s index 59b63d2a..04efb6b7 100644 --- a/data/animations/npc/pina.s +++ b/data/animations/npc/pina.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0810CE54:: @ 0810CE54 - .incbin "pina/gUnk_0810CE54.bin" +gSpriteAnimations_Pina_0:: @ 0810CE54 + .include "animations/gSpriteAnimations_Pina_0.s" -gUnk_0810CEA1:: @ 0810CEA1 - .incbin "pina/gUnk_0810CEA1.bin" +gSpriteAnimations_Pina_8:: @ 0810CEA1 + .include "animations/gSpriteAnimations_Pina_8.s" -gUnk_0810CEEE:: @ 0810CEEE - .incbin "pina/gUnk_0810CEEE.bin" +gSpriteAnimations_Pina_9:: @ 0810CEEE + .include "animations/gSpriteAnimations_Pina_9.s" -gUnk_0810CF0F:: @ 0810CF0F - .incbin "pina/gUnk_0810CF0F.bin" +gSpriteAnimations_Pina_4:: @ 0810CF0F + .include "animations/gSpriteAnimations_Pina_4.s" -gUnk_0810CF14:: @ 0810CF14 - .incbin "pina/gUnk_0810CF14.bin" +gSpriteAnimations_Pina_5:: @ 0810CF14 + .include "animations/gSpriteAnimations_Pina_5.s" -gUnk_0810CF19:: @ 0810CF19 - .incbin "pina/gUnk_0810CF19.bin" +gSpriteAnimations_Pina_7:: @ 0810CF19 + .include "animations/gSpriteAnimations_Pina_7.s" gSpriteAnimations_Pina:: @ 0810CF20 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CF0F - .4byte gUnk_0810CF14 - .4byte gUnk_0810CF0F - .4byte gUnk_0810CF19 - .4byte gUnk_0810CEA1 - .4byte gUnk_0810CEEE + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_4 + .4byte gSpriteAnimations_Pina_5 + .4byte gSpriteAnimations_Pina_4 + .4byte gSpriteAnimations_Pina_7 + .4byte gSpriteAnimations_Pina_8 + .4byte gSpriteAnimations_Pina_9 .4byte 00000000 diff --git a/data/animations/npc/pita.s b/data/animations/npc/pita.s index c121abcf..1cd2e612 100644 --- a/data/animations/npc/pita.s +++ b/data/animations/npc/pita.s @@ -4,19 +4,19 @@ .section .rodata @ .align 2 -gUnk_0810C445:: @ 0810C445 - .incbin "pita/gUnk_0810C445.bin" +gSpriteAnimations_Pita_0:: @ 0810C445 + .include "animations/gSpriteAnimations_Pita_0.s" -gUnk_0810C44A:: @ 0810C44A - .incbin "pita/gUnk_0810C44A.bin" +gSpriteAnimations_Pita_4:: @ 0810C44A + .include "animations/gSpriteAnimations_Pita_4.s" gSpriteAnimations_Pita:: @ 0810C468 - .4byte gUnk_0810C445 - .4byte gUnk_0810C445 - .4byte gUnk_0810C445 - .4byte gUnk_0810C445 - .4byte gUnk_0810C44A - .4byte gUnk_0810C44A - .4byte gUnk_0810C44A - .4byte gUnk_0810C44A + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_4 + .4byte gSpriteAnimations_Pita_4 + .4byte gSpriteAnimations_Pita_4 + .4byte gSpriteAnimations_Pita_4 .4byte 00000000 diff --git a/data/animations/npc/postman.s b/data/animations/npc/postman.s index b9135efa..383efe4c 100644 --- a/data/animations/npc/postman.s +++ b/data/animations/npc/postman.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_0810AA90:: @ 0810AA90 - .incbin "postman/gUnk_0810AA90.bin" +gSpriteAnimations_Postman_0:: @ 0810AA90 + .include "animations/gSpriteAnimations_Postman_0.s" -gUnk_0810AAB9:: @ 0810AAB9 - .incbin "postman/gUnk_0810AAB9.bin" +gSpriteAnimations_Postman_1:: @ 0810AAB9 + .include "animations/gSpriteAnimations_Postman_1.s" -gUnk_0810AAE2:: @ 0810AAE2 - .incbin "postman/gUnk_0810AAE2.bin" +gSpriteAnimations_Postman_2:: @ 0810AAE2 + .include "animations/gSpriteAnimations_Postman_2.s" -gUnk_0810AB0B:: @ 0810AB0B - .incbin "postman/gUnk_0810AB0B.bin" +gSpriteAnimations_Postman_3:: @ 0810AB0B + .include "animations/gSpriteAnimations_Postman_3.s" -gUnk_0810AB34:: @ 0810AB34 - .incbin "postman/gUnk_0810AB34.bin" +gSpriteAnimations_Postman_4:: @ 0810AB34 + .include "animations/gSpriteAnimations_Postman_4.s" -gUnk_0810AB65:: @ 0810AB65 - .incbin "postman/gUnk_0810AB65.bin" +gSpriteAnimations_Postman_5:: @ 0810AB65 + .include "animations/gSpriteAnimations_Postman_5.s" -gUnk_0810AB96:: @ 0810AB96 - .incbin "postman/gUnk_0810AB96.bin" +gSpriteAnimations_Postman_6:: @ 0810AB96 + .include "animations/gSpriteAnimations_Postman_6.s" -gUnk_0810ABC7:: @ 0810ABC7 - .incbin "postman/gUnk_0810ABC7.bin" +gSpriteAnimations_Postman_7:: @ 0810ABC7 + .include "animations/gSpriteAnimations_Postman_7.s" gSpriteAnimations_Postman:: @ 0810ABF8 - .4byte gUnk_0810AA90 - .4byte gUnk_0810AAB9 - .4byte gUnk_0810AAE2 - .4byte gUnk_0810AB0B - .4byte gUnk_0810AB34 - .4byte gUnk_0810AB65 - .4byte gUnk_0810AB96 - .4byte gUnk_0810ABC7 + .4byte gSpriteAnimations_Postman_0 + .4byte gSpriteAnimations_Postman_1 + .4byte gSpriteAnimations_Postman_2 + .4byte gSpriteAnimations_Postman_3 + .4byte gSpriteAnimations_Postman_4 + .4byte gSpriteAnimations_Postman_5 + .4byte gSpriteAnimations_Postman_6 + .4byte gSpriteAnimations_Postman_7 .4byte 00000000 diff --git a/data/animations/npc/rem.s b/data/animations/npc/rem.s index e6387836..0f3cd5a1 100644 --- a/data/animations/npc/rem.s +++ b/data/animations/npc/rem.s @@ -4,87 +4,87 @@ .section .rodata .align 2 -gUnk_081122C0:: @ 081122C0 - .incbin "rem/gUnk_081122C0.bin" +gSpriteAnimations_Rem_1:: @ 081122C0 + .include "animations/gSpriteAnimations_Rem_1.s" -gUnk_081122C9:: @ 081122C9 - .incbin "rem/gUnk_081122C9.bin" +gSpriteAnimations_Rem_0:: @ 081122C9 + .include "animations/gSpriteAnimations_Rem_0.s" -gUnk_081122D2:: @ 081122D2 - .incbin "rem/gUnk_081122D2.bin" +gSpriteAnimations_Rem_3:: @ 081122D2 + .include "animations/gSpriteAnimations_Rem_3.s" -gUnk_081122DB:: @ 081122DB - .incbin "rem/gUnk_081122DB.bin" +gSpriteAnimations_Rem_5:: @ 081122DB + .include "animations/gSpriteAnimations_Rem_5.s" -gUnk_08112300:: @ 08112300 - .incbin "rem/gUnk_08112300.bin" +gSpriteAnimations_Rem_4:: @ 08112300 + .include "animations/gSpriteAnimations_Rem_4.s" -gUnk_08112325:: @ 08112325 - .incbin "rem/gUnk_08112325.bin" +gSpriteAnimations_Rem_7:: @ 08112325 + .include "animations/gSpriteAnimations_Rem_7.s" -gUnk_0811234A:: @ 0811234A - .incbin "rem/gUnk_0811234A.bin" +gSpriteAnimations_Rem_8:: @ 0811234A + .include "animations/gSpriteAnimations_Rem_8.s" -gUnk_08112387:: @ 08112387 - .incbin "rem/gUnk_08112387.bin" +gSpriteAnimations_Rem_9:: @ 08112387 + .include "animations/gSpriteAnimations_Rem_9.s" -gUnk_081123A0:: @ 081123A0 - .incbin "rem/gUnk_081123A0.bin" +gSpriteAnimations_Rem_10:: @ 081123A0 + .include "animations/gSpriteAnimations_Rem_10.s" -gUnk_081123C9:: @ 081123C9 - .incbin "rem/gUnk_081123C9.bin" +gSpriteAnimations_Rem_11:: @ 081123C9 + .include "animations/gSpriteAnimations_Rem_11.s" -gUnk_081123EE:: @ 081123EE - .incbin "rem/gUnk_081123EE.bin" +gSpriteAnimations_Rem_15:: @ 081123EE + .include "animations/gSpriteAnimations_Rem_15.s" -gUnk_08112467:: @ 08112467 - .incbin "rem/gUnk_08112467.bin" +gSpriteAnimations_Rem_12:: @ 08112467 + .include "animations/gSpriteAnimations_Rem_12.s" -gUnk_081124AC:: @ 081124AC - .incbin "rem/gUnk_081124AC.bin" +gSpriteAnimations_Rem_13:: @ 081124AC + .include "animations/gSpriteAnimations_Rem_13.s" -gUnk_081124B5:: @ 081124B5 - .incbin "rem/gUnk_081124B5.bin" +gSpriteAnimations_Rem_14:: @ 081124B5 + .include "animations/gSpriteAnimations_Rem_14.s" -gUnk_081124D2:: @ 081124D2 - .incbin "rem/gUnk_081124D2.bin" +gSpriteAnimations_Rem_16:: @ 081124D2 + .include "animations/gSpriteAnimations_Rem_16.s" -gUnk_081124EB:: @ 081124EB - .incbin "rem/gUnk_081124EB.bin" +gSpriteAnimations_Rem_17:: @ 081124EB + .include "animations/gSpriteAnimations_Rem_17.s" -gUnk_081124FF:: @ 081124FF - .incbin "rem/gUnk_081124FF.bin" +gSpriteAnimations_Rem_18:: @ 081124FF + .include "animations/gSpriteAnimations_Rem_18.s" -gUnk_08112524:: @ 08112524 - .incbin "rem/gUnk_08112524.bin" +gSpriteAnimations_Rem_19:: @ 08112524 + .include "animations/gSpriteAnimations_Rem_19.s" -gUnk_0811253D:: @ 0811253D - .incbin "rem/gUnk_0811253D.bin" +gSpriteAnimations_Rem_20:: @ 0811253D + .include "animations/gSpriteAnimations_Rem_20.s" -gUnk_08112582:: @ 08112582 - .incbin "rem/gUnk_08112582.bin" +gSpriteAnimations_Rem_21:: @ 08112582 + .include "animations/gSpriteAnimations_Rem_21.s" gSpriteAnimations_Rem:: @ 08112598 - .4byte gUnk_081122C9 - .4byte gUnk_081122C0 - .4byte gUnk_081122C9 - .4byte gUnk_081122D2 - .4byte gUnk_08112300 - .4byte gUnk_081122DB - .4byte gUnk_08112300 - .4byte gUnk_08112325 - .4byte gUnk_0811234A - .4byte gUnk_08112387 - .4byte gUnk_081123A0 - .4byte gUnk_081123C9 - .4byte gUnk_08112467 - .4byte gUnk_081124AC - .4byte gUnk_081124B5 - .4byte gUnk_081123EE - .4byte gUnk_081124D2 - .4byte gUnk_081124EB - .4byte gUnk_081124FF - .4byte gUnk_08112524 - .4byte gUnk_0811253D - .4byte gUnk_08112582 + .4byte gSpriteAnimations_Rem_0 + .4byte gSpriteAnimations_Rem_1 + .4byte gSpriteAnimations_Rem_0 + .4byte gSpriteAnimations_Rem_3 + .4byte gSpriteAnimations_Rem_4 + .4byte gSpriteAnimations_Rem_5 + .4byte gSpriteAnimations_Rem_4 + .4byte gSpriteAnimations_Rem_7 + .4byte gSpriteAnimations_Rem_8 + .4byte gSpriteAnimations_Rem_9 + .4byte gSpriteAnimations_Rem_10 + .4byte gSpriteAnimations_Rem_11 + .4byte gSpriteAnimations_Rem_12 + .4byte gSpriteAnimations_Rem_13 + .4byte gSpriteAnimations_Rem_14 + .4byte gSpriteAnimations_Rem_15 + .4byte gSpriteAnimations_Rem_16 + .4byte gSpriteAnimations_Rem_17 + .4byte gSpriteAnimations_Rem_18 + .4byte gSpriteAnimations_Rem_19 + .4byte gSpriteAnimations_Rem_20 + .4byte gSpriteAnimations_Rem_21 .4byte 00000000 diff --git a/data/animations/npc/simon.s b/data/animations/npc/simon.s index 3109a3d5..41cda78a 100644 --- a/data/animations/npc/simon.s +++ b/data/animations/npc/simon.s @@ -4,35 +4,35 @@ .section .rodata .align 2 -gUnk_0811362C:: @ 0811362C - .incbin "simon/gUnk_0811362C.bin" +gSpriteAnimations_Simon_0:: @ 0811362C + .include "animations/gSpriteAnimations_Simon_0.s" -gUnk_08113631:: @ 08113631 - .incbin "simon/gUnk_08113631.bin" +gSpriteAnimations_Simon_1:: @ 08113631 + .include "animations/gSpriteAnimations_Simon_1.s" -gUnk_08113636:: @ 08113636 - .incbin "simon/gUnk_08113636.bin" +gSpriteAnimations_Simon_3:: @ 08113636 + .include "animations/gSpriteAnimations_Simon_3.s" -gUnk_0811363B:: @ 0811363B - .incbin "simon/gUnk_0811363B.bin" +gSpriteAnimations_Simon_4:: @ 0811363B + .include "animations/gSpriteAnimations_Simon_4.s" -gUnk_08113640:: @ 08113640 - .incbin "simon/gUnk_08113640.bin" +gSpriteAnimations_Simon_5:: @ 08113640 + .include "animations/gSpriteAnimations_Simon_5.s" -gUnk_08113645:: @ 08113645 - .incbin "simon/gUnk_08113645.bin" +gSpriteAnimations_Simon_7:: @ 08113645 + .include "animations/gSpriteAnimations_Simon_7.s" -gUnk_0811364A:: @ 0811364A - .incbin "simon/gUnk_0811364A.bin" +gSpriteAnimations_Simon_8:: @ 0811364A + .include "animations/gSpriteAnimations_Simon_8.s" gSpriteAnimations_Simon:: @ 081136B0 - .4byte gUnk_0811362C - .4byte gUnk_08113631 - .4byte gUnk_0811362C - .4byte gUnk_08113636 - .4byte gUnk_0811363B - .4byte gUnk_08113640 - .4byte gUnk_0811363B - .4byte gUnk_08113645 - .4byte gUnk_0811364A + .4byte gSpriteAnimations_Simon_0 + .4byte gSpriteAnimations_Simon_1 + .4byte gSpriteAnimations_Simon_0 + .4byte gSpriteAnimations_Simon_3 + .4byte gSpriteAnimations_Simon_4 + .4byte gSpriteAnimations_Simon_5 + .4byte gSpriteAnimations_Simon_4 + .4byte gSpriteAnimations_Simon_7 + .4byte gSpriteAnimations_Simon_8 .4byte 00000000 diff --git a/data/animations/npc/sittingPerson.s b/data/animations/npc/sittingPerson.s index bb29d1b8..8eb01f03 100644 --- a/data/animations/npc/sittingPerson.s +++ b/data/animations/npc/sittingPerson.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_0810CDA0:: @ 0810CDA0 - .incbin "sittingPerson/gUnk_0810CDA0.bin" +gSpriteAnimations_SittingPerson_0:: @ 0810CDA0 + .include "animations/gSpriteAnimations_SittingPerson_0.s" -gUnk_0810CDB1:: @ 0810CDB1 - .incbin "sittingPerson/gUnk_0810CDB1.bin" +gSpriteAnimations_SittingPerson_2:: @ 0810CDB1 + .include "animations/gSpriteAnimations_SittingPerson_2.s" -gUnk_0810CDC2:: @ 0810CDC2 - .incbin "sittingPerson/gUnk_0810CDC2.bin" +gSpriteAnimations_SittingPerson_3:: @ 0810CDC2 + .include "animations/gSpriteAnimations_SittingPerson_3.s" gSpriteAnimations_SittingPerson:: @ 0810CDD4 - .4byte gUnk_0810CDA0 - .4byte gUnk_0810CDA0 - .4byte gUnk_0810CDB1 - .4byte gUnk_0810CDC2 - .4byte gUnk_0810CDC2 - .4byte gUnk_0810CDC2 - .4byte gUnk_0810CDB1 - .4byte gUnk_0810CDA0 + .4byte gSpriteAnimations_SittingPerson_0 + .4byte gSpriteAnimations_SittingPerson_0 + .4byte gSpriteAnimations_SittingPerson_2 + .4byte gSpriteAnimations_SittingPerson_3 + .4byte gSpriteAnimations_SittingPerson_3 + .4byte gSpriteAnimations_SittingPerson_3 + .4byte gSpriteAnimations_SittingPerson_2 + .4byte gSpriteAnimations_SittingPerson_0 .4byte 00000000 diff --git a/data/animations/npc/smallTownMinish.s b/data/animations/npc/smallTownMinish.s index 941807f1..55df575e 100644 --- a/data/animations/npc/smallTownMinish.s +++ b/data/animations/npc/smallTownMinish.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_081144C8:: @ 081144C8 - .incbin "smallTownMinish/gUnk_081144C8.bin" +gSpriteAnimations_SmallTownMinish_0:: @ 081144C8 + .include "animations/gSpriteAnimations_SmallTownMinish_0.s" -gUnk_081144CD:: @ 081144CD - .incbin "smallTownMinish/gUnk_081144CD.bin" +gSpriteAnimations_SmallTownMinish_1:: @ 081144CD + .include "animations/gSpriteAnimations_SmallTownMinish_1.s" -gUnk_081144D2:: @ 081144D2 - .incbin "smallTownMinish/gUnk_081144D2.bin" +gSpriteAnimations_SmallTownMinish_2:: @ 081144D2 + .include "animations/gSpriteAnimations_SmallTownMinish_2.s" -gUnk_081144D7:: @ 081144D7 - .incbin "smallTownMinish/gUnk_081144D7.bin" +gSpriteAnimations_SmallTownMinish_3:: @ 081144D7 + .include "animations/gSpriteAnimations_SmallTownMinish_3.s" gSpriteAnimations_SmallTownMinish:: @ 081144DC - .4byte gUnk_081144C8 - .4byte gUnk_081144CD - .4byte gUnk_081144D2 - .4byte gUnk_081144D7 + .4byte gSpriteAnimations_SmallTownMinish_0 + .4byte gSpriteAnimations_SmallTownMinish_1 + .4byte gSpriteAnimations_SmallTownMinish_2 + .4byte gSpriteAnimations_SmallTownMinish_3 .4byte 00000000 diff --git a/data/animations/npc/smith.s b/data/animations/npc/smith.s index ede103a3..5b7039c0 100644 --- a/data/animations/npc/smith.s +++ b/data/animations/npc/smith.s @@ -4,66 +4,66 @@ .section .rodata .align 2 -gUnk_081103E4:: @ 081103E4 - .incbin "smith/gUnk_081103E4.bin" +gSpriteAnimations_Smith_0:: @ 081103E4 + .include "animations/gSpriteAnimations_Smith_0.s" -gUnk_081103E9:: @ 081103E9 - .incbin "smith/gUnk_081103E9.bin" +gSpriteAnimations_Smith_1:: @ 081103E9 + .include "animations/gSpriteAnimations_Smith_1.s" -gUnk_081103EE:: @ 081103EE - .incbin "smith/gUnk_081103EE.bin" +gSpriteAnimations_Smith_2:: @ 081103EE + .include "animations/gSpriteAnimations_Smith_2.s" -gUnk_081103F3:: @ 081103F3 - .incbin "smith/gUnk_081103F3.bin" +gSpriteAnimations_Smith_3:: @ 081103F3 + .include "animations/gSpriteAnimations_Smith_3.s" -gUnk_081103F8:: @ 081103F8 - .incbin "smith/gUnk_081103F8.bin" +gSpriteAnimations_Smith_4:: @ 081103F8 + .include "animations/gSpriteAnimations_Smith_4.s" -gUnk_08110409:: @ 08110409 - .incbin "smith/gUnk_08110409.bin" +gSpriteAnimations_Smith_6:: @ 08110409 + .include "animations/gSpriteAnimations_Smith_6.s" -gUnk_0811041A:: @ 0811041A - .incbin "smith/gUnk_0811041A.bin" +gSpriteAnimations_Smith_5:: @ 0811041A + .include "animations/gSpriteAnimations_Smith_5.s" -gUnk_0811042B:: @ 0811042B - .incbin "smith/gUnk_0811042B.bin" +gSpriteAnimations_Smith_7:: @ 0811042B + .include "animations/gSpriteAnimations_Smith_7.s" -gUnk_0811043C:: @ 0811043C - .incbin "smith/gUnk_0811043C.bin" +gSpriteAnimations_Smith_8:: @ 0811043C + .include "animations/gSpriteAnimations_Smith_8.s" -gUnk_08110441:: @ 08110441 - .incbin "smith/gUnk_08110441.bin" +gSpriteAnimations_Smith_9:: @ 08110441 + .include "animations/gSpriteAnimations_Smith_9.s" -gUnk_08110446:: @ 08110446 - .incbin "smith/gUnk_08110446.bin" +gSpriteAnimations_Smith_11:: @ 08110446 + .include "animations/gSpriteAnimations_Smith_11.s" -gUnk_0811044B:: @ 0811044B - .incbin "smith/gUnk_0811044B.bin" +gSpriteAnimations_Smith_12:: @ 0811044B + .include "animations/gSpriteAnimations_Smith_12.s" -gUnk_08110474:: @ 08110474 - .incbin "smith/gUnk_08110474.bin" +gSpriteAnimations_Smith_13:: @ 08110474 + .include "animations/gSpriteAnimations_Smith_13.s" -gUnk_08110479:: @ 08110479 - .incbin "smith/gUnk_08110479.bin" +gSpriteAnimations_Smith_14:: @ 08110479 + .include "animations/gSpriteAnimations_Smith_14.s" -gUnk_0811047E:: @ 0811047E - .incbin "smith/gUnk_0811047E.bin" +gSpriteAnimations_Smith_15:: @ 0811047E + .include "animations/gSpriteAnimations_Smith_15.s" gSpriteAnimations_Smith:: @ 08110484 - .4byte gUnk_081103E4 - .4byte gUnk_081103E9 - .4byte gUnk_081103EE - .4byte gUnk_081103F3 - .4byte gUnk_081103F8 - .4byte gUnk_0811041A - .4byte gUnk_08110409 - .4byte gUnk_0811042B - .4byte gUnk_0811043C - .4byte gUnk_08110441 - .4byte gUnk_0811043C - .4byte gUnk_08110446 - .4byte gUnk_0811044B - .4byte gUnk_08110474 - .4byte gUnk_08110479 - .4byte gUnk_0811047E + .4byte gSpriteAnimations_Smith_0 + .4byte gSpriteAnimations_Smith_1 + .4byte gSpriteAnimations_Smith_2 + .4byte gSpriteAnimations_Smith_3 + .4byte gSpriteAnimations_Smith_4 + .4byte gSpriteAnimations_Smith_5 + .4byte gSpriteAnimations_Smith_6 + .4byte gSpriteAnimations_Smith_7 + .4byte gSpriteAnimations_Smith_8 + .4byte gSpriteAnimations_Smith_9 + .4byte gSpriteAnimations_Smith_8 + .4byte gSpriteAnimations_Smith_11 + .4byte gSpriteAnimations_Smith_12 + .4byte gSpriteAnimations_Smith_13 + .4byte gSpriteAnimations_Smith_14 + .4byte gSpriteAnimations_Smith_15 .4byte 00000000 diff --git a/data/animations/npc/stamp.s b/data/animations/npc/stamp.s index 1d2852fc..15efe269 100644 --- a/data/animations/npc/stamp.s +++ b/data/animations/npc/stamp.s @@ -4,18 +4,18 @@ .section .rodata .align 2 -gUnk_0810C2F4:: @ 0810C2F4 - .incbin "stamp/gUnk_0810C2F4.bin" +gSpriteAnimations_Stamp_0:: @ 0810C2F4 + .include "animations/gSpriteAnimations_Stamp_0.s" -gUnk_0810C325:: @ 0810C325 - .incbin "stamp/gUnk_0810C325.bin" +gSpriteAnimations_Stamp_4:: @ 0810C325 + .include "animations/gSpriteAnimations_Stamp_4.s" gSpriteAnimations_Stamp:: @ 0810C32C - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C325 - .4byte gUnk_0810C325 - .4byte gUnk_0810C325 - .4byte gUnk_0810C325 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_4 + .4byte gSpriteAnimations_Stamp_4 + .4byte gSpriteAnimations_Stamp_4 + .4byte gSpriteAnimations_Stamp_4 diff --git a/data/animations/npc/stockwell.s b/data/animations/npc/stockwell.s index 9226b9ba..b2590bc7 100644 --- a/data/animations/npc/stockwell.s +++ b/data/animations/npc/stockwell.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0810FDE8:: @ 0810FDE8 - .incbin "stockwell/gUnk_0810FDE8.bin" +gSpriteAnimations_Stockwell_1:: @ 0810FDE8 + .include "animations/gSpriteAnimations_Stockwell_1.s" -gUnk_0810FDED:: @ 0810FDED - .incbin "stockwell/gUnk_0810FDED.bin" +gSpriteAnimations_Stockwell_0:: @ 0810FDED + .include "animations/gSpriteAnimations_Stockwell_0.s" -gUnk_0810FDF2:: @ 0810FDF2 - .incbin "stockwell/gUnk_0810FDF2.bin" +gSpriteAnimations_Stockwell_3:: @ 0810FDF2 + .include "animations/gSpriteAnimations_Stockwell_3.s" -gUnk_0810FDF7:: @ 0810FDF7 - .incbin "stockwell/gUnk_0810FDF7.bin" +gSpriteAnimations_Stockwell_4:: @ 0810FDF7 + .include "animations/gSpriteAnimations_Stockwell_4.s" -gUnk_0810FE03:: @ 0810FE03 - .incbin "stockwell/gUnk_0810FE03.bin" +gSpriteAnimations_Stockwell_5:: @ 0810FE03 + .include "animations/gSpriteAnimations_Stockwell_5.s" -gUnk_0810FE1F:: @ 0810FE1F - .incbin "stockwell/gUnk_0810FE1F.bin" +gSpriteAnimations_Stockwell_6:: @ 0810FE1F + .include "animations/gSpriteAnimations_Stockwell_6.s" -gUnk_0810FE68:: @ 0810FE68 - .incbin "stockwell/gUnk_0810FE68.bin" +gSpriteAnimations_Stockwell_7:: @ 0810FE68 + .include "animations/gSpriteAnimations_Stockwell_7.s" gSpriteAnimations_Stockwell:: @ 0810FE90 - .4byte gUnk_0810FDED - .4byte gUnk_0810FDE8 - .4byte gUnk_0810FDED - .4byte gUnk_0810FDF2 - .4byte gUnk_0810FDF7 - .4byte gUnk_0810FE03 - .4byte gUnk_0810FE1F - .4byte gUnk_0810FE68 + .4byte gSpriteAnimations_Stockwell_0 + .4byte gSpriteAnimations_Stockwell_1 + .4byte gSpriteAnimations_Stockwell_0 + .4byte gSpriteAnimations_Stockwell_3 + .4byte gSpriteAnimations_Stockwell_4 + .4byte gSpriteAnimations_Stockwell_5 + .4byte gSpriteAnimations_Stockwell_6 + .4byte gSpriteAnimations_Stockwell_7 diff --git a/data/animations/npc/sturgeon.s b/data/animations/npc/sturgeon.s index 68d7ef44..9b38a7b6 100644 --- a/data/animations/npc/sturgeon.s +++ b/data/animations/npc/sturgeon.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0810FB78:: @ 0810FB78 - .incbin "sturgeon/gUnk_0810FB78.bin" +gSpriteAnimations_Sturgeon_0:: @ 0810FB78 + .include "animations/gSpriteAnimations_Sturgeon_0.s" -gUnk_0810FB7D:: @ 0810FB7D - .incbin "sturgeon/gUnk_0810FB7D.bin" +gSpriteAnimations_Sturgeon_1:: @ 0810FB7D + .include "animations/gSpriteAnimations_Sturgeon_1.s" -gUnk_0810FB82:: @ 0810FB82 - .incbin "sturgeon/gUnk_0810FB82.bin" +gSpriteAnimations_Sturgeon_2:: @ 0810FB82 + .include "animations/gSpriteAnimations_Sturgeon_2.s" -gUnk_0810FB87:: @ 0810FB87 - .incbin "sturgeon/gUnk_0810FB87.bin" +gSpriteAnimations_Sturgeon_3:: @ 0810FB87 + .include "animations/gSpriteAnimations_Sturgeon_3.s" -gUnk_0810FB8C:: @ 0810FB8C - .incbin "sturgeon/gUnk_0810FB8C.bin" +gSpriteAnimations_Sturgeon_8:: @ 0810FB8C + .include "animations/gSpriteAnimations_Sturgeon_8.s" -gUnk_0810FBAD:: @ 0810FBAD - .incbin "sturgeon/gUnk_0810FBAD.bin" +gSpriteAnimations_Sturgeon_9:: @ 0810FBAD + .include "animations/gSpriteAnimations_Sturgeon_9.s" gSpriteAnimations_Sturgeon:: @ 0810FBD0 - .4byte gUnk_0810FB78 - .4byte gUnk_0810FB7D - .4byte gUnk_0810FB82 - .4byte gUnk_0810FB87 - .4byte gUnk_0810FB24 - .4byte gUnk_0810FB39 - .4byte gUnk_0810FB4E - .4byte gUnk_0810FB63 - .4byte gUnk_0810FB8C - .4byte gUnk_0810FBAD + .4byte gSpriteAnimations_Sturgeon_0 + .4byte gSpriteAnimations_Sturgeon_1 + .4byte gSpriteAnimations_Sturgeon_2 + .4byte gSpriteAnimations_Sturgeon_3 + .4byte gSpriteAnimations_Sturgeon_4 + .4byte gSpriteAnimations_Sturgeon_5 + .4byte gSpriteAnimations_Sturgeon_6 + .4byte gSpriteAnimations_Sturgeon_7 + .4byte gSpriteAnimations_Sturgeon_8 + .4byte gSpriteAnimations_Sturgeon_9 .4byte 00000000 diff --git a/data/animations/npc/syrup.s b/data/animations/npc/syrup.s index f2436a3b..023595fb 100644 --- a/data/animations/npc/syrup.s +++ b/data/animations/npc/syrup.s @@ -4,20 +4,20 @@ .section .rodata .align 2 -gUnk_08112208:: @ 08112208 - .incbin "syrup/gUnk_08112208.bin" +gSpriteAnimations_Syrup_0:: @ 08112208 + .include "animations/gSpriteAnimations_Syrup_0.s" gSpriteAnimations_Syrup:: @ 0811222C - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 .4byte 00000000 diff --git a/data/animations/npc/talon.s b/data/animations/npc/talon.s index 433a170e..16d800b6 100644 --- a/data/animations/npc/talon.s +++ b/data/animations/npc/talon.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_0810FEE0:: @ 0810FEE0 - .incbin "talon/gUnk_0810FEE0.bin" +gSpriteAnimations_Talon_2:: @ 0810FEE0 + .include "animations/gSpriteAnimations_Talon_2.s" -gUnk_0810FEE5:: @ 0810FEE5 - .incbin "talon/gUnk_0810FEE5.bin" +gSpriteAnimations_Talon_0:: @ 0810FEE5 + .include "animations/gSpriteAnimations_Talon_0.s" -gUnk_0810FEEA:: @ 0810FEEA - .incbin "talon/gUnk_0810FEEA.bin" +gSpriteAnimations_Talon_3:: @ 0810FEEA + .include "animations/gSpriteAnimations_Talon_3.s" -gUnk_0810FEEF:: @ 0810FEEF - .incbin "talon/gUnk_0810FEEF.bin" +gSpriteAnimations_Talon_1:: @ 0810FEEF + .include "animations/gSpriteAnimations_Talon_1.s" -gUnk_0810FEF4:: @ 0810FEF4 - .incbin "talon/gUnk_0810FEF4.bin" +gSpriteAnimations_Talon_4:: @ 0810FEF4 + .include "animations/gSpriteAnimations_Talon_4.s" -gUnk_0810FF05:: @ 0810FF05 - .incbin "talon/gUnk_0810FF05.bin" +gSpriteAnimations_Talon_5:: @ 0810FF05 + .include "animations/gSpriteAnimations_Talon_5.s" -gUnk_0810FF16:: @ 0810FF16 - .incbin "talon/gUnk_0810FF16.bin" +gSpriteAnimations_Talon_6:: @ 0810FF16 + .include "animations/gSpriteAnimations_Talon_6.s" -gUnk_0810FF27:: @ 0810FF27 - .incbin "talon/gUnk_0810FF27.bin" +gSpriteAnimations_Talon_7:: @ 0810FF27 + .include "animations/gSpriteAnimations_Talon_7.s" gSpriteAnimations_Talon:: @ 0810FF38 - .4byte gUnk_0810FEE5 - .4byte gUnk_0810FEEF - .4byte gUnk_0810FEE0 - .4byte gUnk_0810FEEA - .4byte gUnk_0810FEF4 - .4byte gUnk_0810FF05 - .4byte gUnk_0810FF16 - .4byte gUnk_0810FF27 + .4byte gSpriteAnimations_Talon_0 + .4byte gSpriteAnimations_Talon_1 + .4byte gSpriteAnimations_Talon_2 + .4byte gSpriteAnimations_Talon_3 + .4byte gSpriteAnimations_Talon_4 + .4byte gSpriteAnimations_Talon_5 + .4byte gSpriteAnimations_Talon_6 + .4byte gSpriteAnimations_Talon_7 .4byte 00000000 diff --git a/data/animations/npc/teachers.s b/data/animations/npc/teachers.s index 22185e3e..4230cd0b 100644 --- a/data/animations/npc/teachers.s +++ b/data/animations/npc/teachers.s @@ -4,18 +4,18 @@ .section .rodata .align 2 -gUnk_081139B0:: @ 081139B0 - .incbin "teachers/gUnk_081139B0.bin" +gSpriteAnimations_Teachers_0:: @ 081139B0 + .include "animations/gSpriteAnimations_Teachers_0.s" -gUnk_081139CD:: @ 081139CD - .incbin "teachers/gUnk_081139CD.bin" +gSpriteAnimations_Teachers_3:: @ 081139CD + .include "animations/gSpriteAnimations_Teachers_3.s" -gUnk_081139EA:: @ 081139EA - .incbin "teachers/gUnk_081139EA.bin" +gSpriteAnimations_Teachers_1:: @ 081139EA + .include "animations/gSpriteAnimations_Teachers_1.s" gSpriteAnimations_Teachers:: @ 08113A08 - .4byte gUnk_081139B0 - .4byte gUnk_081139EA - .4byte gUnk_081139B0 - .4byte gUnk_081139CD + .4byte gSpriteAnimations_Teachers_0 + .4byte gSpriteAnimations_Teachers_1 + .4byte gSpriteAnimations_Teachers_0 + .4byte gSpriteAnimations_Teachers_3 .4byte 00000000 diff --git a/data/animations/npc/tingleSiblings.s b/data/animations/npc/tingleSiblings.s index 1e8115fb..36c9d609 100644 --- a/data/animations/npc/tingleSiblings.s +++ b/data/animations/npc/tingleSiblings.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_0810FC54:: @ 0810FC54 - .incbin "tingleSiblings/gUnk_0810FC54.bin" +gSpriteAnimations_TingleSiblings_1:: @ 0810FC54 + .include "animations/gSpriteAnimations_TingleSiblings_1.s" -gUnk_0810FC5E:: @ 0810FC5E - .incbin "tingleSiblings/gUnk_0810FC5E.bin" +gSpriteAnimations_TingleSiblings_0:: @ 0810FC5E + .include "animations/gSpriteAnimations_TingleSiblings_0.s" -gUnk_0810FC68:: @ 0810FC68 - .incbin "tingleSiblings/gUnk_0810FC68.bin" +gSpriteAnimations_TingleSiblings_3:: @ 0810FC68 + .include "animations/gSpriteAnimations_TingleSiblings_3.s" -gUnk_0810FCAD:: @ 0810FCAD - .incbin "tingleSiblings/gUnk_0810FCAD.bin" +gSpriteAnimations_TingleSiblings_4:: @ 0810FCAD + .include "animations/gSpriteAnimations_TingleSiblings_4.s" -gUnk_0810FCCE:: @ 0810FCCE - .incbin "tingleSiblings/gUnk_0810FCCE.bin" +gSpriteAnimations_TingleSiblings_8:: @ 0810FCCE + .include "animations/gSpriteAnimations_TingleSiblings_8.s" gSpriteAnimations_TingleSiblings:: @ 0810FD6C - .4byte gUnk_0810FC5E - .4byte gUnk_0810FC54 - .4byte gUnk_0810FC5E - .4byte gUnk_0810FC68 - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCCE - .4byte gUnk_0810FCCE - .4byte gUnk_0810FCCE - .4byte gUnk_0810FCCE + .4byte gSpriteAnimations_TingleSiblings_0 + .4byte gSpriteAnimations_TingleSiblings_1 + .4byte gSpriteAnimations_TingleSiblings_0 + .4byte gSpriteAnimations_TingleSiblings_3 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_8 + .4byte gSpriteAnimations_TingleSiblings_8 + .4byte gSpriteAnimations_TingleSiblings_8 + .4byte gSpriteAnimations_TingleSiblings_8 .4byte 00000000 diff --git a/data/animations/npc/townMinish.s b/data/animations/npc/townMinish.s index ca059318..555b236b 100644 --- a/data/animations/npc/townMinish.s +++ b/data/animations/npc/townMinish.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_08112C68:: @ 08112C68 - .incbin "townMinish/gUnk_08112C68.bin" +gSpriteAnimations_TownMinish_0:: @ 08112C68 + .include "animations/gSpriteAnimations_TownMinish_0.s" -gUnk_08112C6D:: @ 08112C6D - .incbin "townMinish/gUnk_08112C6D.bin" +gSpriteAnimations_TownMinish_1:: @ 08112C6D + .include "animations/gSpriteAnimations_TownMinish_1.s" -gUnk_08112C72:: @ 08112C72 - .incbin "townMinish/gUnk_08112C72.bin" +gSpriteAnimations_TownMinish_2:: @ 08112C72 + .include "animations/gSpriteAnimations_TownMinish_2.s" -gUnk_08112C77:: @ 08112C77 - .incbin "townMinish/gUnk_08112C77.bin" +gSpriteAnimations_TownMinish_3:: @ 08112C77 + .include "animations/gSpriteAnimations_TownMinish_3.s" -gUnk_08112C7C:: @ 08112C7C - .incbin "townMinish/gUnk_08112C7C.bin" +gSpriteAnimations_TownMinish_4:: @ 08112C7C + .include "animations/gSpriteAnimations_TownMinish_4.s" -gUnk_08112C9D:: @ 08112C9D - .incbin "townMinish/gUnk_08112C9D.bin" +gSpriteAnimations_TownMinish_5:: @ 08112C9D + .include "animations/gSpriteAnimations_TownMinish_5.s" -gUnk_08112CBE:: @ 08112CBE - .incbin "townMinish/gUnk_08112CBE.bin" +gSpriteAnimations_TownMinish_6:: @ 08112CBE + .include "animations/gSpriteAnimations_TownMinish_6.s" -gUnk_08112CDF:: @ 08112CDF - .incbin "townMinish/gUnk_08112CDF.bin" +gSpriteAnimations_TownMinish_7:: @ 08112CDF + .include "animations/gSpriteAnimations_TownMinish_7.s" -gUnk_08112D00:: @ 08112D00 - .incbin "townMinish/gUnk_08112D00.bin" +gSpriteAnimations_TownMinish_8:: @ 08112D00 + .include "animations/gSpriteAnimations_TownMinish_8.s" -gUnk_08112D05:: @ 08112D05 - .incbin "townMinish/gUnk_08112D05.bin" +gSpriteAnimations_TownMinish_9:: @ 08112D05 + .include "animations/gSpriteAnimations_TownMinish_9.s" -gUnk_08112D0A:: @ 08112D0A - .incbin "townMinish/gUnk_08112D0A.bin" +gSpriteAnimations_TownMinish_10:: @ 08112D0A + .include "animations/gSpriteAnimations_TownMinish_10.s" -gUnk_08112D0F:: @ 08112D0F - .incbin "townMinish/gUnk_08112D0F.bin" +gSpriteAnimations_TownMinish_11:: @ 08112D0F + .include "animations/gSpriteAnimations_TownMinish_11.s" gSpriteAnimations_TownMinish:: @ 08112D14 - .4byte gUnk_08112C68 - .4byte gUnk_08112C6D - .4byte gUnk_08112C72 - .4byte gUnk_08112C77 - .4byte gUnk_08112C7C - .4byte gUnk_08112C9D - .4byte gUnk_08112CBE - .4byte gUnk_08112CDF - .4byte gUnk_08112D00 - .4byte gUnk_08112D05 - .4byte gUnk_08112D0A - .4byte gUnk_08112D0F + .4byte gSpriteAnimations_TownMinish_0 + .4byte gSpriteAnimations_TownMinish_1 + .4byte gSpriteAnimations_TownMinish_2 + .4byte gSpriteAnimations_TownMinish_3 + .4byte gSpriteAnimations_TownMinish_4 + .4byte gSpriteAnimations_TownMinish_5 + .4byte gSpriteAnimations_TownMinish_6 + .4byte gSpriteAnimations_TownMinish_7 + .4byte gSpriteAnimations_TownMinish_8 + .4byte gSpriteAnimations_TownMinish_9 + .4byte gSpriteAnimations_TownMinish_10 + .4byte gSpriteAnimations_TownMinish_11 .4byte 00000000 diff --git a/data/animations/npc/townsperson.s b/data/animations/npc/townsperson.s index 33b67bfe..d859bc7c 100644 --- a/data/animations/npc/townsperson.s +++ b/data/animations/npc/townsperson.s @@ -5,37 +5,37 @@ .align 2 -gUnk_0810BD00:: @ 0810BD00 - .incbin "townsperson/gUnk_0810BD00.bin" +gSpriteAnimations_Townsperson_0:: @ 0810BD00 + .include "animations/gSpriteAnimations_Townsperson_0.s" -gUnk_0810BD05:: @ 0810BD05 - .incbin "townsperson/gUnk_0810BD05.bin" +gSpriteAnimations_Townsperson_1:: @ 0810BD05 + .include "animations/gSpriteAnimations_Townsperson_1.s" -gUnk_0810BD0A:: @ 0810BD0A - .incbin "townsperson/gUnk_0810BD0A.bin" +gSpriteAnimations_Townsperson_2:: @ 0810BD0A + .include "animations/gSpriteAnimations_Townsperson_2.s" -gUnk_0810BD0F:: @ 0810BD0F - .incbin "townsperson/gUnk_0810BD0F.bin" +gSpriteAnimations_Townsperson_3:: @ 0810BD0F + .include "animations/gSpriteAnimations_Townsperson_3.s" -gUnk_0810BD14:: @ 0810BD14 - .incbin "townsperson/gUnk_0810BD14.bin" +gSpriteAnimations_Townsperson_4:: @ 0810BD14 + .include "animations/gSpriteAnimations_Townsperson_4.s" -gUnk_0810BD25:: @ 0810BD25 - .incbin "townsperson/gUnk_0810BD25.bin" +gSpriteAnimations_Townsperson_5:: @ 0810BD25 + .include "animations/gSpriteAnimations_Townsperson_5.s" -gUnk_0810BD36:: @ 0810BD36 - .incbin "townsperson/gUnk_0810BD36.bin" +gSpriteAnimations_Townsperson_6:: @ 0810BD36 + .include "animations/gSpriteAnimations_Townsperson_6.s" -gUnk_0810BD47:: @ 0810BD47 - .incbin "townsperson/gUnk_0810BD47.bin" +gSpriteAnimations_Townsperson_7:: @ 0810BD47 + .include "animations/gSpriteAnimations_Townsperson_7.s" gSpriteAnimations_Townsperson:: @ 0810BD58 - .4byte gUnk_0810BD00 - .4byte gUnk_0810BD05 - .4byte gUnk_0810BD0A - .4byte gUnk_0810BD0F - .4byte gUnk_0810BD14 - .4byte gUnk_0810BD25 - .4byte gUnk_0810BD36 - .4byte gUnk_0810BD47 + .4byte gSpriteAnimations_Townsperson_0 + .4byte gSpriteAnimations_Townsperson_1 + .4byte gSpriteAnimations_Townsperson_2 + .4byte gSpriteAnimations_Townsperson_3 + .4byte gSpriteAnimations_Townsperson_4 + .4byte gSpriteAnimations_Townsperson_5 + .4byte gSpriteAnimations_Townsperson_6 + .4byte gSpriteAnimations_Townsperson_7 .4byte 00000000 diff --git a/data/animations/npc/vaati.s b/data/animations/npc/vaati.s index d6153821..7693586e 100644 --- a/data/animations/npc/vaati.s +++ b/data/animations/npc/vaati.s @@ -74,117 +74,117 @@ gSpriteAnimation_Vaati_1:: @ 081107CC .4byte gUnk_081107BC .4byte 00000000 -gUnk_08110840:: @ 08110840 - .incbin "vaati/gUnk_08110840.bin" +gSpriteAnimations_Vaati_0:: @ 08110840 + .include "animations/gSpriteAnimations_Vaati_0.s" -gUnk_08110859:: @ 08110859 - .incbin "vaati/gUnk_08110859.bin" +gSpriteAnimations_Vaati_1:: @ 08110859 + .include "animations/gSpriteAnimations_Vaati_1.s" -gUnk_0811085E:: @ 0811085E - .incbin "vaati/gUnk_0811085E.bin" +gSpriteAnimations_Vaati_2:: @ 0811085E + .include "animations/gSpriteAnimations_Vaati_2.s" -gUnk_08110877:: @ 08110877 - .incbin "vaati/gUnk_08110877.bin" +gSpriteAnimations_Vaati_3:: @ 08110877 + .include "animations/gSpriteAnimations_Vaati_3.s" -gUnk_0811087C:: @ 0811087C - .incbin "vaati/gUnk_0811087C.bin" +gSpriteAnimations_Vaati_4:: @ 0811087C + .include "animations/gSpriteAnimations_Vaati_4.s" -gUnk_0811089A:: @ 0811089A - .incbin "vaati/gUnk_0811089A.bin" +gSpriteAnimations_Vaati_6:: @ 0811089A + .include "animations/gSpriteAnimations_Vaati_6.s" -gUnk_081108B3:: @ 081108B3 - .incbin "vaati/gUnk_081108B3.bin" +gSpriteAnimations_Vaati_16:: @ 081108B3 + .include "animations/gSpriteAnimations_Vaati_16.s" -gUnk_081108CC:: @ 081108CC - .incbin "vaati/gUnk_081108CC.bin" +gSpriteAnimations_Vaati_18:: @ 081108CC + .include "animations/gSpriteAnimations_Vaati_18.s" -gUnk_081108E5:: @ 081108E5 - .incbin "vaati/gUnk_081108E5.bin" +gSpriteAnimations_Vaati_24:: @ 081108E5 + .include "animations/gSpriteAnimations_Vaati_24.s" -gUnk_081108F2:: @ 081108F2 - .incbin "vaati/gUnk_081108F2.bin" +gSpriteAnimations_Vaati_26:: @ 081108F2 + .include "animations/gSpriteAnimations_Vaati_26.s" -gUnk_081108FF:: @ 081108FF - .incbin "vaati/gUnk_081108FF.bin" +gSpriteAnimations_Vaati_40:: @ 081108FF + .include "animations/gSpriteAnimations_Vaati_40.s" -gUnk_08110918:: @ 08110918 - .incbin "vaati/gUnk_08110918.bin" +gSpriteAnimations_Vaati_28:: @ 08110918 + .include "animations/gSpriteAnimations_Vaati_28.s" -gUnk_0811091D:: @ 0811091D - .incbin "vaati/gUnk_0811091D.bin" +gSpriteAnimations_Vaati_30:: @ 0811091D + .include "animations/gSpriteAnimations_Vaati_30.s" -gUnk_08110922:: @ 08110922 - .incbin "vaati/gUnk_08110922.bin" +gSpriteAnimations_Vaati_31:: @ 08110922 + .include "animations/gSpriteAnimations_Vaati_31.s" -gUnk_08110927:: @ 08110927 - .incbin "vaati/gUnk_08110927.bin" +gSpriteAnimations_Vaati_29:: @ 08110927 + .include "animations/gSpriteAnimations_Vaati_29.s" -gUnk_0811092C:: @ 0811092C - .incbin "vaati/gUnk_0811092C.bin" +gSpriteAnimations_Vaati_44:: @ 0811092C + .include "animations/gSpriteAnimations_Vaati_44.s" -gUnk_08110931:: @ 08110931 - .incbin "vaati/gUnk_08110931.bin" +gSpriteAnimations_Vaati_32:: @ 08110931 + .include "animations/gSpriteAnimations_Vaati_32.s" -gUnk_081109F2:: @ 081109F2 - .incbin "vaati/gUnk_081109F2.bin" +gSpriteAnimations_Vaati_36:: @ 081109F2 + .include "animations/gSpriteAnimations_Vaati_36.s" -gUnk_08110AD7:: @ 08110AD7 - .incbin "vaati/gUnk_08110AD7.bin" +gSpriteAnimations_Vaati_48:: @ 08110AD7 + .include "animations/gSpriteAnimations_Vaati_48.s" -gUnk_08110AEC:: @ 08110AEC - .incbin "vaati/gUnk_08110AEC.bin" +gSpriteAnimations_Vaati_50:: @ 08110AEC + .include "animations/gSpriteAnimations_Vaati_50.s" gSpriteAnimations_Vaati:: @ 08110B04 - .4byte gUnk_08110840 - .4byte gUnk_08110859 - .4byte gUnk_0811085E - .4byte gUnk_08110877 - .4byte gUnk_0811087C - .4byte gUnk_0811087C - .4byte gUnk_0811089A - .4byte gUnk_0811087C - .4byte gUnk_08110840 - .4byte gUnk_08110859 - .4byte gUnk_0811085E - .4byte gUnk_08110877 - .4byte gUnk_0811087C - .4byte gUnk_0811087C - .4byte gUnk_0811089A - .4byte gUnk_0811087C - .4byte gUnk_081108B3 - .4byte gUnk_081108B3 - .4byte gUnk_081108CC - .4byte gUnk_081108B3 - .4byte gUnk_081108B3 - .4byte gUnk_081108B3 - .4byte gUnk_081108CC - .4byte gUnk_081108B3 - .4byte gUnk_081108E5 - .4byte gUnk_081108E5 - .4byte gUnk_081108F2 - .4byte gUnk_081108E5 - .4byte gUnk_08110918 - .4byte gUnk_08110927 - .4byte gUnk_0811091D - .4byte gUnk_08110922 - .4byte gUnk_08110931 - .4byte gUnk_08110931 - .4byte gUnk_08110931 - .4byte gUnk_08110931 - .4byte gUnk_081109F2 - .4byte gUnk_081109F2 - .4byte gUnk_081109F2 - .4byte gUnk_081109F2 - .4byte gUnk_081108FF - .4byte gUnk_081108FF - .4byte gUnk_081108FF - .4byte gUnk_081108FF - .4byte gUnk_0811092C - .4byte gUnk_0811092C - .4byte gUnk_0811092C - .4byte gUnk_0811092C - .4byte gUnk_08110AD7 - .4byte gUnk_08110AD7 - .4byte gUnk_08110AEC - .4byte gUnk_08110AEC + .4byte gSpriteAnimations_Vaati_0 + .4byte gSpriteAnimations_Vaati_1 + .4byte gSpriteAnimations_Vaati_2 + .4byte gSpriteAnimations_Vaati_3 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_6 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_0 + .4byte gSpriteAnimations_Vaati_1 + .4byte gSpriteAnimations_Vaati_2 + .4byte gSpriteAnimations_Vaati_3 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_6 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_18 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_18 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_24 + .4byte gSpriteAnimations_Vaati_24 + .4byte gSpriteAnimations_Vaati_26 + .4byte gSpriteAnimations_Vaati_24 + .4byte gSpriteAnimations_Vaati_28 + .4byte gSpriteAnimations_Vaati_29 + .4byte gSpriteAnimations_Vaati_30 + .4byte gSpriteAnimations_Vaati_31 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_48 + .4byte gSpriteAnimations_Vaati_48 + .4byte gSpriteAnimations_Vaati_50 + .4byte gSpriteAnimations_Vaati_50 .4byte 00000000 diff --git a/data/animations/npc/vaatiReborn.s b/data/animations/npc/vaatiReborn.s index 854c765a..6a439e07 100644 --- a/data/animations/npc/vaatiReborn.s +++ b/data/animations/npc/vaatiReborn.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_08112F88:: @ 08112F88 - .incbin "vaatiReborn/gUnk_08112F88.bin" +gSpriteAnimations_VaatiReborn_0:: @ 08112F88 + .include "animations/gSpriteAnimations_VaatiReborn_0.s" -gUnk_08112FC4:: @ 08112FC4 - .incbin "vaatiReborn/gUnk_08112FC4.bin" +gSpriteAnimations_VaatiReborn_1:: @ 08112FC4 + .include "animations/gSpriteAnimations_VaatiReborn_1.s" -gUnk_08112FD5:: @ 08112FD5 - .incbin "vaatiReborn/gUnk_08112FD5.bin" +gSpriteAnimations_VaatiReborn_2:: @ 08112FD5 + .include "animations/gSpriteAnimations_VaatiReborn_2.s" gSpriteAnimations_VaatiReborn:: @ 08112FF4 - .4byte gUnk_08112F88 - .4byte gUnk_08112FC4 - .4byte gUnk_08112FD5 + .4byte gSpriteAnimations_VaatiReborn_0 + .4byte gSpriteAnimations_VaatiReborn_1 + .4byte gSpriteAnimations_VaatiReborn_2 .4byte 00000000 diff --git a/data/animations/npc/wheaton.s b/data/animations/npc/wheaton.s index 777e4489..22ab8b0c 100644 --- a/data/animations/npc/wheaton.s +++ b/data/animations/npc/wheaton.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_0810C3C8:: @ 0810C3C8 - .incbin "wheaton/gUnk_0810C3C8.bin" +gSpriteAnimations_Wheaton_0:: @ 0810C3C8 + .include "animations/gSpriteAnimations_Wheaton_0.s" -gUnk_0810C3E1:: @ 0810C3E1 - .incbin "wheaton/gUnk_0810C3E1.bin" +gSpriteAnimations_Wheaton_1:: @ 0810C3E1 + .include "animations/gSpriteAnimations_Wheaton_1.s" -gUnk_0810C3F2:: @ 0810C3F2 - .incbin "wheaton/gUnk_0810C3F2.bin" +gSpriteAnimations_Wheaton_2:: @ 0810C3F2 + .include "animations/gSpriteAnimations_Wheaton_2.s" -gUnk_0810C403:: @ 0810C403 - .incbin "wheaton/gUnk_0810C403.bin" +gSpriteAnimations_Wheaton_3:: @ 0810C403 + .include "animations/gSpriteAnimations_Wheaton_3.s" gSpriteAnimations_Wheaton:: @ 0810C414 - .4byte gUnk_0810C3C8 - .4byte gUnk_0810C3E1 - .4byte gUnk_0810C3F2 - .4byte gUnk_0810C403 + .4byte gSpriteAnimations_Wheaton_0 + .4byte gSpriteAnimations_Wheaton_1 + .4byte gSpriteAnimations_Wheaton_2 + .4byte gSpriteAnimations_Wheaton_3 .4byte 00000000 diff --git a/data/animations/npc/windTribespeople.s b/data/animations/npc/windTribespeople.s index bf6f1eab..08ec239e 100644 --- a/data/animations/npc/windTribespeople.s +++ b/data/animations/npc/windTribespeople.s @@ -4,176 +4,176 @@ .section .rodata @ .align 2 -gUnk_08113B3F:: @ 08113B3F - .incbin "windTribespeople/gUnk_08113B3F.bin" +gSpriteAnimations_WindTribespeople_0_0:: @ 08113B3F + .include "animations/gSpriteAnimations_WindTribespeople_0_0.s" -gUnk_08113B44:: @ 08113B44 - .incbin "windTribespeople/gUnk_08113B44.bin" +gSpriteAnimations_WindTribespeople_0_1:: @ 08113B44 + .include "animations/gSpriteAnimations_WindTribespeople_0_1.s" -gUnk_08113B49:: @ 08113B49 - .incbin "windTribespeople/gUnk_08113B49.bin" +gSpriteAnimations_WindTribespeople_0_2:: @ 08113B49 + .include "animations/gSpriteAnimations_WindTribespeople_0_2.s" -gUnk_08113B4E:: @ 08113B4E - .incbin "windTribespeople/gUnk_08113B4E.bin" +gSpriteAnimations_WindTribespeople_0_3:: @ 08113B4E + .include "animations/gSpriteAnimations_WindTribespeople_0_3.s" -gUnk_08113B53:: @ 08113B53 - .incbin "windTribespeople/gUnk_08113B53.bin" +gSpriteAnimations_WindTribespeople_0_4:: @ 08113B53 + .include "animations/gSpriteAnimations_WindTribespeople_0_4.s" -gUnk_08113B64:: @ 08113B64 - .incbin "windTribespeople/gUnk_08113B64.bin" +gSpriteAnimations_WindTribespeople_0_5:: @ 08113B64 + .include "animations/gSpriteAnimations_WindTribespeople_0_5.s" -gUnk_08113B75:: @ 08113B75 - .incbin "windTribespeople/gUnk_08113B75.bin" +gSpriteAnimations_WindTribespeople_0_6:: @ 08113B75 + .include "animations/gSpriteAnimations_WindTribespeople_0_6.s" -gUnk_08113B86:: @ 08113B86 - .incbin "windTribespeople/gUnk_08113B86.bin" +gSpriteAnimations_WindTribespeople_0_7:: @ 08113B86 + .include "animations/gSpriteAnimations_WindTribespeople_0_7.s" gSpriteAnimations_WindTribespeople_0:: @ 08113B98 - .4byte gUnk_08113B3F - .4byte gUnk_08113B44 - .4byte gUnk_08113B49 - .4byte gUnk_08113B4E - .4byte gUnk_08113B53 - .4byte gUnk_08113B64 - .4byte gUnk_08113B75 - .4byte gUnk_08113B86 + .4byte gSpriteAnimations_WindTribespeople_0_0 + .4byte gSpriteAnimations_WindTribespeople_0_1 + .4byte gSpriteAnimations_WindTribespeople_0_2 + .4byte gSpriteAnimations_WindTribespeople_0_3 + .4byte gSpriteAnimations_WindTribespeople_0_4 + .4byte gSpriteAnimations_WindTribespeople_0_5 + .4byte gSpriteAnimations_WindTribespeople_0_6 + .4byte gSpriteAnimations_WindTribespeople_0_7 .4byte 00000000 -gUnk_08113BBC:: @ 08113BBC - .incbin "windTribespeople/gUnk_08113BBC.bin" +gSpriteAnimations_WindTribespeople_1_0:: @ 08113BBC + .include "animations/gSpriteAnimations_WindTribespeople_1_0.s" -gUnk_08113BC1:: @ 08113BC1 - .incbin "windTribespeople/gUnk_08113BC1.bin" +gSpriteAnimations_WindTribespeople_1_1:: @ 08113BC1 + .include "animations/gSpriteAnimations_WindTribespeople_1_1.s" -gUnk_08113BC6:: @ 08113BC6 - .incbin "windTribespeople/gUnk_08113BC6.bin" +gSpriteAnimations_WindTribespeople_1_2:: @ 08113BC6 + .include "animations/gSpriteAnimations_WindTribespeople_1_2.s" -gUnk_08113BCB:: @ 08113BCB - .incbin "windTribespeople/gUnk_08113BCB.bin" +gSpriteAnimations_WindTribespeople_1_3:: @ 08113BCB + .include "animations/gSpriteAnimations_WindTribespeople_1_3.s" -gUnk_08113BD0:: @ 08113BD0 - .incbin "windTribespeople/gUnk_08113BD0.bin" +gSpriteAnimations_WindTribespeople_1_4:: @ 08113BD0 + .include "animations/gSpriteAnimations_WindTribespeople_1_4.s" -gUnk_08113BE1:: @ 08113BE1 - .incbin "windTribespeople/gUnk_08113BE1.bin" +gSpriteAnimations_WindTribespeople_1_5:: @ 08113BE1 + .include "animations/gSpriteAnimations_WindTribespeople_1_5.s" -gUnk_08113BF2:: @ 08113BF2 - .incbin "windTribespeople/gUnk_08113BF2.bin" +gSpriteAnimations_WindTribespeople_1_6:: @ 08113BF2 + .include "animations/gSpriteAnimations_WindTribespeople_1_6.s" -gUnk_08113C03:: @ 08113C03 - .incbin "windTribespeople/gUnk_08113C03.bin" +gSpriteAnimations_WindTribespeople_1_7:: @ 08113C03 + .include "animations/gSpriteAnimations_WindTribespeople_1_7.s" gSpriteAnimations_WindTribespeople_1:: @ 08113C14 - .4byte gUnk_08113BBC - .4byte gUnk_08113BC1 - .4byte gUnk_08113BC6 - .4byte gUnk_08113BCB - .4byte gUnk_08113BD0 - .4byte gUnk_08113BE1 - .4byte gUnk_08113BF2 - .4byte gUnk_08113C03 + .4byte gSpriteAnimations_WindTribespeople_1_0 + .4byte gSpriteAnimations_WindTribespeople_1_1 + .4byte gSpriteAnimations_WindTribespeople_1_2 + .4byte gSpriteAnimations_WindTribespeople_1_3 + .4byte gSpriteAnimations_WindTribespeople_1_4 + .4byte gSpriteAnimations_WindTribespeople_1_5 + .4byte gSpriteAnimations_WindTribespeople_1_6 + .4byte gSpriteAnimations_WindTribespeople_1_7 .4byte 00000000 -gUnk_08113C38:: @ 08113C38 - .incbin "windTribespeople/gUnk_08113C38.bin" +gSpriteAnimations_WindTribespeople_2_1:: @ 08113C38 + .include "animations/gSpriteAnimations_WindTribespeople_2_1.s" -gUnk_08113C3D:: @ 08113C3D - .incbin "windTribespeople/gUnk_08113C3D.bin" +gSpriteAnimations_WindTribespeople_2_0:: @ 08113C3D + .include "animations/gSpriteAnimations_WindTribespeople_2_0.s" -gUnk_08113C42:: @ 08113C42 - .incbin "windTribespeople/gUnk_08113C42.bin" +gSpriteAnimations_WindTribespeople_2_3:: @ 08113C42 + .include "animations/gSpriteAnimations_WindTribespeople_2_3.s" -gUnk_08113C47:: @ 08113C47 - .incbin "windTribespeople/gUnk_08113C47.bin" +gSpriteAnimations_WindTribespeople_2_4:: @ 08113C47 + .include "animations/gSpriteAnimations_WindTribespeople_2_4.s" gSpriteAnimations_WindTribespeople_2:: @ 08113C58 - .4byte gUnk_08113C3D - .4byte gUnk_08113C38 - .4byte gUnk_08113C3D - .4byte gUnk_08113C42 - .4byte gUnk_08113C47 - .4byte gUnk_08113C47 - .4byte gUnk_08113C47 - .4byte gUnk_08113C47 + .4byte gSpriteAnimations_WindTribespeople_2_0 + .4byte gSpriteAnimations_WindTribespeople_2_1 + .4byte gSpriteAnimations_WindTribespeople_2_0 + .4byte gSpriteAnimations_WindTribespeople_2_3 + .4byte gSpriteAnimations_WindTribespeople_2_4 + .4byte gSpriteAnimations_WindTribespeople_2_4 + .4byte gSpriteAnimations_WindTribespeople_2_4 + .4byte gSpriteAnimations_WindTribespeople_2_4 .4byte 00000000 -gUnk_08113C7C:: @ 08113C7C - .incbin "windTribespeople/gUnk_08113C7C.bin" +gSpriteAnimations_WindTribespeople_3_0:: @ 08113C7C + .include "animations/gSpriteAnimations_WindTribespeople_3_0.s" -gUnk_08113C81:: @ 08113C81 - .incbin "windTribespeople/gUnk_08113C81.bin" +gSpriteAnimations_WindTribespeople_3_1:: @ 08113C81 + .include "animations/gSpriteAnimations_WindTribespeople_3_1.s" -gUnk_08113C86:: @ 08113C86 - .incbin "windTribespeople/gUnk_08113C86.bin" +gSpriteAnimations_WindTribespeople_3_2:: @ 08113C86 + .include "animations/gSpriteAnimations_WindTribespeople_3_2.s" -gUnk_08113C8B:: @ 08113C8B - .incbin "windTribespeople/gUnk_08113C8B.bin" +gSpriteAnimations_WindTribespeople_3_3:: @ 08113C8B + .include "animations/gSpriteAnimations_WindTribespeople_3_3.s" -gUnk_08113C90:: @ 08113C90 - .incbin "windTribespeople/gUnk_08113C90.bin" +gSpriteAnimations_WindTribespeople_3_4:: @ 08113C90 + .include "animations/gSpriteAnimations_WindTribespeople_3_4.s" -gUnk_08113CA1:: @ 08113CA1 - .incbin "windTribespeople/gUnk_08113CA1.bin" +gSpriteAnimations_WindTribespeople_3_5:: @ 08113CA1 + .include "animations/gSpriteAnimations_WindTribespeople_3_5.s" -gUnk_08113CB2:: @ 08113CB2 - .incbin "windTribespeople/gUnk_08113CB2.bin" +gSpriteAnimations_WindTribespeople_3_6:: @ 08113CB2 + .include "animations/gSpriteAnimations_WindTribespeople_3_6.s" -gUnk_08113CC3:: @ 08113CC3 - .incbin "windTribespeople/gUnk_08113CC3.bin" +gSpriteAnimations_WindTribespeople_3_7:: @ 08113CC3 + .include "animations/gSpriteAnimations_WindTribespeople_3_7.s" gSpriteAnimations_WindTribespeople_3:: @ 08113CD4 - .4byte gUnk_08113C7C - .4byte gUnk_08113C81 - .4byte gUnk_08113C86 - .4byte gUnk_08113C8B - .4byte gUnk_08113C90 - .4byte gUnk_08113CA1 - .4byte gUnk_08113CB2 - .4byte gUnk_08113CC3 + .4byte gSpriteAnimations_WindTribespeople_3_0 + .4byte gSpriteAnimations_WindTribespeople_3_1 + .4byte gSpriteAnimations_WindTribespeople_3_2 + .4byte gSpriteAnimations_WindTribespeople_3_3 + .4byte gSpriteAnimations_WindTribespeople_3_4 + .4byte gSpriteAnimations_WindTribespeople_3_5 + .4byte gSpriteAnimations_WindTribespeople_3_6 + .4byte gSpriteAnimations_WindTribespeople_3_7 .4byte 00000000 -gUnk_08113CF8:: @ 08113CF8 - .incbin "windTribespeople/gUnk_08113CF8.bin" +gSpriteAnimations_WindTribespeople_4_1:: @ 08113CF8 + .include "animations/gSpriteAnimations_WindTribespeople_4_1.s" -gUnk_08113CFD:: @ 08113CFD - .incbin "windTribespeople/gUnk_08113CFD.bin" +gSpriteAnimations_WindTribespeople_4_0:: @ 08113CFD + .include "animations/gSpriteAnimations_WindTribespeople_4_0.s" -gUnk_08113D02:: @ 08113D02 - .incbin "windTribespeople/gUnk_08113D02.bin" +gSpriteAnimations_WindTribespeople_4_3:: @ 08113D02 + .include "animations/gSpriteAnimations_WindTribespeople_4_3.s" -gUnk_08113D07:: @ 08113D07 - .incbin "windTribespeople/gUnk_08113D07.bin" +gSpriteAnimations_WindTribespeople_4_4:: @ 08113D07 + .include "animations/gSpriteAnimations_WindTribespeople_4_4.s" gSpriteAnimations_WindTribespeople_4:: @ 08113D1C - .4byte gUnk_08113CFD - .4byte gUnk_08113CF8 - .4byte gUnk_08113CFD - .4byte gUnk_08113D02 - .4byte gUnk_08113D07 - .4byte gUnk_08113D07 - .4byte gUnk_08113D07 - .4byte gUnk_08113D07 + .4byte gSpriteAnimations_WindTribespeople_4_0 + .4byte gSpriteAnimations_WindTribespeople_4_1 + .4byte gSpriteAnimations_WindTribespeople_4_0 + .4byte gSpriteAnimations_WindTribespeople_4_3 + .4byte gSpriteAnimations_WindTribespeople_4_4 + .4byte gSpriteAnimations_WindTribespeople_4_4 + .4byte gSpriteAnimations_WindTribespeople_4_4 + .4byte gSpriteAnimations_WindTribespeople_4_4 .4byte 00000000 -gUnk_08113D40:: @ 08113D40 - .incbin "windTribespeople/gUnk_08113D40.bin" +gSpriteAnimations_WindTribespeople_5_1:: @ 08113D40 + .include "animations/gSpriteAnimations_WindTribespeople_5_1.s" -gUnk_08113D45:: @ 08113D45 - .incbin "windTribespeople/gUnk_08113D45.bin" +gSpriteAnimations_WindTribespeople_5_0:: @ 08113D45 + .include "animations/gSpriteAnimations_WindTribespeople_5_0.s" -gUnk_08113D4A:: @ 08113D4A - .incbin "windTribespeople/gUnk_08113D4A.bin" +gSpriteAnimations_WindTribespeople_5_3:: @ 08113D4A + .include "animations/gSpriteAnimations_WindTribespeople_5_3.s" -gUnk_08113D4F:: @ 08113D4F - .incbin "windTribespeople/gUnk_08113D4F.bin" +gSpriteAnimations_WindTribespeople_5_4:: @ 08113D4F + .include "animations/gSpriteAnimations_WindTribespeople_5_4.s" gSpriteAnimations_WindTribespeople_5:: @ 08113D60 - .4byte gUnk_08113D45 - .4byte gUnk_08113D40 - .4byte gUnk_08113D45 - .4byte gUnk_08113D4A - .4byte gUnk_08113D4F - .4byte gUnk_08113D4F - .4byte gUnk_08113D4F - .4byte gUnk_08113D4F + .4byte gSpriteAnimations_WindTribespeople_5_0 + .4byte gSpriteAnimations_WindTribespeople_5_1 + .4byte gSpriteAnimations_WindTribespeople_5_0 + .4byte gSpriteAnimations_WindTribespeople_5_3 + .4byte gSpriteAnimations_WindTribespeople_5_4 + .4byte gSpriteAnimations_WindTribespeople_5_4 + .4byte gSpriteAnimations_WindTribespeople_5_4 + .4byte gSpriteAnimations_WindTribespeople_5_4 .4byte 00000000 diff --git a/data/animations/object/bakerOven.s b/data/animations/object/bakerOven.s index b5a81ebe..96da115f 100644 --- a/data/animations/object/bakerOven.s +++ b/data/animations/object/bakerOven.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08123E2C:: @ 08123E2C - .incbin "bakerOven/gUnk_08123E2C.bin" +gSpriteAnimations_BakerOven_0:: @ 08123E2C + .include "animations/gSpriteAnimations_BakerOven_0.s" gSpriteAnimations_BakerOven:: @ 08123E78 - .4byte gUnk_08123E2C + .4byte gSpriteAnimations_BakerOven_0 .4byte 00000000 diff --git a/data/animations/object/beanstalk.s b/data/animations/object/beanstalk.s index c71b5042..214c350e 100644 --- a/data/animations/object/beanstalk.s +++ b/data/animations/object/beanstalk.s @@ -4,62 +4,62 @@ .section .rodata @ .align 2 -gUnk_08120EF9:: @ 08120EF9 - .incbin "beanstalk/gUnk_08120EF9.bin" +gSpriteAnimations_Beanstalk_1_0:: @ 08120EF9 + .include "animations/gSpriteAnimations_Beanstalk_1_0.s" -gUnk_08120F2A:: @ 08120F2A - .incbin "beanstalk/gUnk_08120F2A.bin" +gSpriteAnimations_Beanstalk_1_1:: @ 08120F2A + .include "animations/gSpriteAnimations_Beanstalk_1_1.s" -gUnk_08120F2E:: @ 08120F2E - .incbin "beanstalk/gUnk_08120F2E.bin" +gSpriteAnimations_Beanstalk_1_2:: @ 08120F2E + .include "animations/gSpriteAnimations_Beanstalk_1_2.s" -gUnk_08120F32:: @ 08120F32 - .incbin "beanstalk/gUnk_08120F32.bin" +gSpriteAnimations_Beanstalk_1_3:: @ 08120F32 + .include "animations/gSpriteAnimations_Beanstalk_1_3.s" -gUnk_08120F5A:: @ 08120F5A - .incbin "beanstalk/gUnk_08120F5A.bin" +gSpriteAnimations_Beanstalk_1_4:: @ 08120F5A + .include "animations/gSpriteAnimations_Beanstalk_1_4.s" -gUnk_08120F5E:: @ 08120F5E - .incbin "beanstalk/gUnk_08120F5E.bin" +gSpriteAnimations_Beanstalk_1_5:: @ 08120F5E + .include "animations/gSpriteAnimations_Beanstalk_1_5.s" -gUnk_08120F7E:: @ 08120F7E - .incbin "beanstalk/gUnk_08120F7E.bin" +gSpriteAnimations_Beanstalk_1_6:: @ 08120F7E + .include "animations/gSpriteAnimations_Beanstalk_1_6.s" -gUnk_08120FA6:: @ 08120FA6 - .incbin "beanstalk/gUnk_08120FA6.bin" +gSpriteAnimations_Beanstalk_1_7:: @ 08120FA6 + .include "animations/gSpriteAnimations_Beanstalk_1_7.s" -gUnk_08120FAA:: @ 08120FAA - .incbin "beanstalk/gUnk_08120FAA.bin" +gSpriteAnimations_Beanstalk_1_8:: @ 08120FAA + .include "animations/gSpriteAnimations_Beanstalk_1_8.s" -gUnk_08120FCA:: @ 08120FCA - .incbin "beanstalk/gUnk_08120FCA.bin" +gSpriteAnimations_Beanstalk_1_9:: @ 08120FCA + .include "animations/gSpriteAnimations_Beanstalk_1_9.s" -gUnk_08120FF2:: @ 08120FF2 - .incbin "beanstalk/gUnk_08120FF2.bin" +gSpriteAnimations_Beanstalk_1_10:: @ 08120FF2 + .include "animations/gSpriteAnimations_Beanstalk_1_10.s" -gUnk_08120FF6:: @ 08120FF6 - .incbin "beanstalk/gUnk_08120FF6.bin" +gSpriteAnimations_Beanstalk_1_11:: @ 08120FF6 + .include "animations/gSpriteAnimations_Beanstalk_1_11.s" -gUnk_08121016:: @ 08121016 - .incbin "beanstalk/gUnk_08121016.bin" +gSpriteAnimations_Beanstalk_1_12:: @ 08121016 + .include "animations/gSpriteAnimations_Beanstalk_1_12.s" gSpriteAnimations_Beanstalk_0:: @ 0812101C - .4byte gUnk_08120E8C - .4byte gUnk_08120ED1 + .4byte gSpriteAnimations_Beanstalk_0_0 + .4byte gSpriteAnimations_Beanstalk_0_1 .4byte 00000000 gSpriteAnimations_Beanstalk_1:: @ 08121028 - .4byte gUnk_08120EF9 - .4byte gUnk_08120F2A - .4byte gUnk_08120F2E - .4byte gUnk_08120F32 - .4byte gUnk_08120F5A - .4byte gUnk_08120F5E - .4byte gUnk_08120F7E - .4byte gUnk_08120FA6 - .4byte gUnk_08120FAA - .4byte gUnk_08120FCA - .4byte gUnk_08120FF2 - .4byte gUnk_08120FF6 - .4byte gUnk_08121016 + .4byte gSpriteAnimations_Beanstalk_1_0 + .4byte gSpriteAnimations_Beanstalk_1_1 + .4byte gSpriteAnimations_Beanstalk_1_2 + .4byte gSpriteAnimations_Beanstalk_1_3 + .4byte gSpriteAnimations_Beanstalk_1_4 + .4byte gSpriteAnimations_Beanstalk_1_5 + .4byte gSpriteAnimations_Beanstalk_1_6 + .4byte gSpriteAnimations_Beanstalk_1_7 + .4byte gSpriteAnimations_Beanstalk_1_8 + .4byte gSpriteAnimations_Beanstalk_1_9 + .4byte gSpriteAnimations_Beanstalk_1_10 + .4byte gSpriteAnimations_Beanstalk_1_11 + .4byte gSpriteAnimations_Beanstalk_1_12 .4byte 00000000 diff --git a/data/animations/object/bell.s b/data/animations/object/bell.s index ad7e6dd6..9d712569 100644 --- a/data/animations/object/bell.s +++ b/data/animations/object/bell.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_0812338C:: @ 0812338C - .incbin "bell/gUnk_0812338C.bin" +gSpriteAnimations_Bell_0:: @ 0812338C + .include "animations/gSpriteAnimations_Bell_0.s" gSpriteAnimations_Bell:: @ 081233B0 - .4byte gUnk_0812338C - .incbin "bell/gSpriteAnimations_Bell.bin" + .4byte gSpriteAnimations_Bell_0 + .include "animations/gSpriteAnimations_Bell.s" diff --git a/data/animations/object/bigBarrel.s b/data/animations/object/bigBarrel.s index 0113da16..5d8d97c9 100644 --- a/data/animations/object/bigBarrel.s +++ b/data/animations/object/bigBarrel.s @@ -4,12 +4,12 @@ .section .rodata @ .align 2 -gUnk_08120C66:: @ 08120C66 - .incbin "bigBarrel/gUnk_08120C66.bin" +gSpriteAnimations_BigBarrel_0:: @ 08120C66 + .include "animations/gSpriteAnimations_BigBarrel_0.s" -gUnk_08120C6F:: @ 08120C6F - .incbin "bigBarrel/gUnk_08120C6F.bin" +gSpriteAnimations_BigBarrel_1:: @ 08120C6F + .include "animations/gSpriteAnimations_BigBarrel_1.s" gSpriteAnimations_BigBarrel:: @ 08120C78 - .4byte gUnk_08120C66 - .4byte gUnk_08120C6F + .4byte gSpriteAnimations_BigBarrel_0 + .4byte gSpriteAnimations_BigBarrel_1 diff --git a/data/animations/object/bigIceBlock.s b/data/animations/object/bigIceBlock.s index 0f0b065f..91124b72 100644 --- a/data/animations/object/bigIceBlock.s +++ b/data/animations/object/bigIceBlock.s @@ -4,25 +4,25 @@ .section .rodata @ .align 2 -gUnk_081237BA:: @ 081237BA - .incbin "bigIceBlock/gUnk_081237BA.bin" +gSpriteAnimations_BigIceBlock_0:: @ 081237BA + .include "animations/gSpriteAnimations_BigIceBlock_0.s" -gUnk_081237BE:: @ 081237BE - .incbin "bigIceBlock/gUnk_081237BE.bin" +gSpriteAnimations_BigIceBlock_1:: @ 081237BE + .include "animations/gSpriteAnimations_BigIceBlock_1.s" -gUnk_081237C2:: @ 081237C2 - .incbin "bigIceBlock/gUnk_081237C2.bin" +gSpriteAnimations_BigIceBlock_2:: @ 081237C2 + .include "animations/gSpriteAnimations_BigIceBlock_2.s" -gUnk_081237C6:: @ 081237C6 - .incbin "bigIceBlock/gUnk_081237C6.bin" +gSpriteAnimations_BigIceBlock_3:: @ 081237C6 + .include "animations/gSpriteAnimations_BigIceBlock_3.s" -gUnk_081237CA:: @ 081237CA - .incbin "bigIceBlock/gUnk_081237CA.bin" +gSpriteAnimations_BigIceBlock_4:: @ 081237CA + .include "animations/gSpriteAnimations_BigIceBlock_4.s" gSpriteAnimations_BigIceBlock:: @ 081237E0 - .4byte gUnk_081237BA - .4byte gUnk_081237BE - .4byte gUnk_081237C2 - .4byte gUnk_081237C6 - .4byte gUnk_081237CA + .4byte gSpriteAnimations_BigIceBlock_0 + .4byte gSpriteAnimations_BigIceBlock_1 + .4byte gSpriteAnimations_BigIceBlock_2 + .4byte gSpriteAnimations_BigIceBlock_3 + .4byte gSpriteAnimations_BigIceBlock_4 .4byte 00000000 diff --git a/data/animations/object/bigPushableLever.s b/data/animations/object/bigPushableLever.s index 3b3504fa..e35784d9 100644 --- a/data/animations/object/bigPushableLever.s +++ b/data/animations/object/bigPushableLever.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_081236FC:: @ 081236FC - .incbin "bigPushableLever/gUnk_081236FC.bin" +gSpriteAnimations_BigPushableLever_0:: @ 081236FC + .include "animations/gSpriteAnimations_BigPushableLever_0.s" -gUnk_08123711:: @ 08123711 - .incbin "bigPushableLever/gUnk_08123711.bin" +gSpriteAnimations_BigPushableLever_1:: @ 08123711 + .include "animations/gSpriteAnimations_BigPushableLever_1.s" gSpriteAnimations_BigPushableLever:: @ 08123728 - .4byte gUnk_081236FC - .4byte gUnk_08123711 + .4byte gSpriteAnimations_BigPushableLever_0 + .4byte gSpriteAnimations_BigPushableLever_1 .4byte 00000000 diff --git a/data/animations/object/bigVortex.s b/data/animations/object/bigVortex.s index 5ed8726f..46445f79 100644 --- a/data/animations/object/bigVortex.s +++ b/data/animations/object/bigVortex.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_08123698:: @ 08123698 - .incbin "bigVortex/gUnk_08123698.bin" +gSpriteAnimations_BigVortex_0:: @ 08123698 + .include "animations/gSpriteAnimations_BigVortex_0.s" -gUnk_081236A9:: @ 081236A9 - .incbin "bigVortex/gUnk_081236A9.bin" +gSpriteAnimations_BigVortex_1:: @ 081236A9 + .include "animations/gSpriteAnimations_BigVortex_1.s" -gUnk_081236BA:: @ 081236BA - .incbin "bigVortex/gUnk_081236BA.bin" +gSpriteAnimations_BigVortex_2:: @ 081236BA + .include "animations/gSpriteAnimations_BigVortex_2.s" gSpriteAnimations_BigVortex:: @ 081236CC - .4byte gUnk_08123698 - .4byte gUnk_081236A9 - .4byte gUnk_081236BA + .4byte gSpriteAnimations_BigVortex_0 + .4byte gSpriteAnimations_BigVortex_1 + .4byte gSpriteAnimations_BigVortex_2 .4byte 00000000 diff --git a/data/animations/object/bird.s b/data/animations/object/bird.s index b4362262..b1e77c4c 100644 --- a/data/animations/object/bird.s +++ b/data/animations/object/bird.s @@ -4,28 +4,28 @@ .section .rodata .align 2 -gUnk_08123F0C:: @ 08123F0C - .incbin "bird/gUnk_08123F0C.bin" +gSpriteAnimations_Bird_1_0:: @ 08123F0C + .include "animations/gSpriteAnimations_Bird_1_0.s" gSpriteAnimations_Bird_1:: @ 08123F20 - .4byte gUnk_08123F0C - .incbin "bird/gSpriteAnimations_Bird_1.bin" + .4byte gSpriteAnimations_Bird_1_0 + .include "animations/gSpriteAnimations_Bird_1.s" -gUnk_08123F28:: @ 08123F28 - .incbin "bird/gUnk_08123F28.bin" +gSpriteAnimations_Bird_0_0:: @ 08123F28 + .include "animations/gSpriteAnimations_Bird_0_0.s" -gUnk_08123F49:: @ 08123F49 - .incbin "bird/gUnk_08123F49.bin" +gSpriteAnimations_Bird_0_1:: @ 08123F49 + .include "animations/gSpriteAnimations_Bird_0_1.s" -gUnk_08123F62:: @ 08123F62 - .incbin "bird/gUnk_08123F62.bin" +gSpriteAnimations_Bird_0_2:: @ 08123F62 + .include "animations/gSpriteAnimations_Bird_0_2.s" -gUnk_08123F7B:: @ 08123F7B - .incbin "bird/gUnk_08123F7B.bin" +gSpriteAnimations_Bird_0_3:: @ 08123F7B + .include "animations/gSpriteAnimations_Bird_0_3.s" gSpriteAnimations_Bird:: @ 08123F9C - .4byte gUnk_08123F28 - .4byte gUnk_08123F49 - .4byte gUnk_08123F62 - .4byte gUnk_08123F7B + .4byte gSpriteAnimations_Bird_0_0 + .4byte gSpriteAnimations_Bird_0_1 + .4byte gSpriteAnimations_Bird_0_2 + .4byte gSpriteAnimations_Bird_0_3 .4byte 00000000 diff --git a/data/animations/object/bollard.s b/data/animations/object/bollard.s index 0c5dac3b..ebd00d72 100644 --- a/data/animations/object/bollard.s +++ b/data/animations/object/bollard.s @@ -4,20 +4,20 @@ .section .rodata .align 2 -gUnk_08121314:: @ 08121314 - .incbin "bollard/gUnk_08121314.bin" +gSpriteAnimations_Bollard_0:: @ 08121314 + .include "animations/gSpriteAnimations_Bollard_0.s" -gUnk_08121318:: @ 08121318 - .incbin "bollard/gUnk_08121318.bin" +gSpriteAnimations_Bollard_1:: @ 08121318 + .include "animations/gSpriteAnimations_Bollard_1.s" -gUnk_0812131C:: @ 0812131C - .incbin "bollard/gUnk_0812131C.bin" +gSpriteAnimations_Bollard_2:: @ 0812131C + .include "animations/gSpriteAnimations_Bollard_2.s" -gUnk_0812133C:: @ 0812133C - .incbin "bollard/gUnk_0812133C.bin" +gSpriteAnimations_Bollard_3:: @ 0812133C + .include "animations/gSpriteAnimations_Bollard_3.s" gSpriteAnimations_Bollard:: @ 08121358 - .4byte gUnk_08121314 - .4byte gUnk_08121318 - .4byte gUnk_0812131C - .4byte gUnk_0812133C + .4byte gSpriteAnimations_Bollard_0 + .4byte gSpriteAnimations_Bollard_1 + .4byte gSpriteAnimations_Bollard_2 + .4byte gSpriteAnimations_Bollard_3 diff --git a/data/animations/object/bossDoor.s b/data/animations/object/bossDoor.s index 01618e40..a6228489 100644 --- a/data/animations/object/bossDoor.s +++ b/data/animations/object/bossDoor.s @@ -4,41 +4,41 @@ .section .rodata .align 2 -gUnk_08121514:: @ 08121514 - .incbin "bossDoor/gUnk_08121514.bin" +gSpriteAnimations_BossDoor_0:: @ 08121514 + .include "animations/gSpriteAnimations_BossDoor_0.s" -gUnk_08121538:: @ 08121538 - .incbin "bossDoor/gUnk_08121538.bin" +gSpriteAnimations_BossDoor_1:: @ 08121538 + .include "animations/gSpriteAnimations_BossDoor_1.s" -gUnk_0812155C:: @ 0812155C - .incbin "bossDoor/gUnk_0812155C.bin" +gSpriteAnimations_BossDoor_2:: @ 0812155C + .include "animations/gSpriteAnimations_BossDoor_2.s" -gUnk_08121580:: @ 08121580 - .incbin "bossDoor/gUnk_08121580.bin" +gSpriteAnimations_BossDoor_3:: @ 08121580 + .include "animations/gSpriteAnimations_BossDoor_3.s" -gUnk_081215A4:: @ 081215A4 - .incbin "bossDoor/gUnk_081215A4.bin" +gSpriteAnimations_BossDoor_4:: @ 081215A4 + .include "animations/gSpriteAnimations_BossDoor_4.s" -gUnk_081215A8:: @ 081215A8 - .incbin "bossDoor/gUnk_081215A8.bin" +gSpriteAnimations_BossDoor_5:: @ 081215A8 + .include "animations/gSpriteAnimations_BossDoor_5.s" -gUnk_081215AC:: @ 081215AC - .incbin "bossDoor/gUnk_081215AC.bin" +gSpriteAnimations_BossDoor_6:: @ 081215AC + .include "animations/gSpriteAnimations_BossDoor_6.s" -gUnk_081215B0:: @ 081215B0 - .incbin "bossDoor/gUnk_081215B0.bin" +gSpriteAnimations_BossDoor_7:: @ 081215B0 + .include "animations/gSpriteAnimations_BossDoor_7.s" gSpriteAnimations_BossDoor:: @ 081215B4 - .4byte gUnk_08121514 - .4byte gUnk_08121538 - .4byte gUnk_0812155C - .4byte gUnk_08121580 - .4byte gUnk_081215A4 - .4byte gUnk_081215A8 - .4byte gUnk_081215AC - .4byte gUnk_081215B0 - .4byte gUnk_081215A4 - .4byte gUnk_081215A8 - .4byte gUnk_081215AC - .4byte gUnk_081215B0 + .4byte gSpriteAnimations_BossDoor_0 + .4byte gSpriteAnimations_BossDoor_1 + .4byte gSpriteAnimations_BossDoor_2 + .4byte gSpriteAnimations_BossDoor_3 + .4byte gSpriteAnimations_BossDoor_4 + .4byte gSpriteAnimations_BossDoor_5 + .4byte gSpriteAnimations_BossDoor_6 + .4byte gSpriteAnimations_BossDoor_7 + .4byte gSpriteAnimations_BossDoor_4 + .4byte gSpriteAnimations_BossDoor_5 + .4byte gSpriteAnimations_BossDoor_6 + .4byte gSpriteAnimations_BossDoor_7 .4byte 00000000 diff --git a/data/animations/object/chestSpawner.s b/data/animations/object/chestSpawner.s index bff626d4..1099d0bd 100644 --- a/data/animations/object/chestSpawner.s +++ b/data/animations/object/chestSpawner.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0811F8B8:: @ 0811F8B8 - .incbin "chestSpawner/gUnk_0811F8B8.bin" +gSpriteAnimations_ChestSpawner_0:: @ 0811F8B8 + .include "animations/gSpriteAnimations_ChestSpawner_0.s" -gUnk_0811F8C9:: @ 0811F8C9 - .incbin "chestSpawner/gUnk_0811F8C9.bin" +gSpriteAnimations_ChestSpawner_1:: @ 0811F8C9 + .include "animations/gSpriteAnimations_ChestSpawner_1.s" -gUnk_0811F8CE:: @ 0811F8CE - .incbin "chestSpawner/gUnk_0811F8CE.bin" +gSpriteAnimations_ChestSpawner_4:: @ 0811F8CE + .include "animations/gSpriteAnimations_ChestSpawner_4.s" -gUnk_0811F8D3:: @ 0811F8D3 - .incbin "chestSpawner/gUnk_0811F8D3.bin" +gSpriteAnimations_ChestSpawner_2:: @ 0811F8D3 + .include "animations/gSpriteAnimations_ChestSpawner_2.s" -gUnk_0811F8E8:: @ 0811F8E8 - .incbin "chestSpawner/gUnk_0811F8E8.bin" +gSpriteAnimations_ChestSpawner_3:: @ 0811F8E8 + .include "animations/gSpriteAnimations_ChestSpawner_3.s" gSpriteAnimations_ChestSpawner:: @ 0811F8F0 - .4byte gUnk_0811F8B8 - .4byte gUnk_0811F8C9 - .4byte gUnk_0811F8D3 - .4byte gUnk_0811F8E8 - .4byte gUnk_0811F8CE + .4byte gSpriteAnimations_ChestSpawner_0 + .4byte gSpriteAnimations_ChestSpawner_1 + .4byte gSpriteAnimations_ChestSpawner_2 + .4byte gSpriteAnimations_ChestSpawner_3 + .4byte gSpriteAnimations_ChestSpawner_4 .4byte 00000000 diff --git a/data/animations/object/crenalBeanSprout.s b/data/animations/object/crenalBeanSprout.s index b34e4826..9f4b99e1 100644 --- a/data/animations/object/crenalBeanSprout.s +++ b/data/animations/object/crenalBeanSprout.s @@ -4,38 +4,38 @@ .section .rodata @ .align 2 -gUnk_081231BA:: @ 081231BA - .incbin "crenalBeanSprout/gUnk_081231BA.bin" +gSpriteAnimations_CrenalBeanSprout_0:: @ 081231BA + .include "animations/gSpriteAnimations_CrenalBeanSprout_0.s" -gUnk_081231BF:: @ 081231BF - .incbin "crenalBeanSprout/gUnk_081231BF.bin" +gSpriteAnimations_CrenalBeanSprout_3:: @ 081231BF + .include "animations/gSpriteAnimations_CrenalBeanSprout_3.s" -gUnk_081231CC:: @ 081231CC - .incbin "crenalBeanSprout/gUnk_081231CC.bin" +gSpriteAnimations_CrenalBeanSprout_6:: @ 081231CC + .include "animations/gSpriteAnimations_CrenalBeanSprout_6.s" -gUnk_081231D5:: @ 081231D5 - .incbin "crenalBeanSprout/gUnk_081231D5.bin" +gSpriteAnimations_CrenalBeanSprout_8:: @ 081231D5 + .include "animations/gSpriteAnimations_CrenalBeanSprout_8.s" -gUnk_081231E6:: @ 081231E6 - .incbin "crenalBeanSprout/gUnk_081231E6.bin" +gSpriteAnimations_CrenalBeanSprout_10:: @ 081231E6 + .include "animations/gSpriteAnimations_CrenalBeanSprout_10.s" -gUnk_081231FB:: @ 081231FB - .incbin "crenalBeanSprout/gUnk_081231FB.bin" +gSpriteAnimations_CrenalBeanSprout_1:: @ 081231FB + .include "animations/gSpriteAnimations_CrenalBeanSprout_1.s" -gUnk_08123204:: @ 08123204 - .incbin "crenalBeanSprout/gUnk_08123204.bin" +gSpriteAnimations_CrenalBeanSprout_12:: @ 08123204 + .include "animations/gSpriteAnimations_CrenalBeanSprout_12.s" gSpriteAnimations_CrenalBeanSprout:: @ 08123208 - .4byte gUnk_081231BA - .4byte gUnk_081231FB - .4byte gUnk_081231BA - .4byte gUnk_081231BF - .4byte gUnk_081231FB - .4byte gUnk_081231BF - .4byte gUnk_081231CC - .4byte gUnk_081231CC - .4byte gUnk_081231D5 - .4byte gUnk_081231D5 - .4byte gUnk_081231E6 - .4byte gUnk_081231E6 - .4byte gUnk_08123204 + .4byte gSpriteAnimations_CrenalBeanSprout_0 + .4byte gSpriteAnimations_CrenalBeanSprout_1 + .4byte gSpriteAnimations_CrenalBeanSprout_0 + .4byte gSpriteAnimations_CrenalBeanSprout_3 + .4byte gSpriteAnimations_CrenalBeanSprout_1 + .4byte gSpriteAnimations_CrenalBeanSprout_3 + .4byte gSpriteAnimations_CrenalBeanSprout_6 + .4byte gSpriteAnimations_CrenalBeanSprout_6 + .4byte gSpriteAnimations_CrenalBeanSprout_8 + .4byte gSpriteAnimations_CrenalBeanSprout_8 + .4byte gSpriteAnimations_CrenalBeanSprout_10 + .4byte gSpriteAnimations_CrenalBeanSprout_10 + .4byte gSpriteAnimations_CrenalBeanSprout_12 diff --git a/data/animations/object/deathFx.s b/data/animations/object/deathFx.s index 2d1e37ec..099d9ffc 100644 --- a/data/animations/object/deathFx.s +++ b/data/animations/object/deathFx.s @@ -4,24 +4,24 @@ .section .rodata .align 2 -gUnk_0811ECD4:: @ 0811ECD4 - .incbin "deathFx/gUnk_0811ECD4.bin" +gSpriteAnimations_DeathFx_1_0:: @ 0811ECD4 + .include "animations/gSpriteAnimations_DeathFx_1_0.s" -gUnk_0811ED4D:: @ 0811ED4D - .incbin "deathFx/gUnk_0811ED4D.bin" +gSpriteAnimations_DeathFx_1_2:: @ 0811ED4D + .include "animations/gSpriteAnimations_DeathFx_1_2.s" -gUnk_0811ED86:: @ 0811ED86 - .incbin "deathFx/gUnk_0811ED86.bin" +gSpriteAnimations_DeathFx_1_1:: @ 0811ED86 + .include "animations/gSpriteAnimations_DeathFx_1_1.s" -gUnk_0811EDB7:: @ 0811EDB7 - .incbin "deathFx/gUnk_0811EDB7.bin" +gSpriteAnimations_DeathFx_0_0:: @ 0811EDB7 + .include "animations/gSpriteAnimations_DeathFx_0_0.s" gSpriteAnimations_DeathFx_1:: @ 0811EE10 - .4byte gUnk_0811ECD4 - .4byte gUnk_0811ED86 - .4byte gUnk_0811ED4D + .4byte gSpriteAnimations_DeathFx_1_0 + .4byte gSpriteAnimations_DeathFx_1_1 + .4byte gSpriteAnimations_DeathFx_1_2 .4byte 00000000 gSpriteAnimations_DeathFx_0:: @ 0811EE20 - .4byte gUnk_0811EDB7 + .4byte gSpriteAnimations_DeathFx_0_0 .4byte 00000000 diff --git a/data/animations/object/evilSpirit.s b/data/animations/object/evilSpirit.s index 7a94de84..09a6e5d6 100644 --- a/data/animations/object/evilSpirit.s +++ b/data/animations/object/evilSpirit.s @@ -2,24 +2,24 @@ .include "constants/constants.inc" .section .rodata -gUnk_08120682:: @ 08120682 - .incbin "evilSpirit/gUnk_08120682.bin" +gSpriteAnimations_EvilSpirit_0:: @ 08120682 + .include "animations/gSpriteAnimations_EvilSpirit_0.s" -gUnk_08120686:: @ 08120686 - .incbin "evilSpirit/gUnk_08120686.bin" +gSpriteAnimations_EvilSpirit_1:: @ 08120686 + .include "animations/gSpriteAnimations_EvilSpirit_1.s" -gUnk_0812068A:: @ 0812068A - .incbin "evilSpirit/gUnk_0812068A.bin" +gSpriteAnimations_EvilSpirit_2:: @ 0812068A + .include "animations/gSpriteAnimations_EvilSpirit_2.s" -gUnk_0812068E:: @ 0812068E - .incbin "evilSpirit/gUnk_0812068E.bin" +gSpriteAnimations_EvilSpirit_3:: @ 0812068E + .include "animations/gSpriteAnimations_EvilSpirit_3.s" -gUnk_08120692:: @ 08120692 - .incbin "evilSpirit/gUnk_08120692.bin" +gSpriteAnimations_EvilSpirit_4:: @ 08120692 + .include "animations/gSpriteAnimations_EvilSpirit_4.s" gSpriteAnimations_EvilSpirit:: @ 08120698 - .4byte gUnk_08120682 - .4byte gUnk_08120686 - .4byte gUnk_0812068A - .4byte gUnk_0812068E - .4byte gUnk_08120692 + .4byte gSpriteAnimations_EvilSpirit_0 + .4byte gSpriteAnimations_EvilSpirit_1 + .4byte gSpriteAnimations_EvilSpirit_2 + .4byte gSpriteAnimations_EvilSpirit_3 + .4byte gSpriteAnimations_EvilSpirit_4 diff --git a/data/animations/object/eyeSwitch.s b/data/animations/object/eyeSwitch.s index dd7b6e7f..47c043f4 100644 --- a/data/animations/object/eyeSwitch.s +++ b/data/animations/object/eyeSwitch.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_08120B34:: @ 08120B34 - .incbin "eyeSwitch/gUnk_08120B34.bin" +gSpriteAnimations_EyeSwitch_0:: @ 08120B34 + .include "animations/gSpriteAnimations_EyeSwitch_0.s" -gUnk_08120B45:: @ 08120B45 - .incbin "eyeSwitch/gUnk_08120B45.bin" +gSpriteAnimations_EyeSwitch_1:: @ 08120B45 + .include "animations/gSpriteAnimations_EyeSwitch_1.s" -gUnk_08120B56:: @ 08120B56 - .incbin "eyeSwitch/gUnk_08120B56.bin" +gSpriteAnimations_EyeSwitch_2:: @ 08120B56 + .include "animations/gSpriteAnimations_EyeSwitch_2.s" -gUnk_08120B67:: @ 08120B67 - .incbin "eyeSwitch/gUnk_08120B67.bin" +gSpriteAnimations_EyeSwitch_3:: @ 08120B67 + .include "animations/gSpriteAnimations_EyeSwitch_3.s" -gUnk_08120B78:: @ 08120B78 - .incbin "eyeSwitch/gUnk_08120B78.bin" +gSpriteAnimations_EyeSwitch_4:: @ 08120B78 + .include "animations/gSpriteAnimations_EyeSwitch_4.s" -gUnk_08120B89:: @ 08120B89 - .incbin "eyeSwitch/gUnk_08120B89.bin" +gSpriteAnimations_EyeSwitch_5:: @ 08120B89 + .include "animations/gSpriteAnimations_EyeSwitch_5.s" -gUnk_08120B9A:: @ 08120B9A - .incbin "eyeSwitch/gUnk_08120B9A.bin" +gSpriteAnimations_EyeSwitch_6:: @ 08120B9A + .include "animations/gSpriteAnimations_EyeSwitch_6.s" -gUnk_08120BAB:: @ 08120BAB - .incbin "eyeSwitch/gUnk_08120BAB.bin" +gSpriteAnimations_EyeSwitch_7:: @ 08120BAB + .include "animations/gSpriteAnimations_EyeSwitch_7.s" gSpriteAnimations_EyeSwitch:: @ 08120BBC - .4byte gUnk_08120B34 - .4byte gUnk_08120B45 - .4byte gUnk_08120B56 - .4byte gUnk_08120B67 - .4byte gUnk_08120B78 - .4byte gUnk_08120B89 - .4byte gUnk_08120B9A - .4byte gUnk_08120BAB + .4byte gSpriteAnimations_EyeSwitch_0 + .4byte gSpriteAnimations_EyeSwitch_1 + .4byte gSpriteAnimations_EyeSwitch_2 + .4byte gSpriteAnimations_EyeSwitch_3 + .4byte gSpriteAnimations_EyeSwitch_4 + .4byte gSpriteAnimations_EyeSwitch_5 + .4byte gSpriteAnimations_EyeSwitch_6 + .4byte gSpriteAnimations_EyeSwitch_7 .4byte 00000000 diff --git a/data/animations/object/fan.s b/data/animations/object/fan.s index fe668f1f..f3899aad 100644 --- a/data/animations/object/fan.s +++ b/data/animations/object/fan.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_081243F4:: @ 081243F4 - .incbin "fan/gUnk_081243F4.bin" +gSpriteAnimations_Fan_0:: @ 081243F4 + .include "animations/gSpriteAnimations_Fan_0.s" -gUnk_08124465:: @ 08124465 - .incbin "fan/gUnk_08124465.bin" +gSpriteAnimations_Fan_1:: @ 08124465 + .include "animations/gSpriteAnimations_Fan_1.s" -gUnk_081244D6:: @ 081244D6 - .incbin "fan/gUnk_081244D6.bin" +gSpriteAnimations_Fan_2:: @ 081244D6 + .include "animations/gSpriteAnimations_Fan_2.s" -gUnk_08124547:: @ 08124547 - .incbin "fan/gUnk_08124547.bin" +gSpriteAnimations_Fan_3:: @ 08124547 + .include "animations/gSpriteAnimations_Fan_3.s" -gUnk_081245B8:: @ 081245B8 - .incbin "fan/gUnk_081245B8.bin" +gSpriteAnimations_Fan_4:: @ 081245B8 + .include "animations/gSpriteAnimations_Fan_4.s" -gUnk_081245DD:: @ 081245DD - .incbin "fan/gUnk_081245DD.bin" +gSpriteAnimations_Fan_5:: @ 081245DD + .include "animations/gSpriteAnimations_Fan_5.s" -gUnk_08124602:: @ 08124602 - .incbin "fan/gUnk_08124602.bin" +gSpriteAnimations_Fan_6:: @ 08124602 + .include "animations/gSpriteAnimations_Fan_6.s" -gUnk_08124627:: @ 08124627 - .incbin "fan/gUnk_08124627.bin" +gSpriteAnimations_Fan_7:: @ 08124627 + .include "animations/gSpriteAnimations_Fan_7.s" gSpriteAnimations_Fan:: @ 0812464C - .4byte gUnk_081243F4 - .4byte gUnk_08124465 - .4byte gUnk_081244D6 - .4byte gUnk_08124547 - .4byte gUnk_081245B8 - .4byte gUnk_081245DD - .4byte gUnk_08124602 - .4byte gUnk_08124627 + .4byte gSpriteAnimations_Fan_0 + .4byte gSpriteAnimations_Fan_1 + .4byte gSpriteAnimations_Fan_2 + .4byte gSpriteAnimations_Fan_3 + .4byte gSpriteAnimations_Fan_4 + .4byte gSpriteAnimations_Fan_5 + .4byte gSpriteAnimations_Fan_6 + .4byte gSpriteAnimations_Fan_7 .4byte 00000000 diff --git a/data/animations/object/figurineDevice.s b/data/animations/object/figurineDevice.s index 3ce2d07a..5db5cf93 100644 --- a/data/animations/object/figurineDevice.s +++ b/data/animations/object/figurineDevice.s @@ -4,18 +4,18 @@ .section .rodata .align 2 -gUnk_08120AE8:: @ 08120AE8 - .incbin "figurineDevice/gUnk_08120AE8.bin" +gSpriteAnimations_FigurineDevice_0:: @ 08120AE8 + .include "animations/gSpriteAnimations_FigurineDevice_0.s" -gUnk_08120AED:: @ 08120AED - .incbin "figurineDevice/gUnk_08120AED.bin" +gSpriteAnimations_FigurineDevice_1:: @ 08120AED + .include "animations/gSpriteAnimations_FigurineDevice_1.s" -gUnk_08120B01:: @ 08120B01 - .incbin "figurineDevice/gUnk_08120B01.bin" +gSpriteAnimations_FigurineDevice_2:: @ 08120B01 + .include "animations/gSpriteAnimations_FigurineDevice_2.s" gSpriteAnimations_FigurineDevice:: @ 08120B10 - .4byte gUnk_08120AE8 - .4byte gUnk_08120AED - .4byte gUnk_08120B01 + .4byte gSpriteAnimations_FigurineDevice_0 + .4byte gSpriteAnimations_FigurineDevice_1 + .4byte gSpriteAnimations_FigurineDevice_2 .4byte 00000000 diff --git a/data/animations/object/gentariCurtains.s b/data/animations/object/gentariCurtains.s index 870264b7..92306139 100644 --- a/data/animations/object/gentariCurtains.s +++ b/data/animations/object/gentariCurtains.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0812261C:: @ 0812261C - .incbin "gentariCurtains/gUnk_0812261C.bin" +gSpriteAnimations_GentariCurtains_0:: @ 0812261C + .include "animations/gSpriteAnimations_GentariCurtains_0.s" -gUnk_08122631:: @ 08122631 - .incbin "gentariCurtains/gUnk_08122631.bin" +gSpriteAnimations_GentariCurtains_1:: @ 08122631 + .include "animations/gSpriteAnimations_GentariCurtains_1.s" gSpriteAnimations_GentariCurtains:: @ 08122638 - .4byte gUnk_0812261C - .4byte gUnk_08122631 + .4byte gSpriteAnimations_GentariCurtains_0 + .4byte gSpriteAnimations_GentariCurtains_1 .4byte 00000000 diff --git a/data/animations/object/jailBars.s b/data/animations/object/jailBars.s index fbaf725b..36e7a24d 100644 --- a/data/animations/object/jailBars.s +++ b/data/animations/object/jailBars.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_08124994:: @ 08124994 - .incbin "jailBars/gUnk_08124994.bin" +gSpriteAnimations_JailBars_0:: @ 08124994 + .include "animations/gSpriteAnimations_JailBars_0.s" -gUnk_081249A0:: @ 081249A0 - .incbin "jailBars/gUnk_081249A0.bin" +gSpriteAnimations_JailBars_1:: @ 081249A0 + .include "animations/gSpriteAnimations_JailBars_1.s" gSpriteAnimations_JailBars:: @ 081249AC - .4byte gUnk_08124994 - .4byte gUnk_081249A0 + .4byte gSpriteAnimations_JailBars_0 + .4byte gSpriteAnimations_JailBars_1 .4byte 00000000 diff --git a/data/animations/object/jarPortal.s b/data/animations/object/jarPortal.s index 5beb4897..f81088cd 100644 --- a/data/animations/object/jarPortal.s +++ b/data/animations/object/jarPortal.s @@ -4,20 +4,20 @@ .section .rodata .align 2 -gUnk_0812149C:: @ 0812149C - .incbin "jarPortal/gUnk_0812149C.bin" +gSpriteAnimations_JarPortal_0:: @ 0812149C + .include "animations/gSpriteAnimations_JarPortal_0.s" -gUnk_081214A0:: @ 081214A0 - .incbin "jarPortal/gUnk_081214A0.bin" +gSpriteAnimations_JarPortal_1:: @ 081214A0 + .include "animations/gSpriteAnimations_JarPortal_1.s" -gUnk_081214A4:: @ 081214A4 - .incbin "jarPortal/gUnk_081214A4.bin" +gSpriteAnimations_JarPortal_2:: @ 081214A4 + .include "animations/gSpriteAnimations_JarPortal_2.s" -gUnk_081214B5:: @ 081214B5 - .incbin "jarPortal/gUnk_081214B5.bin" +gSpriteAnimations_JarPortal_3:: @ 081214B5 + .include "animations/gSpriteAnimations_JarPortal_3.s" gSpriteAnimations_JarPortal:: @ 081214C8 - .4byte gUnk_0812149C - .4byte gUnk_081214A0 - .4byte gUnk_081214A4 - .4byte gUnk_081214B5 + .4byte gSpriteAnimations_JarPortal_0 + .4byte gSpriteAnimations_JarPortal_1 + .4byte gSpriteAnimations_JarPortal_2 + .4byte gSpriteAnimations_JarPortal_3 diff --git a/data/animations/object/lavaPlatform.s b/data/animations/object/lavaPlatform.s index 2ec63e57..778c3005 100644 --- a/data/animations/object/lavaPlatform.s +++ b/data/animations/object/lavaPlatform.s @@ -3,40 +3,40 @@ .section .rodata .align 2 -gUnk_08122670:: @ 08122670 - .incbin "lavaPlatform/gUnk_08122670.bin" +gSpriteAnimations_LavaPlatform_1_0:: @ 08122670 + .include "animations/gSpriteAnimations_LavaPlatform_1_0.s" -gUnk_08122684:: @ 08122684 - .incbin "lavaPlatform/gUnk_08122684.bin" +gSpriteAnimations_LavaPlatform_1_1:: @ 08122684 + .include "animations/gSpriteAnimations_LavaPlatform_1_1.s" gSpriteAnimations_LavaPlatform_1:: @ 08122698 - .4byte gUnk_08122670 - .4byte gUnk_08122684 - .incbin "lavaPlatform/gSpriteAnimations_LavaPlatform_1.bin" + .4byte gSpriteAnimations_LavaPlatform_1_0 + .4byte gSpriteAnimations_LavaPlatform_1_1 + .include "animations/gSpriteAnimations_LavaPlatform_1.s" -gUnk_081226A4:: @ 081226A4 - .incbin "lavaPlatform/gUnk_081226A4.bin" +gSpriteAnimations_LavaPlatform_0_0:: @ 081226A4 + .include "animations/gSpriteAnimations_LavaPlatform_0_0.s" -gUnk_081226A8:: @ 081226A8 - .incbin "lavaPlatform/gUnk_081226A8.bin" +gSpriteAnimations_LavaPlatform_0_1:: @ 081226A8 + .include "animations/gSpriteAnimations_LavaPlatform_0_1.s" -gUnk_081226AC:: @ 081226AC - .incbin "lavaPlatform/gUnk_081226AC.bin" +gSpriteAnimations_LavaPlatform_0_2:: @ 081226AC + .include "animations/gSpriteAnimations_LavaPlatform_0_2.s" -gUnk_0812273D:: @ 0812273D - .incbin "lavaPlatform/gUnk_0812273D.bin" +gSpriteAnimations_LavaPlatform_0_3:: @ 0812273D + .include "animations/gSpriteAnimations_LavaPlatform_0_3.s" -gUnk_08122742:: @ 08122742 - .incbin "lavaPlatform/gUnk_08122742.bin" +gSpriteAnimations_LavaPlatform_0_4:: @ 08122742 + .include "animations/gSpriteAnimations_LavaPlatform_0_4.s" -gUnk_08122753:: @ 08122753 - .incbin "lavaPlatform/gUnk_08122753.bin" +gSpriteAnimations_LavaPlatform_0_5:: @ 08122753 + .include "animations/gSpriteAnimations_LavaPlatform_0_5.s" gSpriteAnimations_LavaPlatform:: @ 08122764 - .4byte gUnk_081226A4 - .4byte gUnk_081226A8 - .4byte gUnk_081226AC - .4byte gUnk_0812273D - .4byte gUnk_08122742 - .4byte gUnk_08122753 + .4byte gSpriteAnimations_LavaPlatform_0_0 + .4byte gSpriteAnimations_LavaPlatform_0_1 + .4byte gSpriteAnimations_LavaPlatform_0_2 + .4byte gSpriteAnimations_LavaPlatform_0_3 + .4byte gSpriteAnimations_LavaPlatform_0_4 + .4byte gSpriteAnimations_LavaPlatform_0_5 .4byte 00000000 diff --git a/data/animations/object/macroBook.s b/data/animations/object/macroBook.s index f61f1856..9edb866c 100644 --- a/data/animations/object/macroBook.s +++ b/data/animations/object/macroBook.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_08123CB8:: @ 08123CB8 - .incbin "macroBook/gUnk_08123CB8.bin" +gSpriteAnimations_MacroBook_0:: @ 08123CB8 + .include "animations/gSpriteAnimations_MacroBook_0.s" -gUnk_08123CBD:: @ 08123CBD - .incbin "macroBook/gUnk_08123CBD.bin" +gSpriteAnimations_MacroBook_1:: @ 08123CBD + .include "animations/gSpriteAnimations_MacroBook_1.s" -gUnk_08123CCE:: @ 08123CCE - .incbin "macroBook/gUnk_08123CCE.bin" +gSpriteAnimations_MacroBook_2:: @ 08123CCE + .include "animations/gSpriteAnimations_MacroBook_2.s" -gUnk_08123CEB:: @ 08123CEB - .incbin "macroBook/gUnk_08123CEB.bin" +gSpriteAnimations_MacroBook_3:: @ 08123CEB + .include "animations/gSpriteAnimations_MacroBook_3.s" gSpriteAnimations_MacroBook:: @ 08123D14 - .4byte gUnk_08123CB8 - .4byte gUnk_08123CBD - .4byte gUnk_08123CCE - .4byte gUnk_08123CEB + .4byte gSpriteAnimations_MacroBook_0 + .4byte gSpriteAnimations_MacroBook_1 + .4byte gSpriteAnimations_MacroBook_2 + .4byte gSpriteAnimations_MacroBook_3 .4byte 00000000 diff --git a/data/animations/object/minecart.s b/data/animations/object/minecart.s index 242e623b..21b6acbb 100644 --- a/data/animations/object/minecart.s +++ b/data/animations/object/minecart.s @@ -22,73 +22,73 @@ gUnk_0812241C:: @ 0812241C gUnk_08122436:: @ 08122436 .incbin "minecart/gUnk_08122436.bin" -gUnk_08122450:: @ 08122450 - .incbin "minecart/gUnk_08122450.bin" +gSpriteAnimations_Minecart_0:: @ 08122450 + .include "animations/gSpriteAnimations_Minecart_0.s" -gUnk_08122459:: @ 08122459 - .incbin "minecart/gUnk_08122459.bin" +gSpriteAnimations_Minecart_2:: @ 08122459 + .include "animations/gSpriteAnimations_Minecart_2.s" -gUnk_08122462:: @ 08122462 - .incbin "minecart/gUnk_08122462.bin" +gSpriteAnimations_Minecart_1:: @ 08122462 + .include "animations/gSpriteAnimations_Minecart_1.s" -gUnk_0812246B:: @ 0812246B - .incbin "minecart/gUnk_0812246B.bin" +gSpriteAnimations_Minecart_3:: @ 0812246B + .include "animations/gSpriteAnimations_Minecart_3.s" -gUnk_08122474:: @ 08122474 - .incbin "minecart/gUnk_08122474.bin" +gSpriteAnimations_Minecart_4:: @ 08122474 + .include "animations/gSpriteAnimations_Minecart_4.s" -gUnk_08122489:: @ 08122489 - .incbin "minecart/gUnk_08122489.bin" +gSpriteAnimations_Minecart_5:: @ 08122489 + .include "animations/gSpriteAnimations_Minecart_5.s" -gUnk_0812249E:: @ 0812249E - .incbin "minecart/gUnk_0812249E.bin" +gSpriteAnimations_Minecart_8:: @ 0812249E + .include "animations/gSpriteAnimations_Minecart_8.s" -gUnk_081224B3:: @ 081224B3 - .incbin "minecart/gUnk_081224B3.bin" +gSpriteAnimations_Minecart_9:: @ 081224B3 + .include "animations/gSpriteAnimations_Minecart_9.s" -gUnk_081224C8:: @ 081224C8 - .incbin "minecart/gUnk_081224C8.bin" +gSpriteAnimations_Minecart_12:: @ 081224C8 + .include "animations/gSpriteAnimations_Minecart_12.s" -gUnk_081224E1:: @ 081224E1 - .incbin "minecart/gUnk_081224E1.bin" +gSpriteAnimations_Minecart_14:: @ 081224E1 + .include "animations/gSpriteAnimations_Minecart_14.s" -gUnk_081224F9:: @ 081224F9 - .incbin "minecart/gUnk_081224F9.bin" +gSpriteAnimations_Minecart_13:: @ 081224F9 + .include "animations/gSpriteAnimations_Minecart_13.s" -gUnk_08122511:: @ 08122511 - .incbin "minecart/gUnk_08122511.bin" +gSpriteAnimations_Minecart_15:: @ 08122511 + .include "animations/gSpriteAnimations_Minecart_15.s" -gUnk_08122529:: @ 08122529 - .incbin "minecart/gUnk_08122529.bin" +gSpriteAnimations_Minecart_16:: @ 08122529 + .include "animations/gSpriteAnimations_Minecart_16.s" -gUnk_0812252E:: @ 0812252E - .incbin "minecart/gUnk_0812252E.bin" +gSpriteAnimations_Minecart_18:: @ 0812252E + .include "animations/gSpriteAnimations_Minecart_18.s" -gUnk_08122533:: @ 08122533 - .incbin "minecart/gUnk_08122533.bin" +gSpriteAnimations_Minecart_17:: @ 08122533 + .include "animations/gSpriteAnimations_Minecart_17.s" -gUnk_08122538:: @ 08122538 - .incbin "minecart/gUnk_08122538.bin" +gSpriteAnimations_Minecart_19:: @ 08122538 + .include "animations/gSpriteAnimations_Minecart_19.s" gSpriteAnimations_Minecart:: @ 08122540 - .4byte gUnk_08122450 - .4byte gUnk_08122462 - .4byte gUnk_08122459 - .4byte gUnk_0812246B - .4byte gUnk_08122474 - .4byte gUnk_08122489 - .4byte gUnk_08122474 - .4byte gUnk_08122489 - .4byte gUnk_0812249E - .4byte gUnk_081224B3 - .4byte gUnk_0812249E - .4byte gUnk_081224B3 - .4byte gUnk_081224C8 - .4byte gUnk_081224F9 - .4byte gUnk_081224E1 - .4byte gUnk_08122511 - .4byte gUnk_08122529 - .4byte gUnk_08122533 - .4byte gUnk_0812252E - .4byte gUnk_08122538 + .4byte gSpriteAnimations_Minecart_0 + .4byte gSpriteAnimations_Minecart_1 + .4byte gSpriteAnimations_Minecart_2 + .4byte gSpriteAnimations_Minecart_3 + .4byte gSpriteAnimations_Minecart_4 + .4byte gSpriteAnimations_Minecart_5 + .4byte gSpriteAnimations_Minecart_4 + .4byte gSpriteAnimations_Minecart_5 + .4byte gSpriteAnimations_Minecart_8 + .4byte gSpriteAnimations_Minecart_9 + .4byte gSpriteAnimations_Minecart_8 + .4byte gSpriteAnimations_Minecart_9 + .4byte gSpriteAnimations_Minecart_12 + .4byte gSpriteAnimations_Minecart_13 + .4byte gSpriteAnimations_Minecart_14 + .4byte gSpriteAnimations_Minecart_15 + .4byte gSpriteAnimations_Minecart_16 + .4byte gSpriteAnimations_Minecart_17 + .4byte gSpriteAnimations_Minecart_18 + .4byte gSpriteAnimations_Minecart_19 diff --git a/data/animations/object/minishSizedEntrance.s b/data/animations/object/minishSizedEntrance.s index 7f1637f6..d17ee5c4 100644 --- a/data/animations/object/minishSizedEntrance.s +++ b/data/animations/object/minishSizedEntrance.s @@ -5,14 +5,14 @@ .align 2 @ TODO might as well be giantRock or archway -gUnk_08122264:: @ 08122264 - .incbin "minishSizedEntrance/gUnk_08122264.bin" +gSpriteAnimations_MinishSizedEntrance_0:: @ 08122264 + .include "animations/gSpriteAnimations_MinishSizedEntrance_0.s" -gUnk_08122268:: @ 08122268 - .incbin "minishSizedEntrance/gUnk_08122268.bin" +gSpriteAnimations_MinishSizedEntrance_1:: @ 08122268 + .include "animations/gSpriteAnimations_MinishSizedEntrance_1.s" gSpriteAnimations_MinishSizedEntrance:: @ 0812226C - .4byte gUnk_08122264 - .4byte gUnk_08122268 + .4byte gSpriteAnimations_MinishSizedEntrance_0 + .4byte gSpriteAnimations_MinishSizedEntrance_1 .4byte 00000000 diff --git a/data/animations/object/object1E.s b/data/animations/object/object1E.s index 1f080bcd..5835e534 100644 --- a/data/animations/object/object1E.s +++ b/data/animations/object/object1E.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_081208C8:: @ 081208C8 - .incbin "object1E/gUnk_081208C8.bin" +gSpriteAnimations_Object1E_2:: @ 081208C8 + .include "animations/gSpriteAnimations_Object1E_2.s" -gUnk_081208FC:: @ 081208FC - .incbin "object1E/gUnk_081208FC.bin" +gSpriteAnimations_Object1E_1:: @ 081208FC + .include "animations/gSpriteAnimations_Object1E_1.s" -gUnk_08120930:: @ 08120930 - .incbin "object1E/gUnk_08120930.bin" +gSpriteAnimations_Object1E_0:: @ 08120930 + .include "animations/gSpriteAnimations_Object1E_0.s" -gUnk_08120964:: @ 08120964 - .incbin "object1E/gUnk_08120964.bin" +gSpriteAnimations_Object1E_6:: @ 08120964 + .include "animations/gSpriteAnimations_Object1E_6.s" -gUnk_08120990:: @ 08120990 - .incbin "object1E/gUnk_08120990.bin" +gSpriteAnimations_Object1E_5:: @ 08120990 + .include "animations/gSpriteAnimations_Object1E_5.s" -gUnk_081209BC:: @ 081209BC - .incbin "object1E/gUnk_081209BC.bin" +gSpriteAnimations_Object1E_4:: @ 081209BC + .include "animations/gSpriteAnimations_Object1E_4.s" gSpriteAnimations_Object1E:: @ 081209E8 - .4byte gUnk_08120930 - .4byte gUnk_081208FC - .4byte gUnk_081208C8 - .4byte gUnk_081208FC - .4byte gUnk_081209BC - .4byte gUnk_08120990 - .4byte gUnk_08120964 - .4byte gUnk_08120990 + .4byte gSpriteAnimations_Object1E_0 + .4byte gSpriteAnimations_Object1E_1 + .4byte gSpriteAnimations_Object1E_2 + .4byte gSpriteAnimations_Object1E_1 + .4byte gSpriteAnimations_Object1E_4 + .4byte gSpriteAnimations_Object1E_5 + .4byte gSpriteAnimations_Object1E_6 + .4byte gSpriteAnimations_Object1E_5 .4byte 00000000 diff --git a/data/animations/object/object24.s b/data/animations/object/object24.s index dd2e6642..d3de774e 100644 --- a/data/animations/object/object24.s +++ b/data/animations/object/object24.s @@ -4,24 +4,24 @@ .section .rodata @ .align 2 -gUnk_08120BF1:: @ 08120BF1 - .incbin "object24/gUnk_08120BF1.bin" +gSpriteAnimations_Object24_0:: @ 08120BF1 + .include "animations/gSpriteAnimations_Object24_0.s" -gUnk_08120BF5:: @ 08120BF5 - .incbin "object24/gUnk_08120BF5.bin" +gSpriteAnimations_Object24_1:: @ 08120BF5 + .include "animations/gSpriteAnimations_Object24_1.s" -gUnk_08120BF9:: @ 08120BF9 - .incbin "object24/gUnk_08120BF9.bin" +gSpriteAnimations_Object24_2:: @ 08120BF9 + .include "animations/gSpriteAnimations_Object24_2.s" -gUnk_08120BFD:: @ 08120BFD - .incbin "object24/gUnk_08120BFD.bin" +gSpriteAnimations_Object24_3:: @ 08120BFD + .include "animations/gSpriteAnimations_Object24_3.s" -gUnk_08120C01:: @ 08120C01 - .incbin "object24/gUnk_08120C01.bin" +gSpriteAnimations_Object24_4:: @ 08120C01 + .include "animations/gSpriteAnimations_Object24_4.s" gSpriteAnimations_Object24:: @ 08120C08 - .4byte gUnk_08120BF1 - .4byte gUnk_08120BF5 - .4byte gUnk_08120BF9 - .4byte gUnk_08120BFD - .4byte gUnk_08120C01 + .4byte gSpriteAnimations_Object24_0 + .4byte gSpriteAnimations_Object24_1 + .4byte gSpriteAnimations_Object24_2 + .4byte gSpriteAnimations_Object24_3 + .4byte gSpriteAnimations_Object24_4 diff --git a/data/animations/object/object29.s b/data/animations/object/object29.s index dc535b4b..ea360cd1 100644 --- a/data/animations/object/object29.s +++ b/data/animations/object/object29.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_08120DA0:: @ 08120DA0 - .incbin "object29/gUnk_08120DA0.bin" +gSpriteAnimations_Object29_0:: @ 08120DA0 + .include "animations/gSpriteAnimations_Object29_0.s" -gUnk_08120DB1:: @ 08120DB1 - .incbin "object29/gUnk_08120DB1.bin" +gSpriteAnimations_Object29_1:: @ 08120DB1 + .include "animations/gSpriteAnimations_Object29_1.s" gSpriteAnimations_Object29:: @ 08120DC4 - .4byte gUnk_08120DA0 - .4byte gUnk_08120DB1 + .4byte gSpriteAnimations_Object29_0 + .4byte gSpriteAnimations_Object29_1 .4byte 00000000 diff --git a/data/animations/object/object2A.s b/data/animations/object/object2A.s index 385a2459..5a624078 100644 --- a/data/animations/object/object2A.s +++ b/data/animations/object/object2A.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08120DD8:: @ 08120DD8 - .incbin "object2A/gUnk_08120DD8.bin" +gSpriteAnimations_Object2A_0:: @ 08120DD8 + .include "animations/gSpriteAnimations_Object2A_0.s" gSpriteAnimations_Object2A:: @ 08120DEC - .4byte gUnk_08120DD8 + .4byte gSpriteAnimations_Object2A_0 .4byte 00000000 diff --git a/data/animations/object/object35.s b/data/animations/object/object35.s index ea34d59b..0152bc3b 100644 --- a/data/animations/object/object35.s +++ b/data/animations/object/object35.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_081213FC:: @ 081213FC - .incbin "object35/gUnk_081213FC.bin" +gSpriteAnimations_Object35_0:: @ 081213FC + .include "animations/gSpriteAnimations_Object35_0.s" -gUnk_0812140D:: @ 0812140D - .incbin "object35/gUnk_0812140D.bin" +gSpriteAnimations_Object35_1:: @ 0812140D + .include "animations/gSpriteAnimations_Object35_1.s" -gUnk_0812141E:: @ 0812141E - .incbin "object35/gUnk_0812141E.bin" +gSpriteAnimations_Object35_2:: @ 0812141E + .include "animations/gSpriteAnimations_Object35_2.s" gSpriteAnimations_Object35:: @ 08121430 - .4byte gUnk_081213FC - .4byte gUnk_0812140D - .4byte gUnk_0812141E + .4byte gSpriteAnimations_Object35_0 + .4byte gSpriteAnimations_Object35_1 + .4byte gSpriteAnimations_Object35_2 .4byte 00000000 diff --git a/data/animations/object/object4.s b/data/animations/object/object4.s index d707133f..862d4626 100644 --- a/data/animations/object/object4.s +++ b/data/animations/object/object4.s @@ -4,109 +4,109 @@ .section .rodata .align 2 -gUnk_0811EE64:: @ 0811EE64 - .incbin "object4/gUnk_0811EE64.bin" +gSpriteAnimations_Object4_2:: @ 0811EE64 + .include "animations/gSpriteAnimations_Object4_2.s" -gUnk_0811EE8D:: @ 0811EE8D - .incbin "object4/gUnk_0811EE8D.bin" +gSpriteAnimations_Object4_10:: @ 0811EE8D + .include "animations/gSpriteAnimations_Object4_10.s" -gUnk_0811EE91:: @ 0811EE91 - .incbin "object4/gUnk_0811EE91.bin" +gSpriteAnimations_Object4_3:: @ 0811EE91 + .include "animations/gSpriteAnimations_Object4_3.s" -gUnk_0811EEBA:: @ 0811EEBA - .incbin "object4/gUnk_0811EEBA.bin" +gSpriteAnimations_Object4_11:: @ 0811EEBA + .include "animations/gSpriteAnimations_Object4_11.s" -gUnk_0811EEBE:: @ 0811EEBE - .incbin "object4/gUnk_0811EEBE.bin" +gSpriteAnimations_Object4_0:: @ 0811EEBE + .include "animations/gSpriteAnimations_Object4_0.s" -gUnk_0811EEC3:: @ 0811EEC3 - .incbin "object4/gUnk_0811EEC3.bin" +gSpriteAnimations_Object4_8:: @ 0811EEC3 + .include "animations/gSpriteAnimations_Object4_8.s" -gUnk_0811EEC7:: @ 0811EEC7 - .incbin "object4/gUnk_0811EEC7.bin" +gSpriteAnimations_Object4_1:: @ 0811EEC7 + .include "animations/gSpriteAnimations_Object4_1.s" -gUnk_0811EEF0:: @ 0811EEF0 - .incbin "object4/gUnk_0811EEF0.bin" +gSpriteAnimations_Object4_9:: @ 0811EEF0 + .include "animations/gSpriteAnimations_Object4_9.s" -gUnk_0811EEF4:: @ 0811EEF4 - .incbin "object4/gUnk_0811EEF4.bin" +gSpriteAnimations_Object4_12:: @ 0811EEF4 + .include "animations/gSpriteAnimations_Object4_12.s" -gUnk_0811EEFD:: @ 0811EEFD - .incbin "object4/gUnk_0811EEFD.bin" +gSpriteAnimations_Object4_13:: @ 0811EEFD + .include "animations/gSpriteAnimations_Object4_13.s" -gUnk_0811EF06:: @ 0811EF06 - .incbin "object4/gUnk_0811EF06.bin" +gSpriteAnimations_Object4_14:: @ 0811EF06 + .include "animations/gSpriteAnimations_Object4_14.s" -gUnk_0811EF0F:: @ 0811EF0F - .incbin "object4/gUnk_0811EF0F.bin" +gSpriteAnimations_Object4_19:: @ 0811EF0F + .include "animations/gSpriteAnimations_Object4_19.s" -gUnk_0811EF37:: @ 0811EF37 - .incbin "object4/gUnk_0811EF37.bin" +gSpriteAnimations_Object4_15:: @ 0811EF37 + .include "animations/gSpriteAnimations_Object4_15.s" -gUnk_0811EF4F:: @ 0811EF4F - .incbin "object4/gUnk_0811EF4F.bin" +gSpriteAnimations_Object4_16:: @ 0811EF4F + .include "animations/gSpriteAnimations_Object4_16.s" -gUnk_0811EF67:: @ 0811EF67 - .incbin "object4/gUnk_0811EF67.bin" +gSpriteAnimations_Object4_17:: @ 0811EF67 + .include "animations/gSpriteAnimations_Object4_17.s" -gUnk_0811EF7F:: @ 0811EF7F - .incbin "object4/gUnk_0811EF7F.bin" +gSpriteAnimations_Object4_18:: @ 0811EF7F + .include "animations/gSpriteAnimations_Object4_18.s" -gUnk_0811EF97:: @ 0811EF97 - .incbin "object4/gUnk_0811EF97.bin" +gSpriteAnimations_Object4_22:: @ 0811EF97 + .include "animations/gSpriteAnimations_Object4_22.s" -gUnk_0811EFA0:: @ 0811EFA0 - .incbin "object4/gUnk_0811EFA0.bin" +gSpriteAnimations_Object4_23:: @ 0811EFA0 + .include "animations/gSpriteAnimations_Object4_23.s" -gUnk_0811EFA9:: @ 0811EFA9 - .incbin "object4/gUnk_0811EFA9.bin" +gSpriteAnimations_Object4_20:: @ 0811EFA9 + .include "animations/gSpriteAnimations_Object4_20.s" -gUnk_0811EFB2:: @ 0811EFB2 - .incbin "object4/gUnk_0811EFB2.bin" +gSpriteAnimations_Object4_21:: @ 0811EFB2 + .include "animations/gSpriteAnimations_Object4_21.s" -gUnk_0811EFBB:: @ 0811EFBB - .incbin "object4/gUnk_0811EFBB.bin" +gSpriteAnimations_Object4_24:: @ 0811EFBB + .include "animations/gSpriteAnimations_Object4_24.s" -gUnk_0811EFC4:: @ 0811EFC4 - .incbin "object4/gUnk_0811EFC4.bin" +gSpriteAnimations_Object4_25:: @ 0811EFC4 + .include "animations/gSpriteAnimations_Object4_25.s" -gUnk_0811EFD9:: @ 0811EFD9 - .incbin "object4/gUnk_0811EFD9.bin" +gSpriteAnimations_Object4_26:: @ 0811EFD9 + .include "animations/gSpriteAnimations_Object4_26.s" -gUnk_0811EFEE:: @ 0811EFEE - .incbin "object4/gUnk_0811EFEE.bin" +gSpriteAnimations_Object4_27:: @ 0811EFEE + .include "animations/gSpriteAnimations_Object4_27.s" -gUnk_0811F003:: @ 0811F003 - .incbin "object4/gUnk_0811F003.bin" +gSpriteAnimations_Object4_28:: @ 0811F003 + .include "animations/gSpriteAnimations_Object4_28.s" gSpriteAnimations_Object4:: @ 0811F018 - .4byte gUnk_0811EEBE - .4byte gUnk_0811EEC7 - .4byte gUnk_0811EE64 - .4byte gUnk_0811EE91 - .4byte gUnk_0811EEBE - .4byte gUnk_0811EEC7 - .4byte gUnk_0811EE64 - .4byte gUnk_0811EE91 - .4byte gUnk_0811EEC3 - .4byte gUnk_0811EEF0 - .4byte gUnk_0811EE8D - .4byte gUnk_0811EEBA - .4byte gUnk_0811EEF4 - .4byte gUnk_0811EEFD - .4byte gUnk_0811EF06 - .4byte gUnk_0811EF37 - .4byte gUnk_0811EF4F - .4byte gUnk_0811EF67 - .4byte gUnk_0811EF7F - .4byte gUnk_0811EF0F - .4byte gUnk_0811EFA9 - .4byte gUnk_0811EFB2 - .4byte gUnk_0811EF97 - .4byte gUnk_0811EFA0 - .4byte gUnk_0811EFBB - .4byte gUnk_0811EFC4 - .4byte gUnk_0811EFD9 - .4byte gUnk_0811EFEE - .4byte gUnk_0811F003 + .4byte gSpriteAnimations_Object4_0 + .4byte gSpriteAnimations_Object4_1 + .4byte gSpriteAnimations_Object4_2 + .4byte gSpriteAnimations_Object4_3 + .4byte gSpriteAnimations_Object4_0 + .4byte gSpriteAnimations_Object4_1 + .4byte gSpriteAnimations_Object4_2 + .4byte gSpriteAnimations_Object4_3 + .4byte gSpriteAnimations_Object4_8 + .4byte gSpriteAnimations_Object4_9 + .4byte gSpriteAnimations_Object4_10 + .4byte gSpriteAnimations_Object4_11 + .4byte gSpriteAnimations_Object4_12 + .4byte gSpriteAnimations_Object4_13 + .4byte gSpriteAnimations_Object4_14 + .4byte gSpriteAnimations_Object4_15 + .4byte gSpriteAnimations_Object4_16 + .4byte gSpriteAnimations_Object4_17 + .4byte gSpriteAnimations_Object4_18 + .4byte gSpriteAnimations_Object4_19 + .4byte gSpriteAnimations_Object4_20 + .4byte gSpriteAnimations_Object4_21 + .4byte gSpriteAnimations_Object4_22 + .4byte gSpriteAnimations_Object4_23 + .4byte gSpriteAnimations_Object4_24 + .4byte gSpriteAnimations_Object4_25 + .4byte gSpriteAnimations_Object4_26 + .4byte gSpriteAnimations_Object4_27 + .4byte gSpriteAnimations_Object4_28 .4byte 00000000 diff --git a/data/animations/object/object43.s b/data/animations/object/object43.s index d57be893..77b7c1b8 100644 --- a/data/animations/object/object43.s +++ b/data/animations/object/object43.s @@ -4,60 +4,60 @@ .section .rodata .align 2 -gUnk_081217E0:: @ 081217E0 - .incbin "object43/gUnk_081217E0.bin" +gSpriteAnimations_Object43_0:: @ 081217E0 + .include "animations/gSpriteAnimations_Object43_0.s" -gUnk_08121864:: @ 08121864 - .incbin "object43/gUnk_08121864.bin" +gSpriteAnimations_Object43_1:: @ 08121864 + .include "animations/gSpriteAnimations_Object43_1.s" -gUnk_081218E8:: @ 081218E8 - .incbin "object43/gUnk_081218E8.bin" +gSpriteAnimations_Object43_2:: @ 081218E8 + .include "animations/gSpriteAnimations_Object43_2.s" -gUnk_0812196C:: @ 0812196C - .incbin "object43/gUnk_0812196C.bin" +gSpriteAnimations_Object43_3:: @ 0812196C + .include "animations/gSpriteAnimations_Object43_3.s" -gUnk_081219F0:: @ 081219F0 - .incbin "object43/gUnk_081219F0.bin" +gSpriteAnimations_Object43_4:: @ 081219F0 + .include "animations/gSpriteAnimations_Object43_4.s" -gUnk_08121A2D:: @ 08121A2D - .incbin "object43/gUnk_08121A2D.bin" +gSpriteAnimations_Object43_5:: @ 08121A2D + .include "animations/gSpriteAnimations_Object43_5.s" -gUnk_08121A6A:: @ 08121A6A - .incbin "object43/gUnk_08121A6A.bin" +gSpriteAnimations_Object43_6:: @ 08121A6A + .include "animations/gSpriteAnimations_Object43_6.s" -gUnk_08121AA7:: @ 08121AA7 - .incbin "object43/gUnk_08121AA7.bin" +gSpriteAnimations_Object43_7:: @ 08121AA7 + .include "animations/gSpriteAnimations_Object43_7.s" -gUnk_08121AE4:: @ 08121AE4 - .incbin "object43/gUnk_08121AE4.bin" +gSpriteAnimations_Object43_8:: @ 08121AE4 + .include "animations/gSpriteAnimations_Object43_8.s" -gUnk_08121AF4:: @ 08121AF4 - .incbin "object43/gUnk_08121AF4.bin" +gSpriteAnimations_Object43_9:: @ 08121AF4 + .include "animations/gSpriteAnimations_Object43_9.s" -gUnk_08121B04:: @ 08121B04 - .incbin "object43/gUnk_08121B04.bin" +gSpriteAnimations_Object43_10:: @ 08121B04 + .include "animations/gSpriteAnimations_Object43_10.s" -gUnk_08121B14:: @ 08121B14 - .incbin "object43/gUnk_08121B14.bin" +gSpriteAnimations_Object43_11:: @ 08121B14 + .include "animations/gSpriteAnimations_Object43_11.s" -gUnk_08121B24:: @ 08121B24 - .incbin "object43/gUnk_08121B24.bin" +gSpriteAnimations_Object43_12:: @ 08121B24 + .include "animations/gSpriteAnimations_Object43_12.s" gSpriteAnimations_Object43:: @ 08121B48 - .4byte gUnk_081217E0 - .4byte gUnk_08121864 - .4byte gUnk_081218E8 - .4byte gUnk_0812196C - .4byte gUnk_081219F0 - .4byte gUnk_08121A2D - .4byte gUnk_08121A6A - .4byte gUnk_08121AA7 - .4byte gUnk_08121AE4 - .4byte gUnk_08121AF4 - .4byte gUnk_08121B04 - .4byte gUnk_08121B14 - .4byte gUnk_08121B24 - .4byte gUnk_08121B24 - .4byte gUnk_08121B24 - .4byte gUnk_08121B24 + .4byte gSpriteAnimations_Object43_0 + .4byte gSpriteAnimations_Object43_1 + .4byte gSpriteAnimations_Object43_2 + .4byte gSpriteAnimations_Object43_3 + .4byte gSpriteAnimations_Object43_4 + .4byte gSpriteAnimations_Object43_5 + .4byte gSpriteAnimations_Object43_6 + .4byte gSpriteAnimations_Object43_7 + .4byte gSpriteAnimations_Object43_8 + .4byte gSpriteAnimations_Object43_9 + .4byte gSpriteAnimations_Object43_10 + .4byte gSpriteAnimations_Object43_11 + .4byte gSpriteAnimations_Object43_12 + .4byte gSpriteAnimations_Object43_12 + .4byte gSpriteAnimations_Object43_12 + .4byte gSpriteAnimations_Object43_12 .4byte 00000000 diff --git a/data/animations/object/object44.s b/data/animations/object/object44.s index 5fe91f2f..426b9270 100644 --- a/data/animations/object/object44.s +++ b/data/animations/object/object44.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08121B94:: @ 08121B94 - .incbin "object44/gUnk_08121B94.bin" +gSpriteAnimations_Object44_0:: @ 08121B94 + .include "animations/gSpriteAnimations_Object44_0.s" gSpriteAnimations_Object44:: @ 08121BD0 - .4byte gUnk_08121B94 + .4byte gSpriteAnimations_Object44_0 .4byte 00000000 diff --git a/data/animations/object/object45.s b/data/animations/object/object45.s index b6a3064a..fd8892f7 100644 --- a/data/animations/object/object45.s +++ b/data/animations/object/object45.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_08121BE0:: @ 08121BE0 - .incbin "object45/gUnk_08121BE0.bin" +gSpriteAnimations_Object45_0:: @ 08121BE0 + .include "animations/gSpriteAnimations_Object45_0.s" -gUnk_08121BF8:: @ 08121BF8 - .incbin "object45/gUnk_08121BF8.bin" +gSpriteAnimations_Object45_1:: @ 08121BF8 + .include "animations/gSpriteAnimations_Object45_1.s" gSpriteAnimations_Object45:: @ 08121C34 - .4byte gUnk_08121BE0 - .4byte gUnk_08121BF8 + .4byte gSpriteAnimations_Object45_0 + .4byte gSpriteAnimations_Object45_1 .4byte 00000000 diff --git a/data/animations/object/object6.s b/data/animations/object/object6.s index 9a13cf43..c4ab52b5 100644 --- a/data/animations/object/object6.s +++ b/data/animations/object/object6.s @@ -4,149 +4,149 @@ .section .rodata .align 2 -gUnk_0811F190:: @ 0811F190 - .incbin "object6/gUnk_0811F190.bin" +gSpriteAnimations_Object6_0:: @ 0811F190 + .include "animations/gSpriteAnimations_Object6_0.s" -gUnk_0811F1AD:: @ 0811F1AD - .incbin "object6/gUnk_0811F1AD.bin" +gSpriteAnimations_Object6_1:: @ 0811F1AD + .include "animations/gSpriteAnimations_Object6_1.s" -gUnk_0811F1CA:: @ 0811F1CA - .incbin "object6/gUnk_0811F1CA.bin" +gSpriteAnimations_Object6_2:: @ 0811F1CA + .include "animations/gSpriteAnimations_Object6_2.s" -gUnk_0811F1E7:: @ 0811F1E7 - .incbin "object6/gUnk_0811F1E7.bin" +gSpriteAnimations_Object6_3:: @ 0811F1E7 + .include "animations/gSpriteAnimations_Object6_3.s" -gUnk_0811F210:: @ 0811F210 - .incbin "object6/gUnk_0811F210.bin" +gSpriteAnimations_Object6_8:: @ 0811F210 + .include "animations/gSpriteAnimations_Object6_8.s" -gUnk_0811F22D:: @ 0811F22D - .incbin "object6/gUnk_0811F22D.bin" +gSpriteAnimations_Object6_9:: @ 0811F22D + .include "animations/gSpriteAnimations_Object6_9.s" -gUnk_0811F24A:: @ 0811F24A - .incbin "object6/gUnk_0811F24A.bin" +gSpriteAnimations_Object6_10:: @ 0811F24A + .include "animations/gSpriteAnimations_Object6_10.s" -gUnk_0811F267:: @ 0811F267 - .incbin "object6/gUnk_0811F267.bin" +gSpriteAnimations_Object6_11:: @ 0811F267 + .include "animations/gSpriteAnimations_Object6_11.s" -gUnk_0811F290:: @ 0811F290 - .incbin "object6/gUnk_0811F290.bin" +gSpriteAnimations_Object6_4:: @ 0811F290 + .include "animations/gSpriteAnimations_Object6_4.s" -gUnk_0811F2AD:: @ 0811F2AD - .incbin "object6/gUnk_0811F2AD.bin" +gSpriteAnimations_Object6_5:: @ 0811F2AD + .include "animations/gSpriteAnimations_Object6_5.s" -gUnk_0811F2CA:: @ 0811F2CA - .incbin "object6/gUnk_0811F2CA.bin" +gSpriteAnimations_Object6_6:: @ 0811F2CA + .include "animations/gSpriteAnimations_Object6_6.s" -gUnk_0811F2E7:: @ 0811F2E7 - .incbin "object6/gUnk_0811F2E7.bin" +gSpriteAnimations_Object6_7:: @ 0811F2E7 + .include "animations/gSpriteAnimations_Object6_7.s" -gUnk_0811F310:: @ 0811F310 - .incbin "object6/gUnk_0811F310.bin" +gSpriteAnimations_Object6_12:: @ 0811F310 + .include "animations/gSpriteAnimations_Object6_12.s" -gUnk_0811F31D:: @ 0811F31D - .incbin "object6/gUnk_0811F31D.bin" +gSpriteAnimations_Object6_13:: @ 0811F31D + .include "animations/gSpriteAnimations_Object6_13.s" -gUnk_0811F32A:: @ 0811F32A - .incbin "object6/gUnk_0811F32A.bin" +gSpriteAnimations_Object6_14:: @ 0811F32A + .include "animations/gSpriteAnimations_Object6_14.s" -gUnk_0811F337:: @ 0811F337 - .incbin "object6/gUnk_0811F337.bin" +gSpriteAnimations_Object6_15:: @ 0811F337 + .include "animations/gSpriteAnimations_Object6_15.s" -gUnk_0811F360:: @ 0811F360 - .incbin "object6/gUnk_0811F360.bin" +gSpriteAnimations_Object6_16:: @ 0811F360 + .include "animations/gSpriteAnimations_Object6_16.s" -gUnk_0811F36D:: @ 0811F36D - .incbin "object6/gUnk_0811F36D.bin" +gSpriteAnimations_Object6_17:: @ 0811F36D + .include "animations/gSpriteAnimations_Object6_17.s" -gUnk_0811F37A:: @ 0811F37A - .incbin "object6/gUnk_0811F37A.bin" +gSpriteAnimations_Object6_18:: @ 0811F37A + .include "animations/gSpriteAnimations_Object6_18.s" -gUnk_0811F387:: @ 0811F387 - .incbin "object6/gUnk_0811F387.bin" +gSpriteAnimations_Object6_19:: @ 0811F387 + .include "animations/gSpriteAnimations_Object6_19.s" -gUnk_0811F3B0:: @ 0811F3B0 - .incbin "object6/gUnk_0811F3B0.bin" +gSpriteAnimations_Object6_20:: @ 0811F3B0 + .include "animations/gSpriteAnimations_Object6_20.s" -gUnk_0811F3BD:: @ 0811F3BD - .incbin "object6/gUnk_0811F3BD.bin" +gSpriteAnimations_Object6_21:: @ 0811F3BD + .include "animations/gSpriteAnimations_Object6_21.s" -gUnk_0811F3CA:: @ 0811F3CA - .incbin "object6/gUnk_0811F3CA.bin" +gSpriteAnimations_Object6_22:: @ 0811F3CA + .include "animations/gSpriteAnimations_Object6_22.s" -gUnk_0811F3D7:: @ 0811F3D7 - .incbin "object6/gUnk_0811F3D7.bin" +gSpriteAnimations_Object6_23:: @ 0811F3D7 + .include "animations/gSpriteAnimations_Object6_23.s" -gUnk_0811F400:: @ 0811F400 - .incbin "object6/gUnk_0811F400.bin" +gSpriteAnimations_Object6_31:: @ 0811F400 + .include "animations/gSpriteAnimations_Object6_31.s" -gUnk_0811F405:: @ 0811F405 - .incbin "object6/gUnk_0811F405.bin" +gSpriteAnimations_Object6_32:: @ 0811F405 + .include "animations/gSpriteAnimations_Object6_32.s" -gUnk_0811F416:: @ 0811F416 - .incbin "object6/gUnk_0811F416.bin" +gSpriteAnimations_Object6_33:: @ 0811F416 + .include "animations/gSpriteAnimations_Object6_33.s" -gUnk_0811F43F:: @ 0811F43F - .incbin "object6/gUnk_0811F43F.bin" +gSpriteAnimations_Object6_34:: @ 0811F43F + .include "animations/gSpriteAnimations_Object6_34.s" -gUnk_0811F468:: @ 0811F468 - .incbin "object6/gUnk_0811F468.bin" +gSpriteAnimations_Object6_24:: @ 0811F468 + .include "animations/gSpriteAnimations_Object6_24.s" -gUnk_0811F4B9:: @ 0811F4B9 - .incbin "object6/gUnk_0811F4B9.bin" +gSpriteAnimations_Object6_25:: @ 0811F4B9 + .include "animations/gSpriteAnimations_Object6_25.s" -gUnk_0811F4D2:: @ 0811F4D2 - .incbin "object6/gUnk_0811F4D2.bin" +gSpriteAnimations_Object6_26:: @ 0811F4D2 + .include "animations/gSpriteAnimations_Object6_26.s" -gUnk_0811F4D7:: @ 0811F4D7 - .incbin "object6/gUnk_0811F4D7.bin" +gSpriteAnimations_Object6_27:: @ 0811F4D7 + .include "animations/gSpriteAnimations_Object6_27.s" -gUnk_0811F54B:: @ 0811F54B - .incbin "object6/gUnk_0811F54B.bin" +gSpriteAnimations_Object6_28:: @ 0811F54B + .include "animations/gSpriteAnimations_Object6_28.s" -gUnk_0811F560:: @ 0811F560 - .incbin "object6/gUnk_0811F560.bin" +gSpriteAnimations_Object6_29:: @ 0811F560 + .include "animations/gSpriteAnimations_Object6_29.s" -gUnk_0811F575:: @ 0811F575 - .incbin "object6/gUnk_0811F575.bin" +gSpriteAnimations_Object6_30:: @ 0811F575 + .include "animations/gSpriteAnimations_Object6_30.s" -gUnk_0811F58A:: @ 0811F58A - .incbin "object6/gUnk_0811F58A.bin" +gSpriteAnimations_Object6_35:: @ 0811F58A + .include "animations/gSpriteAnimations_Object6_35.s" gSpriteAnimations_Object6:: @ 0811F590 - .4byte gUnk_0811F190 - .4byte gUnk_0811F1AD - .4byte gUnk_0811F1CA - .4byte gUnk_0811F1E7 - .4byte gUnk_0811F290 - .4byte gUnk_0811F2AD - .4byte gUnk_0811F2CA - .4byte gUnk_0811F2E7 - .4byte gUnk_0811F210 - .4byte gUnk_0811F22D - .4byte gUnk_0811F24A - .4byte gUnk_0811F267 - .4byte gUnk_0811F310 - .4byte gUnk_0811F31D - .4byte gUnk_0811F32A - .4byte gUnk_0811F337 - .4byte gUnk_0811F360 - .4byte gUnk_0811F36D - .4byte gUnk_0811F37A - .4byte gUnk_0811F387 - .4byte gUnk_0811F3B0 - .4byte gUnk_0811F3BD - .4byte gUnk_0811F3CA - .4byte gUnk_0811F3D7 - .4byte gUnk_0811F468 - .4byte gUnk_0811F4B9 - .4byte gUnk_0811F4D2 - .4byte gUnk_0811F4D7 - .4byte gUnk_0811F54B - .4byte gUnk_0811F560 - .4byte gUnk_0811F575 - .4byte gUnk_0811F400 - .4byte gUnk_0811F405 - .4byte gUnk_0811F416 - .4byte gUnk_0811F43F - .4byte gUnk_0811F58A + .4byte gSpriteAnimations_Object6_0 + .4byte gSpriteAnimations_Object6_1 + .4byte gSpriteAnimations_Object6_2 + .4byte gSpriteAnimations_Object6_3 + .4byte gSpriteAnimations_Object6_4 + .4byte gSpriteAnimations_Object6_5 + .4byte gSpriteAnimations_Object6_6 + .4byte gSpriteAnimations_Object6_7 + .4byte gSpriteAnimations_Object6_8 + .4byte gSpriteAnimations_Object6_9 + .4byte gSpriteAnimations_Object6_10 + .4byte gSpriteAnimations_Object6_11 + .4byte gSpriteAnimations_Object6_12 + .4byte gSpriteAnimations_Object6_13 + .4byte gSpriteAnimations_Object6_14 + .4byte gSpriteAnimations_Object6_15 + .4byte gSpriteAnimations_Object6_16 + .4byte gSpriteAnimations_Object6_17 + .4byte gSpriteAnimations_Object6_18 + .4byte gSpriteAnimations_Object6_19 + .4byte gSpriteAnimations_Object6_20 + .4byte gSpriteAnimations_Object6_21 + .4byte gSpriteAnimations_Object6_22 + .4byte gSpriteAnimations_Object6_23 + .4byte gSpriteAnimations_Object6_24 + .4byte gSpriteAnimations_Object6_25 + .4byte gSpriteAnimations_Object6_26 + .4byte gSpriteAnimations_Object6_27 + .4byte gSpriteAnimations_Object6_28 + .4byte gSpriteAnimations_Object6_29 + .4byte gSpriteAnimations_Object6_30 + .4byte gSpriteAnimations_Object6_31 + .4byte gSpriteAnimations_Object6_32 + .4byte gSpriteAnimations_Object6_33 + .4byte gSpriteAnimations_Object6_34 + .4byte gSpriteAnimations_Object6_35 .4byte 00000000 diff --git a/data/animations/object/object64.s b/data/animations/object/object64.s index b0f63c30..bdba6f08 100644 --- a/data/animations/object/object64.s +++ b/data/animations/object/object64.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_0812296C:: @ 0812296C - .incbin "object64/gUnk_0812296C.bin" +gSpriteAnimations_Object64_0:: @ 0812296C + .include "animations/gSpriteAnimations_Object64_0.s" -gUnk_0812297C:: @ 0812297C - .incbin "object64/gUnk_0812297C.bin" +gSpriteAnimations_Object64_1:: @ 0812297C + .include "animations/gSpriteAnimations_Object64_1.s" -gUnk_08122988:: @ 08122988 - .incbin "object64/gUnk_08122988.bin" +gSpriteAnimations_Object64_2:: @ 08122988 + .include "animations/gSpriteAnimations_Object64_2.s" gSpriteAnimations_Object64:: @ 081229A4 - .4byte gUnk_0812296C - .4byte gUnk_0812297C - .4byte gUnk_08122988 + .4byte gSpriteAnimations_Object64_0 + .4byte gSpriteAnimations_Object64_1 + .4byte gSpriteAnimations_Object64_2 .4byte 00000000 diff --git a/data/animations/object/object6A.s b/data/animations/object/object6A.s index d0031b35..46623d07 100644 --- a/data/animations/object/object6A.s +++ b/data/animations/object/object6A.s @@ -16,292 +16,292 @@ gSpriteAnimation_Object6A_9:: @ 08122B64 .4byte gUnk_08122B55 .4byte 00000000 -gUnk_08122B70:: @ 08122B70 - .incbin "object6A/gUnk_08122B70.bin" +gSpriteAnimations_Object6A_5_2:: @ 08122B70 + .include "animations/gSpriteAnimations_Object6A_5_2.s" -gUnk_08122B75:: @ 08122B75 - .incbin "object6A/gUnk_08122B75.bin" +gSpriteAnimations_Object6A_5_3:: @ 08122B75 + .include "animations/gSpriteAnimations_Object6A_5_3.s" -gUnk_08122B7A:: @ 08122B7A - .incbin "object6A/gUnk_08122B7A.bin" +gSpriteAnimations_Object6A_5_4:: @ 08122B7A + .include "animations/gSpriteAnimations_Object6A_5_4.s" -gUnk_08122B7F:: @ 08122B7F - .incbin "object6A/gUnk_08122B7F.bin" +gSpriteAnimations_Object6A_5_5:: @ 08122B7F + .include "animations/gSpriteAnimations_Object6A_5_5.s" -gUnk_08122B84:: @ 08122B84 - .incbin "object6A/gUnk_08122B84.bin" +gSpriteAnimations_Object6A_5_6:: @ 08122B84 + .include "animations/gSpriteAnimations_Object6A_5_6.s" -gUnk_08122B89:: @ 08122B89 - .incbin "object6A/gUnk_08122B89.bin" +gSpriteAnimations_Object6A_5_7:: @ 08122B89 + .include "animations/gSpriteAnimations_Object6A_5_7.s" -gUnk_08122B8E:: @ 08122B8E - .incbin "object6A/gUnk_08122B8E.bin" +gSpriteAnimations_Object6A_5_8:: @ 08122B8E + .include "animations/gSpriteAnimations_Object6A_5_8.s" -gUnk_08122B93:: @ 08122B93 - .incbin "object6A/gUnk_08122B93.bin" +gSpriteAnimations_Object6A_5_9:: @ 08122B93 + .include "animations/gSpriteAnimations_Object6A_5_9.s" -gUnk_08122B98:: @ 08122B98 - .incbin "object6A/gUnk_08122B98.bin" +gSpriteAnimations_Object6A_5_0:: @ 08122B98 + .include "animations/gSpriteAnimations_Object6A_5_0.s" -gUnk_08122BB1:: @ 08122BB1 - .incbin "object6A/gUnk_08122BB1.bin" +gSpriteAnimations_Object6A_5_1:: @ 08122BB1 + .include "animations/gSpriteAnimations_Object6A_5_1.s" gSpriteAnimations_Object6A_5:: @ 08122BC8 - .4byte gUnk_08122B98 - .4byte gUnk_08122BB1 - .4byte gUnk_08122B70 - .4byte gUnk_08122B75 - .4byte gUnk_08122B7A - .4byte gUnk_08122B7F - .4byte gUnk_08122B84 - .4byte gUnk_08122B89 - .4byte gUnk_08122B8E - .4byte gUnk_08122B93 + .4byte gSpriteAnimations_Object6A_5_0 + .4byte gSpriteAnimations_Object6A_5_1 + .4byte gSpriteAnimations_Object6A_5_2 + .4byte gSpriteAnimations_Object6A_5_3 + .4byte gSpriteAnimations_Object6A_5_4 + .4byte gSpriteAnimations_Object6A_5_5 + .4byte gSpriteAnimations_Object6A_5_6 + .4byte gSpriteAnimations_Object6A_5_7 + .4byte gSpriteAnimations_Object6A_5_8 + .4byte gSpriteAnimations_Object6A_5_9 .4byte 00000000 -gUnk_08122BF4:: @ 08122BF4 - .incbin "object6A/gUnk_08122BF4.bin" +gSpriteAnimations_Object6A_9_0:: @ 08122BF4 + .include "animations/gSpriteAnimations_Object6A_9_0.s" -gUnk_08122BFD:: @ 08122BFD - .incbin "object6A/gUnk_08122BFD.bin" +gSpriteAnimations_Object6A_9_2:: @ 08122BFD + .include "animations/gSpriteAnimations_Object6A_9_2.s" -gUnk_08122C06:: @ 08122C06 - .incbin "object6A/gUnk_08122C06.bin" +gSpriteAnimations_Object6A_9_3:: @ 08122C06 + .include "animations/gSpriteAnimations_Object6A_9_3.s" -gUnk_08122C0B:: @ 08122C0B - .incbin "object6A/gUnk_08122C0B.bin" +gSpriteAnimations_Object6A_9_1:: @ 08122C0B + .include "animations/gSpriteAnimations_Object6A_9_1.s" -gUnk_08122C74:: @ 08122C74 - .incbin "object6A/gUnk_08122C74.bin" +gSpriteAnimations_Object6A_9_4:: @ 08122C74 + .include "animations/gSpriteAnimations_Object6A_9_4.s" -gUnk_08122C89:: @ 08122C89 - .incbin "object6A/gUnk_08122C89.bin" +gSpriteAnimations_Object6A_9_5:: @ 08122C89 + .include "animations/gSpriteAnimations_Object6A_9_5.s" -gSpriteAnimations_Object6A:: @ 08122C90 - .4byte gUnk_08122BF4 - .4byte gUnk_08122C0B - .4byte gUnk_08122BFD - .4byte gUnk_08122C06 - .4byte gUnk_08122C74 - .4byte gUnk_08122C89 +gSpriteAnimations_Object6A_9:: @ 08122C90 + .4byte gSpriteAnimations_Object6A_9_0 + .4byte gSpriteAnimations_Object6A_9_1 + .4byte gSpriteAnimations_Object6A_9_2 + .4byte gSpriteAnimations_Object6A_9_3 + .4byte gSpriteAnimations_Object6A_9_4 + .4byte gSpriteAnimations_Object6A_9_5 .4byte 00000000 -gUnk_08122CAC:: @ 08122CAC - .incbin "object6A/gUnk_08122CAC.bin" +gSpriteAnimations_Object6A_2_0:: @ 08122CAC + .include "animations/gSpriteAnimations_Object6A_2_0.s" -gUnk_08122CB5:: @ 08122CB5 - .incbin "object6A/gUnk_08122CB5.bin" +gSpriteAnimations_Object6A_2_1:: @ 08122CB5 + .include "animations/gSpriteAnimations_Object6A_2_1.s" gSpriteAnimations_Object6A_2:: @ 08122CBC - .4byte gUnk_08122CAC - .4byte gUnk_08122CB5 + .4byte gSpriteAnimations_Object6A_2_0 + .4byte gSpriteAnimations_Object6A_2_1 .4byte 00000000 -gUnk_08122CC8:: @ 08122CC8 - .incbin "object6A/gUnk_08122CC8.bin" +gSpriteAnimations_Object6A_0_0:: @ 08122CC8 + .include "animations/gSpriteAnimations_Object6A_0_0.s" -gUnk_08122CD1:: @ 08122CD1 - .incbin "object6A/gUnk_08122CD1.bin" +gSpriteAnimations_Object6A_0_1:: @ 08122CD1 + .include "animations/gSpriteAnimations_Object6A_0_1.s" -gUnk_08122CD6:: @ 08122CD6 - .incbin "object6A/gUnk_08122CD6.bin" +gSpriteAnimations_Object6A_0_2:: @ 08122CD6 + .include "animations/gSpriteAnimations_Object6A_0_2.s" -gUnk_08122CDB:: @ 08122CDB - .incbin "object6A/gUnk_08122CDB.bin" +gSpriteAnimations_Object6A_0_3:: @ 08122CDB + .include "animations/gSpriteAnimations_Object6A_0_3.s" gSpriteAnimations_Object6A_0:: @ 08122CE4 - .4byte gUnk_08122CC8 - .4byte gUnk_08122CD1 - .4byte gUnk_08122CD6 - .4byte gUnk_08122CDB + .4byte gSpriteAnimations_Object6A_0_0 + .4byte gSpriteAnimations_Object6A_0_1 + .4byte gSpriteAnimations_Object6A_0_2 + .4byte gSpriteAnimations_Object6A_0_3 .4byte 00000000 -gUnk_08122CF8:: @ 08122CF8 - .incbin "object6A/gUnk_08122CF8.bin" +gSpriteAnimations_Object6A_1_0:: @ 08122CF8 + .include "animations/gSpriteAnimations_Object6A_1_0.s" -gUnk_08122CFD:: @ 08122CFD - .incbin "object6A/gUnk_08122CFD.bin" +gSpriteAnimations_Object6A_1_1:: @ 08122CFD + .include "animations/gSpriteAnimations_Object6A_1_1.s" gSpriteAnimations_Object6A_1:: @ 08122D04 - .4byte gUnk_08122CF8 - .4byte gUnk_08122CFD + .4byte gSpriteAnimations_Object6A_1_0 + .4byte gSpriteAnimations_Object6A_1_1 .4byte 00000000 -gUnk_08122D10:: @ 08122D10 - .incbin "object6A/gUnk_08122D10.bin" +gSpriteAnimations_Object6A_6_0:: @ 08122D10 + .include "animations/gSpriteAnimations_Object6A_6_0.s" -gUnk_08122D19:: @ 08122D19 - .incbin "object6A/gUnk_08122D19.bin" +gSpriteAnimations_Object6A_6_1:: @ 08122D19 + .include "animations/gSpriteAnimations_Object6A_6_1.s" -gUnk_08122D22:: @ 08122D22 - .incbin "object6A/gUnk_08122D22.bin" +gSpriteAnimations_Object6A_6_2:: @ 08122D22 + .include "animations/gSpriteAnimations_Object6A_6_2.s" -gUnk_08122D2B:: @ 08122D2B - .incbin "object6A/gUnk_08122D2B.bin" +gSpriteAnimations_Object6A_6_3:: @ 08122D2B + .include "animations/gSpriteAnimations_Object6A_6_3.s" -gUnk_08122D34:: @ 08122D34 - .incbin "object6A/gUnk_08122D34.bin" +gSpriteAnimations_Object6A_6_4:: @ 08122D34 + .include "animations/gSpriteAnimations_Object6A_6_4.s" -gUnk_08122D55:: @ 08122D55 - .incbin "object6A/gUnk_08122D55.bin" +gSpriteAnimations_Object6A_6_5:: @ 08122D55 + .include "animations/gSpriteAnimations_Object6A_6_5.s" -gUnk_08122D76:: @ 08122D76 - .incbin "object6A/gUnk_08122D76.bin" +gSpriteAnimations_Object6A_6_6:: @ 08122D76 + .include "animations/gSpriteAnimations_Object6A_6_6.s" -gUnk_08122D97:: @ 08122D97 - .incbin "object6A/gUnk_08122D97.bin" +gSpriteAnimations_Object6A_6_7:: @ 08122D97 + .include "animations/gSpriteAnimations_Object6A_6_7.s" -gUnk_08122DB8:: @ 08122DB8 - .incbin "object6A/gUnk_08122DB8.bin" +gSpriteAnimations_Object6A_6_8:: @ 08122DB8 + .include "animations/gSpriteAnimations_Object6A_6_8.s" -gUnk_08122DC5:: @ 08122DC5 - .incbin "object6A/gUnk_08122DC5.bin" +gSpriteAnimations_Object6A_6_9:: @ 08122DC5 + .include "animations/gSpriteAnimations_Object6A_6_9.s" -gUnk_08122DD2:: @ 08122DD2 - .incbin "object6A/gUnk_08122DD2.bin" +gSpriteAnimations_Object6A_6_10:: @ 08122DD2 + .include "animations/gSpriteAnimations_Object6A_6_10.s" -gUnk_08122DDF:: @ 08122DDF - .incbin "object6A/gUnk_08122DDF.bin" +gSpriteAnimations_Object6A_6_11:: @ 08122DDF + .include "animations/gSpriteAnimations_Object6A_6_11.s" -gUnk_08122DEC:: @ 08122DEC - .incbin "object6A/gUnk_08122DEC.bin" +gSpriteAnimations_Object6A_6_12:: @ 08122DEC + .include "animations/gSpriteAnimations_Object6A_6_12.s" -gUnk_08122E05:: @ 08122E05 - .incbin "object6A/gUnk_08122E05.bin" +gSpriteAnimations_Object6A_6_13:: @ 08122E05 + .include "animations/gSpriteAnimations_Object6A_6_13.s" -gUnk_08122E1E:: @ 08122E1E - .incbin "object6A/gUnk_08122E1E.bin" +gSpriteAnimations_Object6A_6_14:: @ 08122E1E + .include "animations/gSpriteAnimations_Object6A_6_14.s" -gUnk_08122E37:: @ 08122E37 - .incbin "object6A/gUnk_08122E37.bin" +gSpriteAnimations_Object6A_6_15:: @ 08122E37 + .include "animations/gSpriteAnimations_Object6A_6_15.s" -gUnk_08122E50:: @ 08122E50 - .incbin "object6A/gUnk_08122E50.bin" +gSpriteAnimations_Object6A_6_16:: @ 08122E50 + .include "animations/gSpriteAnimations_Object6A_6_16.s" -gUnk_08122E65:: @ 08122E65 - .incbin "object6A/gUnk_08122E65.bin" +gSpriteAnimations_Object6A_6_17:: @ 08122E65 + .include "animations/gSpriteAnimations_Object6A_6_17.s" -gUnk_08122E7A:: @ 08122E7A - .incbin "object6A/gUnk_08122E7A.bin" +gSpriteAnimations_Object6A_6_18:: @ 08122E7A + .include "animations/gSpriteAnimations_Object6A_6_18.s" -gUnk_08122E8F:: @ 08122E8F - .incbin "object6A/gUnk_08122E8F.bin" +gSpriteAnimations_Object6A_6_19:: @ 08122E8F + .include "animations/gSpriteAnimations_Object6A_6_19.s" -gUnk_08122EA4:: @ 08122EA4 - .incbin "object6A/gUnk_08122EA4.bin" +gSpriteAnimations_Object6A_6_20:: @ 08122EA4 + .include "animations/gSpriteAnimations_Object6A_6_20.s" -gUnk_08122EAD:: @ 08122EAD - .incbin "object6A/gUnk_08122EAD.bin" +gSpriteAnimations_Object6A_6_21:: @ 08122EAD + .include "animations/gSpriteAnimations_Object6A_6_21.s" gSpriteAnimations_Object6A_6:: @ 08122ED0 - .4byte gUnk_08122D10 - .4byte gUnk_08122D19 - .4byte gUnk_08122D22 - .4byte gUnk_08122D2B - .4byte gUnk_08122D34 - .4byte gUnk_08122D55 - .4byte gUnk_08122D76 - .4byte gUnk_08122D97 - .4byte gUnk_08122DB8 - .4byte gUnk_08122DC5 - .4byte gUnk_08122DD2 - .4byte gUnk_08122DDF - .4byte gUnk_08122DEC - .4byte gUnk_08122E05 - .4byte gUnk_08122E1E - .4byte gUnk_08122E37 - .4byte gUnk_08122E50 - .4byte gUnk_08122E65 - .4byte gUnk_08122E7A - .4byte gUnk_08122E8F - .4byte gUnk_08122EA4 - .4byte gUnk_08122EAD + .4byte gSpriteAnimations_Object6A_6_0 + .4byte gSpriteAnimations_Object6A_6_1 + .4byte gSpriteAnimations_Object6A_6_2 + .4byte gSpriteAnimations_Object6A_6_3 + .4byte gSpriteAnimations_Object6A_6_4 + .4byte gSpriteAnimations_Object6A_6_5 + .4byte gSpriteAnimations_Object6A_6_6 + .4byte gSpriteAnimations_Object6A_6_7 + .4byte gSpriteAnimations_Object6A_6_8 + .4byte gSpriteAnimations_Object6A_6_9 + .4byte gSpriteAnimations_Object6A_6_10 + .4byte gSpriteAnimations_Object6A_6_11 + .4byte gSpriteAnimations_Object6A_6_12 + .4byte gSpriteAnimations_Object6A_6_13 + .4byte gSpriteAnimations_Object6A_6_14 + .4byte gSpriteAnimations_Object6A_6_15 + .4byte gSpriteAnimations_Object6A_6_16 + .4byte gSpriteAnimations_Object6A_6_17 + .4byte gSpriteAnimations_Object6A_6_18 + .4byte gSpriteAnimations_Object6A_6_19 + .4byte gSpriteAnimations_Object6A_6_20 + .4byte gSpriteAnimations_Object6A_6_21 .4byte 00000000 -gUnk_08122F2C:: @ 08122F2C - .incbin "object6A/gUnk_08122F2C.bin" +gSpriteAnimations_Object6A_3_0:: @ 08122F2C + .include "animations/gSpriteAnimations_Object6A_3_0.s" -gUnk_08122F31:: @ 08122F31 - .incbin "object6A/gUnk_08122F31.bin" +gSpriteAnimations_Object6A_3_1:: @ 08122F31 + .include "animations/gSpriteAnimations_Object6A_3_1.s" -gUnk_08122F52:: @ 08122F52 - .incbin "object6A/gUnk_08122F52.bin" +gSpriteAnimations_Object6A_3_2:: @ 08122F52 + .include "animations/gSpriteAnimations_Object6A_3_2.s" -gUnk_08122F57:: @ 08122F57 - .incbin "object6A/gUnk_08122F57.bin" +gSpriteAnimations_Object6A_3_3:: @ 08122F57 + .include "animations/gSpriteAnimations_Object6A_3_3.s" -gUnk_08122F78:: @ 08122F78 - .incbin "object6A/gUnk_08122F78.bin" +gSpriteAnimations_Object6A_3_4:: @ 08122F78 + .include "animations/gSpriteAnimations_Object6A_3_4.s" -gUnk_08122F7D:: @ 08122F7D - .incbin "object6A/gUnk_08122F7D.bin" +gSpriteAnimations_Object6A_3_5:: @ 08122F7D + .include "animations/gSpriteAnimations_Object6A_3_5.s" -gUnk_08122F9E:: @ 08122F9E - .incbin "object6A/gUnk_08122F9E.bin" +gSpriteAnimations_Object6A_3_6:: @ 08122F9E + .include "animations/gSpriteAnimations_Object6A_3_6.s" -gUnk_08122FA3:: @ 08122FA3 - .incbin "object6A/gUnk_08122FA3.bin" +gSpriteAnimations_Object6A_3_7:: @ 08122FA3 + .include "animations/gSpriteAnimations_Object6A_3_7.s" -gUnk_08122FC4:: @ 08122FC4 - .incbin "object6A/gUnk_08122FC4.bin" +gSpriteAnimations_Object6A_3_8:: @ 08122FC4 + .include "animations/gSpriteAnimations_Object6A_3_8.s" -gUnk_08122FC9:: @ 08122FC9 - .incbin "object6A/gUnk_08122FC9.bin" +gSpriteAnimations_Object6A_3_9:: @ 08122FC9 + .include "animations/gSpriteAnimations_Object6A_3_9.s" -gUnk_08122FCE:: @ 08122FCE - .incbin "object6A/gUnk_08122FCE.bin" +gSpriteAnimations_Object6A_3_10:: @ 08122FCE + .include "animations/gSpriteAnimations_Object6A_3_10.s" -gUnk_08122FD3:: @ 08122FD3 - .incbin "object6A/gUnk_08122FD3.bin" +gSpriteAnimations_Object6A_3_11:: @ 08122FD3 + .include "animations/gSpriteAnimations_Object6A_3_11.s" -gUnk_0812302C:: @ 0812302C - .incbin "object6A/gUnk_0812302C.bin" +gSpriteAnimations_Object6A_3_12:: @ 0812302C + .include "animations/gSpriteAnimations_Object6A_3_12.s" -gUnk_08123059:: @ 08123059 - .incbin "object6A/gUnk_08123059.bin" +gSpriteAnimations_Object6A_3_13:: @ 08123059 + .include "animations/gSpriteAnimations_Object6A_3_13.s" gSpriteAnimations_Object6A_3:: @ 0812308C - .4byte gUnk_08122F2C - .4byte gUnk_08122F31 - .4byte gUnk_08122F52 - .4byte gUnk_08122F57 - .4byte gUnk_08122F78 - .4byte gUnk_08122F7D - .4byte gUnk_08122F9E - .4byte gUnk_08122FA3 - .4byte gUnk_08122FC4 - .4byte gUnk_08122FC9 - .4byte gUnk_08122FCE - .4byte gUnk_08122FD3 - .4byte gUnk_0812302C - .4byte gUnk_08123059 + .4byte gSpriteAnimations_Object6A_3_0 + .4byte gSpriteAnimations_Object6A_3_1 + .4byte gSpriteAnimations_Object6A_3_2 + .4byte gSpriteAnimations_Object6A_3_3 + .4byte gSpriteAnimations_Object6A_3_4 + .4byte gSpriteAnimations_Object6A_3_5 + .4byte gSpriteAnimations_Object6A_3_6 + .4byte gSpriteAnimations_Object6A_3_7 + .4byte gSpriteAnimations_Object6A_3_8 + .4byte gSpriteAnimations_Object6A_3_9 + .4byte gSpriteAnimations_Object6A_3_10 + .4byte gSpriteAnimations_Object6A_3_11 + .4byte gSpriteAnimations_Object6A_3_12 + .4byte gSpriteAnimations_Object6A_3_13 .4byte 00000000 -gUnk_081230C8:: @ 081230C8 - .incbin "object6A/gUnk_081230C8.bin" +gSpriteAnimations_Object6A_4_0:: @ 081230C8 + .include "animations/gSpriteAnimations_Object6A_4_0.s" gSpriteAnimations_Object6A_4:: @ 0812311C - .4byte gUnk_081230C8 - .incbin "object6A/gSpriteAnimations_Object6A_4.bin" + .4byte gSpriteAnimations_Object6A_4_0 + .include "animations/gSpriteAnimations_Object6A_4.s" -gUnk_08123124:: @ 08123124 - .incbin "object6A/gUnk_08123124.bin" +gSpriteAnimations_Object6A_7_0:: @ 08123124 + .include "animations/gSpriteAnimations_Object6A_7_0.s" -gUnk_08123129:: @ 08123129 - .incbin "object6A/gUnk_08123129.bin" +gSpriteAnimations_Object6A_7_2:: @ 08123129 + .include "animations/gSpriteAnimations_Object6A_7_2.s" -gUnk_0812312E:: @ 0812312E - .incbin "object6A/gUnk_0812312E.bin" +gSpriteAnimations_Object6A_7_1:: @ 0812312E + .include "animations/gSpriteAnimations_Object6A_7_1.s" gSpriteAnimations_Object6A_7:: @ 08123140 - .4byte gUnk_08123124 - .4byte gUnk_0812312E - .4byte gUnk_08123129 + .4byte gSpriteAnimations_Object6A_7_0 + .4byte gSpriteAnimations_Object6A_7_1 + .4byte gSpriteAnimations_Object6A_7_2 .4byte 00000000 -gUnk_08123150:: @ 08123150 - .incbin "object6A/gUnk_08123150.bin" +gSpriteAnimations_Object6A_8_0:: @ 08123150 + .include "animations/gSpriteAnimations_Object6A_8_0.s" gSpriteAnimations_Object6A_8:: @ 08123160 - .4byte gUnk_08123150 + .4byte gSpriteAnimations_Object6A_8_0 .4byte 00000000 diff --git a/data/animations/object/object79.s b/data/animations/object/object79.s index 718a2de0..6834dfbb 100644 --- a/data/animations/object/object79.s +++ b/data/animations/object/object79.s @@ -4,17 +4,17 @@ .section .rodata @ .align 2 -gUnk_08123422:: @ 08123422 - .incbin "object79/gUnk_08123422.bin" +gSpriteAnimations_Object79_0:: @ 08123422 + .include "animations/gSpriteAnimations_Object79_0.s" -gUnk_0812343B:: @ 0812343B - .incbin "object79/gUnk_0812343B.bin" +gSpriteAnimations_Object79_1:: @ 0812343B + .include "animations/gSpriteAnimations_Object79_1.s" -gUnk_0812344C:: @ 0812344C - .incbin "object79/gUnk_0812344C.bin" +gSpriteAnimations_Object79_2:: @ 0812344C + .include "animations/gSpriteAnimations_Object79_2.s" gSpriteAnimations_Object79:: @ 08123474 - .4byte gUnk_08123422 - .4byte gUnk_0812343B - .4byte gUnk_0812344C + .4byte gSpriteAnimations_Object79_0 + .4byte gSpriteAnimations_Object79_1 + .4byte gSpriteAnimations_Object79_2 .4byte 00000000 diff --git a/data/animations/object/object86.s b/data/animations/object/object86.s index 9e10953f..c1917491 100644 --- a/data/animations/object/object86.s +++ b/data/animations/object/object86.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0812380C:: @ 0812380C - .incbin "object86/gUnk_0812380C.bin" +gSpriteAnimations_Object86_0:: @ 0812380C + .include "animations/gSpriteAnimations_Object86_0.s" -gUnk_08123820:: @ 08123820 - .incbin "object86/gUnk_08123820.bin" +gSpriteAnimations_Object86_1:: @ 08123820 + .include "animations/gSpriteAnimations_Object86_1.s" gSpriteAnimations_Object86:: @ 08123834 - .4byte gUnk_0812380C - .4byte gUnk_08123820 + .4byte gSpriteAnimations_Object86_0 + .4byte gSpriteAnimations_Object86_1 .4byte 00000000 diff --git a/data/animations/object/object9.s b/data/animations/object/object9.s index 7f5a2a73..b04dd46d 100644 --- a/data/animations/object/object9.s +++ b/data/animations/object/object9.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0811F760:: @ 0811F760 - .incbin "object9/gUnk_0811F760.bin" +gSpriteAnimations_Object9_0:: @ 0811F760 + .include "animations/gSpriteAnimations_Object9_0.s" -gUnk_0811F795:: @ 0811F795 - .incbin "object9/gUnk_0811F795.bin" +gSpriteAnimations_Object9_1:: @ 0811F795 + .include "animations/gSpriteAnimations_Object9_1.s" gSpriteAnimations_Object9:: @ 0811F7CC - .4byte gUnk_0811F760 - .4byte gUnk_0811F795 + .4byte gSpriteAnimations_Object9_0 + .4byte gSpriteAnimations_Object9_1 .4byte 00000000 diff --git a/data/animations/object/object93.s b/data/animations/object/object93.s index e2110b7a..9fb293f2 100644 --- a/data/animations/object/object93.s +++ b/data/animations/object/object93.s @@ -8,16 +8,16 @@ gUnk_08123E80:: @ 08123E80 .4byte sub_0809CEA8 .4byte sub_0809CEC0 -gUnk_08123E88:: @ 08123E88 - .incbin "object93/gUnk_08123E88.bin" +gSpriteAnimations_Object93_0_0:: @ 08123E88 + .include "animations/gSpriteAnimations_Object93_0_0.s" gSpriteAnimations_Object93_0:: @ 08123E9C - .4byte gUnk_08123E88 - .incbin "object93/gSpriteAnimations_Object93_0.bin" + .4byte gSpriteAnimations_Object93_0_0 + .include "animations/gSpriteAnimations_Object93_0.s" -gUnk_08123EA4:: @ 08123EA4 - .incbin "object93/gUnk_08123EA4.bin" +gSpriteAnimations_Object93_1_0:: @ 08123EA4 + .include "animations/gSpriteAnimations_Object93_1_0.s" gSpriteAnimations_Object93_1:: @ 08123EB8 - .4byte gUnk_08123EA4 - .incbin "object93/gSpriteAnimations_Object93_1.bin" + .4byte gSpriteAnimations_Object93_1_0 + .include "animations/gSpriteAnimations_Object93_1.s" diff --git a/data/animations/object/object98.s b/data/animations/object/object98.s index 18ff6aa0..e406fb28 100644 --- a/data/animations/object/object98.s +++ b/data/animations/object/object98.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_08124194:: @ 08124194 - .incbin "object98/gUnk_08124194.bin" +gSpriteAnimations_Object98_0:: @ 08124194 + .include "animations/gSpriteAnimations_Object98_0.s" -gUnk_081241DC:: @ 081241DC - .incbin "object98/gUnk_081241DC.bin" +gSpriteAnimations_Object98_1:: @ 081241DC + .include "animations/gSpriteAnimations_Object98_1.s" -gUnk_08124224:: @ 08124224 - .incbin "object98/gUnk_08124224.bin" +gSpriteAnimations_Object98_2:: @ 08124224 + .include "animations/gSpriteAnimations_Object98_2.s" -gUnk_0812426C:: @ 0812426C - .incbin "object98/gUnk_0812426C.bin" +gSpriteAnimations_Object98_3:: @ 0812426C + .include "animations/gSpriteAnimations_Object98_3.s" gSpriteAnimations_Object98:: @ 081242B4 - .4byte gUnk_08124194 - .4byte gUnk_081241DC - .4byte gUnk_08124224 - .4byte gUnk_0812426C + .4byte gSpriteAnimations_Object98_0 + .4byte gSpriteAnimations_Object98_1 + .4byte gSpriteAnimations_Object98_2 + .4byte gSpriteAnimations_Object98_3 .4byte 00000000 diff --git a/data/animations/object/object9B.s b/data/animations/object/object9B.s index df9e3fdf..d93e85d1 100644 --- a/data/animations/object/object9B.s +++ b/data/animations/object/object9B.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_081242E8:: @ 081242E8 - .incbin "object9B/gUnk_081242E8.bin" +gSpriteAnimations_Object9B_0:: @ 081242E8 + .include "animations/gSpriteAnimations_Object9B_0.s" -gUnk_08124320:: @ 08124320 - .incbin "object9B/gUnk_08124320.bin" +gSpriteAnimations_Object9B_1:: @ 08124320 + .include "animations/gSpriteAnimations_Object9B_1.s" gSpriteAnimations_Object9B:: @ 08124348 - .4byte gUnk_081242E8 - .4byte gUnk_08124320 + .4byte gSpriteAnimations_Object9B_0 + .4byte gSpriteAnimations_Object9B_1 .4byte 00000000 diff --git a/data/animations/object/objectA0.s b/data/animations/object/objectA0.s index f70efb7a..bac0fa14 100644 --- a/data/animations/object/objectA0.s +++ b/data/animations/object/objectA0.s @@ -4,31 +4,31 @@ .section .rodata .align 2 -gUnk_0812468C:: @ 0812468C - .incbin "objectA0/gUnk_0812468C.bin" +gSpriteAnimations_ObjectA0_1:: @ 0812468C + .include "animations/gSpriteAnimations_ObjectA0_1.s" -gUnk_08124690:: @ 08124690 - .incbin "objectA0/gUnk_08124690.bin" +gSpriteAnimations_ObjectA0_0:: @ 08124690 + .include "animations/gSpriteAnimations_ObjectA0_0.s" -gUnk_08124694:: @ 08124694 - .incbin "objectA0/gUnk_08124694.bin" +gSpriteAnimations_ObjectA0_3:: @ 08124694 + .include "animations/gSpriteAnimations_ObjectA0_3.s" -gUnk_08124698:: @ 08124698 - .incbin "objectA0/gUnk_08124698.bin" +gSpriteAnimations_ObjectA0_5:: @ 08124698 + .include "animations/gSpriteAnimations_ObjectA0_5.s" -gUnk_081246A8:: @ 081246A8 - .incbin "objectA0/gUnk_081246A8.bin" +gSpriteAnimations_ObjectA0_4:: @ 081246A8 + .include "animations/gSpriteAnimations_ObjectA0_4.s" -gUnk_081246B8:: @ 081246B8 - .incbin "objectA0/gUnk_081246B8.bin" +gSpriteAnimations_ObjectA0_7:: @ 081246B8 + .include "animations/gSpriteAnimations_ObjectA0_7.s" gSpriteAnimations_ObjectA0:: @ 081246C8 - .4byte gUnk_08124690 - .4byte gUnk_0812468C - .4byte gUnk_08124690 - .4byte gUnk_08124694 - .4byte gUnk_081246A8 - .4byte gUnk_08124698 - .4byte gUnk_081246A8 - .4byte gUnk_081246B8 + .4byte gSpriteAnimations_ObjectA0_0 + .4byte gSpriteAnimations_ObjectA0_1 + .4byte gSpriteAnimations_ObjectA0_0 + .4byte gSpriteAnimations_ObjectA0_3 + .4byte gSpriteAnimations_ObjectA0_4 + .4byte gSpriteAnimations_ObjectA0_5 + .4byte gSpriteAnimations_ObjectA0_4 + .4byte gSpriteAnimations_ObjectA0_7 .4byte 00000000 diff --git a/data/animations/object/objectA6.s b/data/animations/object/objectA6.s index 30108b9b..dc0fff24 100644 --- a/data/animations/object/objectA6.s +++ b/data/animations/object/objectA6.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08124808:: @ 08124808 - .incbin "objectA6/gUnk_08124808.bin" +gSpriteAnimations_ObjectA6_0:: @ 08124808 + .include "animations/gSpriteAnimations_ObjectA6_0.s" gSpriteAnimations_ObjectA6:: @ 0812481C - .4byte gUnk_08124808 + .4byte gSpriteAnimations_ObjectA6_0 .4byte 00000000 diff --git a/data/animations/object/objectAB.s b/data/animations/object/objectAB.s index 019b92c8..aa5fede3 100644 --- a/data/animations/object/objectAB.s +++ b/data/animations/object/objectAB.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08124878:: @ 08124878 - .incbin "objectAB/gUnk_08124878.bin" +gSpriteAnimations_ObjectAB_0:: @ 08124878 + .include "animations/gSpriteAnimations_ObjectAB_0.s" gSpriteAnimations_ObjectAB:: @ 08124890 - .4byte gUnk_08124878 + .4byte gSpriteAnimations_ObjectAB_0 .4byte 00000000 diff --git a/data/animations/object/objectAF.s b/data/animations/object/objectAF.s index 1ecae22f..210b4646 100644 --- a/data/animations/object/objectAF.s +++ b/data/animations/object/objectAF.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_081248D0:: @ 081248D0 - .incbin "objectAF/gUnk_081248D0.bin" +gSpriteAnimations_ObjectAF_0:: @ 081248D0 + .include "animations/gSpriteAnimations_ObjectAF_0.s" -gUnk_081248E1:: @ 081248E1 - .incbin "objectAF/gUnk_081248E1.bin" +gSpriteAnimations_ObjectAF_1:: @ 081248E1 + .include "animations/gSpriteAnimations_ObjectAF_1.s" -gUnk_081248F2:: @ 081248F2 - .incbin "objectAF/gUnk_081248F2.bin" +gSpriteAnimations_ObjectAF_2:: @ 081248F2 + .include "animations/gSpriteAnimations_ObjectAF_2.s" -gUnk_0812490E:: @ 0812490E - .incbin "objectAF/gUnk_0812490E.bin" +gSpriteAnimations_ObjectAF_3:: @ 0812490E + .include "animations/gSpriteAnimations_ObjectAF_3.s" gSpriteAnimations_ObjectAF:: @ 08124928 - .4byte gUnk_081248D0 - .4byte gUnk_081248E1 - .4byte gUnk_081248F2 - .4byte gUnk_0812490E + .4byte gSpriteAnimations_ObjectAF_0 + .4byte gSpriteAnimations_ObjectAF_1 + .4byte gSpriteAnimations_ObjectAF_2 + .4byte gSpriteAnimations_ObjectAF_3 .4byte 00000000 diff --git a/data/animations/object/objectB2.s b/data/animations/object/objectB2.s index d4479c2a..dff98079 100644 --- a/data/animations/object/objectB2.s +++ b/data/animations/object/objectB2.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_081249B8:: @ 081249B8 - .incbin "objectB2/gUnk_081249B8.bin" +gSpriteAnimations_ObjectB2_0:: @ 081249B8 + .include "animations/gSpriteAnimations_ObjectB2_0.s" -gUnk_081249C9:: @ 081249C9 - .incbin "objectB2/gUnk_081249C9.bin" +gSpriteAnimations_ObjectB2_1:: @ 081249C9 + .include "animations/gSpriteAnimations_ObjectB2_1.s" -gUnk_081249DA:: @ 081249DA - .incbin "objectB2/gUnk_081249DA.bin" +gSpriteAnimations_ObjectB2_2:: @ 081249DA + .include "animations/gSpriteAnimations_ObjectB2_2.s" -gUnk_081249EB:: @ 081249EB - .incbin "objectB2/gUnk_081249EB.bin" +gSpriteAnimations_ObjectB2_3:: @ 081249EB + .include "animations/gSpriteAnimations_ObjectB2_3.s" gSpriteAnimations_ObjectB2:: @ 081249FC - .4byte gUnk_081249B8 - .4byte gUnk_081249C9 - .4byte gUnk_081249DA - .4byte gUnk_081249EB + .4byte gSpriteAnimations_ObjectB2_0 + .4byte gSpriteAnimations_ObjectB2_1 + .4byte gSpriteAnimations_ObjectB2_2 + .4byte gSpriteAnimations_ObjectB2_3 .4byte 00000000 diff --git a/data/animations/object/objectB3.s b/data/animations/object/objectB3.s index ec9e51b0..d801d8dd 100644 --- a/data/animations/object/objectB3.s +++ b/data/animations/object/objectB3.s @@ -4,28 +4,28 @@ .section .rodata .align 2 -gUnk_08124A2C:: @ 08124A2C - .incbin "objectB3/gUnk_08124A2C.bin" +gSpriteAnimations_ObjectB3_0:: @ 08124A2C + .include "animations/gSpriteAnimations_ObjectB3_0.s" -gUnk_08124A7D:: @ 08124A7D - .incbin "objectB3/gUnk_08124A7D.bin" +gSpriteAnimations_ObjectB3_1:: @ 08124A7D + .include "animations/gSpriteAnimations_ObjectB3_1.s" -gUnk_08124A82:: @ 08124A82 - .incbin "objectB3/gUnk_08124A82.bin" +gSpriteAnimations_ObjectB3_2:: @ 08124A82 + .include "animations/gSpriteAnimations_ObjectB3_2.s" -gUnk_08124A87:: @ 08124A87 - .incbin "objectB3/gUnk_08124A87.bin" +gSpriteAnimations_ObjectB3_3:: @ 08124A87 + .include "animations/gSpriteAnimations_ObjectB3_3.s" -gUnk_08124A8C:: @ 08124A8C - .incbin "objectB3/gUnk_08124A8C.bin" +gSpriteAnimations_ObjectB3_4:: @ 08124A8C + .include "animations/gSpriteAnimations_ObjectB3_4.s" -gUnk_08124AAD:: @ 08124AAD - .incbin "objectB3/gUnk_08124AAD.bin" +gSpriteAnimations_ObjectB3_5:: @ 08124AAD + .include "animations/gSpriteAnimations_ObjectB3_5.s" gSpriteAnimations_ObjectB3:: @ 08124AF8 - .4byte gUnk_08124A2C - .4byte gUnk_08124A7D - .4byte gUnk_08124A82 - .4byte gUnk_08124A87 - .4byte gUnk_08124A8C - .4byte gUnk_08124AAD + .4byte gSpriteAnimations_ObjectB3_0 + .4byte gSpriteAnimations_ObjectB3_1 + .4byte gSpriteAnimations_ObjectB3_2 + .4byte gSpriteAnimations_ObjectB3_3 + .4byte gSpriteAnimations_ObjectB3_4 + .4byte gSpriteAnimations_ObjectB3_5 diff --git a/data/animations/object/objectB4.s b/data/animations/object/objectB4.s index e5c1e652..90fd222a 100644 --- a/data/animations/object/objectB4.s +++ b/data/animations/object/objectB4.s @@ -4,18 +4,13 @@ .section .rodata .align 2 -gUnk_08124B38:: @ 08124B38 - .incbin "objectB4/gUnk_08124B38.bin" +gSpriteAnimations_ObjectB4_0:: @ 08124B38 + .include "animations/gSpriteAnimations_ObjectB4_0.s" -gUnk_08124BA9:: @ 08124BA9 -.ifdef EU - @ TODO only small differences - .incbin "objectB4/gUnk_08124BA9_EU.bin" -.else - .incbin "objectB4/gUnk_08124BA9_1_USA-JP-DEMO_USA-DEMO_JP.bin" -.endif +gSpriteAnimations_ObjectB4_1:: @ 08124BA9 + .include "animations/gSpriteAnimations_ObjectB4_1.s" gSpriteAnimations_ObjectB4:: @ 08124BFC - .4byte gUnk_08124B38 - .4byte gUnk_08124BA9 + .4byte gSpriteAnimations_ObjectB4_0 + .4byte gSpriteAnimations_ObjectB4_1 .4byte 00000000 diff --git a/data/animations/object/objectD.s b/data/animations/object/objectD.s index 871a1f82..405f3940 100644 --- a/data/animations/object/objectD.s +++ b/data/animations/object/objectD.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_0811F918:: @ 0811F918 - .incbin "objectD/gUnk_0811F918.bin" +gSpriteAnimations_ObjectD_0:: @ 0811F918 + .include "animations/gSpriteAnimations_ObjectD_0.s" -gUnk_0811F945:: @ 0811F945 - .incbin "objectD/gUnk_0811F945.bin" +gSpriteAnimations_ObjectD_1:: @ 0811F945 + .include "animations/gSpriteAnimations_ObjectD_1.s" gSpriteAnimations_ObjectD:: @ 0811F954 - .4byte gUnk_0811F918 - .4byte gUnk_0811F945 + .4byte gSpriteAnimations_ObjectD_0 + .4byte gSpriteAnimations_ObjectD_1 .4byte 00000000 diff --git a/data/animations/object/picoBloom.s b/data/animations/object/picoBloom.s index 085f36fb..ff3df4e7 100644 --- a/data/animations/object/picoBloom.s +++ b/data/animations/object/picoBloom.s @@ -4,31 +4,31 @@ .section .rodata @ .align 2 -gUnk_0812357A:: @ 0812357A - .incbin "picoBloom/gUnk_0812357A.bin" +gSpriteAnimations_PicoBloom_0:: @ 0812357A + .include "animations/gSpriteAnimations_PicoBloom_0.s" -gUnk_08123593:: @ 08123593 - .incbin "picoBloom/gUnk_08123593.bin" +gSpriteAnimations_PicoBloom_3:: @ 08123593 + .include "animations/gSpriteAnimations_PicoBloom_3.s" -gUnk_081235AC:: @ 081235AC - .incbin "picoBloom/gUnk_081235AC.bin" +gSpriteAnimations_PicoBloom_2:: @ 081235AC + .include "animations/gSpriteAnimations_PicoBloom_2.s" -gUnk_081235B1:: @ 081235B1 - .incbin "picoBloom/gUnk_081235B1.bin" +gSpriteAnimations_PicoBloom_5:: @ 081235B1 + .include "animations/gSpriteAnimations_PicoBloom_5.s" -gUnk_081235B6:: @ 081235B6 - .incbin "picoBloom/gUnk_081235B6.bin" +gSpriteAnimations_PicoBloom_1:: @ 081235B6 + .include "animations/gSpriteAnimations_PicoBloom_1.s" -gUnk_081235EB:: @ 081235EB - .incbin "picoBloom/gUnk_081235EB.bin" +gSpriteAnimations_PicoBloom_4:: @ 081235EB + .include "animations/gSpriteAnimations_PicoBloom_4.s" gSpriteAnimations_PicoBloom:: @ 08123620 - .4byte gUnk_0812357A - .4byte gUnk_081235B6 - .4byte gUnk_081235AC - .4byte gUnk_08123593 - .4byte gUnk_081235EB - .4byte gUnk_081235B1 + .4byte gSpriteAnimations_PicoBloom_0 + .4byte gSpriteAnimations_PicoBloom_1 + .4byte gSpriteAnimations_PicoBloom_2 + .4byte gSpriteAnimations_PicoBloom_3 + .4byte gSpriteAnimations_PicoBloom_4 + .4byte gSpriteAnimations_PicoBloom_5 .4byte 00000000 gUnk_0812363C:: @ 0812363C diff --git a/data/animations/object/pinwheel.s b/data/animations/object/pinwheel.s index 88161b64..0ddbd1ea 100644 --- a/data/animations/object/pinwheel.s +++ b/data/animations/object/pinwheel.s @@ -4,9 +4,9 @@ .section .rodata .align 2 -gUnk_08125068:: @ 08125068 - .incbin "pinwheel/gUnk_08125068.bin" +gSpriteAnimations_Pinwheel_0:: @ 08125068 + .include "animations/gSpriteAnimations_Pinwheel_0.s" gSpriteAnimations_Pinwheel:: @ 0812507C - .4byte gUnk_08125068 + .4byte gSpriteAnimations_Pinwheel_0 .4byte 00000000 diff --git a/data/animations/object/pot.s b/data/animations/object/pot.s index 0e0c4acd..c3908ca8 100644 --- a/data/animations/object/pot.s +++ b/data/animations/object/pot.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_0811F0DC:: @ 0811F0DC - .incbin "pot/gUnk_0811F0DC.bin" +gSpriteAnimations_Pot_0:: @ 0811F0DC + .include "animations/gSpriteAnimations_Pot_0.s" -gUnk_0811F0E1:: @ 0811F0E1 - .incbin "pot/gUnk_0811F0E1.bin" +gSpriteAnimations_Pot_1:: @ 0811F0E1 + .include "animations/gSpriteAnimations_Pot_1.s" -gUnk_0811F0E6:: @ 0811F0E6 - .incbin "pot/gUnk_0811F0E6.bin" +gSpriteAnimations_Pot_2:: @ 0811F0E6 + .include "animations/gSpriteAnimations_Pot_2.s" -gUnk_0811F0EB:: @ 0811F0EB - .incbin "pot/gUnk_0811F0EB.bin" +gSpriteAnimations_Pot_3:: @ 0811F0EB + .include "animations/gSpriteAnimations_Pot_3.s" -gUnk_0811F0F0:: @ 0811F0F0 - .incbin "pot/gUnk_0811F0F0.bin" +gSpriteAnimations_Pot_4:: @ 0811F0F0 + .include "animations/gSpriteAnimations_Pot_4.s" -gUnk_0811F0F5:: @ 0811F0F5 - .incbin "pot/gUnk_0811F0F5.bin" +gSpriteAnimations_Pot_5:: @ 0811F0F5 + .include "animations/gSpriteAnimations_Pot_5.s" -gUnk_0811F0FA:: @ 0811F0FA - .incbin "pot/gUnk_0811F0FA.bin" +gSpriteAnimations_Pot_6:: @ 0811F0FA + .include "animations/gSpriteAnimations_Pot_6.s" -gUnk_0811F0FF:: @ 0811F0FF - .incbin "pot/gUnk_0811F0FF.bin" +gSpriteAnimations_Pot_7:: @ 0811F0FF + .include "animations/gSpriteAnimations_Pot_7.s" -gUnk_0811F104:: @ 0811F104 - .incbin "pot/gUnk_0811F104.bin" +gSpriteAnimations_Pot_8:: @ 0811F104 + .include "animations/gSpriteAnimations_Pot_8.s" -gUnk_0811F109:: @ 0811F109 - .incbin "pot/gUnk_0811F109.bin" +gSpriteAnimations_Pot_9:: @ 0811F109 + .include "animations/gSpriteAnimations_Pot_9.s" -gUnk_0811F10E:: @ 0811F10E - .incbin "pot/gUnk_0811F10E.bin" +gSpriteAnimations_Pot_10:: @ 0811F10E + .include "animations/gSpriteAnimations_Pot_10.s" -gUnk_0811F113:: @ 0811F113 - .incbin "pot/gUnk_0811F113.bin" +gSpriteAnimations_Pot_11:: @ 0811F113 + .include "animations/gSpriteAnimations_Pot_11.s" gSpriteAnimations_Pot:: @ 0811F118 - .4byte gUnk_0811F0DC - .4byte gUnk_0811F0E1 - .4byte gUnk_0811F0E6 - .4byte gUnk_0811F0EB - .4byte gUnk_0811F0F0 - .4byte gUnk_0811F0F5 - .4byte gUnk_0811F0FA - .4byte gUnk_0811F0FF - .4byte gUnk_0811F104 - .4byte gUnk_0811F109 - .4byte gUnk_0811F10E - .4byte gUnk_0811F113 + .4byte gSpriteAnimations_Pot_0 + .4byte gSpriteAnimations_Pot_1 + .4byte gSpriteAnimations_Pot_2 + .4byte gSpriteAnimations_Pot_3 + .4byte gSpriteAnimations_Pot_4 + .4byte gSpriteAnimations_Pot_5 + .4byte gSpriteAnimations_Pot_6 + .4byte gSpriteAnimations_Pot_7 + .4byte gSpriteAnimations_Pot_8 + .4byte gSpriteAnimations_Pot_9 + .4byte gSpriteAnimations_Pot_10 + .4byte gSpriteAnimations_Pot_11 .4byte 00000000 diff --git a/data/animations/object/pullableLever.s b/data/animations/object/pullableLever.s index d872a754..688c5c81 100644 --- a/data/animations/object/pullableLever.s +++ b/data/animations/object/pullableLever.s @@ -4,117 +4,117 @@ .section .rodata .align 2 -gUnk_081222C4:: @ 081222C4 - .incbin "pullableLever/gUnk_081222C4.bin" +gSpriteAnimations_PullableLever_0:: @ 081222C4 + .include "animations/gSpriteAnimations_PullableLever_0.s" -gUnk_081222C8:: @ 081222C8 - .incbin "pullableLever/gUnk_081222C8.bin" +gSpriteAnimations_PullableLever_1:: @ 081222C8 + .include "animations/gSpriteAnimations_PullableLever_1.s" -gUnk_081222CC:: @ 081222CC - .incbin "pullableLever/gUnk_081222CC.bin" +gSpriteAnimations_PullableLever_2:: @ 081222CC + .include "animations/gSpriteAnimations_PullableLever_2.s" -gUnk_081222D0:: @ 081222D0 - .incbin "pullableLever/gUnk_081222D0.bin" +gSpriteAnimations_PullableLever_3:: @ 081222D0 + .include "animations/gSpriteAnimations_PullableLever_3.s" -gUnk_081222D4:: @ 081222D4 - .incbin "pullableLever/gUnk_081222D4.bin" +gSpriteAnimations_PullableLever_6:: @ 081222D4 + .include "animations/gSpriteAnimations_PullableLever_6.s" -gUnk_081222D8:: @ 081222D8 - .incbin "pullableLever/gUnk_081222D8.bin" +gSpriteAnimations_PullableLever_7:: @ 081222D8 + .include "animations/gSpriteAnimations_PullableLever_7.s" -gUnk_081222DC:: @ 081222DC - .incbin "pullableLever/gUnk_081222DC.bin" +gSpriteAnimations_PullableLever_4:: @ 081222DC + .include "animations/gSpriteAnimations_PullableLever_4.s" -gUnk_081222E0:: @ 081222E0 - .incbin "pullableLever/gUnk_081222E0.bin" +gSpriteAnimations_PullableLever_5:: @ 081222E0 + .include "animations/gSpriteAnimations_PullableLever_5.s" -gUnk_081222E4:: @ 081222E4 - .incbin "pullableLever/gUnk_081222E4.bin" +gSpriteAnimations_PullableLever_8:: @ 081222E4 + .include "animations/gSpriteAnimations_PullableLever_8.s" -gUnk_081222E8:: @ 081222E8 - .incbin "pullableLever/gUnk_081222E8.bin" +gSpriteAnimations_PullableLever_9:: @ 081222E8 + .include "animations/gSpriteAnimations_PullableLever_9.s" -gUnk_081222EC:: @ 081222EC - .incbin "pullableLever/gUnk_081222EC.bin" +gSpriteAnimations_PullableLever_10:: @ 081222EC + .include "animations/gSpriteAnimations_PullableLever_10.s" -gUnk_081222F0:: @ 081222F0 - .incbin "pullableLever/gUnk_081222F0.bin" +gSpriteAnimations_PullableLever_11:: @ 081222F0 + .include "animations/gSpriteAnimations_PullableLever_11.s" -gUnk_081222F4:: @ 081222F4 - .incbin "pullableLever/gUnk_081222F4.bin" +gSpriteAnimations_PullableLever_12:: @ 081222F4 + .include "animations/gSpriteAnimations_PullableLever_12.s" -gUnk_081222F8:: @ 081222F8 - .incbin "pullableLever/gUnk_081222F8.bin" +gSpriteAnimations_PullableLever_13:: @ 081222F8 + .include "animations/gSpriteAnimations_PullableLever_13.s" -gUnk_081222FC:: @ 081222FC - .incbin "pullableLever/gUnk_081222FC.bin" +gSpriteAnimations_PullableLever_14:: @ 081222FC + .include "animations/gSpriteAnimations_PullableLever_14.s" -gUnk_08122300:: @ 08122300 - .incbin "pullableLever/gUnk_08122300.bin" +gSpriteAnimations_PullableLever_15:: @ 08122300 + .include "animations/gSpriteAnimations_PullableLever_15.s" -gUnk_08122304:: @ 08122304 - .incbin "pullableLever/gUnk_08122304.bin" +gSpriteAnimations_PullableLever_16:: @ 08122304 + .include "animations/gSpriteAnimations_PullableLever_16.s" -gUnk_08122308:: @ 08122308 - .incbin "pullableLever/gUnk_08122308.bin" +gSpriteAnimations_PullableLever_17:: @ 08122308 + .include "animations/gSpriteAnimations_PullableLever_17.s" -gUnk_0812230C:: @ 0812230C - .incbin "pullableLever/gUnk_0812230C.bin" +gSpriteAnimations_PullableLever_18:: @ 0812230C + .include "animations/gSpriteAnimations_PullableLever_18.s" -gUnk_08122310:: @ 08122310 - .incbin "pullableLever/gUnk_08122310.bin" +gSpriteAnimations_PullableLever_19:: @ 08122310 + .include "animations/gSpriteAnimations_PullableLever_19.s" -gUnk_08122314:: @ 08122314 - .incbin "pullableLever/gUnk_08122314.bin" +gSpriteAnimations_PullableLever_20:: @ 08122314 + .include "animations/gSpriteAnimations_PullableLever_20.s" -gUnk_08122318:: @ 08122318 - .incbin "pullableLever/gUnk_08122318.bin" +gSpriteAnimations_PullableLever_21:: @ 08122318 + .include "animations/gSpriteAnimations_PullableLever_21.s" -gUnk_0812231C:: @ 0812231C - .incbin "pullableLever/gUnk_0812231C.bin" +gSpriteAnimations_PullableLever_22:: @ 0812231C + .include "animations/gSpriteAnimations_PullableLever_22.s" -gUnk_08122320:: @ 08122320 - .incbin "pullableLever/gUnk_08122320.bin" +gSpriteAnimations_PullableLever_23:: @ 08122320 + .include "animations/gSpriteAnimations_PullableLever_23.s" -gUnk_08122324:: @ 08122324 - .incbin "pullableLever/gUnk_08122324.bin" +gSpriteAnimations_PullableLever_24:: @ 08122324 + .include "animations/gSpriteAnimations_PullableLever_24.s" -gUnk_08122328:: @ 08122328 - .incbin "pullableLever/gUnk_08122328.bin" +gSpriteAnimations_PullableLever_25:: @ 08122328 + .include "animations/gSpriteAnimations_PullableLever_25.s" -gUnk_0812232C:: @ 0812232C - .incbin "pullableLever/gUnk_0812232C.bin" +gSpriteAnimations_PullableLever_26:: @ 0812232C + .include "animations/gSpriteAnimations_PullableLever_26.s" -gUnk_08122330:: @ 08122330 - .incbin "pullableLever/gUnk_08122330.bin" +gSpriteAnimations_PullableLever_27:: @ 08122330 + .include "animations/gSpriteAnimations_PullableLever_27.s" gSpriteAnimations_PullableLever:: @ 08122334 - .4byte gUnk_081222C4 - .4byte gUnk_081222C8 - .4byte gUnk_081222CC - .4byte gUnk_081222D0 - .4byte gUnk_081222DC - .4byte gUnk_081222E0 - .4byte gUnk_081222D4 - .4byte gUnk_081222D8 - .4byte gUnk_081222E4 - .4byte gUnk_081222E8 - .4byte gUnk_081222EC - .4byte gUnk_081222F0 - .4byte gUnk_081222F4 - .4byte gUnk_081222F8 - .4byte gUnk_081222FC - .4byte gUnk_08122300 - .4byte gUnk_08122304 - .4byte gUnk_08122308 - .4byte gUnk_0812230C - .4byte gUnk_08122310 - .4byte gUnk_08122314 - .4byte gUnk_08122318 - .4byte gUnk_0812231C - .4byte gUnk_08122320 - .4byte gUnk_08122324 - .4byte gUnk_08122328 - .4byte gUnk_0812232C - .4byte gUnk_08122330 + .4byte gSpriteAnimations_PullableLever_0 + .4byte gSpriteAnimations_PullableLever_1 + .4byte gSpriteAnimations_PullableLever_2 + .4byte gSpriteAnimations_PullableLever_3 + .4byte gSpriteAnimations_PullableLever_4 + .4byte gSpriteAnimations_PullableLever_5 + .4byte gSpriteAnimations_PullableLever_6 + .4byte gSpriteAnimations_PullableLever_7 + .4byte gSpriteAnimations_PullableLever_8 + .4byte gSpriteAnimations_PullableLever_9 + .4byte gSpriteAnimations_PullableLever_10 + .4byte gSpriteAnimations_PullableLever_11 + .4byte gSpriteAnimations_PullableLever_12 + .4byte gSpriteAnimations_PullableLever_13 + .4byte gSpriteAnimations_PullableLever_14 + .4byte gSpriteAnimations_PullableLever_15 + .4byte gSpriteAnimations_PullableLever_16 + .4byte gSpriteAnimations_PullableLever_17 + .4byte gSpriteAnimations_PullableLever_18 + .4byte gSpriteAnimations_PullableLever_19 + .4byte gSpriteAnimations_PullableLever_20 + .4byte gSpriteAnimations_PullableLever_21 + .4byte gSpriteAnimations_PullableLever_22 + .4byte gSpriteAnimations_PullableLever_23 + .4byte gSpriteAnimations_PullableLever_24 + .4byte gSpriteAnimations_PullableLever_25 + .4byte gSpriteAnimations_PullableLever_26 + .4byte gSpriteAnimations_PullableLever_27 .4byte 00000000 diff --git a/data/animations/object/pullableMushroom.s b/data/animations/object/pullableMushroom.s index 04fb3902..36c60002 100644 --- a/data/animations/object/pullableMushroom.s +++ b/data/animations/object/pullableMushroom.s @@ -4,61 +4,61 @@ .section .rodata .align 2 -gUnk_08121204:: @ 08121204 - .incbin "pullableMushroom/gUnk_08121204.bin" +gSpriteAnimations_PullableMushroom_0:: @ 08121204 + .include "animations/gSpriteAnimations_PullableMushroom_0.s" -gUnk_08121208:: @ 08121208 - .incbin "pullableMushroom/gUnk_08121208.bin" +gSpriteAnimations_PullableMushroom_1:: @ 08121208 + .include "animations/gSpriteAnimations_PullableMushroom_1.s" -gUnk_08121225:: @ 08121225 - .incbin "pullableMushroom/gUnk_08121225.bin" +gSpriteAnimations_PullableMushroom_13:: @ 08121225 + .include "animations/gSpriteAnimations_PullableMushroom_13.s" -gUnk_08121235:: @ 08121235 - .incbin "pullableMushroom/gUnk_08121235.bin" +gSpriteAnimations_PullableMushroom_2:: @ 08121235 + .include "animations/gSpriteAnimations_PullableMushroom_2.s" -gUnk_08121252:: @ 08121252 - .incbin "pullableMushroom/gUnk_08121252.bin" +gSpriteAnimations_PullableMushroom_14:: @ 08121252 + .include "animations/gSpriteAnimations_PullableMushroom_14.s" -gUnk_08121263:: @ 08121263 - .incbin "pullableMushroom/gUnk_08121263.bin" +gSpriteAnimations_PullableMushroom_3:: @ 08121263 + .include "animations/gSpriteAnimations_PullableMushroom_3.s" -gUnk_08121280:: @ 08121280 - .incbin "pullableMushroom/gUnk_08121280.bin" +gSpriteAnimations_PullableMushroom_15:: @ 08121280 + .include "animations/gSpriteAnimations_PullableMushroom_15.s" -gUnk_08121291:: @ 08121291 - .incbin "pullableMushroom/gUnk_08121291.bin" +gSpriteAnimations_PullableMushroom_5:: @ 08121291 + .include "animations/gSpriteAnimations_PullableMushroom_5.s" -gUnk_0812129A:: @ 0812129A - .incbin "pullableMushroom/gUnk_0812129A.bin" +gSpriteAnimations_PullableMushroom_6:: @ 0812129A + .include "animations/gSpriteAnimations_PullableMushroom_6.s" -gUnk_081212A3:: @ 081212A3 - .incbin "pullableMushroom/gUnk_081212A3.bin" +gSpriteAnimations_PullableMushroom_7:: @ 081212A3 + .include "animations/gSpriteAnimations_PullableMushroom_7.s" -gUnk_081212AC:: @ 081212AC - .incbin "pullableMushroom/gUnk_081212AC.bin" +gSpriteAnimations_PullableMushroom_9:: @ 081212AC + .include "animations/gSpriteAnimations_PullableMushroom_9.s" -gUnk_081212B0:: @ 081212B0 - .incbin "pullableMushroom/gUnk_081212B0.bin" +gSpriteAnimations_PullableMushroom_10:: @ 081212B0 + .include "animations/gSpriteAnimations_PullableMushroom_10.s" -gUnk_081212B4:: @ 081212B4 - .incbin "pullableMushroom/gUnk_081212B4.bin" +gSpriteAnimations_PullableMushroom_11:: @ 081212B4 + .include "animations/gSpriteAnimations_PullableMushroom_11.s" gSpriteAnimations_PullableMushroom:: @ 081212B8 - .4byte gUnk_08121204 - .4byte gUnk_08121208 - .4byte gUnk_08121235 - .4byte gUnk_08121263 - .4byte gUnk_08121235 - .4byte gUnk_08121291 - .4byte gUnk_0812129A - .4byte gUnk_081212A3 - .4byte gUnk_0812129A - .4byte gUnk_081212AC - .4byte gUnk_081212B0 - .4byte gUnk_081212B4 - .4byte gUnk_081212B0 - .4byte gUnk_08121225 - .4byte gUnk_08121252 - .4byte gUnk_08121280 - .4byte gUnk_08121252 + .4byte gSpriteAnimations_PullableMushroom_0 + .4byte gSpriteAnimations_PullableMushroom_1 + .4byte gSpriteAnimations_PullableMushroom_2 + .4byte gSpriteAnimations_PullableMushroom_3 + .4byte gSpriteAnimations_PullableMushroom_2 + .4byte gSpriteAnimations_PullableMushroom_5 + .4byte gSpriteAnimations_PullableMushroom_6 + .4byte gSpriteAnimations_PullableMushroom_7 + .4byte gSpriteAnimations_PullableMushroom_6 + .4byte gSpriteAnimations_PullableMushroom_9 + .4byte gSpriteAnimations_PullableMushroom_10 + .4byte gSpriteAnimations_PullableMushroom_11 + .4byte gSpriteAnimations_PullableMushroom_10 + .4byte gSpriteAnimations_PullableMushroom_13 + .4byte gSpriteAnimations_PullableMushroom_14 + .4byte gSpriteAnimations_PullableMushroom_15 + .4byte gSpriteAnimations_PullableMushroom_14 .4byte 00000000 diff --git a/data/animations/object/pushableLever.s b/data/animations/object/pushableLever.s index 2a11ceea..6bbf69f0 100644 --- a/data/animations/object/pushableLever.s +++ b/data/animations/object/pushableLever.s @@ -4,13 +4,13 @@ .section .rodata .align 2 -gUnk_081234B4:: @ 081234B4 - .incbin "pushableLever/gUnk_081234B4.bin" +gSpriteAnimations_PushableLever_0:: @ 081234B4 + .include "animations/gSpriteAnimations_PushableLever_0.s" -gUnk_081234C9:: @ 081234C9 - .incbin "pushableLever/gUnk_081234C9.bin" +gSpriteAnimations_PushableLever_1:: @ 081234C9 + .include "animations/gSpriteAnimations_PushableLever_1.s" gSpriteAnimations_PushableLever:: @ 081234E0 - .4byte gUnk_081234B4 - .4byte gUnk_081234C9 + .4byte gSpriteAnimations_PushableLever_0 + .4byte gSpriteAnimations_PushableLever_1 .4byte 00000000 diff --git a/data/animations/object/pushableRock.s b/data/animations/object/pushableRock.s index ffdd6606..5c0e4cd8 100644 --- a/data/animations/object/pushableRock.s +++ b/data/animations/object/pushableRock.s @@ -4,30 +4,30 @@ .section .rodata .align 2 -gUnk_08121090:: @ 08121090 - .incbin "pushableRock/gUnk_08121090.bin" +gSpriteAnimations_PushableRock_0:: @ 08121090 + .include "animations/gSpriteAnimations_PushableRock_0.s" -gUnk_08121094:: @ 08121094 - .incbin "pushableRock/gUnk_08121094.bin" +gSpriteAnimations_PushableRock_1:: @ 08121094 + .include "animations/gSpriteAnimations_PushableRock_1.s" -gUnk_081210D0:: @ 081210D0 - .incbin "pushableRock/gUnk_081210D0.bin" +gSpriteAnimations_PushableRock_2:: @ 081210D0 + .include "animations/gSpriteAnimations_PushableRock_2.s" -gUnk_0812110C:: @ 0812110C - .incbin "pushableRock/gUnk_0812110C.bin" +gSpriteAnimations_PushableRock_3:: @ 0812110C + .include "animations/gSpriteAnimations_PushableRock_3.s" -gUnk_08121148:: @ 08121148 - .incbin "pushableRock/gUnk_08121148.bin" +gSpriteAnimations_PushableRock_5:: @ 08121148 + .include "animations/gSpriteAnimations_PushableRock_5.s" -gUnk_08121154:: @ 08121154 - .incbin "pushableRock/gUnk_08121154.bin" +gSpriteAnimations_PushableRock_6:: @ 08121154 + .include "animations/gSpriteAnimations_PushableRock_6.s" gSpriteAnimations_PushableRock:: @ 08121158 - .4byte gUnk_08121090 - .4byte gUnk_08121094 - .4byte gUnk_081210D0 - .4byte gUnk_0812110C - .4byte gUnk_081210D0 - .4byte gUnk_08121148 - .4byte gUnk_08121154 + .4byte gSpriteAnimations_PushableRock_0 + .4byte gSpriteAnimations_PushableRock_1 + .4byte gSpriteAnimations_PushableRock_2 + .4byte gSpriteAnimations_PushableRock_3 + .4byte gSpriteAnimations_PushableRock_2 + .4byte gSpriteAnimations_PushableRock_5 + .4byte gSpriteAnimations_PushableRock_6 .4byte 00000000 diff --git a/data/animations/object/pushableStatue.s b/data/animations/object/pushableStatue.s index 18b429c3..5019d79a 100644 --- a/data/animations/object/pushableStatue.s +++ b/data/animations/object/pushableStatue.s @@ -4,8 +4,8 @@ .section .rodata @ .align 2 -gUnk_08120D86:: @ 08120D86 - .incbin "pushableStatue/gUnk_08120D86.bin" +gSpriteAnimations_PushableStatue_0:: @ 08120D86 + .include "animations/gSpriteAnimations_PushableStatue_0.s" gSpriteAnimations_PushableStatue:: @ 08120D8C - .4byte gUnk_08120D86 + .4byte gSpriteAnimations_PushableStatue_0 diff --git a/data/animations/object/railtrack.s b/data/animations/object/railtrack.s index 0187e29c..0c91420e 100644 --- a/data/animations/object/railtrack.s +++ b/data/animations/object/railtrack.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_081205E4:: @ 081205E4 - .incbin "railtrack/gUnk_081205E4.bin" +gSpriteAnimations_Railtrack_0:: @ 081205E4 + .include "animations/gSpriteAnimations_Railtrack_0.s" -gUnk_081205E8:: @ 081205E8 - .incbin "railtrack/gUnk_081205E8.bin" +gSpriteAnimations_Railtrack_1:: @ 081205E8 + .include "animations/gSpriteAnimations_Railtrack_1.s" -gUnk_081205EC:: @ 081205EC - .incbin "railtrack/gUnk_081205EC.bin" +gSpriteAnimations_Railtrack_2:: @ 081205EC + .include "animations/gSpriteAnimations_Railtrack_2.s" -gUnk_081205F0:: @ 081205F0 - .incbin "railtrack/gUnk_081205F0.bin" +gSpriteAnimations_Railtrack_3:: @ 081205F0 + .include "animations/gSpriteAnimations_Railtrack_3.s" gSpriteAnimations_Railtrack:: @ 081205F4 - .4byte gUnk_081205E4 - .4byte gUnk_081205E8 - .4byte gUnk_081205EC - .4byte gUnk_081205F0 + .4byte gSpriteAnimations_Railtrack_0 + .4byte gSpriteAnimations_Railtrack_1 + .4byte gSpriteAnimations_Railtrack_2 + .4byte gSpriteAnimations_Railtrack_3 .4byte 00000000 diff --git a/data/animations/object/smallIceBlock.s b/data/animations/object/smallIceBlock.s index 5a3a72ca..bde6ed94 100644 --- a/data/animations/object/smallIceBlock.s +++ b/data/animations/object/smallIceBlock.s @@ -4,21 +4,21 @@ .section .rodata @ .align 2 -gUnk_0812376A:: @ 0812376A - .incbin "smallIceBlock/gUnk_0812376A.bin" +gSpriteAnimations_SmallIceBlock_0:: @ 0812376A + .include "animations/gSpriteAnimations_SmallIceBlock_0.s" -gUnk_0812376E:: @ 0812376E - .incbin "smallIceBlock/gUnk_0812376E.bin" +gSpriteAnimations_SmallIceBlock_1:: @ 0812376E + .include "animations/gSpriteAnimations_SmallIceBlock_1.s" -gUnk_08123772:: @ 08123772 - .incbin "smallIceBlock/gUnk_08123772.bin" +gSpriteAnimations_SmallIceBlock_2:: @ 08123772 + .include "animations/gSpriteAnimations_SmallIceBlock_2.s" -gUnk_08123776:: @ 08123776 - .incbin "smallIceBlock/gUnk_08123776.bin" +gSpriteAnimations_SmallIceBlock_3:: @ 08123776 + .include "animations/gSpriteAnimations_SmallIceBlock_3.s" gSpriteAnimations_SmallIceBlock:: @ 0812378C - .4byte gUnk_0812376A - .4byte gUnk_0812376E - .4byte gUnk_08123772 - .4byte gUnk_08123776 + .4byte gSpriteAnimations_SmallIceBlock_0 + .4byte gSpriteAnimations_SmallIceBlock_1 + .4byte gSpriteAnimations_SmallIceBlock_2 + .4byte gSpriteAnimations_SmallIceBlock_3 .4byte 00000000 diff --git a/data/animations/object/specialFx.s b/data/animations/object/specialFx.s index 66385d94..c870e534 100644 --- a/data/animations/object/specialFx.s +++ b/data/animations/object/specialFx.s @@ -4,306 +4,306 @@ .section .rodata .align 2 -gUnk_0811FB10:: @ 0811FB10 - .incbin "specialFx/gUnk_0811FB10.bin" +gSpriteAnimations_SpecialFx_0:: @ 0811FB10 + .include "animations/gSpriteAnimations_SpecialFx_0.s" -gUnk_0811FB25:: @ 0811FB25 - .incbin "specialFx/gUnk_0811FB25.bin" +gSpriteAnimations_SpecialFx_1:: @ 0811FB25 + .include "animations/gSpriteAnimations_SpecialFx_1.s" -gUnk_0811FB7D:: @ 0811FB7D - .incbin "specialFx/gUnk_0811FB7D.bin" +gSpriteAnimations_SpecialFx_67:: @ 0811FB7D + .include "animations/gSpriteAnimations_SpecialFx_67.s" -gUnk_0811FBC1:: @ 0811FBC1 - .incbin "specialFx/gUnk_0811FBC1.bin" +gSpriteAnimations_SpecialFx_2:: @ 0811FBC1 + .include "animations/gSpriteAnimations_SpecialFx_2.s" -gUnk_0811FBE1:: @ 0811FBE1 - .incbin "specialFx/gUnk_0811FBE1.bin" +gSpriteAnimations_SpecialFx_3:: @ 0811FBE1 + .include "animations/gSpriteAnimations_SpecialFx_3.s" -gUnk_0811FBFD:: @ 0811FBFD - .incbin "specialFx/gUnk_0811FBFD.bin" +gSpriteAnimations_SpecialFx_23:: @ 0811FBFD + .include "animations/gSpriteAnimations_SpecialFx_23.s" -gUnk_0811FC11:: @ 0811FC11 - .incbin "specialFx/gUnk_0811FC11.bin" +gSpriteAnimations_SpecialFx_4:: @ 0811FC11 + .include "animations/gSpriteAnimations_SpecialFx_4.s" -gUnk_0811FC2D:: @ 0811FC2D - .incbin "specialFx/gUnk_0811FC2D.bin" +gSpriteAnimations_SpecialFx_5:: @ 0811FC2D + .include "animations/gSpriteAnimations_SpecialFx_5.s" -gUnk_0811FC51:: @ 0811FC51 - .incbin "specialFx/gUnk_0811FC51.bin" +gSpriteAnimations_SpecialFx_6:: @ 0811FC51 + .include "animations/gSpriteAnimations_SpecialFx_6.s" -gUnk_0811FC72:: @ 0811FC72 - .incbin "specialFx/gUnk_0811FC72.bin" +gSpriteAnimations_SpecialFx_7:: @ 0811FC72 + .include "animations/gSpriteAnimations_SpecialFx_7.s" -gUnk_0811FC87:: @ 0811FC87 - .incbin "specialFx/gUnk_0811FC87.bin" +gSpriteAnimations_SpecialFx_8:: @ 0811FC87 + .include "animations/gSpriteAnimations_SpecialFx_8.s" -gUnk_0811FCAB:: @ 0811FCAB - .incbin "specialFx/gUnk_0811FCAB.bin" +gSpriteAnimations_SpecialFx_9:: @ 0811FCAB + .include "animations/gSpriteAnimations_SpecialFx_9.s" -gUnk_0811FCDF:: @ 0811FCDF - .incbin "specialFx/gUnk_0811FCDF.bin" +gSpriteAnimations_SpecialFx_10:: @ 0811FCDF + .include "animations/gSpriteAnimations_SpecialFx_10.s" -gUnk_0811FD23:: @ 0811FD23 - .incbin "specialFx/gUnk_0811FD23.bin" +gSpriteAnimations_SpecialFx_11:: @ 0811FD23 + .include "animations/gSpriteAnimations_SpecialFx_11.s" -gUnk_0811FD3B:: @ 0811FD3B - .incbin "specialFx/gUnk_0811FD3B.bin" +gSpriteAnimations_SpecialFx_12:: @ 0811FD3B + .include "animations/gSpriteAnimations_SpecialFx_12.s" -gUnk_0811FD57:: @ 0811FD57 - .incbin "specialFx/gUnk_0811FD57.bin" +gSpriteAnimations_SpecialFx_14:: @ 0811FD57 + .include "animations/gSpriteAnimations_SpecialFx_14.s" -gUnk_0811FD73:: @ 0811FD73 - .incbin "specialFx/gUnk_0811FD73.bin" +gSpriteAnimations_SpecialFx_16:: @ 0811FD73 + .include "animations/gSpriteAnimations_SpecialFx_16.s" -gUnk_0811FD7F:: @ 0811FD7F - .incbin "specialFx/gUnk_0811FD7F.bin" +gSpriteAnimations_SpecialFx_17:: @ 0811FD7F + .include "animations/gSpriteAnimations_SpecialFx_17.s" -gUnk_0811FD8F:: @ 0811FD8F - .incbin "specialFx/gUnk_0811FD8F.bin" +gSpriteAnimations_SpecialFx_18:: @ 0811FD8F + .include "animations/gSpriteAnimations_SpecialFx_18.s" -gUnk_0811FDA3:: @ 0811FDA3 - .incbin "specialFx/gUnk_0811FDA3.bin" +gSpriteAnimations_SpecialFx_20:: @ 0811FDA3 + .include "animations/gSpriteAnimations_SpecialFx_20.s" -gUnk_0811FDB8:: @ 0811FDB8 - .incbin "specialFx/gUnk_0811FDB8.bin" +gSpriteAnimations_SpecialFx_22:: @ 0811FDB8 + .include "animations/gSpriteAnimations_SpecialFx_22.s" -gUnk_0811FDCC:: @ 0811FDCC - .incbin "specialFx/gUnk_0811FDCC.bin" +gSpriteAnimations_SpecialFx_24:: @ 0811FDCC + .include "animations/gSpriteAnimations_SpecialFx_24.s" -gUnk_0811FDD4:: @ 0811FDD4 - .incbin "specialFx/gUnk_0811FDD4.bin" +gSpriteAnimations_SpecialFx_25:: @ 0811FDD4 + .include "animations/gSpriteAnimations_SpecialFx_25.s" -gUnk_0811FDEC:: @ 0811FDEC - .incbin "specialFx/gUnk_0811FDEC.bin" +gSpriteAnimations_SpecialFx_26:: @ 0811FDEC + .include "animations/gSpriteAnimations_SpecialFx_26.s" -gUnk_0811FDFC:: @ 0811FDFC - .incbin "specialFx/gUnk_0811FDFC.bin" +gSpriteAnimations_SpecialFx_27:: @ 0811FDFC + .include "animations/gSpriteAnimations_SpecialFx_27.s" -gUnk_0811FE15:: @ 0811FE15 - .incbin "specialFx/gUnk_0811FE15.bin" +gSpriteAnimations_SpecialFx_28:: @ 0811FE15 + .include "animations/gSpriteAnimations_SpecialFx_28.s" -gUnk_0811FE56:: @ 0811FE56 - .incbin "specialFx/gUnk_0811FE56.bin" +gSpriteAnimations_SpecialFx_29:: @ 0811FE56 + .include "animations/gSpriteAnimations_SpecialFx_29.s" -gUnk_0811FE5E:: @ 0811FE5E - .incbin "specialFx/gUnk_0811FE5E.bin" +gSpriteAnimations_SpecialFx_31:: @ 0811FE5E + .include "animations/gSpriteAnimations_SpecialFx_31.s" -gUnk_0811FE76:: @ 0811FE76 - .incbin "specialFx/gUnk_0811FE76.bin" +gSpriteAnimations_SpecialFx_32:: @ 0811FE76 + .include "animations/gSpriteAnimations_SpecialFx_32.s" -gUnk_0811FE8E:: @ 0811FE8E - .incbin "specialFx/gUnk_0811FE8E.bin" +gSpriteAnimations_SpecialFx_33:: @ 0811FE8E + .include "animations/gSpriteAnimations_SpecialFx_33.s" -gUnk_0811FEA2:: @ 0811FEA2 - .incbin "specialFx/gUnk_0811FEA2.bin" +gSpriteAnimations_SpecialFx_34:: @ 0811FEA2 + .include "animations/gSpriteAnimations_SpecialFx_34.s" -gUnk_0811FEAE:: @ 0811FEAE - .incbin "specialFx/gUnk_0811FEAE.bin" +gSpriteAnimations_SpecialFx_35:: @ 0811FEAE + .include "animations/gSpriteAnimations_SpecialFx_35.s" -gUnk_0811FEBA:: @ 0811FEBA - .incbin "specialFx/gUnk_0811FEBA.bin" +gSpriteAnimations_SpecialFx_36:: @ 0811FEBA + .include "animations/gSpriteAnimations_SpecialFx_36.s" -gUnk_0811FEE2:: @ 0811FEE2 - .incbin "specialFx/gUnk_0811FEE2.bin" +gSpriteAnimations_SpecialFx_37:: @ 0811FEE2 + .include "animations/gSpriteAnimations_SpecialFx_37.s" -gUnk_0811FEEF:: @ 0811FEEF - .incbin "specialFx/gUnk_0811FEEF.bin" +gSpriteAnimations_SpecialFx_51:: @ 0811FEEF + .include "animations/gSpriteAnimations_SpecialFx_51.s" -gUnk_0811FF0F:: @ 0811FF0F - .incbin "specialFx/gUnk_0811FF0F.bin" +gSpriteAnimations_SpecialFx_39:: @ 0811FF0F + .include "animations/gSpriteAnimations_SpecialFx_39.s" -gUnk_0811FF2F:: @ 0811FF2F - .incbin "specialFx/gUnk_0811FF2F.bin" +gSpriteAnimations_SpecialFx_52:: @ 0811FF2F + .include "animations/gSpriteAnimations_SpecialFx_52.s" -gUnk_0811FF4F:: @ 0811FF4F - .incbin "specialFx/gUnk_0811FF4F.bin" +gSpriteAnimations_SpecialFx_50:: @ 0811FF4F + .include "animations/gSpriteAnimations_SpecialFx_50.s" -gUnk_0811FF6F:: @ 0811FF6F - .incbin "specialFx/gUnk_0811FF6F.bin" +gSpriteAnimations_SpecialFx_40:: @ 0811FF6F + .include "animations/gSpriteAnimations_SpecialFx_40.s" -gUnk_0811FF8F:: @ 0811FF8F - .incbin "specialFx/gUnk_0811FF8F.bin" +gSpriteAnimations_SpecialFx_44:: @ 0811FF8F + .include "animations/gSpriteAnimations_SpecialFx_44.s" -gUnk_0811FFA7:: @ 0811FFA7 - .incbin "specialFx/gUnk_0811FFA7.bin" +gSpriteAnimations_SpecialFx_46:: @ 0811FFA7 + .include "animations/gSpriteAnimations_SpecialFx_46.s" -gUnk_0811FFC7:: @ 0811FFC7 - .incbin "specialFx/gUnk_0811FFC7.bin" +gSpriteAnimations_SpecialFx_47:: @ 0811FFC7 + .include "animations/gSpriteAnimations_SpecialFx_47.s" -gUnk_0811FFDF:: @ 0811FFDF - .incbin "specialFx/gUnk_0811FFDF.bin" +gSpriteAnimations_SpecialFx_41:: @ 0811FFDF + .include "animations/gSpriteAnimations_SpecialFx_41.s" -gUnk_0811FFF7:: @ 0811FFF7 - .incbin "specialFx/gUnk_0811FFF7.bin" +gSpriteAnimations_SpecialFx_42:: @ 0811FFF7 + .include "animations/gSpriteAnimations_SpecialFx_42.s" -gUnk_08120017:: @ 08120017 - .incbin "specialFx/gUnk_08120017.bin" +gSpriteAnimations_SpecialFx_45:: @ 08120017 + .include "animations/gSpriteAnimations_SpecialFx_45.s" -gUnk_0812003B:: @ 0812003B - .incbin "specialFx/gUnk_0812003B.bin" +gSpriteAnimations_SpecialFx_48:: @ 0812003B + .include "animations/gSpriteAnimations_SpecialFx_48.s" -gUnk_08120063:: @ 08120063 - .incbin "specialFx/gUnk_08120063.bin" +gSpriteAnimations_SpecialFx_49:: @ 08120063 + .include "animations/gSpriteAnimations_SpecialFx_49.s" -gUnk_0812007F:: @ 0812007F - .incbin "specialFx/gUnk_0812007F.bin" +gSpriteAnimations_SpecialFx_54:: @ 0812007F + .include "animations/gSpriteAnimations_SpecialFx_54.s" -gUnk_0812009B:: @ 0812009B - .incbin "specialFx/gUnk_0812009B.bin" +gSpriteAnimations_SpecialFx_55:: @ 0812009B + .include "animations/gSpriteAnimations_SpecialFx_55.s" -gUnk_081200AF:: @ 081200AF - .incbin "specialFx/gUnk_081200AF.bin" +gSpriteAnimations_SpecialFx_56:: @ 081200AF + .include "animations/gSpriteAnimations_SpecialFx_56.s" -gUnk_081200CB:: @ 081200CB - .incbin "specialFx/gUnk_081200CB.bin" +gSpriteAnimations_SpecialFx_57:: @ 081200CB + .include "animations/gSpriteAnimations_SpecialFx_57.s" -gUnk_081200EB:: @ 081200EB - .incbin "specialFx/gUnk_081200EB.bin" +gSpriteAnimations_SpecialFx_58:: @ 081200EB + .include "animations/gSpriteAnimations_SpecialFx_58.s" -gUnk_081200FF:: @ 081200FF - .incbin "specialFx/gUnk_081200FF.bin" +gSpriteAnimations_SpecialFx_59:: @ 081200FF + .include "animations/gSpriteAnimations_SpecialFx_59.s" -gUnk_08120123:: @ 08120123 - .incbin "specialFx/gUnk_08120123.bin" +gSpriteAnimations_SpecialFx_60:: @ 08120123 + .include "animations/gSpriteAnimations_SpecialFx_60.s" -gUnk_08120147:: @ 08120147 - .incbin "specialFx/gUnk_08120147.bin" +gSpriteAnimations_SpecialFx_61:: @ 08120147 + .include "animations/gSpriteAnimations_SpecialFx_61.s" -gUnk_08120167:: @ 08120167 - .incbin "specialFx/gUnk_08120167.bin" +gSpriteAnimations_SpecialFx_62:: @ 08120167 + .include "animations/gSpriteAnimations_SpecialFx_62.s" -gUnk_0812017F:: @ 0812017F - .incbin "specialFx/gUnk_0812017F.bin" +gSpriteAnimations_SpecialFx_63:: @ 0812017F + .include "animations/gSpriteAnimations_SpecialFx_63.s" -gUnk_08120197:: @ 08120197 - .incbin "specialFx/gUnk_08120197.bin" +gSpriteAnimations_SpecialFx_64:: @ 08120197 + .include "animations/gSpriteAnimations_SpecialFx_64.s" -gUnk_081201AF:: @ 081201AF - .incbin "specialFx/gUnk_081201AF.bin" +gSpriteAnimations_SpecialFx_66:: @ 081201AF + .include "animations/gSpriteAnimations_SpecialFx_66.s" -gUnk_081201E0:: @ 081201E0 - .incbin "specialFx/gUnk_081201E0.bin" +gSpriteAnimations_SpecialFx_68:: @ 081201E0 + .include "animations/gSpriteAnimations_SpecialFx_68.s" -gUnk_08120209:: @ 08120209 - .incbin "specialFx/gUnk_08120209.bin" +gSpriteAnimations_SpecialFx_70:: @ 08120209 + .include "animations/gSpriteAnimations_SpecialFx_70.s" -gUnk_08120241:: @ 08120241 - .incbin "specialFx/gUnk_08120241.bin" +gSpriteAnimations_SpecialFx_71:: @ 08120241 + .include "animations/gSpriteAnimations_SpecialFx_71.s" -gUnk_08120279:: @ 08120279 - .incbin "specialFx/gUnk_08120279.bin" +gSpriteAnimations_SpecialFx_72:: @ 08120279 + .include "animations/gSpriteAnimations_SpecialFx_72.s" -gUnk_081202AD:: @ 081202AD - .incbin "specialFx/gUnk_081202AD.bin" +gSpriteAnimations_SpecialFx_73:: @ 081202AD + .include "animations/gSpriteAnimations_SpecialFx_73.s" -gUnk_081202BE:: @ 081202BE - .incbin "specialFx/gUnk_081202BE.bin" +gSpriteAnimations_SpecialFx_74:: @ 081202BE + .include "animations/gSpriteAnimations_SpecialFx_74.s" -gUnk_081202E3:: @ 081202E3 - .incbin "specialFx/gUnk_081202E3.bin" +gSpriteAnimations_SpecialFx_75:: @ 081202E3 + .include "animations/gSpriteAnimations_SpecialFx_75.s" -gUnk_0812030C:: @ 0812030C - .incbin "specialFx/gUnk_0812030C.bin" +gSpriteAnimations_SpecialFx_78:: @ 0812030C + .include "animations/gSpriteAnimations_SpecialFx_78.s" -gUnk_08120350:: @ 08120350 - .incbin "specialFx/gUnk_08120350.bin" +gSpriteAnimations_SpecialFx_79:: @ 08120350 + .include "animations/gSpriteAnimations_SpecialFx_79.s" -gUnk_0812036C:: @ 0812036C - .incbin "specialFx/gUnk_0812036C.bin" +gSpriteAnimations_SpecialFx_80:: @ 0812036C + .include "animations/gSpriteAnimations_SpecialFx_80.s" -gUnk_0812038C:: @ 0812038C - .incbin "specialFx/gUnk_0812038C.bin" +gSpriteAnimations_SpecialFx_81:: @ 0812038C + .include "animations/gSpriteAnimations_SpecialFx_81.s" -gUnk_081203C4:: @ 081203C4 - .incbin "specialFx/gUnk_081203C4.bin" +gSpriteAnimations_SpecialFx_86:: @ 081203C4 + .include "animations/gSpriteAnimations_SpecialFx_86.s" gSpriteAnimations_SpecialFx:: @ 081203FC - .4byte gUnk_0811FB10 - .4byte gUnk_0811FB25 - .4byte gUnk_0811FBC1 - .4byte gUnk_0811FBE1 - .4byte gUnk_0811FC11 - .4byte gUnk_0811FC2D - .4byte gUnk_0811FC51 - .4byte gUnk_0811FC72 - .4byte gUnk_0811FC87 - .4byte gUnk_0811FCAB - .4byte gUnk_0811FCDF - .4byte gUnk_0811FD23 - .4byte gUnk_0811FD3B - .4byte gUnk_0811FC11 - .4byte gUnk_0811FD57 - .4byte gUnk_0811FC11 - .4byte gUnk_0811FD73 - .4byte gUnk_0811FD7F - .4byte gUnk_0811FD8F - .4byte gUnk_0811FBE1 - .4byte gUnk_0811FDA3 - .4byte gUnk_0811FC11 - .4byte gUnk_0811FDB8 - .4byte gUnk_0811FBFD - .4byte gUnk_0811FDCC - .4byte gUnk_0811FDD4 - .4byte gUnk_0811FDEC - .4byte gUnk_0811FDFC - .4byte gUnk_0811FE15 - .4byte gUnk_0811FE56 - .4byte gUnk_0811FE15 - .4byte gUnk_0811FE5E - .4byte gUnk_0811FE76 - .4byte gUnk_0811FE8E - .4byte gUnk_0811FEA2 - .4byte gUnk_0811FEAE - .4byte gUnk_0811FEBA - .4byte gUnk_0811FEE2 - .4byte gUnk_0811FC72 - .4byte gUnk_0811FF0F - .4byte gUnk_0811FF6F - .4byte gUnk_0811FFDF - .4byte gUnk_0811FFF7 - .4byte gUnk_0811FD23 - .4byte gUnk_0811FF8F - .4byte gUnk_08120017 - .4byte gUnk_0811FFA7 - .4byte gUnk_0811FFC7 - .4byte gUnk_0812003B - .4byte gUnk_08120063 - .4byte gUnk_0811FF4F - .4byte gUnk_0811FEEF - .4byte gUnk_0811FF2F - .4byte gUnk_0811FB25 - .4byte gUnk_0812007F - .4byte gUnk_0812009B - .4byte gUnk_081200AF - .4byte gUnk_081200CB - .4byte gUnk_081200EB - .4byte gUnk_081200FF - .4byte gUnk_08120123 - .4byte gUnk_08120147 - .4byte gUnk_08120167 - .4byte gUnk_0812017F - .4byte gUnk_08120197 - .4byte gUnk_0811FE5E - .4byte gUnk_081201AF - .4byte gUnk_0811FB7D - .4byte gUnk_081201E0 - .4byte gUnk_0811FC11 - .4byte gUnk_08120209 - .4byte gUnk_08120241 - .4byte gUnk_08120279 - .4byte gUnk_081202AD - .4byte gUnk_081202BE - .4byte gUnk_081202E3 - .4byte gUnk_081200EB - .4byte gUnk_0811FC72 - .4byte gUnk_0812030C - .4byte gUnk_08120350 - .4byte gUnk_0812036C - .4byte gUnk_0812038C - .4byte gUnk_0811FD3B - .4byte gUnk_0811FBC1 - .4byte gUnk_0811FBC1 - .4byte gUnk_0811FBC1 - .4byte gUnk_081203C4 - .4byte gUnk_081203C4 + .4byte gSpriteAnimations_SpecialFx_0 + .4byte gSpriteAnimations_SpecialFx_1 + .4byte gSpriteAnimations_SpecialFx_2 + .4byte gSpriteAnimations_SpecialFx_3 + .4byte gSpriteAnimations_SpecialFx_4 + .4byte gSpriteAnimations_SpecialFx_5 + .4byte gSpriteAnimations_SpecialFx_6 + .4byte gSpriteAnimations_SpecialFx_7 + .4byte gSpriteAnimations_SpecialFx_8 + .4byte gSpriteAnimations_SpecialFx_9 + .4byte gSpriteAnimations_SpecialFx_10 + .4byte gSpriteAnimations_SpecialFx_11 + .4byte gSpriteAnimations_SpecialFx_12 + .4byte gSpriteAnimations_SpecialFx_4 + .4byte gSpriteAnimations_SpecialFx_14 + .4byte gSpriteAnimations_SpecialFx_4 + .4byte gSpriteAnimations_SpecialFx_16 + .4byte gSpriteAnimations_SpecialFx_17 + .4byte gSpriteAnimations_SpecialFx_18 + .4byte gSpriteAnimations_SpecialFx_3 + .4byte gSpriteAnimations_SpecialFx_20 + .4byte gSpriteAnimations_SpecialFx_4 + .4byte gSpriteAnimations_SpecialFx_22 + .4byte gSpriteAnimations_SpecialFx_23 + .4byte gSpriteAnimations_SpecialFx_24 + .4byte gSpriteAnimations_SpecialFx_25 + .4byte gSpriteAnimations_SpecialFx_26 + .4byte gSpriteAnimations_SpecialFx_27 + .4byte gSpriteAnimations_SpecialFx_28 + .4byte gSpriteAnimations_SpecialFx_29 + .4byte gSpriteAnimations_SpecialFx_28 + .4byte gSpriteAnimations_SpecialFx_31 + .4byte gSpriteAnimations_SpecialFx_32 + .4byte gSpriteAnimations_SpecialFx_33 + .4byte gSpriteAnimations_SpecialFx_34 + .4byte gSpriteAnimations_SpecialFx_35 + .4byte gSpriteAnimations_SpecialFx_36 + .4byte gSpriteAnimations_SpecialFx_37 + .4byte gSpriteAnimations_SpecialFx_7 + .4byte gSpriteAnimations_SpecialFx_39 + .4byte gSpriteAnimations_SpecialFx_40 + .4byte gSpriteAnimations_SpecialFx_41 + .4byte gSpriteAnimations_SpecialFx_42 + .4byte gSpriteAnimations_SpecialFx_11 + .4byte gSpriteAnimations_SpecialFx_44 + .4byte gSpriteAnimations_SpecialFx_45 + .4byte gSpriteAnimations_SpecialFx_46 + .4byte gSpriteAnimations_SpecialFx_47 + .4byte gSpriteAnimations_SpecialFx_48 + .4byte gSpriteAnimations_SpecialFx_49 + .4byte gSpriteAnimations_SpecialFx_50 + .4byte gSpriteAnimations_SpecialFx_51 + .4byte gSpriteAnimations_SpecialFx_52 + .4byte gSpriteAnimations_SpecialFx_1 + .4byte gSpriteAnimations_SpecialFx_54 + .4byte gSpriteAnimations_SpecialFx_55 + .4byte gSpriteAnimations_SpecialFx_56 + .4byte gSpriteAnimations_SpecialFx_57 + .4byte gSpriteAnimations_SpecialFx_58 + .4byte gSpriteAnimations_SpecialFx_59 + .4byte gSpriteAnimations_SpecialFx_60 + .4byte gSpriteAnimations_SpecialFx_61 + .4byte gSpriteAnimations_SpecialFx_62 + .4byte gSpriteAnimations_SpecialFx_63 + .4byte gSpriteAnimations_SpecialFx_64 + .4byte gSpriteAnimations_SpecialFx_31 + .4byte gSpriteAnimations_SpecialFx_66 + .4byte gSpriteAnimations_SpecialFx_67 + .4byte gSpriteAnimations_SpecialFx_68 + .4byte gSpriteAnimations_SpecialFx_4 + .4byte gSpriteAnimations_SpecialFx_70 + .4byte gSpriteAnimations_SpecialFx_71 + .4byte gSpriteAnimations_SpecialFx_72 + .4byte gSpriteAnimations_SpecialFx_73 + .4byte gSpriteAnimations_SpecialFx_74 + .4byte gSpriteAnimations_SpecialFx_75 + .4byte gSpriteAnimations_SpecialFx_58 + .4byte gSpriteAnimations_SpecialFx_7 + .4byte gSpriteAnimations_SpecialFx_78 + .4byte gSpriteAnimations_SpecialFx_79 + .4byte gSpriteAnimations_SpecialFx_80 + .4byte gSpriteAnimations_SpecialFx_81 + .4byte gSpriteAnimations_SpecialFx_12 + .4byte gSpriteAnimations_SpecialFx_2 + .4byte gSpriteAnimations_SpecialFx_2 + .4byte gSpriteAnimations_SpecialFx_2 + .4byte gSpriteAnimations_SpecialFx_86 + .4byte gSpriteAnimations_SpecialFx_86 .4byte 00000000 diff --git a/data/animations/object/thoughtBubble.s b/data/animations/object/thoughtBubble.s index 518c5cc3..bb80b177 100644 --- a/data/animations/object/thoughtBubble.s +++ b/data/animations/object/thoughtBubble.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_081225A0:: @ 081225A0 - .incbin "thoughtBubble/gUnk_081225A0.bin" +gSpriteAnimations_ThoughtBubble_0:: @ 081225A0 + .include "animations/gSpriteAnimations_ThoughtBubble_0.s" -gUnk_081225BC:: @ 081225BC - .incbin "thoughtBubble/gUnk_081225BC.bin" +gSpriteAnimations_ThoughtBubble_1:: @ 081225BC + .include "animations/gSpriteAnimations_ThoughtBubble_1.s" -gUnk_081225D8:: @ 081225D8 - .incbin "thoughtBubble/gUnk_081225D8.bin" +gSpriteAnimations_ThoughtBubble_2:: @ 081225D8 + .include "animations/gSpriteAnimations_ThoughtBubble_2.s" gSpriteAnimations_ThoughtBubble:: @ 081225F4 - .4byte gUnk_081225A0 - .4byte gUnk_081225BC - .4byte gUnk_081225D8 + .4byte gSpriteAnimations_ThoughtBubble_0 + .4byte gSpriteAnimations_ThoughtBubble_1 + .4byte gSpriteAnimations_ThoughtBubble_2 .4byte 00000000 diff --git a/data/animations/object/warpPoint.s b/data/animations/object/warpPoint.s index 9ba1fa9c..bf4958a3 100644 --- a/data/animations/object/warpPoint.s +++ b/data/animations/object/warpPoint.s @@ -4,13 +4,13 @@ .section .rodata @ .align 2 -gUnk_08121383:: @ 08121383 - .incbin "warpPoint/gUnk_08121383.bin" +gSpriteAnimations_WarpPoint_0:: @ 08121383 + .include "animations/gSpriteAnimations_WarpPoint_0.s" -gUnk_08121394:: @ 08121394 - .incbin "warpPoint/gUnk_08121394.bin" +gSpriteAnimations_WarpPoint_1:: @ 08121394 + .include "animations/gSpriteAnimations_WarpPoint_1.s" gSpriteAnimations_WarpPoint:: @ 081213B8 - .4byte gUnk_08121383 - .4byte gUnk_08121394 + .4byte gSpriteAnimations_WarpPoint_0 + .4byte gSpriteAnimations_WarpPoint_1 .4byte 00000000 diff --git a/data/animations/object/whirlwind.s b/data/animations/object/whirlwind.s index d5cd87fd..98969abc 100644 --- a/data/animations/object/whirlwind.s +++ b/data/animations/object/whirlwind.s @@ -4,12 +4,12 @@ .section .rodata .align 2 -gUnk_08122800:: @ 08122800 - .incbin "whirlwind/gUnk_08122800.bin" +gSpriteAnimations_Whirlwind_0:: @ 08122800 + .include "animations/gSpriteAnimations_Whirlwind_0.s" -gUnk_08122819:: @ 08122819 - .incbin "whirlwind/gUnk_08122819.bin" +gSpriteAnimations_Whirlwind_1:: @ 08122819 + .include "animations/gSpriteAnimations_Whirlwind_1.s" gSpriteAnimations_Whirlwind:: @ 08122834 - .4byte gUnk_08122800 - .4byte gUnk_08122819 + .4byte gSpriteAnimations_Whirlwind_0 + .4byte gSpriteAnimations_Whirlwind_1 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 diff --git a/data/const/enemy/ballChainSoldier.s b/data/const/enemy/ballChainSoldier.s index 22c8fc1d..69e8693f 100644 --- a/data/const/enemy/ballChainSoldier.s +++ b/data/const/enemy/ballChainSoldier.s @@ -34,11 +34,11 @@ gUnk_080D0728:: @ 080D0728 gUnk_080D0730:: @ 080D0730 .incbin "ballChainSoldier/gUnk_080D0730.bin" -gUnk_080D0738:: @ 080D0738 - .incbin "ballChainSoldier/gUnk_080D0738.bin" +gSpriteAnimations_BallChainSoldier_3:: @ 080D0738 + .include "animations/gSpriteAnimations_BallChainSoldier_3.s" -gUnk_080D073C:: @ 080D073C - .incbin "ballChainSoldier/gUnk_080D073C.bin" +gSpriteAnimations_BallChainSoldier_2:: @ 080D073C + .include "animations/gSpriteAnimations_BallChainSoldier_2.s" -gUnk_080D0740:: @ 080D0740 - .incbin "ballChainSoldier/gUnk_080D0740.bin" +gSpriteAnimations_BallChainSoldier_1:: @ 080D0740 + .include "animations/gSpriteAnimations_BallChainSoldier_1.s" diff --git a/data/const/npc/bladeBrothers.s b/data/const/npc/bladeBrothers.s index bd4b1756..1401778f 100644 --- a/data/const/npc/bladeBrothers.s +++ b/data/const/npc/bladeBrothers.s @@ -72,5 +72,5 @@ gUnk_0811172A:: @ 0811172A gUnk_08111740:: @ 08111740 .incbin "bladeBrothers/gUnk_08111740.bin" -gUnk_0811176C:: @ 0811176C - .incbin "bladeBrothers/gUnk_0811176C.bin" +gSpriteAnimations_BladeBrothers_1_1:: @ 0811176C + .include "animations/gSpriteAnimations_BladeBrothers_1_1.s" diff --git a/data/const/npc/guard.s b/data/const/npc/guard.s index 1af67e05..5cefab70 100644 --- a/data/const/npc/guard.s +++ b/data/const/npc/guard.s @@ -24,3 +24,48 @@ gUnk_0810F550:: @ 0810F550 .4byte sub_08063E54 .4byte sub_08063E6C +gUnk_0810F560:: @ 0810F560 + .incbin "guard/gUnk_0810F560.bin" + +gUnk_0810F59A:: @ 0810F59A + .incbin "guard/gUnk_0810F59A.bin" + +gUnk_0810F5D4:: @ 0810F5D4 + .incbin "guard/gUnk_0810F5D4.bin" + +gUnk_0810F60E:: @ 0810F60E + .incbin "guard/gUnk_0810F60E.bin" +.ifdef JP + @ TODO only small differences + .incbin "guard/gUnk_0810F60E_1_JP.bin" +.else +.ifdef EU + .incbin "guard/gUnk_0810F60E_2_EU.bin" +.else + .incbin "guard/gUnk_0810F60E_3_USA-DEMO_USA-DEMO_JP.bin" +.endif +.endif +.ifdef JP + @ TODO only small differences + .incbin "guard/gUnk_0810F60E_4_JP.bin" +.else +.ifdef EU + .incbin "guard/gUnk_0810F60E_5_EU.bin" +.else + .incbin "guard/gUnk_0810F60E_6_USA-DEMO_USA-DEMO_JP.bin" +.endif +.endif + +gUnk_0810F648:: @ 0810F648 + .incbin "guard/gUnk_0810F648.bin" + +gUnk_0810F682:: @ 0810F682 + .incbin "guard/gUnk_0810F682.bin" + +gUnk_0810F6BC:: @ 0810F6BC + .4byte gUnk_0810F560 + .4byte gUnk_0810F59A + .4byte gUnk_0810F5D4 + .4byte gUnk_0810F60E + .4byte gUnk_0810F648 + .4byte gUnk_0810F682 diff --git a/data/const/npc/sturgeon.s b/data/const/npc/sturgeon.s index d7506db5..7da0e49d 100644 --- a/data/const/npc/sturgeon.s +++ b/data/const/npc/sturgeon.s @@ -19,14 +19,14 @@ gUnk_0810FA54:: @ 0810FA54 gUnk_0810FA5A:: @ 0810FA5A .incbin "sturgeon/gUnk_0810FA5A.bin" -gUnk_0810FB24:: @ 0810FB24 - .incbin "sturgeon/gUnk_0810FB24.bin" +gSpriteAnimations_Sturgeon_4:: @ 0810FB24 + .include "animations/gSpriteAnimations_Sturgeon_4.s" -gUnk_0810FB39:: @ 0810FB39 - .incbin "sturgeon/gUnk_0810FB39.bin" +gSpriteAnimations_Sturgeon_5:: @ 0810FB39 + .include "animations/gSpriteAnimations_Sturgeon_5.s" -gUnk_0810FB4E:: @ 0810FB4E - .incbin "sturgeon/gUnk_0810FB4E.bin" +gSpriteAnimations_Sturgeon_6:: @ 0810FB4E + .include "animations/gSpriteAnimations_Sturgeon_6.s" -gUnk_0810FB63:: @ 0810FB63 - .incbin "sturgeon/gUnk_0810FB63.bin" +gSpriteAnimations_Sturgeon_7:: @ 0810FB63 + .include "animations/gSpriteAnimations_Sturgeon_7.s" diff --git a/data/const/object/beanstalk.s b/data/const/object/beanstalk.s index d465e60b..768aef3e 100644 --- a/data/const/object/beanstalk.s +++ b/data/const/object/beanstalk.s @@ -38,8 +38,8 @@ gUnk_08120E84:: @ 08120E84 .4byte sub_0808A220 .4byte nullsub_518 -gUnk_08120E8C:: @ 08120E8C - .incbin "beanstalk/gUnk_08120E8C.bin" +gSpriteAnimations_Beanstalk_0_0:: @ 08120E8C + .include "animations/gSpriteAnimations_Beanstalk_0_0.s" -gUnk_08120ED1:: @ 08120ED1 - .incbin "beanstalk/gUnk_08120ED1.bin" +gSpriteAnimations_Beanstalk_0_1:: @ 08120ED1 + .include "animations/gSpriteAnimations_Beanstalk_0_1.s" diff --git a/data/const/playerItem/playerItemGustJar.s b/data/const/playerItem/playerItemGustJar.s index f555e860..48dbafc6 100644 --- a/data/const/playerItem/playerItemGustJar.s +++ b/data/const/playerItem/playerItemGustJar.s @@ -21,46 +21,46 @@ gUnk_08132714:: @ 08132714 .4byte gUnk_08132AFE .4byte gUnk_08132B0C -gUnk_08132734:: @ 08132734 - .incbin "playerItemGustJar/gUnk_08132734.bin" +gSpriteAnimations_ItemGustJar_2:: @ 08132734 + .include "animations/gSpriteAnimations_ItemGustJar_2.s" -gUnk_08132744:: @ 08132744 - .incbin "playerItemGustJar/gUnk_08132744.bin" +gSpriteAnimations_ItemGustJar_1:: @ 08132744 + .include "animations/gSpriteAnimations_ItemGustJar_1.s" -gUnk_08132754:: @ 08132754 - .incbin "playerItemGustJar/gUnk_08132754.bin" +gSpriteAnimations_ItemGustJar_0:: @ 08132754 + .include "animations/gSpriteAnimations_ItemGustJar_0.s" -gUnk_08132764:: @ 08132764 - .incbin "playerItemGustJar/gUnk_08132764.bin" +gSpriteAnimations_ItemGustJar_6:: @ 08132764 + .include "animations/gSpriteAnimations_ItemGustJar_6.s" -gUnk_08132774:: @ 08132774 - .incbin "playerItemGustJar/gUnk_08132774.bin" +gSpriteAnimations_ItemGustJar_5:: @ 08132774 + .include "animations/gSpriteAnimations_ItemGustJar_5.s" -gUnk_08132784:: @ 08132784 - .incbin "playerItemGustJar/gUnk_08132784.bin" +gSpriteAnimations_ItemGustJar_4:: @ 08132784 + .include "animations/gSpriteAnimations_ItemGustJar_4.s" -gUnk_08132794:: @ 08132794 - .incbin "playerItemGustJar/gUnk_08132794.bin" +gSpriteAnimations_ItemGustJar_10:: @ 08132794 + .include "animations/gSpriteAnimations_ItemGustJar_10.s" -gUnk_081327AC:: @ 081327AC - .incbin "playerItemGustJar/gUnk_081327AC.bin" +gSpriteAnimations_ItemGustJar_9:: @ 081327AC + .include "animations/gSpriteAnimations_ItemGustJar_9.s" -gUnk_081327C4:: @ 081327C4 - .incbin "playerItemGustJar/gUnk_081327C4.bin" +gSpriteAnimations_ItemGustJar_8:: @ 081327C4 + .include "animations/gSpriteAnimations_ItemGustJar_8.s" gSpriteAnimations_ItemGustJar:: @ 081327DC - .4byte gUnk_08132754 - .4byte gUnk_08132744 - .4byte gUnk_08132734 - .4byte gUnk_08132744 - .4byte gUnk_08132784 - .4byte gUnk_08132774 - .4byte gUnk_08132764 - .4byte gUnk_08132774 - .4byte gUnk_081327C4 - .4byte gUnk_081327AC - .4byte gUnk_08132794 - .4byte gUnk_081327AC + .4byte gSpriteAnimations_ItemGustJar_0 + .4byte gSpriteAnimations_ItemGustJar_1 + .4byte gSpriteAnimations_ItemGustJar_2 + .4byte gSpriteAnimations_ItemGustJar_1 + .4byte gSpriteAnimations_ItemGustJar_4 + .4byte gSpriteAnimations_ItemGustJar_5 + .4byte gSpriteAnimations_ItemGustJar_6 + .4byte gSpriteAnimations_ItemGustJar_5 + .4byte gSpriteAnimations_ItemGustJar_8 + .4byte gSpriteAnimations_ItemGustJar_9 + .4byte gSpriteAnimations_ItemGustJar_10 + .4byte gSpriteAnimations_ItemGustJar_9 .4byte 00000000 gSpriteFrames_23:: @ 08132810 diff --git a/data/data_080029B4.s b/data/data_080029B4.s index 20288da9..ff8ce73e 100644 --- a/data/data_080029B4.s +++ b/data/data_080029B4.s @@ -170,7 +170,7 @@ gSpritePtrs:: @ 080029B4 .4byte gSprite_081DF834 .4byte 00000000 - .4byte gSpriteAnimations_Object6A + .4byte gSpriteAnimations_Object6A_9 .4byte gSpriteFrames_33 .4byte gSprite_081DF834 .4byte 00000000 diff --git a/data/data_080D015C.s b/data/data_080D015C.s index ebe7a18e..a33bf38b 100644 --- a/data/data_080D015C.s +++ b/data/data_080D015C.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_080D015C:: @ 080D015C - .incbin "data_080D015C/gUnk_080D015C.bin" +gSpriteAnimations_Lakitu_0:: @ 080D015C + .include "animations/gSpriteAnimations_Lakitu_0.s" -gUnk_080D016D:: @ 080D016D - .incbin "data_080D015C/gUnk_080D016D.bin" +gSpriteAnimations_Lakitu_1:: @ 080D016D + .include "animations/gSpriteAnimations_Lakitu_1.s" -gUnk_080D017E:: @ 080D017E - .incbin "data_080D015C/gUnk_080D017E.bin" +gSpriteAnimations_Lakitu_2:: @ 080D017E + .include "animations/gSpriteAnimations_Lakitu_2.s" -gUnk_080D018F:: @ 080D018F - .incbin "data_080D015C/gUnk_080D018F.bin" +gSpriteAnimations_Lakitu_3:: @ 080D018F + .include "animations/gSpriteAnimations_Lakitu_3.s" -gUnk_080D01A0:: @ 080D01A0 - .incbin "data_080D015C/gUnk_080D01A0.bin" +gSpriteAnimations_Lakitu_4:: @ 080D01A0 + .include "animations/gSpriteAnimations_Lakitu_4.s" -gUnk_080D01B1:: @ 080D01B1 - .incbin "data_080D015C/gUnk_080D01B1.bin" +gSpriteAnimations_Lakitu_5:: @ 080D01B1 + .include "animations/gSpriteAnimations_Lakitu_5.s" -gUnk_080D01C2:: @ 080D01C2 - .incbin "data_080D015C/gUnk_080D01C2.bin" +gSpriteAnimations_Lakitu_6:: @ 080D01C2 + .include "animations/gSpriteAnimations_Lakitu_6.s" -gUnk_080D01D3:: @ 080D01D3 - .incbin "data_080D015C/gUnk_080D01D3.bin" +gSpriteAnimations_Lakitu_7:: @ 080D01D3 + .include "animations/gSpriteAnimations_Lakitu_7.s" -gUnk_080D01E4:: @ 080D01E4 - .incbin "data_080D015C/gUnk_080D01E4.bin" +gSpriteAnimations_Lakitu_8:: @ 080D01E4 + .include "animations/gSpriteAnimations_Lakitu_8.s" gUnk_080D01EF:: @ 080D01EF .incbin "data_080D015C/gUnk_080D01EF.bin" @@ -43,17 +43,17 @@ gUnk_080D0210:: @ 080D0210 gUnk_080D0211:: @ 080D0211 .incbin "data_080D015C/gUnk_080D0211.bin" -gUnk_080D0225:: @ 080D0225 - .incbin "data_080D015C/gUnk_080D0225.bin" +gSpriteAnimations_Lakitu_9:: @ 080D0225 + .include "animations/gSpriteAnimations_Lakitu_9.s" -gUnk_080D0266:: @ 080D0266 - .incbin "data_080D015C/gUnk_080D0266.bin" +gSpriteAnimations_Lakitu_10:: @ 080D0266 + .include "animations/gSpriteAnimations_Lakitu_10.s" -gUnk_080D02A7:: @ 080D02A7 - .incbin "data_080D015C/gUnk_080D02A7.bin" +gSpriteAnimations_Lakitu_11:: @ 080D02A7 + .include "animations/gSpriteAnimations_Lakitu_11.s" -gUnk_080D02E8:: @ 080D02E8 - .incbin "data_080D015C/gUnk_080D02E8.bin" +gSpriteAnimations_Lakitu_12:: @ 080D02E8 + .include "animations/gSpriteAnimations_Lakitu_12.s" gUnk_080D02F3:: @ 080D02F3 .incbin "data_080D015C/gUnk_080D02F3.bin" @@ -64,8 +64,8 @@ gUnk_080D02F6:: @ 080D02F6 gUnk_080D02F7:: @ 080D02F7 .incbin "data_080D015C/gUnk_080D02F7.bin" -gUnk_080D02F9:: @ 080D02F9 - .incbin "data_080D015C/gUnk_080D02F9.bin" +gSpriteAnimations_Lakitu_13:: @ 080D02F9 + .include "animations/gSpriteAnimations_Lakitu_13.s" gUnk_080D02FC:: @ 080D02FC .incbin "data_080D015C/gUnk_080D02FC.bin" @@ -73,8 +73,8 @@ gUnk_080D02FC:: @ 080D02FC gUnk_080D0300:: @ 080D0300 .incbin "data_080D015C/gUnk_080D0300.bin" -gUnk_080D030A:: @ 080D030A - .incbin "data_080D015C/gUnk_080D030A.bin" +gSpriteAnimations_Lakitu_14:: @ 080D030A + .include "animations/gSpriteAnimations_Lakitu_14.s" gUnk_080D031B:: @ 080D031B .incbin "data_080D015C/gUnk_080D031B.bin" @@ -104,21 +104,21 @@ gUnk_080D03A3:: @ 080D03A3 .incbin "data_080D015C/gUnk_080D03A3.bin" gSpriteAnimations_Lakitu:: @ 080D03B4 - .4byte gUnk_080D015C - .4byte gUnk_080D016D - .4byte gUnk_080D017E - .4byte gUnk_080D018F - .4byte gUnk_080D01A0 - .4byte gUnk_080D01B1 - .4byte gUnk_080D01C2 - .4byte gUnk_080D01D3 - .4byte gUnk_080D01E4 - .4byte gUnk_080D0225 - .4byte gUnk_080D0266 - .4byte gUnk_080D02A7 - .4byte gUnk_080D02E8 - .4byte gUnk_080D02F9 - .4byte gUnk_080D030A + .4byte gSpriteAnimations_Lakitu_0 + .4byte gSpriteAnimations_Lakitu_1 + .4byte gSpriteAnimations_Lakitu_2 + .4byte gSpriteAnimations_Lakitu_3 + .4byte gSpriteAnimations_Lakitu_4 + .4byte gSpriteAnimations_Lakitu_5 + .4byte gSpriteAnimations_Lakitu_6 + .4byte gSpriteAnimations_Lakitu_7 + .4byte gSpriteAnimations_Lakitu_8 + .4byte gSpriteAnimations_Lakitu_9 + .4byte gSpriteAnimations_Lakitu_10 + .4byte gSpriteAnimations_Lakitu_11 + .4byte gSpriteAnimations_Lakitu_12 + .4byte gSpriteAnimations_Lakitu_13 + .4byte gSpriteAnimations_Lakitu_14 gUnk_080D03F0:: @ 080D03F0 .4byte gUnk_080D031B diff --git a/data/data_08125104.s b/data/data_08125104.s index ea63e6d6..7cb58f87 100644 --- a/data/data_08125104.s +++ b/data/data_08125104.s @@ -761,131 +761,131 @@ gUnk_08126EE4:: @ 08126EE4 gUnk_08126EEC:: @ 08126EEC .incbin "data_08125104/gUnk_08126EEC.bin" -gUnk_08126EF4:: @ 08126EF4 - .incbin "data_08125104/gUnk_08126EF4.bin" +gSpriteAnimations_166_0:: @ 08126EF4 + .include "animations/gSpriteAnimations_166_0.s" -gUnk_08126EF8:: @ 08126EF8 - .incbin "data_08125104/gUnk_08126EF8.bin" +gSpriteAnimations_166_1:: @ 08126EF8 + .include "animations/gSpriteAnimations_166_1.s" -gUnk_08126EFD:: @ 08126EFD - .incbin "data_08125104/gUnk_08126EFD.bin" +gSpriteAnimations_166_2:: @ 08126EFD + .include "animations/gSpriteAnimations_166_2.s" -gUnk_08126F02:: @ 08126F02 - .incbin "data_08125104/gUnk_08126F02.bin" +gSpriteAnimations_166_3:: @ 08126F02 + .include "animations/gSpriteAnimations_166_3.s" -gUnk_08126F13:: @ 08126F13 - .incbin "data_08125104/gUnk_08126F13.bin" +gSpriteAnimations_166_7:: @ 08126F13 + .include "animations/gSpriteAnimations_166_7.s" -gUnk_08126F28:: @ 08126F28 - .incbin "data_08125104/gUnk_08126F28.bin" +gSpriteAnimations_166_8:: @ 08126F28 + .include "animations/gSpriteAnimations_166_8.s" -gUnk_08126F3D:: @ 08126F3D - .incbin "data_08125104/gUnk_08126F3D.bin" +gSpriteAnimations_166_4:: @ 08126F3D + .include "animations/gSpriteAnimations_166_4.s" -gUnk_08126F4E:: @ 08126F4E - .incbin "data_08125104/gUnk_08126F4E.bin" +gSpriteAnimations_166_22:: @ 08126F4E + .include "animations/gSpriteAnimations_166_22.s" -gUnk_08126F5F:: @ 08126F5F - .incbin "data_08125104/gUnk_08126F5F.bin" +gSpriteAnimations_166_23:: @ 08126F5F + .include "animations/gSpriteAnimations_166_23.s" -gUnk_08126F70:: @ 08126F70 - .incbin "data_08125104/gUnk_08126F70.bin" +gSpriteAnimations_166_6:: @ 08126F70 + .include "animations/gSpriteAnimations_166_6.s" -gUnk_08126F81:: @ 08126F81 - .incbin "data_08125104/gUnk_08126F81.bin" +gSpriteAnimations_166_5:: @ 08126F81 + .include "animations/gSpriteAnimations_166_5.s" -gUnk_08126F8A:: @ 08126F8A - .incbin "data_08125104/gUnk_08126F8A.bin" +gSpriteAnimations_166_9:: @ 08126F8A + .include "animations/gSpriteAnimations_166_9.s" -gUnk_08126F96:: @ 08126F96 - .incbin "data_08125104/gUnk_08126F96.bin" +gSpriteAnimations_166_10:: @ 08126F96 + .include "animations/gSpriteAnimations_166_10.s" -gUnk_08126FA3:: @ 08126FA3 - .incbin "data_08125104/gUnk_08126FA3.bin" +gSpriteAnimations_166_13:: @ 08126FA3 + .include "animations/gSpriteAnimations_166_13.s" -gUnk_08126FB3:: @ 08126FB3 - .incbin "data_08125104/gUnk_08126FB3.bin" +gSpriteAnimations_166_16:: @ 08126FB3 + .include "animations/gSpriteAnimations_166_16.s" -gUnk_08126FC3:: @ 08126FC3 - .incbin "data_08125104/gUnk_08126FC3.bin" +gSpriteAnimations_166_11:: @ 08126FC3 + .include "animations/gSpriteAnimations_166_11.s" -gUnk_08126FE4:: @ 08126FE4 - .incbin "data_08125104/gUnk_08126FE4.bin" +gSpriteAnimations_166_14:: @ 08126FE4 + .include "animations/gSpriteAnimations_166_14.s" -gUnk_08126FF8:: @ 08126FF8 - .incbin "data_08125104/gUnk_08126FF8.bin" +gSpriteAnimations_166_12:: @ 08126FF8 + .include "animations/gSpriteAnimations_166_12.s" -gUnk_08127019:: @ 08127019 - .incbin "data_08125104/gUnk_08127019.bin" +gSpriteAnimations_166_15:: @ 08127019 + .include "animations/gSpriteAnimations_166_15.s" -gUnk_08127031:: @ 08127031 - .incbin "data_08125104/gUnk_08127031.bin" +gSpriteAnimations_166_17:: @ 08127031 + .include "animations/gSpriteAnimations_166_17.s" -gUnk_08127046:: @ 08127046 - .incbin "data_08125104/gUnk_08127046.bin" +gSpriteAnimations_166_18:: @ 08127046 + .include "animations/gSpriteAnimations_166_18.s" -gUnk_0812705B:: @ 0812705B - .incbin "data_08125104/gUnk_0812705B.bin" +gSpriteAnimations_166_19:: @ 0812705B + .include "animations/gSpriteAnimations_166_19.s" -gUnk_081270B7:: @ 081270B7 - .incbin "data_08125104/gUnk_081270B7.bin" +gSpriteAnimations_166_20:: @ 081270B7 + .include "animations/gSpriteAnimations_166_20.s" -gUnk_081270E0:: @ 081270E0 - .incbin "data_08125104/gUnk_081270E0.bin" +gSpriteAnimations_166_21:: @ 081270E0 + .include "animations/gSpriteAnimations_166_21.s" -gUnk_081270F1:: @ 081270F1 - .incbin "data_08125104/gUnk_081270F1.bin" +gSpriteAnimations_166_24:: @ 081270F1 + .include "animations/gSpriteAnimations_166_24.s" -gUnk_081270F6:: @ 081270F6 - .incbin "data_08125104/gUnk_081270F6.bin" +gSpriteAnimations_166_25:: @ 081270F6 + .include "animations/gSpriteAnimations_166_25.s" -gUnk_08127107:: @ 08127107 - .incbin "data_08125104/gUnk_08127107.bin" +gSpriteAnimations_166_26:: @ 08127107 + .include "animations/gSpriteAnimations_166_26.s" -gUnk_08127118:: @ 08127118 - .incbin "data_08125104/gUnk_08127118.bin" +gSpriteAnimations_166_27:: @ 08127118 + .include "animations/gSpriteAnimations_166_27.s" -gUnk_08127129:: @ 08127129 - .incbin "data_08125104/gUnk_08127129.bin" +gSpriteAnimations_166_28:: @ 08127129 + .include "animations/gSpriteAnimations_166_28.s" -gUnk_0812713A:: @ 0812713A - .incbin "data_08125104/gUnk_0812713A.bin" +gSpriteAnimations_166_29:: @ 0812713A + .include "animations/gSpriteAnimations_166_29.s" -gUnk_08127143:: @ 08127143 - .incbin "data_08125104/gUnk_08127143.bin" +gSpriteAnimations_166_30:: @ 08127143 + .include "animations/gSpriteAnimations_166_30.s" gSpriteAnimations_166:: @ 0812714C - .4byte gUnk_08126EF4 - .4byte gUnk_08126EF8 - .4byte gUnk_08126EFD - .4byte gUnk_08126F02 - .4byte gUnk_08126F3D - .4byte gUnk_08126F81 - .4byte gUnk_08126F70 - .4byte gUnk_08126F13 - .4byte gUnk_08126F28 - .4byte gUnk_08126F8A - .4byte gUnk_08126F96 - .4byte gUnk_08126FC3 - .4byte gUnk_08126FF8 - .4byte gUnk_08126FA3 - .4byte gUnk_08126FE4 - .4byte gUnk_08127019 - .4byte gUnk_08126FB3 - .4byte gUnk_08127031 - .4byte gUnk_08127046 - .4byte gUnk_0812705B - .4byte gUnk_081270B7 - .4byte gUnk_081270E0 - .4byte gUnk_08126F4E - .4byte gUnk_08126F5F - .4byte gUnk_081270F1 - .4byte gUnk_081270F6 - .4byte gUnk_08127107 - .4byte gUnk_08127118 - .4byte gUnk_08127129 - .4byte gUnk_0812713A - .4byte gUnk_08127143 + .4byte gSpriteAnimations_166_0 + .4byte gSpriteAnimations_166_1 + .4byte gSpriteAnimations_166_2 + .4byte gSpriteAnimations_166_3 + .4byte gSpriteAnimations_166_4 + .4byte gSpriteAnimations_166_5 + .4byte gSpriteAnimations_166_6 + .4byte gSpriteAnimations_166_7 + .4byte gSpriteAnimations_166_8 + .4byte gSpriteAnimations_166_9 + .4byte gSpriteAnimations_166_10 + .4byte gSpriteAnimations_166_11 + .4byte gSpriteAnimations_166_12 + .4byte gSpriteAnimations_166_13 + .4byte gSpriteAnimations_166_14 + .4byte gSpriteAnimations_166_15 + .4byte gSpriteAnimations_166_16 + .4byte gSpriteAnimations_166_17 + .4byte gSpriteAnimations_166_18 + .4byte gSpriteAnimations_166_19 + .4byte gSpriteAnimations_166_20 + .4byte gSpriteAnimations_166_21 + .4byte gSpriteAnimations_166_22 + .4byte gSpriteAnimations_166_23 + .4byte gSpriteAnimations_166_24 + .4byte gSpriteAnimations_166_25 + .4byte gSpriteAnimations_166_26 + .4byte gSpriteAnimations_166_27 + .4byte gSpriteAnimations_166_28 + .4byte gSpriteAnimations_166_29 + .4byte gSpriteAnimations_166_30 .4byte 00000000 gUnk_081271CC:: @ 081271CC diff --git a/data/gfx/figurine_gfx.s b/data/gfx/figurine_gfx.s index 35155dfa..1e815c8c 100644 --- a/data/gfx/figurine_gfx.s +++ b/data/gfx/figurine_gfx.s @@ -415,4 +415,4 @@ gFigurineGfx136:: @ 088C00E0 @ TODO the last 0x8c0 of gFigurineGfx136 belong to gGfx_89_6 -@ TODO end of figurine data
\ No newline at end of file +@ TODO end of figurine data diff --git a/data/gfx/figurine_pals.s b/data/gfx/figurine_pals.s index 969ae98c..0fc224e2 100644 --- a/data/gfx/figurine_pals.s +++ b/data/gfx/figurine_pals.s @@ -413,4 +413,4 @@ gFigurinePal135:: @ 085BD440 gFigurinePal136:: @ 085BD520 .incbin "palettes/gFigurinePal136.gbapal" -@ TODO end of figurine data
\ No newline at end of file +@ TODO end of figurine data diff --git a/data/gfx/palette_groups.s b/data/gfx/palette_groups.s index ad23b86c..35d0c8ab 100644 --- a/data/gfx/palette_groups.s +++ b/data/gfx/palette_groups.s @@ -1,630 +1,629 @@ -gPaletteGroup_0:: @ 080FF428 - .incbin "palettes/gPaletteGroup_0.bin" - -gPaletteGroup_1:: @ 080FF430 +gPaletteGroup_1:: @ 080FF428 .incbin "palettes/gPaletteGroup_1.bin" -gPaletteGroup_2:: @ 080FF438 +gPaletteGroup_2:: @ 080FF430 .incbin "palettes/gPaletteGroup_2.bin" -gPaletteGroup_3:: @ 080FF444 +gPaletteGroup_3:: @ 080FF438 .incbin "palettes/gPaletteGroup_3.bin" -gPaletteGroup_4:: @ 080FF450 +gPaletteGroup_4:: @ 080FF444 .incbin "palettes/gPaletteGroup_4.bin" -gPaletteGroup_5:: @ 080FF454 +gPaletteGroup_5:: @ 080FF450 .incbin "palettes/gPaletteGroup_5.bin" -gPaletteGroup_6:: @ 080FF458 +gPaletteGroup_6:: @ 080FF454 .incbin "palettes/gPaletteGroup_6.bin" -gPaletteGroup_7:: @ 080FF45C +gPaletteGroup_7:: @ 080FF458 .incbin "palettes/gPaletteGroup_7.bin" -gPaletteGroup_8:: @ 080FF460 +gPaletteGroup_8:: @ 080FF45C .incbin "palettes/gPaletteGroup_8.bin" -gPaletteGroup_9:: @ 080FF474 +gPaletteGroup_9:: @ 080FF460 .incbin "palettes/gPaletteGroup_9.bin" -gPaletteGroup_11:: @ 080FF484 - .incbin "palettes/gPaletteGroup_11.bin" - -gPaletteGroup_10:: @ 080FF488 +gPaletteGroup_10:: @ 080FF474 .incbin "palettes/gPaletteGroup_10.bin" -gPaletteGroup_27:: @ 080FF490 - .incbin "palettes/gPaletteGroup_27.bin" - -gPaletteGroup_38:: @ 080FF494 - .incbin "palettes/gPaletteGroup_38.bin" +gPaletteGroup_21:: @ 080FF484 + .incbin "palettes/gPaletteGroup_21.bin" -gPaletteGroup_20:: @ 080FF498 +gPaletteGroup_20:: @ 080FF488 .incbin "palettes/gPaletteGroup_20.bin" -gPaletteGroup_19:: @ 080FF49C - .incbin "palettes/gPaletteGroup_19.bin" +gPaletteGroup_37:: @ 080FF490 + .incbin "palettes/gPaletteGroup_37.bin" -gPaletteGroup_13:: @ 080FF4A0 - .incbin "palettes/gPaletteGroup_13.bin" +gPaletteGroup_48:: @ 080FF494 + .incbin "palettes/gPaletteGroup_48.bin" -gPaletteGroup_21:: @ 080FF4A4 - .incbin "palettes/gPaletteGroup_21.bin" +gPaletteGroup_30:: @ 080FF498 + .incbin "palettes/gPaletteGroup_30.bin" -gPaletteGroup_22:: @ 080FF4A8 - .incbin "palettes/gPaletteGroup_22.bin" +gPaletteGroup_29:: @ 080FF49C + .incbin "palettes/gPaletteGroup_29.bin" -gPaletteGroup_23:: @ 080FF4AC +gPaletteGroup_23:: @ 080FF4A0 .incbin "palettes/gPaletteGroup_23.bin" -gPaletteGroup_24:: @ 080FF4B0 - .incbin "palettes/gPaletteGroup_24.bin" +gPaletteGroup_31:: @ 080FF4A4 + .incbin "palettes/gPaletteGroup_31.bin" -gPaletteGroup_60:: @ 080FF4B4 - .incbin "palettes/gPaletteGroup_60.bin" +gPaletteGroup_32:: @ 080FF4A8 + .incbin "palettes/gPaletteGroup_32.bin" -gPaletteGroup_26:: @ 080FF4B8 - .incbin "palettes/gPaletteGroup_26.bin" +gPaletteGroup_33:: @ 080FF4AC + .incbin "palettes/gPaletteGroup_33.bin" -gPaletteGroup_169:: @ 080FF4BC - .incbin "palettes/gPaletteGroup_169.bin" +gPaletteGroup_34:: @ 080FF4B0 + .incbin "palettes/gPaletteGroup_34.bin" -gPaletteGroup_53:: @ 080FF4C0 - .incbin "palettes/gPaletteGroup_53.bin" +gPaletteGroup_70:: @ 080FF4B4 + .incbin "palettes/gPaletteGroup_70.bin" -gPaletteGroup_17:: @ 080FF4C4 - .incbin "palettes/gPaletteGroup_17.bin" +gPaletteGroup_36:: @ 080FF4B8 + .incbin "palettes/gPaletteGroup_36.bin" -gPaletteGroup_62:: @ 080FF4C8 - .incbin "palettes/gPaletteGroup_62.bin" +gPaletteGroup_269:: @ 080FF4BC + .incbin "palettes/gPaletteGroup_269.bin" -gPaletteGroup_63:: @ 080FF4CC +gPaletteGroup_63:: @ 080FF4C0 .incbin "palettes/gPaletteGroup_63.bin" -gPaletteGroup_64:: @ 080FF4D0 - .incbin "palettes/gPaletteGroup_64.bin" +gPaletteGroup_27:: @ 080FF4C4 + .incbin "palettes/gPaletteGroup_27.bin" -gPaletteGroup_65:: @ 080FF4D4 - .incbin "palettes/gPaletteGroup_65.bin" +gPaletteGroup_72:: @ 080FF4C8 + .incbin "palettes/gPaletteGroup_72.bin" -gPaletteGroup_92:: @ 080FF4D8 - .incbin "palettes/gPaletteGroup_92.bin" +gPaletteGroup_73:: @ 080FF4CC + .incbin "palettes/gPaletteGroup_73.bin" -gPaletteGroup_14:: @ 080FF4DC - .incbin "palettes/gPaletteGroup_14.bin" +gPaletteGroup_74:: @ 080FF4D0 + .incbin "palettes/gPaletteGroup_74.bin" -gPaletteGroup_108:: @ 080FF4E0 - .incbin "palettes/gPaletteGroup_108.bin" +gPaletteGroup_75:: @ 080FF4D4 + .incbin "palettes/gPaletteGroup_75.bin" -gPaletteGroup_16:: @ 080FF4E4 - .incbin "palettes/gPaletteGroup_16.bin" +gPaletteGroup_102:: @ 080FF4D8 + .incbin "palettes/gPaletteGroup_102.bin" -gPaletteGroup_25:: @ 080FF4E8 - .incbin "palettes/gPaletteGroup_25.bin" +gPaletteGroup_24:: @ 080FF4DC + .incbin "palettes/gPaletteGroup_24.bin" -gPaletteGroup_89:: @ 080FF4EC - .incbin "palettes/gPaletteGroup_89.bin" +gPaletteGroup_208:: @ 080FF4E0 + .incbin "palettes/gPaletteGroup_208.bin" -gPaletteGroup_35:: @ 080FF4F0 +gPaletteGroup_26:: @ 080FF4E4 + .incbin "palettes/gPaletteGroup_26.bin" + +gPaletteGroup_35:: @ 080FF4E8 .incbin "palettes/gPaletteGroup_35.bin" -gPaletteGroup_36:: @ 080FF4F4 - .incbin "palettes/gPaletteGroup_36.bin" +gPaletteGroup_99:: @ 080FF4EC + .incbin "palettes/gPaletteGroup_99.bin" -gPaletteGroup_127:: @ 080FF4F8 - .incbin "palettes/gPaletteGroup_127.bin" +gPaletteGroup_45:: @ 080FF4F0 + .incbin "palettes/gPaletteGroup_45.bin" -gPaletteGroup_93:: @ 080FF4FC - .incbin "palettes/gPaletteGroup_93.bin" +gPaletteGroup_46:: @ 080FF4F4 + .incbin "palettes/gPaletteGroup_46.bin" -gPaletteGroup_54:: @ 080FF500 - .incbin "palettes/gPaletteGroup_54.bin" +gPaletteGroup_227:: @ 080FF4F8 + .incbin "palettes/gPaletteGroup_227.bin" -gPaletteGroup_103:: @ 080FF504 +gPaletteGroup_103:: @ 080FF4FC .incbin "palettes/gPaletteGroup_103.bin" -gPaletteGroup_129:: @ 080FF508 - .incbin "palettes/gPaletteGroup_129.bin" +gPaletteGroup_64:: @ 080FF500 + .incbin "palettes/gPaletteGroup_64.bin" -gPaletteGroup_59:: @ 080FF50C - .incbin "palettes/gPaletteGroup_59.bin" +gPaletteGroup_203:: @ 080FF504 + .incbin "palettes/gPaletteGroup_203.bin" -gPaletteGroup_55:: @ 080FF510 - .incbin "palettes/gPaletteGroup_55.bin" +gPaletteGroup_229:: @ 080FF508 + .incbin "palettes/gPaletteGroup_229.bin" -gPaletteGroup_161:: @ 080FF514 - .incbin "palettes/gPaletteGroup_161.bin" +gPaletteGroup_69:: @ 080FF50C + .incbin "palettes/gPaletteGroup_69.bin" -gPaletteGroup_56:: @ 080FF518 - .incbin "palettes/gPaletteGroup_56.bin" +gPaletteGroup_65:: @ 080FF510 + .incbin "palettes/gPaletteGroup_65.bin" -gPaletteGroup_57:: @ 080FF51C - .incbin "palettes/gPaletteGroup_57.bin" +gPaletteGroup_261:: @ 080FF514 + .incbin "palettes/gPaletteGroup_261.bin" -gPaletteGroup_144:: @ 080FF520 - .incbin "palettes/gPaletteGroup_144.bin" +gPaletteGroup_66:: @ 080FF518 + .incbin "palettes/gPaletteGroup_66.bin" -gPaletteGroup_58:: @ 080FF524 - .incbin "palettes/gPaletteGroup_58.bin" +gPaletteGroup_67:: @ 080FF51C + .incbin "palettes/gPaletteGroup_67.bin" -gPaletteGroup_143:: @ 080FF528 - .incbin "palettes/gPaletteGroup_143.bin" +gPaletteGroup_244:: @ 080FF520 + .incbin "palettes/gPaletteGroup_244.bin" -gPaletteGroup_179:: @ 080FF52C - .incbin "palettes/gPaletteGroup_179.bin" +gPaletteGroup_68:: @ 080FF524 + .incbin "palettes/gPaletteGroup_68.bin" -gPaletteGroup_154:: @ 080FF530 - .incbin "palettes/gPaletteGroup_154.bin" +gPaletteGroup_243:: @ 080FF528 + .incbin "palettes/gPaletteGroup_243.bin" -gPaletteGroup_155:: @ 080FF534 - .incbin "palettes/gPaletteGroup_155.bin" +gPaletteGroup_279:: @ 080FF52C + .incbin "palettes/gPaletteGroup_279.bin" -gPaletteGroup_168:: @ 080FF538 - .incbin "palettes/gPaletteGroup_168.bin" +gPaletteGroup_254:: @ 080FF530 + .incbin "palettes/gPaletteGroup_254.bin" -gPaletteGroup_104:: @ 080FF53C - .incbin "palettes/gPaletteGroup_104.bin" +gPaletteGroup_255:: @ 080FF534 + .incbin "palettes/gPaletteGroup_255.bin" -gPaletteGroup_105:: @ 080FF540 - .incbin "palettes/gPaletteGroup_105.bin" +gPaletteGroup_268:: @ 080FF538 + .incbin "palettes/gPaletteGroup_268.bin" -gPaletteGroup_106:: @ 080FF544 - .incbin "palettes/gPaletteGroup_106.bin" +gPaletteGroup_204:: @ 080FF53C + .incbin "palettes/gPaletteGroup_204.bin" -gPaletteGroup_107:: @ 080FF548 - .incbin "palettes/gPaletteGroup_107.bin" +gPaletteGroup_205:: @ 080FF540 + .incbin "palettes/gPaletteGroup_205.bin" -gPaletteGroup_119:: @ 080FF54C - .incbin "palettes/gPaletteGroup_119.bin" +gPaletteGroup_206:: @ 080FF544 + .incbin "palettes/gPaletteGroup_206.bin" -gPaletteGroup_162:: @ 080FF550 - .incbin "palettes/gPaletteGroup_162.bin" +gPaletteGroup_207:: @ 080FF548 + .incbin "palettes/gPaletteGroup_207.bin" -gPaletteGroup_163:: @ 080FF554 - .incbin "palettes/gPaletteGroup_163.bin" +gPaletteGroup_219:: @ 080FF54C + .incbin "palettes/gPaletteGroup_219.bin" -gPaletteGroup_164:: @ 080FF558 - .incbin "palettes/gPaletteGroup_164.bin" +gPaletteGroup_262:: @ 080FF550 + .incbin "palettes/gPaletteGroup_262.bin" -gPaletteGroup_165:: @ 080FF55C - .incbin "palettes/gPaletteGroup_165.bin" +gPaletteGroup_263:: @ 080FF554 + .incbin "palettes/gPaletteGroup_263.bin" -gPaletteGroup_15:: @ 080FF560 - .incbin "palettes/gPaletteGroup_15.bin" +gPaletteGroup_264:: @ 080FF558 + .incbin "palettes/gPaletteGroup_264.bin" -gPaletteGroup_45:: @ 080FF564 - .incbin "palettes/gPaletteGroup_45.bin" +gPaletteGroup_265:: @ 080FF55C + .incbin "palettes/gPaletteGroup_265.bin" -gPaletteGroup_66:: @ 080FF568 - .incbin "palettes/gPaletteGroup_66.bin" +gPaletteGroup_25:: @ 080FF560 + .incbin "palettes/gPaletteGroup_25.bin" -gPaletteGroup_84:: @ 080FF56C - .incbin "palettes/gPaletteGroup_84.bin" +gPaletteGroup_55:: @ 080FF564 + .incbin "palettes/gPaletteGroup_55.bin" + +gPaletteGroup_76:: @ 080FF568 + .incbin "palettes/gPaletteGroup_76.bin" -gPaletteGroup_18:: @ 080FF570 - .incbin "palettes/gPaletteGroup_18.bin" +gPaletteGroup_94:: @ 080FF56C + .incbin "palettes/gPaletteGroup_94.bin" -gPaletteGroup_28:: @ 080FF574 +gPaletteGroup_28:: @ 080FF570 .incbin "palettes/gPaletteGroup_28.bin" -gPaletteGroup_29:: @ 080FF578 - .incbin "palettes/gPaletteGroup_29.bin" +gPaletteGroup_38:: @ 080FF574 + .incbin "palettes/gPaletteGroup_38.bin" -gPaletteGroup_32:: @ 080FF57C - .incbin "palettes/gPaletteGroup_32.bin" +gPaletteGroup_39:: @ 080FF578 + .incbin "palettes/gPaletteGroup_39.bin" -gPaletteGroup_98:: @ 080FF580 - .incbin "palettes/gPaletteGroup_98.bin" +gPaletteGroup_42:: @ 080FF57C + .incbin "palettes/gPaletteGroup_42.bin" -gPaletteGroup_99:: @ 080FF584 - .incbin "palettes/gPaletteGroup_99.bin" +gPaletteGroup_108:: @ 080FF580 + .incbin "palettes/gPaletteGroup_108.bin" -gPaletteGroup_166:: @ 080FF588 - .incbin "palettes/gPaletteGroup_166.bin" +gPaletteGroup_109:: @ 080FF584 + .incbin "palettes/gPaletteGroup_109.bin" -gPaletteGroup_43:: @ 080FF58C - .incbin "palettes/gPaletteGroup_43.bin" +gPaletteGroup_266:: @ 080FF588 + .incbin "palettes/gPaletteGroup_266.bin" -gPaletteGroup_30:: @ 080FF590 - .incbin "palettes/gPaletteGroup_30.bin" +gPaletteGroup_53:: @ 080FF58C + .incbin "palettes/gPaletteGroup_53.bin" -gPaletteGroup_31:: @ 080FF594 - .incbin "palettes/gPaletteGroup_31.bin" +gPaletteGroup_40:: @ 080FF590 + .incbin "palettes/gPaletteGroup_40.bin" -gPaletteGroup_37:: @ 080FF598 - .incbin "palettes/gPaletteGroup_37.bin" +gPaletteGroup_41:: @ 080FF594 + .incbin "palettes/gPaletteGroup_41.bin" -gPaletteGroup_40:: @ 080FF59C - .incbin "palettes/gPaletteGroup_40.bin" +gPaletteGroup_47:: @ 080FF598 + .incbin "palettes/gPaletteGroup_47.bin" -gPaletteGroup_61:: @ 080FF5A0 - .incbin "palettes/gPaletteGroup_61.bin" +gPaletteGroup_50:: @ 080FF59C + .incbin "palettes/gPaletteGroup_50.bin" -gPaletteGroup_91:: @ 080FF5A4 - .incbin "palettes/gPaletteGroup_91.bin" +gPaletteGroup_71:: @ 080FF5A0 + .incbin "palettes/gPaletteGroup_71.bin" -gPaletteGroup_101:: @ 080FF5A8 +gPaletteGroup_101:: @ 080FF5A4 .incbin "palettes/gPaletteGroup_101.bin" -gPaletteGroup_102:: @ 080FF5AC - .incbin "palettes/gPaletteGroup_102.bin" +gPaletteGroup_201:: @ 080FF5A8 + .incbin "palettes/gPaletteGroup_201.bin" -gPaletteGroup_50:: @ 080FF5B0 - .incbin "palettes/gPaletteGroup_50.bin" +gPaletteGroup_202:: @ 080FF5AC + .incbin "palettes/gPaletteGroup_202.bin" -gPaletteGroup_51:: @ 080FF5B4 - .incbin "palettes/gPaletteGroup_51.bin" +gPaletteGroup_60:: @ 080FF5B0 + .incbin "palettes/gPaletteGroup_60.bin" -gPaletteGroup_88:: @ 080FF5B8 - .incbin "palettes/gPaletteGroup_88.bin" +gPaletteGroup_61:: @ 080FF5B4 + .incbin "palettes/gPaletteGroup_61.bin" -gPaletteGroup_156:: @ 080FF5BC - .incbin "palettes/gPaletteGroup_156.bin" +gPaletteGroup_98:: @ 080FF5B8 + .incbin "palettes/gPaletteGroup_98.bin" -gPaletteGroup_167:: @ 080FF5C0 - .incbin "palettes/gPaletteGroup_167.bin" +gPaletteGroup_256:: @ 080FF5BC + .incbin "palettes/gPaletteGroup_256.bin" -gPaletteGroup_52:: @ 080FF5C4 - .incbin "palettes/gPaletteGroup_52.bin" +gPaletteGroup_267:: @ 080FF5C0 + .incbin "palettes/gPaletteGroup_267.bin" -gPaletteGroup_12:: @ 080FF5C8 - .incbin "palettes/gPaletteGroup_12.bin" +gPaletteGroup_62:: @ 080FF5C4 + .incbin "palettes/gPaletteGroup_62.bin" -gPaletteGroup_44:: @ 080FF5CC - .incbin "palettes/gPaletteGroup_44.bin" +gPaletteGroup_22:: @ 080FF5C8 + .incbin "palettes/gPaletteGroup_22.bin" -gPaletteGroup_145:: @ 080FF5D0 - .incbin "palettes/gPaletteGroup_145.bin" +gPaletteGroup_54:: @ 080FF5CC + .incbin "palettes/gPaletteGroup_54.bin" -gPaletteGroup_146:: @ 080FF5D4 - .incbin "palettes/gPaletteGroup_146.bin" +gPaletteGroup_245:: @ 080FF5D0 + .incbin "palettes/gPaletteGroup_245.bin" -gPaletteGroup_147:: @ 080FF5D8 - .incbin "palettes/gPaletteGroup_147.bin" +gPaletteGroup_246:: @ 080FF5D4 + .incbin "palettes/gPaletteGroup_246.bin" -gPaletteGroup_148:: @ 080FF5DC - .incbin "palettes/gPaletteGroup_148.bin" +gPaletteGroup_247:: @ 080FF5D8 + .incbin "palettes/gPaletteGroup_247.bin" -gPaletteGroup_149:: @ 080FF5E0 - .incbin "palettes/gPaletteGroup_149.bin" +gPaletteGroup_248:: @ 080FF5DC + .incbin "palettes/gPaletteGroup_248.bin" -gPaletteGroup_33:: @ 080FF5E4 - .incbin "palettes/gPaletteGroup_33.bin" +gPaletteGroup_249:: @ 080FF5E0 + .incbin "palettes/gPaletteGroup_249.bin" -gPaletteGroup_150:: @ 080FF5E8 - .incbin "palettes/gPaletteGroup_150.bin" +gPaletteGroup_43:: @ 080FF5E4 + .incbin "palettes/gPaletteGroup_43.bin" -gPaletteGroup_151:: @ 080FF5EC - .incbin "palettes/gPaletteGroup_151.bin" +gPaletteGroup_250:: @ 080FF5E8 + .incbin "palettes/gPaletteGroup_250.bin" -gPaletteGroup_152:: @ 080FF5F0 - .incbin "palettes/gPaletteGroup_152.bin" +gPaletteGroup_251:: @ 080FF5EC + .incbin "palettes/gPaletteGroup_251.bin" -gPaletteGroup_153:: @ 080FF5F4 - .incbin "palettes/gPaletteGroup_153.bin" +gPaletteGroup_252:: @ 080FF5F0 + .incbin "palettes/gPaletteGroup_252.bin" -gPaletteGroup_34:: @ 080FF5F8 - .incbin "palettes/gPaletteGroup_34.bin" +gPaletteGroup_253:: @ 080FF5F4 + .incbin "palettes/gPaletteGroup_253.bin" -gPaletteGroup_100:: @ 080FF5FC - .incbin "palettes/gPaletteGroup_100.bin" +gPaletteGroup_44:: @ 080FF5F8 + .incbin "palettes/gPaletteGroup_44.bin" -gPaletteGroup_109:: @ 080FF600 - .incbin "palettes/gPaletteGroup_109.bin" +gPaletteGroup_200:: @ 080FF5FC + .incbin "palettes/gPaletteGroup_200.bin" -gPaletteGroup_120:: @ 080FF604 - .incbin "palettes/gPaletteGroup_120.bin" +gPaletteGroup_209:: @ 080FF600 + .incbin "palettes/gPaletteGroup_209.bin" -gPaletteGroup_124:: @ 080FF608 - .incbin "palettes/gPaletteGroup_124.bin" +gPaletteGroup_220:: @ 080FF604 + .incbin "palettes/gPaletteGroup_220.bin" -gPaletteGroup_125:: @ 080FF60C - .incbin "palettes/gPaletteGroup_125.bin" +gPaletteGroup_224:: @ 080FF608 + .incbin "palettes/gPaletteGroup_224.bin" -gPaletteGroup_126:: @ 080FF610 - .incbin "palettes/gPaletteGroup_126.bin" +gPaletteGroup_225:: @ 080FF60C + .incbin "palettes/gPaletteGroup_225.bin" -gPaletteGroup_130:: @ 080FF614 - .incbin "palettes/gPaletteGroup_130.bin" +gPaletteGroup_226:: @ 080FF610 + .incbin "palettes/gPaletteGroup_226.bin" -gPaletteGroup_131:: @ 080FF618 - .incbin "palettes/gPaletteGroup_131.bin" +gPaletteGroup_230:: @ 080FF614 + .incbin "palettes/gPaletteGroup_230.bin" -gPaletteGroup_132:: @ 080FF61C - .incbin "palettes/gPaletteGroup_132.bin" +gPaletteGroup_231:: @ 080FF618 + .incbin "palettes/gPaletteGroup_231.bin" -gPaletteGroup_157:: @ 080FF620 - .incbin "palettes/gPaletteGroup_157.bin" +gPaletteGroup_232:: @ 080FF61C + .incbin "palettes/gPaletteGroup_232.bin" -gPaletteGroup_158:: @ 080FF624 - .incbin "palettes/gPaletteGroup_158.bin" +gPaletteGroup_257:: @ 080FF620 + .incbin "palettes/gPaletteGroup_257.bin" -gPaletteGroup_159:: @ 080FF628 - .incbin "palettes/gPaletteGroup_159.bin" +gPaletteGroup_258:: @ 080FF624 + .incbin "palettes/gPaletteGroup_258.bin" -gPaletteGroup_160:: @ 080FF62C - .incbin "palettes/gPaletteGroup_160.bin" +gPaletteGroup_259:: @ 080FF628 + .incbin "palettes/gPaletteGroup_259.bin" -gPaletteGroup_110:: @ 080FF630 - .incbin "palettes/gPaletteGroup_110.bin" +gPaletteGroup_260:: @ 080FF62C + .incbin "palettes/gPaletteGroup_260.bin" -gPaletteGroup_111:: @ 080FF634 - .incbin "palettes/gPaletteGroup_111.bin" +gPaletteGroup_210:: @ 080FF630 + .incbin "palettes/gPaletteGroup_210.bin" -gPaletteGroup_112:: @ 080FF638 - .incbin "palettes/gPaletteGroup_112.bin" +gPaletteGroup_211:: @ 080FF634 + .incbin "palettes/gPaletteGroup_211.bin" -gPaletteGroup_113:: @ 080FF63C - .incbin "palettes/gPaletteGroup_113.bin" +gPaletteGroup_212:: @ 080FF638 + .incbin "palettes/gPaletteGroup_212.bin" -gPaletteGroup_94:: @ 080FF640 - .incbin "palettes/gPaletteGroup_94.bin" +gPaletteGroup_213:: @ 080FF63C + .incbin "palettes/gPaletteGroup_213.bin" -gPaletteGroup_95:: @ 080FF644 - .incbin "palettes/gPaletteGroup_95.bin" +gPaletteGroup_104:: @ 080FF640 + .incbin "palettes/gPaletteGroup_104.bin" -gPaletteGroup_96:: @ 080FF648 - .incbin "palettes/gPaletteGroup_96.bin" +gPaletteGroup_105:: @ 080FF644 + .incbin "palettes/gPaletteGroup_105.bin" -gPaletteGroup_97:: @ 080FF64C - .incbin "palettes/gPaletteGroup_97.bin" +gPaletteGroup_106:: @ 080FF648 + .incbin "palettes/gPaletteGroup_106.bin" -gPaletteGroup_67:: @ 080FF650 - .incbin "palettes/gPaletteGroup_67.bin" +gPaletteGroup_107:: @ 080FF64C + .incbin "palettes/gPaletteGroup_107.bin" -gPaletteGroup_68:: @ 080FF654 - .incbin "palettes/gPaletteGroup_68.bin" +gPaletteGroup_77:: @ 080FF650 + .incbin "palettes/gPaletteGroup_77.bin" -gPaletteGroup_69:: @ 080FF658 - .incbin "palettes/gPaletteGroup_69.bin" +gPaletteGroup_78:: @ 080FF654 + .incbin "palettes/gPaletteGroup_78.bin" -gPaletteGroup_70:: @ 080FF65C - .incbin "palettes/gPaletteGroup_70.bin" +gPaletteGroup_79:: @ 080FF658 + .incbin "palettes/gPaletteGroup_79.bin" -gPaletteGroup_71:: @ 080FF660 - .incbin "palettes/gPaletteGroup_71.bin" +gPaletteGroup_80:: @ 080FF65C + .incbin "palettes/gPaletteGroup_80.bin" -gPaletteGroup_72:: @ 080FF664 - .incbin "palettes/gPaletteGroup_72.bin" +gPaletteGroup_81:: @ 080FF660 + .incbin "palettes/gPaletteGroup_81.bin" -gPaletteGroup_73:: @ 080FF668 - .incbin "palettes/gPaletteGroup_73.bin" +gPaletteGroup_82:: @ 080FF664 + .incbin "palettes/gPaletteGroup_82.bin" -gPaletteGroup_74:: @ 080FF66C - .incbin "palettes/gPaletteGroup_74.bin" +gPaletteGroup_83:: @ 080FF668 + .incbin "palettes/gPaletteGroup_83.bin" -gPaletteGroup_75:: @ 080FF670 - .incbin "palettes/gPaletteGroup_75.bin" +gPaletteGroup_84:: @ 080FF66C + .incbin "palettes/gPaletteGroup_84.bin" -gPaletteGroup_85:: @ 080FF674 +gPaletteGroup_85:: @ 080FF670 .incbin "palettes/gPaletteGroup_85.bin" -gPaletteGroup_86:: @ 080FF678 - .incbin "palettes/gPaletteGroup_86.bin" +gPaletteGroup_95:: @ 080FF674 + .incbin "palettes/gPaletteGroup_95.bin" -gPaletteGroup_87:: @ 080FF67C - .incbin "palettes/gPaletteGroup_87.bin" +gPaletteGroup_96:: @ 080FF678 + .incbin "palettes/gPaletteGroup_96.bin" -gPaletteGroup_76:: @ 080FF680 - .incbin "palettes/gPaletteGroup_76.bin" +gPaletteGroup_97:: @ 080FF67C + .incbin "palettes/gPaletteGroup_97.bin" -gPaletteGroup_77:: @ 080FF684 - .incbin "palettes/gPaletteGroup_77.bin" +gPaletteGroup_86:: @ 080FF680 + .incbin "palettes/gPaletteGroup_86.bin" -gPaletteGroup_78:: @ 080FF688 - .incbin "palettes/gPaletteGroup_78.bin" +gPaletteGroup_87:: @ 080FF684 + .incbin "palettes/gPaletteGroup_87.bin" -gPaletteGroup_79:: @ 080FF68C - .incbin "palettes/gPaletteGroup_79.bin" +gPaletteGroup_88:: @ 080FF688 + .incbin "palettes/gPaletteGroup_88.bin" -gPaletteGroup_80:: @ 080FF690 - .incbin "palettes/gPaletteGroup_80.bin" +gPaletteGroup_89:: @ 080FF68C + .incbin "palettes/gPaletteGroup_89.bin" -gPaletteGroup_81:: @ 080FF694 - .incbin "palettes/gPaletteGroup_81.bin" +gPaletteGroup_90:: @ 080FF690 + .incbin "palettes/gPaletteGroup_90.bin" -gPaletteGroup_82:: @ 080FF698 - .incbin "palettes/gPaletteGroup_82.bin" +gPaletteGroup_91:: @ 080FF694 + .incbin "palettes/gPaletteGroup_91.bin" -gPaletteGroup_83:: @ 080FF69C - .incbin "palettes/gPaletteGroup_83.bin" +gPaletteGroup_92:: @ 080FF698 + .incbin "palettes/gPaletteGroup_92.bin" -gPaletteGroup_114:: @ 080FF6A0 - .incbin "palettes/gPaletteGroup_114.bin" +gPaletteGroup_93:: @ 080FF69C + .incbin "palettes/gPaletteGroup_93.bin" -gPaletteGroup_115:: @ 080FF6A4 - .incbin "palettes/gPaletteGroup_115.bin" +gPaletteGroup_214:: @ 080FF6A0 + .incbin "palettes/gPaletteGroup_214.bin" -gPaletteGroup_116:: @ 080FF6A8 - .incbin "palettes/gPaletteGroup_116.bin" +gPaletteGroup_215:: @ 080FF6A4 + .incbin "palettes/gPaletteGroup_215.bin" -gPaletteGroup_117:: @ 080FF6AC - .incbin "palettes/gPaletteGroup_117.bin" +gPaletteGroup_216:: @ 080FF6A8 + .incbin "palettes/gPaletteGroup_216.bin" -gPaletteGroup_118:: @ 080FF6B0 - .incbin "palettes/gPaletteGroup_118.bin" +gPaletteGroup_217:: @ 080FF6AC + .incbin "palettes/gPaletteGroup_217.bin" -gPaletteGroup_128:: @ 080FF6B4 - .incbin "palettes/gPaletteGroup_128.bin" +gPaletteGroup_218:: @ 080FF6B0 + .incbin "palettes/gPaletteGroup_218.bin" -gPaletteGroup_123:: @ 080FF6B8 - .incbin "palettes/gPaletteGroup_123.bin" +gPaletteGroup_228:: @ 080FF6B4 + .incbin "palettes/gPaletteGroup_228.bin" -gPaletteGroup_122:: @ 080FF6BC - .incbin "palettes/gPaletteGroup_122.bin" +gPaletteGroup_223:: @ 080FF6B8 + .incbin "palettes/gPaletteGroup_223.bin" -gPaletteGroup_121:: @ 080FF6C0 - .incbin "palettes/gPaletteGroup_121.bin" +gPaletteGroup_222:: @ 080FF6BC + .incbin "palettes/gPaletteGroup_222.bin" -gPaletteGroup_39:: @ 080FF6C4 - .incbin "palettes/gPaletteGroup_39.bin" +gPaletteGroup_221:: @ 080FF6C0 + .incbin "palettes/gPaletteGroup_221.bin" -gPaletteGroup_41:: @ 080FF6C8 - .incbin "palettes/gPaletteGroup_41.bin" +gPaletteGroup_49:: @ 080FF6C4 + .incbin "palettes/gPaletteGroup_49.bin" -gPaletteGroup_42:: @ 080FF6CC - .incbin "palettes/gPaletteGroup_42.bin" +gPaletteGroup_51:: @ 080FF6C8 + .incbin "palettes/gPaletteGroup_51.bin" -gPaletteGroup_46:: @ 080FF6D0 - .incbin "palettes/gPaletteGroup_46.bin" +gPaletteGroup_52:: @ 080FF6CC + .incbin "palettes/gPaletteGroup_52.bin" -gPaletteGroup_47:: @ 080FF6D4 - .incbin "palettes/gPaletteGroup_47.bin" +gPaletteGroup_56:: @ 080FF6D0 + .incbin "palettes/gPaletteGroup_56.bin" -gPaletteGroup_48:: @ 080FF6D8 - .incbin "palettes/gPaletteGroup_48.bin" +gPaletteGroup_57:: @ 080FF6D4 + .incbin "palettes/gPaletteGroup_57.bin" -gPaletteGroup_49:: @ 080FF6DC - .incbin "palettes/gPaletteGroup_49.bin" +gPaletteGroup_58:: @ 080FF6D8 + .incbin "palettes/gPaletteGroup_58.bin" -gPaletteGroup_90:: @ 080FF6E0 - .incbin "palettes/gPaletteGroup_90.bin" +gPaletteGroup_59:: @ 080FF6DC + .incbin "palettes/gPaletteGroup_59.bin" -gPaletteGroup_133:: @ 080FF6E4 - .incbin "palettes/gPaletteGroup_133.bin" +gPaletteGroup_100:: @ 080FF6E0 + .incbin "palettes/gPaletteGroup_100.bin" -gPaletteGroup_134:: @ 080FF6E8 - .incbin "palettes/gPaletteGroup_134.bin" +gPaletteGroup_233:: @ 080FF6E4 + .incbin "palettes/gPaletteGroup_233.bin" -gPaletteGroup_135:: @ 080FF6EC - .incbin "palettes/gPaletteGroup_135.bin" +gPaletteGroup_234:: @ 080FF6E8 + .incbin "palettes/gPaletteGroup_234.bin" -gPaletteGroup_136:: @ 080FF6F0 - .incbin "palettes/gPaletteGroup_136.bin" +gPaletteGroup_235:: @ 080FF6EC + .incbin "palettes/gPaletteGroup_235.bin" -gPaletteGroup_137:: @ 080FF6F4 - .incbin "palettes/gPaletteGroup_137.bin" +gPaletteGroup_236:: @ 080FF6F0 + .incbin "palettes/gPaletteGroup_236.bin" -gPaletteGroup_138:: @ 080FF6F8 - .incbin "palettes/gPaletteGroup_138.bin" +gPaletteGroup_237:: @ 080FF6F4 + .incbin "palettes/gPaletteGroup_237.bin" -gPaletteGroup_139:: @ 080FF6FC - .incbin "palettes/gPaletteGroup_139.bin" +gPaletteGroup_238:: @ 080FF6F8 + .incbin "palettes/gPaletteGroup_238.bin" -gPaletteGroup_140:: @ 080FF700 - .incbin "palettes/gPaletteGroup_140.bin" +gPaletteGroup_239:: @ 080FF6FC + .incbin "palettes/gPaletteGroup_239.bin" -gPaletteGroup_141:: @ 080FF704 - .incbin "palettes/gPaletteGroup_141.bin" +gPaletteGroup_240:: @ 080FF700 + .incbin "palettes/gPaletteGroup_240.bin" -gPaletteGroup_142:: @ 080FF708 - .incbin "palettes/gPaletteGroup_142.bin" +gPaletteGroup_241:: @ 080FF704 + .incbin "palettes/gPaletteGroup_241.bin" -gPaletteGroup_170:: @ 080FF70C - .incbin "palettes/gPaletteGroup_170.bin" +gPaletteGroup_242:: @ 080FF708 + .incbin "palettes/gPaletteGroup_242.bin" -gPaletteGroup_171:: @ 080FF710 - .incbin "palettes/gPaletteGroup_171.bin" +gPaletteGroup_270:: @ 080FF70C + .incbin "palettes/gPaletteGroup_270.bin" -gPaletteGroup_172:: @ 080FF714 - .incbin "palettes/gPaletteGroup_172.bin" +gPaletteGroup_271:: @ 080FF710 + .incbin "palettes/gPaletteGroup_271.bin" -gPaletteGroup_173:: @ 080FF718 - .incbin "palettes/gPaletteGroup_173.bin" +gPaletteGroup_272:: @ 080FF714 + .incbin "palettes/gPaletteGroup_272.bin" -gPaletteGroup_174:: @ 080FF71C - .incbin "palettes/gPaletteGroup_174.bin" +gPaletteGroup_273:: @ 080FF718 + .incbin "palettes/gPaletteGroup_273.bin" -gPaletteGroup_175:: @ 080FF720 - .incbin "palettes/gPaletteGroup_175.bin" +gPaletteGroup_274:: @ 080FF71C + .incbin "palettes/gPaletteGroup_274.bin" -gPaletteGroup_176:: @ 080FF724 - .incbin "palettes/gPaletteGroup_176.bin" +gPaletteGroup_275:: @ 080FF720 + .incbin "palettes/gPaletteGroup_275.bin" -gPaletteGroup_177:: @ 080FF728 - .incbin "palettes/gPaletteGroup_177.bin" +gPaletteGroup_276:: @ 080FF724 + .incbin "palettes/gPaletteGroup_276.bin" -gPaletteGroup_178:: @ 080FF72C - .incbin "palettes/gPaletteGroup_178.bin" +gPaletteGroup_277:: @ 080FF728 + .incbin "palettes/gPaletteGroup_277.bin" +gPaletteGroup_278:: @ 080FF72C + .incbin "palettes/gPaletteGroup_278.bin" -gPaletteGroup_180:: @ 080FF730 - .incbin "palettes/gPaletteGroup_180.bin" -gPaletteGroup_181:: @ 080FF73C - .incbin "palettes/gPaletteGroup_181.bin" +gPaletteGroup_280:: @ 080FF730 + .incbin "palettes/gPaletteGroup_280.bin" -gPaletteGroup_182:: @ 080FF744 - .incbin "palettes/gPaletteGroup_182.bin" +gPaletteGroup_281:: @ 080FF73C + .incbin "palettes/gPaletteGroup_281.bin" -gPaletteGroup_183:: @ 080FF750 - .incbin "palettes/gPaletteGroup_183.bin" +gPaletteGroup_282:: @ 080FF744 + .incbin "palettes/gPaletteGroup_282.bin" -gPaletteGroup_184:: @ 080FF75C - .incbin "palettes/gPaletteGroup_184.bin" +gPaletteGroup_283:: @ 080FF750 + .incbin "palettes/gPaletteGroup_283.bin" -gPaletteGroup_185:: @ 080FF770 - .incbin "palettes/gPaletteGroup_185.bin" +gPaletteGroup_284:: @ 080FF75C + .incbin "palettes/gPaletteGroup_284.bin" -gPaletteGroup_186:: @ 080FF778 - .incbin "palettes/gPaletteGroup_186.bin" +gPaletteGroup_285:: @ 080FF770 + .incbin "palettes/gPaletteGroup_285.bin" -gPaletteGroup_187:: @ 080FF780 - .incbin "palettes/gPaletteGroup_187.bin" +gPaletteGroup_286:: @ 080FF778 + .incbin "palettes/gPaletteGroup_286.bin" -gPaletteGroup_188:: @ 080FF788 - .incbin "palettes/gPaletteGroup_188.bin" +gPaletteGroup_287:: @ 080FF780 + .incbin "palettes/gPaletteGroup_287.bin" -gPaletteGroup_189:: @ 080FF790 - .incbin "palettes/gPaletteGroup_189.bin" +gPaletteGroup_288:: @ 080FF788 + .incbin "palettes/gPaletteGroup_288.bin" -gPaletteGroup_190:: @ 080FF798 - .incbin "palettes/gPaletteGroup_190.bin" +gPaletteGroup_289:: @ 080FF790 + .incbin "palettes/gPaletteGroup_289.bin" -gPaletteGroup_191:: @ 080FF7A0 - .incbin "palettes/gPaletteGroup_191.bin" +gPaletteGroup_290:: @ 080FF798 + .incbin "palettes/gPaletteGroup_290.bin" -gPaletteGroup_192:: @ 080FF7A8 - .incbin "palettes/gPaletteGroup_192.bin" +gPaletteGroup_291:: @ 080FF7A0 + .incbin "palettes/gPaletteGroup_291.bin" -gPaletteGroup_193:: @ 080FF7B0 - .incbin "palettes/gPaletteGroup_193.bin" +gPaletteGroup_292:: @ 080FF7A8 + .incbin "palettes/gPaletteGroup_292.bin" -gPaletteGroup_194:: @ 080FF7B8 - .incbin "palettes/gPaletteGroup_194.bin" +gPaletteGroup_293:: @ 080FF7B0 + .incbin "palettes/gPaletteGroup_293.bin" -gPaletteGroup_195:: @ 080FF7C0 - .incbin "palettes/gPaletteGroup_195.bin" +gPaletteGroup_294:: @ 080FF7B8 + .incbin "palettes/gPaletteGroup_294.bin" -gPaletteGroup_196:: @ 080FF7C8 - .incbin "palettes/gPaletteGroup_196.bin" +gPaletteGroup_295:: @ 080FF7C0 + .incbin "palettes/gPaletteGroup_295.bin" -gPaletteGroup_197:: @ 080FF7D0 - .incbin "palettes/gPaletteGroup_197.bin" +gPaletteGroup_296:: @ 080FF7C8 + .incbin "palettes/gPaletteGroup_296.bin" -gPaletteGroup_198:: @ 080FF7D8 - .incbin "palettes/gPaletteGroup_198.bin" +gPaletteGroup_297:: @ 080FF7D0 + .incbin "palettes/gPaletteGroup_297.bin" -gPaletteGroup_199:: @ 080FF7E0 - .incbin "palettes/gPaletteGroup_199.bin" +gPaletteGroup_298:: @ 080FF7D8 + .incbin "palettes/gPaletteGroup_298.bin" -gPaletteGroup_200:: @ 080FF7E8 - .incbin "palettes/gPaletteGroup_200.bin" +gPaletteGroup_299:: @ 080FF7E0 + .incbin "palettes/gPaletteGroup_299.bin" -gPaletteGroup_201:: @ 080FF7F0 - .incbin "palettes/gPaletteGroup_201.bin" +gPaletteGroup_300:: @ 080FF7E8 + .incbin "palettes/gPaletteGroup_300.bin" -gPaletteGroup_202:: @ 080FF7F8 - .incbin "palettes/gPaletteGroup_202.bin" +gPaletteGroup_301:: @ 080FF7F0 + .incbin "palettes/gPaletteGroup_301.bin" -gPaletteGroup_203:: @ 080FF808 - .incbin "palettes/gPaletteGroup_203.bin" +gPaletteGroup_302:: @ 080FF7F8 + .incbin "palettes/gPaletteGroup_302.bin" -gPaletteGroup_204:: @ 080FF814 - .incbin "palettes/gPaletteGroup_204.bin" +gPaletteGroup_303:: @ 080FF808 + .incbin "palettes/gPaletteGroup_303.bin" -gPaletteGroup_205:: @ 080FF83C - .incbin "palettes/gPaletteGroup_205.bin" +gPaletteGroup_304:: @ 080FF814 + .incbin "palettes/gPaletteGroup_304.bin" + +gPaletteGroup_305:: @ 080FF83C + .incbin "palettes/gPaletteGroup_305.bin" -gPaletteGroup_206:: @ 080FF844 +gPaletteGroup_306:: @ 080FF844 .ifndef EU - .incbin "palettes/gPaletteGroup_206.bin" + .incbin "palettes/gPaletteGroup_306.bin" .endif gPaletteGroups:: @ 080FF850 .4byte 00000000 - .4byte gPaletteGroup_0 .4byte gPaletteGroup_1 .4byte gPaletteGroup_2 .4byte gPaletteGroup_3 @@ -635,15 +634,6 @@ gPaletteGroups:: @ 080FF850 .4byte gPaletteGroup_8 .4byte gPaletteGroup_9 .4byte gPaletteGroup_10 - .4byte gPaletteGroup_11 - .4byte gPaletteGroup_12 - .4byte gPaletteGroup_13 - .4byte gPaletteGroup_14 - .4byte gPaletteGroup_15 - .4byte gPaletteGroup_16 - .4byte gPaletteGroup_17 - .4byte gPaletteGroup_18 - .4byte gPaletteGroup_19 .4byte gPaletteGroup_20 .4byte gPaletteGroup_21 .4byte gPaletteGroup_22 @@ -734,102 +724,112 @@ gPaletteGroups:: @ 080FF850 .4byte gPaletteGroup_107 .4byte gPaletteGroup_108 .4byte gPaletteGroup_109 - .4byte gPaletteGroup_110 - .4byte gPaletteGroup_111 - .4byte gPaletteGroup_112 - .4byte gPaletteGroup_113 - .4byte gPaletteGroup_114 - .4byte gPaletteGroup_115 - .4byte gPaletteGroup_116 - .4byte gPaletteGroup_117 - .4byte gPaletteGroup_118 - .4byte gPaletteGroup_119 - .4byte gPaletteGroup_120 - .4byte gPaletteGroup_121 - .4byte gPaletteGroup_122 - .4byte gPaletteGroup_123 - .4byte gPaletteGroup_124 - .4byte gPaletteGroup_125 - .4byte gPaletteGroup_126 - .4byte gPaletteGroup_127 - .4byte gPaletteGroup_128 - .4byte gPaletteGroup_129 - .4byte gPaletteGroup_130 - .4byte gPaletteGroup_131 - .4byte gPaletteGroup_132 - .4byte gPaletteGroup_133 - .4byte gPaletteGroup_134 - .4byte gPaletteGroup_135 - .4byte gPaletteGroup_136 - .4byte gPaletteGroup_137 - .4byte gPaletteGroup_138 - .4byte gPaletteGroup_139 - .4byte gPaletteGroup_140 - .4byte gPaletteGroup_141 - .4byte gPaletteGroup_142 - .4byte gPaletteGroup_143 - .4byte gPaletteGroup_144 - .4byte gPaletteGroup_145 - .4byte gPaletteGroup_146 - .4byte gPaletteGroup_147 - .4byte gPaletteGroup_148 - .4byte gPaletteGroup_149 - .4byte gPaletteGroup_150 - .4byte gPaletteGroup_151 - .4byte gPaletteGroup_152 - .4byte gPaletteGroup_153 - .4byte gPaletteGroup_154 - .4byte gPaletteGroup_155 - .4byte gPaletteGroup_156 - .4byte gPaletteGroup_157 - .4byte gPaletteGroup_158 - .4byte gPaletteGroup_159 - .4byte gPaletteGroup_160 - .4byte gPaletteGroup_161 - .4byte gPaletteGroup_162 - .4byte gPaletteGroup_163 - .4byte gPaletteGroup_164 - .4byte gPaletteGroup_165 - .4byte gPaletteGroup_166 - .4byte gPaletteGroup_167 - .4byte gPaletteGroup_168 - .4byte gPaletteGroup_169 - .4byte gPaletteGroup_170 - .4byte gPaletteGroup_171 - .4byte gPaletteGroup_172 - .4byte gPaletteGroup_173 - .4byte gPaletteGroup_174 - .4byte gPaletteGroup_175 - .4byte gPaletteGroup_176 - .4byte gPaletteGroup_177 - .4byte gPaletteGroup_178 - .4byte gPaletteGroup_179 - .4byte gPaletteGroup_180 - .4byte gPaletteGroup_181 - .4byte gPaletteGroup_182 - .4byte gPaletteGroup_183 - .4byte gPaletteGroup_184 - .4byte gPaletteGroup_185 - .4byte gPaletteGroup_186 - .4byte gPaletteGroup_187 - .4byte gPaletteGroup_188 - .4byte gPaletteGroup_189 - .4byte gPaletteGroup_190 - .4byte gPaletteGroup_191 - .4byte gPaletteGroup_192 - .4byte gPaletteGroup_193 - .4byte gPaletteGroup_194 - .4byte gPaletteGroup_195 - .4byte gPaletteGroup_196 - .4byte gPaletteGroup_197 - .4byte gPaletteGroup_198 - .4byte gPaletteGroup_199 .4byte gPaletteGroup_200 .4byte gPaletteGroup_201 .4byte gPaletteGroup_202 .4byte gPaletteGroup_203 .4byte gPaletteGroup_204 .4byte gPaletteGroup_205 -.ifndef EU .4byte gPaletteGroup_206 + .4byte gPaletteGroup_207 + .4byte gPaletteGroup_208 + .4byte gPaletteGroup_209 + .4byte gPaletteGroup_210 + .4byte gPaletteGroup_211 + .4byte gPaletteGroup_212 + .4byte gPaletteGroup_213 + .4byte gPaletteGroup_214 + .4byte gPaletteGroup_215 + .4byte gPaletteGroup_216 + .4byte gPaletteGroup_217 + .4byte gPaletteGroup_218 + .4byte gPaletteGroup_219 + .4byte gPaletteGroup_220 + .4byte gPaletteGroup_221 + .4byte gPaletteGroup_222 + .4byte gPaletteGroup_223 + .4byte gPaletteGroup_224 + .4byte gPaletteGroup_225 + .4byte gPaletteGroup_226 + .4byte gPaletteGroup_227 + .4byte gPaletteGroup_228 + .4byte gPaletteGroup_229 + .4byte gPaletteGroup_230 + .4byte gPaletteGroup_231 + .4byte gPaletteGroup_232 + .4byte gPaletteGroup_233 + .4byte gPaletteGroup_234 + .4byte gPaletteGroup_235 + .4byte gPaletteGroup_236 + .4byte gPaletteGroup_237 + .4byte gPaletteGroup_238 + .4byte gPaletteGroup_239 + .4byte gPaletteGroup_240 + .4byte gPaletteGroup_241 + .4byte gPaletteGroup_242 + .4byte gPaletteGroup_243 + .4byte gPaletteGroup_244 + .4byte gPaletteGroup_245 + .4byte gPaletteGroup_246 + .4byte gPaletteGroup_247 + .4byte gPaletteGroup_248 + .4byte gPaletteGroup_249 + .4byte gPaletteGroup_250 + .4byte gPaletteGroup_251 + .4byte gPaletteGroup_252 + .4byte gPaletteGroup_253 + .4byte gPaletteGroup_254 + .4byte gPaletteGroup_255 + .4byte gPaletteGroup_256 + .4byte gPaletteGroup_257 + .4byte gPaletteGroup_258 + .4byte gPaletteGroup_259 + .4byte gPaletteGroup_260 + .4byte gPaletteGroup_261 + .4byte gPaletteGroup_262 + .4byte gPaletteGroup_263 + .4byte gPaletteGroup_264 + .4byte gPaletteGroup_265 + .4byte gPaletteGroup_266 + .4byte gPaletteGroup_267 + .4byte gPaletteGroup_268 + .4byte gPaletteGroup_269 + .4byte gPaletteGroup_270 + .4byte gPaletteGroup_271 + .4byte gPaletteGroup_272 + .4byte gPaletteGroup_273 + .4byte gPaletteGroup_274 + .4byte gPaletteGroup_275 + .4byte gPaletteGroup_276 + .4byte gPaletteGroup_277 + .4byte gPaletteGroup_278 + .4byte gPaletteGroup_279 + .4byte gPaletteGroup_280 + .4byte gPaletteGroup_281 + .4byte gPaletteGroup_282 + .4byte gPaletteGroup_283 + .4byte gPaletteGroup_284 + .4byte gPaletteGroup_285 + .4byte gPaletteGroup_286 + .4byte gPaletteGroup_287 + .4byte gPaletteGroup_288 + .4byte gPaletteGroup_289 + .4byte gPaletteGroup_290 + .4byte gPaletteGroup_291 + .4byte gPaletteGroup_292 + .4byte gPaletteGroup_293 + .4byte gPaletteGroup_294 + .4byte gPaletteGroup_295 + .4byte gPaletteGroup_296 + .4byte gPaletteGroup_297 + .4byte gPaletteGroup_298 + .4byte gPaletteGroup_299 + .4byte gPaletteGroup_300 + .4byte gPaletteGroup_301 + .4byte gPaletteGroup_302 + .4byte gPaletteGroup_303 + .4byte gPaletteGroup_304 + .4byte gPaletteGroup_305 +.ifndef EU + .4byte gPaletteGroup_306 .endif diff --git a/data/map/entity_headers.s b/data/map/entity_headers.s index 77fde05f..8495b498 100644 --- a/data/map/entity_headers.s +++ b/data/map/entity_headers.s @@ -18374,4 +18374,4 @@ Room_CrenelCaves_ToGrayblade:: @ 080FC3A4 .4byte 0x00000000 .4byte 0x00000000 .4byte sub_0804FF7C - .4byte nullsub_106
\ No newline at end of file + .4byte nullsub_106 |