diff options
Diffstat (limited to 'data/animations/object')
64 files changed, 1496 insertions, 1501 deletions
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 |