diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-24 11:41:27 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-24 11:41:27 +0200 |
| commit | fdfd43d0d31feeda3082227bcfae7d32abc663f6 (patch) | |
| tree | 0d853b60ad7a72d6076410f676b3aeb897ad4b06 /data/animations/npc | |
| parent | a19a870382befa354caa24148733ea335fcc692c (diff) | |
Extract animations
Diffstat (limited to 'data/animations/npc')
75 files changed, 2473 insertions, 2524 deletions
diff --git a/data/animations/npc/anju.s b/data/animations/npc/anju.s index e8aa3d50..1ef6bd90 100644 --- a/data/animations/npc/anju.s +++ b/data/animations/npc/anju.s @@ -5,37 +5,37 @@ .align 2 -gUnk_081136D8:: @ 081136D8 - .incbin "anju/gUnk_081136D8.bin" +gSpriteAnimations_Anju_4:: @ 081136D8 + .include "animations/gSpriteAnimations_Anju_4.s" -gUnk_081136E9:: @ 081136E9 - .incbin "anju/gUnk_081136E9.bin" +gSpriteAnimations_Anju_5:: @ 081136E9 + .include "animations/gSpriteAnimations_Anju_5.s" -gUnk_081136FA:: @ 081136FA - .incbin "anju/gUnk_081136FA.bin" +gSpriteAnimations_Anju_6:: @ 081136FA + .include "animations/gSpriteAnimations_Anju_6.s" -gUnk_0811370B:: @ 0811370B - .incbin "anju/gUnk_0811370B.bin" +gSpriteAnimations_Anju_7:: @ 0811370B + .include "animations/gSpriteAnimations_Anju_7.s" -gUnk_0811371C:: @ 0811371C - .incbin "anju/gUnk_0811371C.bin" +gSpriteAnimations_Anju_0:: @ 0811371C + .include "animations/gSpriteAnimations_Anju_0.s" -gUnk_08113721:: @ 08113721 - .incbin "anju/gUnk_08113721.bin" +gSpriteAnimations_Anju_1:: @ 08113721 + .include "animations/gSpriteAnimations_Anju_1.s" -gUnk_08113726:: @ 08113726 - .incbin "anju/gUnk_08113726.bin" +gSpriteAnimations_Anju_2:: @ 08113726 + .include "animations/gSpriteAnimations_Anju_2.s" -gUnk_0811372B:: @ 0811372B - .incbin "anju/gUnk_0811372B.bin" +gSpriteAnimations_Anju_3:: @ 0811372B + .include "animations/gSpriteAnimations_Anju_3.s" gSpriteAnimations_Anju:: @ 08113730 - .4byte gUnk_0811371C - .4byte gUnk_08113721 - .4byte gUnk_08113726 - .4byte gUnk_0811372B - .4byte gUnk_081136D8 - .4byte gUnk_081136E9 - .4byte gUnk_081136FA - .4byte gUnk_0811370B + .4byte gSpriteAnimations_Anju_0 + .4byte gSpriteAnimations_Anju_1 + .4byte gSpriteAnimations_Anju_2 + .4byte gSpriteAnimations_Anju_3 + .4byte gSpriteAnimations_Anju_4 + .4byte gSpriteAnimations_Anju_5 + .4byte gSpriteAnimations_Anju_6 + .4byte gSpriteAnimations_Anju_7 .4byte 00000000 diff --git a/data/animations/npc/beedle.s b/data/animations/npc/beedle.s index dc755047..a66f2582 100644 --- a/data/animations/npc/beedle.s +++ b/data/animations/npc/beedle.s @@ -4,38 +4,38 @@ .section .rodata .align 2 -gUnk_0810C968:: @ 0810C968 - .incbin "beedle/gUnk_0810C968.bin" +gSpriteAnimations_Beedle_0:: @ 0810C968 + .include "animations/gSpriteAnimations_Beedle_0.s" -gUnk_0810C9A5:: @ 0810C9A5 - .incbin "beedle/gUnk_0810C9A5.bin" +gSpriteAnimations_Beedle_4:: @ 0810C9A5 + .include "animations/gSpriteAnimations_Beedle_4.s" -gUnk_0810C9AA:: @ 0810C9AA - .incbin "beedle/gUnk_0810C9AA.bin" +gSpriteAnimations_Beedle_5:: @ 0810C9AA + .include "animations/gSpriteAnimations_Beedle_5.s" -gUnk_0810C9AF:: @ 0810C9AF - .incbin "beedle/gUnk_0810C9AF.bin" +gSpriteAnimations_Beedle_7:: @ 0810C9AF + .include "animations/gSpriteAnimations_Beedle_7.s" -gUnk_0810C9B4:: @ 0810C9B4 - .incbin "beedle/gUnk_0810C9B4.bin" +gSpriteAnimations_Beedle_8:: @ 0810C9B4 + .include "animations/gSpriteAnimations_Beedle_8.s" -gUnk_0810C9F1:: @ 0810C9F1 - .incbin "beedle/gUnk_0810C9F1.bin" +gSpriteAnimations_Beedle_9:: @ 0810C9F1 + .include "animations/gSpriteAnimations_Beedle_9.s" -gUnk_0810CA2E:: @ 0810CA2E - .incbin "beedle/gUnk_0810CA2E.bin" +gSpriteAnimations_Beedle_11:: @ 0810CA2E + .include "animations/gSpriteAnimations_Beedle_11.s" gSpriteAnimations_Beedle:: @ 0810CA6C - .4byte gUnk_0810C968 - .4byte gUnk_0810C968 - .4byte gUnk_0810C968 - .4byte gUnk_0810C968 - .4byte gUnk_0810C9A5 - .4byte gUnk_0810C9AA - .4byte gUnk_0810C9A5 - .4byte gUnk_0810C9AF - .4byte gUnk_0810C9B4 - .4byte gUnk_0810C9F1 - .4byte gUnk_0810C9B4 - .4byte gUnk_0810CA2E + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_0 + .4byte gSpriteAnimations_Beedle_4 + .4byte gSpriteAnimations_Beedle_5 + .4byte gSpriteAnimations_Beedle_4 + .4byte gSpriteAnimations_Beedle_7 + .4byte gSpriteAnimations_Beedle_8 + .4byte gSpriteAnimations_Beedle_9 + .4byte gSpriteAnimations_Beedle_8 + .4byte gSpriteAnimations_Beedle_11 .4byte 00000000 diff --git a/data/animations/npc/bladeBrothers.s b/data/animations/npc/bladeBrothers.s index cb102381..4ae287d6 100644 --- a/data/animations/npc/bladeBrothers.s +++ b/data/animations/npc/bladeBrothers.s @@ -4,45 +4,45 @@ .section .rodata @ .align 2 -gUnk_08111771:: @ 08111771 - .incbin "bladeBrothers/gUnk_08111771.bin" +gSpriteAnimations_BladeBrothers_1_0:: @ 08111771 + .include "animations/gSpriteAnimations_BladeBrothers_1_0.s" -gUnk_08111776:: @ 08111776 - .incbin "bladeBrothers/gUnk_08111776.bin" +gSpriteAnimations_BladeBrothers_1_3:: @ 08111776 + .include "animations/gSpriteAnimations_BladeBrothers_1_3.s" -gUnk_0811177B:: @ 0811177B - .incbin "bladeBrothers/gUnk_0811177B.bin" +gSpriteAnimations_BladeBrothers_1_4:: @ 0811177B + .include "animations/gSpriteAnimations_BladeBrothers_1_4.s" -gUnk_081117C8:: @ 081117C8 - .incbin "bladeBrothers/gUnk_081117C8.bin" +gSpriteAnimations_BladeBrothers_0_1:: @ 081117C8 + .include "animations/gSpriteAnimations_BladeBrothers_0_1.s" -gUnk_081117F9:: @ 081117F9 - .incbin "bladeBrothers/gUnk_081117F9.bin" +gSpriteAnimations_BladeBrothers_0_0:: @ 081117F9 + .include "animations/gSpriteAnimations_BladeBrothers_0_0.s" -gUnk_0811182A:: @ 0811182A - .incbin "bladeBrothers/gUnk_0811182A.bin" +gSpriteAnimations_BladeBrothers_0_3:: @ 0811182A + .include "animations/gSpriteAnimations_BladeBrothers_0_3.s" -gUnk_0811185B:: @ 0811185B - .incbin "bladeBrothers/gUnk_0811185B.bin" +gSpriteAnimations_BladeBrothers_0_4:: @ 0811185B + .include "animations/gSpriteAnimations_BladeBrothers_0_4.s" gSpriteAnimations_BladeBrothers_1:: @ 081118CC - .4byte gUnk_08111771 - .4byte gUnk_0811176C - .4byte gUnk_08111771 - .4byte gUnk_08111776 - .4byte gUnk_0811177B - .4byte gUnk_0811177B - .4byte gUnk_0811177B - .4byte gUnk_0811177B + .4byte gSpriteAnimations_BladeBrothers_1_0 + .4byte gSpriteAnimations_BladeBrothers_1_1 + .4byte gSpriteAnimations_BladeBrothers_1_0 + .4byte gSpriteAnimations_BladeBrothers_1_3 + .4byte gSpriteAnimations_BladeBrothers_1_4 + .4byte gSpriteAnimations_BladeBrothers_1_4 + .4byte gSpriteAnimations_BladeBrothers_1_4 + .4byte gSpriteAnimations_BladeBrothers_1_4 .4byte 00000000 gSpriteAnimations_BladeBrothers_0:: @ 081118F0 - .4byte gUnk_081117F9 - .4byte gUnk_081117C8 - .4byte gUnk_081117F9 - .4byte gUnk_0811182A - .4byte gUnk_0811185B - .4byte gUnk_0811185B - .4byte gUnk_0811185B - .4byte gUnk_0811185B + .4byte gSpriteAnimations_BladeBrothers_0_0 + .4byte gSpriteAnimations_BladeBrothers_0_1 + .4byte gSpriteAnimations_BladeBrothers_0_0 + .4byte gSpriteAnimations_BladeBrothers_0_3 + .4byte gSpriteAnimations_BladeBrothers_0_4 + .4byte gSpriteAnimations_BladeBrothers_0_4 + .4byte gSpriteAnimations_BladeBrothers_0_4 + .4byte gSpriteAnimations_BladeBrothers_0_4 .4byte 00000000 diff --git a/data/animations/npc/brocco.s b/data/animations/npc/brocco.s index b8564444..bacf5940 100644 --- a/data/animations/npc/brocco.s +++ b/data/animations/npc/brocco.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810CAFC:: @ 0810CAFC - .incbin "brocco/gUnk_0810CAFC.bin" +gSpriteAnimations_Brocco_0:: @ 0810CAFC + .include "animations/gSpriteAnimations_Brocco_0.s" -gUnk_0810CB45:: @ 0810CB45 - .incbin "brocco/gUnk_0810CB45.bin" +gSpriteAnimations_Brocco_4:: @ 0810CB45 + .include "animations/gSpriteAnimations_Brocco_4.s" -gUnk_0810CB4A:: @ 0810CB4A - .incbin "brocco/gUnk_0810CB4A.bin" +gSpriteAnimations_Brocco_5:: @ 0810CB4A + .include "animations/gSpriteAnimations_Brocco_5.s" -gUnk_0810CB4F:: @ 0810CB4F - .incbin "brocco/gUnk_0810CB4F.bin" +gSpriteAnimations_Brocco_7:: @ 0810CB4F + .include "animations/gSpriteAnimations_Brocco_7.s" gSpriteAnimations_Brocco:: @ 0810CB54 - .4byte gUnk_0810CAFC - .4byte gUnk_0810CAFC - .4byte gUnk_0810CAFC - .4byte gUnk_0810CAFC - .4byte gUnk_0810CB45 - .4byte gUnk_0810CB4A - .4byte gUnk_0810CB45 - .4byte gUnk_0810CB4F + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_0 + .4byte gSpriteAnimations_Brocco_4 + .4byte gSpriteAnimations_Brocco_5 + .4byte gSpriteAnimations_Brocco_4 + .4byte gSpriteAnimations_Brocco_7 .4byte 00000000 diff --git a/data/animations/npc/carlov.s b/data/animations/npc/carlov.s index 525a9bd6..259aac80 100644 --- a/data/animations/npc/carlov.s +++ b/data/animations/npc/carlov.s @@ -4,42 +4,42 @@ .section .rodata .align 2 -gUnk_08113258:: @ 08113258 - .incbin "carlov/gUnk_08113258.bin" +gSpriteAnimations_Carlov_0_0:: @ 08113258 + .include "animations/gSpriteAnimations_Carlov_0_0.s" -gUnk_0811325D:: @ 0811325D - .incbin "carlov/gUnk_0811325D.bin" +gSpriteAnimations_Carlov_0_8:: @ 0811325D + .include "animations/gSpriteAnimations_Carlov_0_8.s" -gUnk_0811326E:: @ 0811326E - .incbin "carlov/gUnk_0811326E.bin" +gSpriteAnimations_Carlov_0_9:: @ 0811326E + .include "animations/gSpriteAnimations_Carlov_0_9.s" -gUnk_0811329F:: @ 0811329F - .incbin "carlov/gUnk_0811329F.bin" +gSpriteAnimations_Carlov_0_10:: @ 0811329F + .include "animations/gSpriteAnimations_Carlov_0_10.s" gSpriteAnimations_Carlov_0:: @ 081132E4 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_0811325D - .4byte gUnk_0811326E - .4byte gUnk_0811329F + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_8 + .4byte gSpriteAnimations_Carlov_0_9 + .4byte gSpriteAnimations_Carlov_0_10 .4byte 00000000 gSpriteAnimations_Carlov_1:: @ 08113314 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_08113258 - .4byte gUnk_0811325D - .4byte gUnk_0811326E - .4byte gUnk_0811329F - .4byte gUnk_08113258 - .4byte gUnk_0811325D - .4byte gUnk_0811326E - .4byte gUnk_0811329F + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_8 + .4byte gSpriteAnimations_Carlov_0_9 + .4byte gSpriteAnimations_Carlov_0_10 + .4byte gSpriteAnimations_Carlov_0_0 + .4byte gSpriteAnimations_Carlov_0_8 + .4byte gSpriteAnimations_Carlov_0_9 + .4byte gSpriteAnimations_Carlov_0_10 .4byte 00000000 diff --git a/data/animations/npc/carpenter.s b/data/animations/npc/carpenter.s index 6d2457bd..1391c48b 100644 --- a/data/animations/npc/carpenter.s +++ b/data/animations/npc/carpenter.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_08110D08:: @ 08110D08 - .incbin "carpenter/gUnk_08110D08.bin" +gSpriteAnimations_Carpenter_0:: @ 08110D08 + .include "animations/gSpriteAnimations_Carpenter_0.s" -gUnk_08110D2D:: @ 08110D2D - .incbin "carpenter/gUnk_08110D2D.bin" +gSpriteAnimations_Carpenter_5:: @ 08110D2D + .include "animations/gSpriteAnimations_Carpenter_5.s" -gUnk_08110D32:: @ 08110D32 - .incbin "carpenter/gUnk_08110D32.bin" +gSpriteAnimations_Carpenter_7:: @ 08110D32 + .include "animations/gSpriteAnimations_Carpenter_7.s" -gUnk_08110D37:: @ 08110D37 - .incbin "carpenter/gUnk_08110D37.bin" +gSpriteAnimations_Carpenter_4:: @ 08110D37 + .include "animations/gSpriteAnimations_Carpenter_4.s" -gUnk_08110D3C:: @ 08110D3C - .incbin "carpenter/gUnk_08110D3C.bin" +gSpriteAnimations_Carpenter_8:: @ 08110D3C + .include "animations/gSpriteAnimations_Carpenter_8.s" -gUnk_08110D61:: @ 08110D61 - .incbin "carpenter/gUnk_08110D61.bin" +gSpriteAnimations_Carpenter_13:: @ 08110D61 + .include "animations/gSpriteAnimations_Carpenter_13.s" -gUnk_08110D66:: @ 08110D66 - .incbin "carpenter/gUnk_08110D66.bin" +gSpriteAnimations_Carpenter_15:: @ 08110D66 + .include "animations/gSpriteAnimations_Carpenter_15.s" -gUnk_08110D6B:: @ 08110D6B - .incbin "carpenter/gUnk_08110D6B.bin" +gSpriteAnimations_Carpenter_12:: @ 08110D6B + .include "animations/gSpriteAnimations_Carpenter_12.s" -gUnk_08110D70:: @ 08110D70 - .incbin "carpenter/gUnk_08110D70.bin" +gSpriteAnimations_Carpenter_16:: @ 08110D70 + .include "animations/gSpriteAnimations_Carpenter_16.s" -gUnk_08110D8D:: @ 08110D8D - .incbin "carpenter/gUnk_08110D8D.bin" +gSpriteAnimations_Carpenter_20:: @ 08110D8D + .include "animations/gSpriteAnimations_Carpenter_20.s" -gUnk_08110D92:: @ 08110D92 - .incbin "carpenter/gUnk_08110D92.bin" +gSpriteAnimations_Carpenter_23:: @ 08110D92 + .include "animations/gSpriteAnimations_Carpenter_23.s" -gUnk_08110D97:: @ 08110D97 - .incbin "carpenter/gUnk_08110D97.bin" +gSpriteAnimations_Carpenter_21:: @ 08110D97 + .include "animations/gSpriteAnimations_Carpenter_21.s" -gUnk_08110D9C:: @ 08110D9C - .incbin "carpenter/gUnk_08110D9C.bin" +gSpriteAnimations_Carpenter_24:: @ 08110D9C + .include "animations/gSpriteAnimations_Carpenter_24.s" -gUnk_08110DB9:: @ 08110DB9 - .incbin "carpenter/gUnk_08110DB9.bin" +gSpriteAnimations_Carpenter_28:: @ 08110DB9 + .include "animations/gSpriteAnimations_Carpenter_28.s" -gUnk_08110DBE:: @ 08110DBE - .incbin "carpenter/gUnk_08110DBE.bin" +gSpriteAnimations_Carpenter_31:: @ 08110DBE + .include "animations/gSpriteAnimations_Carpenter_31.s" -gUnk_08110DC3:: @ 08110DC3 - .incbin "carpenter/gUnk_08110DC3.bin" +gSpriteAnimations_Carpenter_29:: @ 08110DC3 + .include "animations/gSpriteAnimations_Carpenter_29.s" gSpriteAnimations_Carpenter:: @ 08110DC8 - .4byte gUnk_08110D08 - .4byte gUnk_08110D08 - .4byte gUnk_08110D08 - .4byte gUnk_08110D08 - .4byte gUnk_08110D37 - .4byte gUnk_08110D2D - .4byte gUnk_08110D2D - .4byte gUnk_08110D32 - .4byte gUnk_08110D3C - .4byte gUnk_08110D3C - .4byte gUnk_08110D3C - .4byte gUnk_08110D3C - .4byte gUnk_08110D6B - .4byte gUnk_08110D61 - .4byte gUnk_08110D61 - .4byte gUnk_08110D66 - .4byte gUnk_08110D70 - .4byte gUnk_08110D70 - .4byte gUnk_08110D70 - .4byte gUnk_08110D70 - .4byte gUnk_08110D8D - .4byte gUnk_08110D97 - .4byte gUnk_08110D8D - .4byte gUnk_08110D92 - .4byte gUnk_08110D9C - .4byte gUnk_08110D9C - .4byte gUnk_08110D9C - .4byte gUnk_08110D9C - .4byte gUnk_08110DB9 - .4byte gUnk_08110DC3 - .4byte gUnk_08110DB9 - .4byte gUnk_08110DBE + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_0 + .4byte gSpriteAnimations_Carpenter_4 + .4byte gSpriteAnimations_Carpenter_5 + .4byte gSpriteAnimations_Carpenter_5 + .4byte gSpriteAnimations_Carpenter_7 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_8 + .4byte gSpriteAnimations_Carpenter_12 + .4byte gSpriteAnimations_Carpenter_13 + .4byte gSpriteAnimations_Carpenter_13 + .4byte gSpriteAnimations_Carpenter_15 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_16 + .4byte gSpriteAnimations_Carpenter_20 + .4byte gSpriteAnimations_Carpenter_21 + .4byte gSpriteAnimations_Carpenter_20 + .4byte gSpriteAnimations_Carpenter_23 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_24 + .4byte gSpriteAnimations_Carpenter_28 + .4byte gSpriteAnimations_Carpenter_29 + .4byte gSpriteAnimations_Carpenter_28 + .4byte gSpriteAnimations_Carpenter_31 .4byte 00000000 diff --git a/data/animations/npc/castorWildsStatue.s b/data/animations/npc/castorWildsStatue.s index ca5ce721..a8fc1e8b 100644 --- a/data/animations/npc/castorWildsStatue.s +++ b/data/animations/npc/castorWildsStatue.s @@ -4,30 +4,30 @@ .section .rodata .align 2 -gUnk_08110E9C:: @ 08110E9C - .incbin "castorWildsStatue/gUnk_08110E9C.bin" +gSpriteAnimations_CastorWildsStatue_0:: @ 08110E9C + .include "animations/gSpriteAnimations_CastorWildsStatue_0.s" -gUnk_08110EA1:: @ 08110EA1 - .incbin "castorWildsStatue/gUnk_08110EA1.bin" +gSpriteAnimations_CastorWildsStatue_4:: @ 08110EA1 + .include "animations/gSpriteAnimations_CastorWildsStatue_4.s" -gUnk_08110EA6:: @ 08110EA6 - .incbin "castorWildsStatue/gUnk_08110EA6.bin" +gSpriteAnimations_CastorWildsStatue_1:: @ 08110EA6 + .include "animations/gSpriteAnimations_CastorWildsStatue_1.s" gSpriteAnimations_CastorWildsStatue:: @ 08110EAC - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110E9C - .4byte gUnk_08110EA6 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 - .4byte gUnk_08110EA1 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_0 + .4byte gSpriteAnimations_CastorWildsStatue_1 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 + .4byte gSpriteAnimations_CastorWildsStatue_4 .4byte 00000000 diff --git a/data/animations/npc/cat.s b/data/animations/npc/cat.s index f65b540f..6e5a05ba 100644 --- a/data/animations/npc/cat.s +++ b/data/animations/npc/cat.s @@ -38,41 +38,41 @@ gUnk_08111154:: @ 08111154 .4byte gUnk_08111144 .4byte gUnk_0811114C -gUnk_08111174:: @ 08111174 - .incbin "cat/gUnk_08111174.bin" +gSpriteAnimations_Cat_0:: @ 08111174 + .include "animations/gSpriteAnimations_Cat_0.s" -gUnk_081111B0:: @ 081111B0 - .incbin "cat/gUnk_081111B0.bin" +gSpriteAnimations_Cat_1:: @ 081111B0 + .include "animations/gSpriteAnimations_Cat_1.s" -gUnk_081111B9:: @ 081111B9 - .incbin "cat/gUnk_081111B9.bin" +gSpriteAnimations_Cat_2:: @ 081111B9 + .include "animations/gSpriteAnimations_Cat_2.s" -gUnk_081111C2:: @ 081111C2 - .incbin "cat/gUnk_081111C2.bin" +gSpriteAnimations_Cat_3:: @ 081111C2 + .include "animations/gSpriteAnimations_Cat_3.s" -gUnk_081111D3:: @ 081111D3 - .incbin "cat/gUnk_081111D3.bin" +gSpriteAnimations_Cat_4:: @ 081111D3 + .include "animations/gSpriteAnimations_Cat_4.s" -gUnk_081111EB:: @ 081111EB - .incbin "cat/gUnk_081111EB.bin" +gSpriteAnimations_Cat_5:: @ 081111EB + .include "animations/gSpriteAnimations_Cat_5.s" -gUnk_08111204:: @ 08111204 - .incbin "cat/gUnk_08111204.bin" +gSpriteAnimations_Cat_6:: @ 08111204 + .include "animations/gSpriteAnimations_Cat_6.s" -gUnk_0811122C:: @ 0811122C - .incbin "cat/gUnk_0811122C.bin" +gSpriteAnimations_Cat_7:: @ 0811122C + .include "animations/gSpriteAnimations_Cat_7.s" -gUnk_08111238:: @ 08111238 - .incbin "cat/gUnk_08111238.bin" +gSpriteAnimations_Cat_8:: @ 08111238 + .include "animations/gSpriteAnimations_Cat_8.s" gSpriteAnimations_Cat:: @ 0811125C - .4byte gUnk_08111174 - .4byte gUnk_081111B0 - .4byte gUnk_081111B9 - .4byte gUnk_081111C2 - .4byte gUnk_081111D3 - .4byte gUnk_081111EB - .4byte gUnk_08111204 - .4byte gUnk_0811122C - .4byte gUnk_08111238 + .4byte gSpriteAnimations_Cat_0 + .4byte gSpriteAnimations_Cat_1 + .4byte gSpriteAnimations_Cat_2 + .4byte gSpriteAnimations_Cat_3 + .4byte gSpriteAnimations_Cat_4 + .4byte gSpriteAnimations_Cat_5 + .4byte gSpriteAnimations_Cat_6 + .4byte gSpriteAnimations_Cat_7 + .4byte gSpriteAnimations_Cat_8 .4byte 00000000 diff --git a/data/animations/npc/clothesRack.s b/data/animations/npc/clothesRack.s index 916c2af7..9bd53b95 100644 --- a/data/animations/npc/clothesRack.s +++ b/data/animations/npc/clothesRack.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_08114244:: @ 08114244 - .incbin "clothesRack/gUnk_08114244.bin" +gSpriteAnimations_ClothesRack_0:: @ 08114244 + .include "animations/gSpriteAnimations_ClothesRack_0.s" -gUnk_0811425D:: @ 0811425D - .incbin "clothesRack/gUnk_0811425D.bin" +gSpriteAnimations_ClothesRack_1:: @ 0811425D + .include "animations/gSpriteAnimations_ClothesRack_1.s" -gUnk_08114276:: @ 08114276 - .incbin "clothesRack/gUnk_08114276.bin" +gSpriteAnimations_ClothesRack_2:: @ 08114276 + .include "animations/gSpriteAnimations_ClothesRack_2.s" -gUnk_0811428F:: @ 0811428F - .incbin "clothesRack/gUnk_0811428F.bin" +gSpriteAnimations_ClothesRack_3:: @ 0811428F + .include "animations/gSpriteAnimations_ClothesRack_3.s" gSpriteAnimations_ClothesRack:: @ 081142A8 - .4byte gUnk_08114244 - .4byte gUnk_0811425D - .4byte gUnk_08114276 - .4byte gUnk_0811428F + .4byte gSpriteAnimations_ClothesRack_0 + .4byte gSpriteAnimations_ClothesRack_1 + .4byte gSpriteAnimations_ClothesRack_2 + .4byte gSpriteAnimations_ClothesRack_3 .4byte 00000000 diff --git a/data/animations/npc/cow.s b/data/animations/npc/cow.s index 12bb372b..063a4402 100644 --- a/data/animations/npc/cow.s +++ b/data/animations/npc/cow.s @@ -4,85 +4,85 @@ .section .rodata .align 2 -gUnk_08111960:: @ 08111960 - .incbin "cow/gUnk_08111960.bin" +gSpriteAnimations_Cow_0:: @ 08111960 + .include "animations/gSpriteAnimations_Cow_0.s" -gUnk_08111965:: @ 08111965 - .incbin "cow/gUnk_08111965.bin" +gSpriteAnimations_Cow_1:: @ 08111965 + .include "animations/gSpriteAnimations_Cow_1.s" -gUnk_0811196A:: @ 0811196A - .incbin "cow/gUnk_0811196A.bin" +gSpriteAnimations_Cow_2:: @ 0811196A + .include "animations/gSpriteAnimations_Cow_2.s" -gUnk_0811196F:: @ 0811196F - .incbin "cow/gUnk_0811196F.bin" +gSpriteAnimations_Cow_3:: @ 0811196F + .include "animations/gSpriteAnimations_Cow_3.s" -gUnk_08111974:: @ 08111974 - .incbin "cow/gUnk_08111974.bin" +gSpriteAnimations_Cow_4:: @ 08111974 + .include "animations/gSpriteAnimations_Cow_4.s" -gUnk_08111985:: @ 08111985 - .incbin "cow/gUnk_08111985.bin" +gSpriteAnimations_Cow_5:: @ 08111985 + .include "animations/gSpriteAnimations_Cow_5.s" -gUnk_08111996:: @ 08111996 - .incbin "cow/gUnk_08111996.bin" +gSpriteAnimations_Cow_6:: @ 08111996 + .include "animations/gSpriteAnimations_Cow_6.s" -gUnk_081119A7:: @ 081119A7 - .incbin "cow/gUnk_081119A7.bin" +gSpriteAnimations_Cow_7:: @ 081119A7 + .include "animations/gSpriteAnimations_Cow_7.s" -gUnk_081119B8:: @ 081119B8 - .incbin "cow/gUnk_081119B8.bin" +gSpriteAnimations_Cow_8:: @ 081119B8 + .include "animations/gSpriteAnimations_Cow_8.s" -gUnk_081119C4:: @ 081119C4 - .incbin "cow/gUnk_081119C4.bin" +gSpriteAnimations_Cow_9:: @ 081119C4 + .include "animations/gSpriteAnimations_Cow_9.s" -gUnk_081119D0:: @ 081119D0 - .incbin "cow/gUnk_081119D0.bin" +gSpriteAnimations_Cow_10:: @ 081119D0 + .include "animations/gSpriteAnimations_Cow_10.s" -gUnk_081119DC:: @ 081119DC - .incbin "cow/gUnk_081119DC.bin" +gSpriteAnimations_Cow_11:: @ 081119DC + .include "animations/gSpriteAnimations_Cow_11.s" -gUnk_081119E8:: @ 081119E8 - .incbin "cow/gUnk_081119E8.bin" +gSpriteAnimations_Cow_12:: @ 081119E8 + .include "animations/gSpriteAnimations_Cow_12.s" -gUnk_081119F1:: @ 081119F1 - .incbin "cow/gUnk_081119F1.bin" +gSpriteAnimations_Cow_13:: @ 081119F1 + .include "animations/gSpriteAnimations_Cow_13.s" -gUnk_081119FA:: @ 081119FA - .incbin "cow/gUnk_081119FA.bin" +gSpriteAnimations_Cow_14:: @ 081119FA + .include "animations/gSpriteAnimations_Cow_14.s" -gUnk_08111A03:: @ 08111A03 - .incbin "cow/gUnk_08111A03.bin" +gSpriteAnimations_Cow_15:: @ 08111A03 + .include "animations/gSpriteAnimations_Cow_15.s" -gUnk_08111A0C:: @ 08111A0C - .incbin "cow/gUnk_08111A0C.bin" +gSpriteAnimations_Cow_16:: @ 08111A0C + .include "animations/gSpriteAnimations_Cow_16.s" -gUnk_08111A14:: @ 08111A14 - .incbin "cow/gUnk_08111A14.bin" +gSpriteAnimations_Cow_17:: @ 08111A14 + .include "animations/gSpriteAnimations_Cow_17.s" -gUnk_08111A1C:: @ 08111A1C - .incbin "cow/gUnk_08111A1C.bin" +gSpriteAnimations_Cow_18:: @ 08111A1C + .include "animations/gSpriteAnimations_Cow_18.s" -gUnk_08111A24:: @ 08111A24 - .incbin "cow/gUnk_08111A24.bin" +gSpriteAnimations_Cow_19:: @ 08111A24 + .include "animations/gSpriteAnimations_Cow_19.s" gSpriteAnimations_Cow:: @ 08111A2C - .4byte gUnk_08111960 - .4byte gUnk_08111965 - .4byte gUnk_0811196A - .4byte gUnk_0811196F - .4byte gUnk_08111974 - .4byte gUnk_08111985 - .4byte gUnk_08111996 - .4byte gUnk_081119A7 - .4byte gUnk_081119B8 - .4byte gUnk_081119C4 - .4byte gUnk_081119D0 - .4byte gUnk_081119DC - .4byte gUnk_081119E8 - .4byte gUnk_081119F1 - .4byte gUnk_081119FA - .4byte gUnk_08111A03 - .4byte gUnk_08111A0C - .4byte gUnk_08111A14 - .4byte gUnk_08111A1C - .4byte gUnk_08111A24 + .4byte gSpriteAnimations_Cow_0 + .4byte gSpriteAnimations_Cow_1 + .4byte gSpriteAnimations_Cow_2 + .4byte gSpriteAnimations_Cow_3 + .4byte gSpriteAnimations_Cow_4 + .4byte gSpriteAnimations_Cow_5 + .4byte gSpriteAnimations_Cow_6 + .4byte gSpriteAnimations_Cow_7 + .4byte gSpriteAnimations_Cow_8 + .4byte gSpriteAnimations_Cow_9 + .4byte gSpriteAnimations_Cow_10 + .4byte gSpriteAnimations_Cow_11 + .4byte gSpriteAnimations_Cow_12 + .4byte gSpriteAnimations_Cow_13 + .4byte gSpriteAnimations_Cow_14 + .4byte gSpriteAnimations_Cow_15 + .4byte gSpriteAnimations_Cow_16 + .4byte gSpriteAnimations_Cow_17 + .4byte gSpriteAnimations_Cow_18 + .4byte gSpriteAnimations_Cow_19 .4byte 00000000 diff --git a/data/animations/npc/dampe.s b/data/animations/npc/dampe.s index 4847aa50..f420d9a5 100644 --- a/data/animations/npc/dampe.s +++ b/data/animations/npc/dampe.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_08113350:: @ 08113350 - .incbin "dampe/gUnk_08113350.bin" +gSpriteAnimations_Dampe_0:: @ 08113350 + .include "animations/gSpriteAnimations_Dampe_0.s" -gUnk_08113369:: @ 08113369 - .incbin "dampe/gUnk_08113369.bin" +gSpriteAnimations_Dampe_4:: @ 08113369 + .include "animations/gSpriteAnimations_Dampe_4.s" -gUnk_0811336E:: @ 0811336E - .incbin "dampe/gUnk_0811336E.bin" +gSpriteAnimations_Dampe_5:: @ 0811336E + .include "animations/gSpriteAnimations_Dampe_5.s" -gUnk_08113377:: @ 08113377 - .incbin "dampe/gUnk_08113377.bin" +gSpriteAnimations_Dampe_7:: @ 08113377 + .include "animations/gSpriteAnimations_Dampe_7.s" gSpriteAnimations_Dampe:: @ 08113380 - .4byte gUnk_08113350 - .4byte gUnk_08113350 - .4byte gUnk_08113350 - .4byte gUnk_08113350 - .4byte gUnk_08113369 - .4byte gUnk_0811336E - .4byte gUnk_08113369 - .4byte gUnk_08113377 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_0 + .4byte gSpriteAnimations_Dampe_4 + .4byte gSpriteAnimations_Dampe_5 + .4byte gSpriteAnimations_Dampe_4 + .4byte gSpriteAnimations_Dampe_7 .4byte 00000000 diff --git a/data/animations/npc/din.s b/data/animations/npc/din.s index 02145055..2ae22d95 100644 --- a/data/animations/npc/din.s +++ b/data/animations/npc/din.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810F96C:: @ 0810F96C - .incbin "din/gUnk_0810F96C.bin" +gSpriteAnimations_Din_0:: @ 0810F96C + .include "animations/gSpriteAnimations_Din_0.s" -gUnk_0810F971:: @ 0810F971 - .incbin "din/gUnk_0810F971.bin" +gSpriteAnimations_Din_3:: @ 0810F971 + .include "animations/gSpriteAnimations_Din_3.s" -gUnk_0810F976:: @ 0810F976 - .incbin "din/gUnk_0810F976.bin" +gSpriteAnimations_Din_1:: @ 0810F976 + .include "animations/gSpriteAnimations_Din_1.s" -gUnk_0810F97B:: @ 0810F97B - .incbin "din/gUnk_0810F97B.bin" +gSpriteAnimations_Din_4:: @ 0810F97B + .include "animations/gSpriteAnimations_Din_4.s" gSpriteAnimations_Din:: @ 0810F98C - .4byte gUnk_0810F96C - .4byte gUnk_0810F976 - .4byte gUnk_0810F96C - .4byte gUnk_0810F971 - .4byte gUnk_0810F97B - .4byte gUnk_0810F97B - .4byte gUnk_0810F97B - .4byte gUnk_0810F97B + .4byte gSpriteAnimations_Din_0 + .4byte gSpriteAnimations_Din_1 + .4byte gSpriteAnimations_Din_0 + .4byte gSpriteAnimations_Din_3 + .4byte gSpriteAnimations_Din_4 + .4byte gSpriteAnimations_Din_4 + .4byte gSpriteAnimations_Din_4 + .4byte gSpriteAnimations_Din_4 .4byte 00000000 diff --git a/data/animations/npc/dog.s b/data/animations/npc/dog.s index 4df1cfc9..6b340583 100644 --- a/data/animations/npc/dog.s +++ b/data/animations/npc/dog.s @@ -4,142 +4,142 @@ .section .rodata @ .align 2 -gUnk_08111FE2:: @ 08111FE2 - .incbin "dog/gUnk_08111FE2.bin" +gSpriteAnimations_Dog_0:: @ 08111FE2 + .include "animations/gSpriteAnimations_Dog_0.s" -gUnk_08111FE7:: @ 08111FE7 - .incbin "dog/gUnk_08111FE7.bin" +gSpriteAnimations_Dog_1:: @ 08111FE7 + .include "animations/gSpriteAnimations_Dog_1.s" -gUnk_08111FEC:: @ 08111FEC - .incbin "dog/gUnk_08111FEC.bin" +gSpriteAnimations_Dog_2:: @ 08111FEC + .include "animations/gSpriteAnimations_Dog_2.s" -gUnk_08111FF1:: @ 08111FF1 - .incbin "dog/gUnk_08111FF1.bin" +gSpriteAnimations_Dog_3:: @ 08111FF1 + .include "animations/gSpriteAnimations_Dog_3.s" -gUnk_08111FF6:: @ 08111FF6 - .incbin "dog/gUnk_08111FF6.bin" +gSpriteAnimations_Dog_4:: @ 08111FF6 + .include "animations/gSpriteAnimations_Dog_4.s" -gUnk_08112007:: @ 08112007 - .incbin "dog/gUnk_08112007.bin" +gSpriteAnimations_Dog_6:: @ 08112007 + .include "animations/gSpriteAnimations_Dog_6.s" -gUnk_08112018:: @ 08112018 - .incbin "dog/gUnk_08112018.bin" +gSpriteAnimations_Dog_10:: @ 08112018 + .include "animations/gSpriteAnimations_Dog_10.s" -gUnk_0811201D:: @ 0811201D - .incbin "dog/gUnk_0811201D.bin" +gSpriteAnimations_Dog_11:: @ 0811201D + .include "animations/gSpriteAnimations_Dog_11.s" -gUnk_08112022:: @ 08112022 - .incbin "dog/gUnk_08112022.bin" +gSpriteAnimations_Dog_9:: @ 08112022 + .include "animations/gSpriteAnimations_Dog_9.s" -gUnk_08112027:: @ 08112027 - .incbin "dog/gUnk_08112027.bin" +gSpriteAnimations_Dog_8:: @ 08112027 + .include "animations/gSpriteAnimations_Dog_8.s" -gUnk_0811202C:: @ 0811202C - .incbin "dog/gUnk_0811202C.bin" +gSpriteAnimations_Dog_16:: @ 0811202C + .include "animations/gSpriteAnimations_Dog_16.s" -gUnk_08112031:: @ 08112031 - .incbin "dog/gUnk_08112031.bin" +gSpriteAnimations_Dog_19:: @ 08112031 + .include "animations/gSpriteAnimations_Dog_19.s" -gUnk_08112036:: @ 08112036 - .incbin "dog/gUnk_08112036.bin" +gSpriteAnimations_Dog_17:: @ 08112036 + .include "animations/gSpriteAnimations_Dog_17.s" -gUnk_0811203B:: @ 0811203B - .incbin "dog/gUnk_0811203B.bin" +gSpriteAnimations_Dog_21:: @ 0811203B + .include "animations/gSpriteAnimations_Dog_21.s" -gUnk_08112040:: @ 08112040 - .incbin "dog/gUnk_08112040.bin" +gSpriteAnimations_Dog_22:: @ 08112040 + .include "animations/gSpriteAnimations_Dog_22.s" -gUnk_08112045:: @ 08112045 - .incbin "dog/gUnk_08112045.bin" +gSpriteAnimations_Dog_20:: @ 08112045 + .include "animations/gSpriteAnimations_Dog_20.s" -gUnk_0811204A:: @ 0811204A - .incbin "dog/gUnk_0811204A.bin" +gSpriteAnimations_Dog_13:: @ 0811204A + .include "animations/gSpriteAnimations_Dog_13.s" -gUnk_0811204F:: @ 0811204F - .incbin "dog/gUnk_0811204F.bin" +gSpriteAnimations_Dog_14:: @ 0811204F + .include "animations/gSpriteAnimations_Dog_14.s" -gUnk_08112054:: @ 08112054 - .incbin "dog/gUnk_08112054.bin" +gSpriteAnimations_Dog_12:: @ 08112054 + .include "animations/gSpriteAnimations_Dog_12.s" -gUnk_08112059:: @ 08112059 - .incbin "dog/gUnk_08112059.bin" +gSpriteAnimations_Dog_24:: @ 08112059 + .include "animations/gSpriteAnimations_Dog_24.s" -gUnk_0811205E:: @ 0811205E - .incbin "dog/gUnk_0811205E.bin" +gSpriteAnimations_Dog_27:: @ 0811205E + .include "animations/gSpriteAnimations_Dog_27.s" -gUnk_08112063:: @ 08112063 - .incbin "dog/gUnk_08112063.bin" +gSpriteAnimations_Dog_25:: @ 08112063 + .include "animations/gSpriteAnimations_Dog_25.s" -gUnk_08112068:: @ 08112068 - .incbin "dog/gUnk_08112068.bin" +gSpriteAnimations_Dog_30:: @ 08112068 + .include "animations/gSpriteAnimations_Dog_30.s" -gUnk_08112075:: @ 08112075 - .incbin "dog/gUnk_08112075.bin" +gSpriteAnimations_Dog_31:: @ 08112075 + .include "animations/gSpriteAnimations_Dog_31.s" -gUnk_08112082:: @ 08112082 - .incbin "dog/gUnk_08112082.bin" +gSpriteAnimations_Dog_29:: @ 08112082 + .include "animations/gSpriteAnimations_Dog_29.s" -gUnk_0811208F:: @ 0811208F - .incbin "dog/gUnk_0811208F.bin" +gSpriteAnimations_Dog_28:: @ 0811208F + .include "animations/gSpriteAnimations_Dog_28.s" -gUnk_0811209C:: @ 0811209C - .incbin "dog/gUnk_0811209C.bin" +gSpriteAnimations_Dog_32:: @ 0811209C + .include "animations/gSpriteAnimations_Dog_32.s" -gUnk_081120AD:: @ 081120AD - .incbin "dog/gUnk_081120AD.bin" +gSpriteAnimations_Dog_34:: @ 081120AD + .include "animations/gSpriteAnimations_Dog_34.s" -gUnk_081120BE:: @ 081120BE - .incbin "dog/gUnk_081120BE.bin" +gSpriteAnimations_Dog_36:: @ 081120BE + .include "animations/gSpriteAnimations_Dog_36.s" -gUnk_081120CF:: @ 081120CF - .incbin "dog/gUnk_081120CF.bin" +gSpriteAnimations_Dog_38:: @ 081120CF + .include "animations/gSpriteAnimations_Dog_38.s" -gUnk_081120E0:: @ 081120E0 - .incbin "dog/gUnk_081120E0.bin" +gSpriteAnimations_Dog_40:: @ 081120E0 + .include "animations/gSpriteAnimations_Dog_40.s" gSpriteAnimations_Dog:: @ 08112100 - .4byte gUnk_08111FE2 - .4byte gUnk_08111FE7 - .4byte gUnk_08111FEC - .4byte gUnk_08111FF1 - .4byte gUnk_08111FF6 - .4byte gUnk_08111FF6 - .4byte gUnk_08112007 - .4byte gUnk_08112007 - .4byte gUnk_08112027 - .4byte gUnk_08112022 - .4byte gUnk_08112018 - .4byte gUnk_0811201D - .4byte gUnk_08112054 - .4byte gUnk_0811204A - .4byte gUnk_0811204F - .4byte gUnk_0811204A - .4byte gUnk_0811202C - .4byte gUnk_08112036 - .4byte gUnk_0811202C - .4byte gUnk_08112031 - .4byte gUnk_08112045 - .4byte gUnk_0811203B - .4byte gUnk_08112040 - .4byte gUnk_0811203B - .4byte gUnk_08112059 - .4byte gUnk_08112063 - .4byte gUnk_08112059 - .4byte gUnk_0811205E - .4byte gUnk_0811208F - .4byte gUnk_08112082 - .4byte gUnk_08112068 - .4byte gUnk_08112075 - .4byte gUnk_0811209C - .4byte gUnk_0811209C - .4byte gUnk_081120AD - .4byte gUnk_081120AD - .4byte gUnk_081120BE - .4byte gUnk_081120BE - .4byte gUnk_081120CF - .4byte gUnk_081120CF - .4byte gUnk_081120E0 - .4byte gUnk_081120E0 - .4byte gUnk_081120E0 - .4byte gUnk_081120E0 + .4byte gSpriteAnimations_Dog_0 + .4byte gSpriteAnimations_Dog_1 + .4byte gSpriteAnimations_Dog_2 + .4byte gSpriteAnimations_Dog_3 + .4byte gSpriteAnimations_Dog_4 + .4byte gSpriteAnimations_Dog_4 + .4byte gSpriteAnimations_Dog_6 + .4byte gSpriteAnimations_Dog_6 + .4byte gSpriteAnimations_Dog_8 + .4byte gSpriteAnimations_Dog_9 + .4byte gSpriteAnimations_Dog_10 + .4byte gSpriteAnimations_Dog_11 + .4byte gSpriteAnimations_Dog_12 + .4byte gSpriteAnimations_Dog_13 + .4byte gSpriteAnimations_Dog_14 + .4byte gSpriteAnimations_Dog_13 + .4byte gSpriteAnimations_Dog_16 + .4byte gSpriteAnimations_Dog_17 + .4byte gSpriteAnimations_Dog_16 + .4byte gSpriteAnimations_Dog_19 + .4byte gSpriteAnimations_Dog_20 + .4byte gSpriteAnimations_Dog_21 + .4byte gSpriteAnimations_Dog_22 + .4byte gSpriteAnimations_Dog_21 + .4byte gSpriteAnimations_Dog_24 + .4byte gSpriteAnimations_Dog_25 + .4byte gSpriteAnimations_Dog_24 + .4byte gSpriteAnimations_Dog_27 + .4byte gSpriteAnimations_Dog_28 + .4byte gSpriteAnimations_Dog_29 + .4byte gSpriteAnimations_Dog_30 + .4byte gSpriteAnimations_Dog_31 + .4byte gSpriteAnimations_Dog_32 + .4byte gSpriteAnimations_Dog_32 + .4byte gSpriteAnimations_Dog_34 + .4byte gSpriteAnimations_Dog_34 + .4byte gSpriteAnimations_Dog_36 + .4byte gSpriteAnimations_Dog_36 + .4byte gSpriteAnimations_Dog_38 + .4byte gSpriteAnimations_Dog_38 + .4byte gSpriteAnimations_Dog_40 + .4byte gSpriteAnimations_Dog_40 + .4byte gSpriteAnimations_Dog_40 + .4byte gSpriteAnimations_Dog_40 .4byte 00000000 diff --git a/data/animations/npc/drLeft.s b/data/animations/npc/drLeft.s index 7bbd42f5..15cf67d5 100644 --- a/data/animations/npc/drLeft.s +++ b/data/animations/npc/drLeft.s @@ -4,45 +4,45 @@ .section .rodata .align 2 -gUnk_081133B8:: @ 081133B8 - .incbin "drLeft/gUnk_081133B8.bin" +gSpriteAnimations_DrLeft_0:: @ 081133B8 + .include "animations/gSpriteAnimations_DrLeft_0.s" -gUnk_081133E9:: @ 081133E9 - .incbin "drLeft/gUnk_081133E9.bin" +gSpriteAnimations_DrLeft_12:: @ 081133E9 + .include "animations/gSpriteAnimations_DrLeft_12.s" -gUnk_081133FA:: @ 081133FA - .incbin "drLeft/gUnk_081133FA.bin" +gSpriteAnimations_DrLeft_13:: @ 081133FA + .include "animations/gSpriteAnimations_DrLeft_13.s" -gUnk_08113413:: @ 08113413 - .incbin "drLeft/gUnk_08113413.bin" +gSpriteAnimations_DrLeft_14:: @ 08113413 + .include "animations/gSpriteAnimations_DrLeft_14.s" -gUnk_08113434:: @ 08113434 - .incbin "drLeft/gUnk_08113434.bin" +gSpriteAnimations_DrLeft_5:: @ 08113434 + .include "animations/gSpriteAnimations_DrLeft_5.s" -gUnk_0811343D:: @ 0811343D - .incbin "drLeft/gUnk_0811343D.bin" +gSpriteAnimations_DrLeft_4:: @ 0811343D + .include "animations/gSpriteAnimations_DrLeft_4.s" -gUnk_08113446:: @ 08113446 - .incbin "drLeft/gUnk_08113446.bin" +gSpriteAnimations_DrLeft_7:: @ 08113446 + .include "animations/gSpriteAnimations_DrLeft_7.s" -gUnk_0811344F:: @ 0811344F - .incbin "drLeft/gUnk_0811344F.bin" +gSpriteAnimations_DrLeft_8:: @ 0811344F + .include "animations/gSpriteAnimations_DrLeft_8.s" gSpriteAnimations_DrLeft:: @ 08113490 - .4byte gUnk_081133B8 - .4byte gUnk_081133B8 - .4byte gUnk_081133B8 - .4byte gUnk_081133B8 - .4byte gUnk_0811343D - .4byte gUnk_08113434 - .4byte gUnk_0811343D - .4byte gUnk_08113446 - .4byte gUnk_0811344F - .4byte gUnk_0811344F - .4byte gUnk_0811344F - .4byte gUnk_0811344F - .4byte gUnk_081133E9 - .4byte gUnk_081133FA - .4byte gUnk_08113413 - .4byte gUnk_081133FA + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_0 + .4byte gSpriteAnimations_DrLeft_4 + .4byte gSpriteAnimations_DrLeft_5 + .4byte gSpriteAnimations_DrLeft_4 + .4byte gSpriteAnimations_DrLeft_7 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_8 + .4byte gSpriteAnimations_DrLeft_12 + .4byte gSpriteAnimations_DrLeft_13 + .4byte gSpriteAnimations_DrLeft_14 + .4byte gSpriteAnimations_DrLeft_13 .4byte 00000000 diff --git a/data/animations/npc/emma.s b/data/animations/npc/emma.s index 3c583d91..ecccfbde 100644 --- a/data/animations/npc/emma.s +++ b/data/animations/npc/emma.s @@ -4,15 +4,15 @@ .section .rodata .align 2 -gUnk_081138DC:: @ 081138DC - .incbin "emma/gUnk_081138DC.bin" +gSpriteAnimations_Emma_0:: @ 081138DC + .include "animations/gSpriteAnimations_Emma_0.s" -gUnk_081138E1:: @ 081138E1 - .incbin "emma/gUnk_081138E1.bin" +gSpriteAnimations_Emma_2:: @ 081138E1 + .include "animations/gSpriteAnimations_Emma_2.s" gSpriteAnimations_Emma:: @ 081138FC - .4byte gUnk_081138DC - .4byte gUnk_081138DC - .4byte gUnk_081138E1 - .4byte gUnk_081138DC + .4byte gSpriteAnimations_Emma_0 + .4byte gSpriteAnimations_Emma_0 + .4byte gSpriteAnimations_Emma_2 + .4byte gSpriteAnimations_Emma_0 .4byte 00000000 diff --git a/data/animations/npc/epona.s b/data/animations/npc/epona.s index 7a1a2b9f..07e145ac 100644 --- a/data/animations/npc/epona.s +++ b/data/animations/npc/epona.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_08110088:: @ 08110088 - .incbin "epona/gUnk_08110088.bin" +gSpriteAnimations_Epona_0:: @ 08110088 + .include "animations/gSpriteAnimations_Epona_0.s" -gUnk_0811008D:: @ 0811008D - .incbin "epona/gUnk_0811008D.bin" +gSpriteAnimations_Epona_2:: @ 0811008D + .include "animations/gSpriteAnimations_Epona_2.s" -gUnk_08110092:: @ 08110092 - .incbin "epona/gUnk_08110092.bin" +gSpriteAnimations_Epona_1:: @ 08110092 + .include "animations/gSpriteAnimations_Epona_1.s" -gUnk_08110097:: @ 08110097 - .incbin "epona/gUnk_08110097.bin" +gSpriteAnimations_Epona_4:: @ 08110097 + .include "animations/gSpriteAnimations_Epona_4.s" -gUnk_081100B8:: @ 081100B8 - .incbin "epona/gUnk_081100B8.bin" +gSpriteAnimations_Epona_8:: @ 081100B8 + .include "animations/gSpriteAnimations_Epona_8.s" gSpriteAnimations_Epona:: @ 081100E4 - .4byte gUnk_08110088 - .4byte gUnk_08110092 - .4byte gUnk_0811008D - .4byte gUnk_08110092 - .4byte gUnk_08110097 - .4byte gUnk_08110097 - .4byte gUnk_08110097 - .4byte gUnk_08110097 - .4byte gUnk_081100B8 - .4byte gUnk_081100B8 - .4byte gUnk_081100B8 - .4byte gUnk_081100B8 + .4byte gSpriteAnimations_Epona_0 + .4byte gSpriteAnimations_Epona_1 + .4byte gSpriteAnimations_Epona_2 + .4byte gSpriteAnimations_Epona_1 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_4 + .4byte gSpriteAnimations_Epona_8 + .4byte gSpriteAnimations_Epona_8 + .4byte gSpriteAnimations_Epona_8 + .4byte gSpriteAnimations_Epona_8 .4byte 00000000 diff --git a/data/animations/npc/farmers.s b/data/animations/npc/farmers.s index 659776f6..f506329d 100644 --- a/data/animations/npc/farmers.s +++ b/data/animations/npc/farmers.s @@ -4,64 +4,64 @@ .section .rodata .align 2 -gUnk_08113168:: @ 08113168 - .incbin "farmers/gUnk_08113168.bin" +gSpriteAnimations_Farmers_0_0:: @ 08113168 + .include "animations/gSpriteAnimations_Farmers_0_0.s" -gUnk_0811318D:: @ 0811318D - .incbin "farmers/gUnk_0811318D.bin" +gSpriteAnimations_Farmers_0_4:: @ 0811318D + .include "animations/gSpriteAnimations_Farmers_0_4.s" -gUnk_08113192:: @ 08113192 - .incbin "farmers/gUnk_08113192.bin" +gSpriteAnimations_Farmers_0_5:: @ 08113192 + .include "animations/gSpriteAnimations_Farmers_0_5.s" -gUnk_08113197:: @ 08113197 - .incbin "farmers/gUnk_08113197.bin" +gSpriteAnimations_Farmers_0_7:: @ 08113197 + .include "animations/gSpriteAnimations_Farmers_0_7.s" gSpriteAnimations_Farmers_0:: @ 0811319C - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_0811318D - .4byte gUnk_08113192 - .4byte gUnk_08113192 - .4byte gUnk_08113197 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_08113168 - .4byte gUnk_0811318D - .4byte gUnk_08113197 - .4byte gUnk_08113192 - .4byte gUnk_08113192 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_4 + .4byte gSpriteAnimations_Farmers_0_5 + .4byte gSpriteAnimations_Farmers_0_5 + .4byte gSpriteAnimations_Farmers_0_7 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_0 + .4byte gSpriteAnimations_Farmers_0_4 + .4byte gSpriteAnimations_Farmers_0_7 + .4byte gSpriteAnimations_Farmers_0_5 + .4byte gSpriteAnimations_Farmers_0_5 .4byte 00000000 -gUnk_081131E0:: @ 081131E0 - .incbin "farmers/gUnk_081131E0.bin" +gSpriteAnimations_Farmers_1_0:: @ 081131E0 + .include "animations/gSpriteAnimations_Farmers_1_0.s" -gUnk_08113205:: @ 08113205 - .incbin "farmers/gUnk_08113205.bin" +gSpriteAnimations_Farmers_1_4:: @ 08113205 + .include "animations/gSpriteAnimations_Farmers_1_4.s" -gUnk_0811320A:: @ 0811320A - .incbin "farmers/gUnk_0811320A.bin" +gSpriteAnimations_Farmers_1_5:: @ 0811320A + .include "animations/gSpriteAnimations_Farmers_1_5.s" -gUnk_0811320F:: @ 0811320F - .incbin "farmers/gUnk_0811320F.bin" +gSpriteAnimations_Farmers_1_7:: @ 0811320F + .include "animations/gSpriteAnimations_Farmers_1_7.s" gSpriteAnimations_Farmers_1:: @ 08113214 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_08113205 - .4byte gUnk_0811320A - .4byte gUnk_0811320A - .4byte gUnk_0811320F - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_081131E0 - .4byte gUnk_08113205 - .4byte gUnk_0811320F - .4byte gUnk_0811320A - .4byte gUnk_0811320A + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_4 + .4byte gSpriteAnimations_Farmers_1_5 + .4byte gSpriteAnimations_Farmers_1_5 + .4byte gSpriteAnimations_Farmers_1_7 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_0 + .4byte gSpriteAnimations_Farmers_1_4 + .4byte gSpriteAnimations_Farmers_1_7 + .4byte gSpriteAnimations_Farmers_1_5 + .4byte gSpriteAnimations_Farmers_1_5 .4byte 00000000 diff --git a/data/animations/npc/farore.s b/data/animations/npc/farore.s index 2b7fefc7..c305a8e4 100644 --- a/data/animations/npc/farore.s +++ b/data/animations/npc/farore.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810F9F4:: @ 0810F9F4 - .incbin "farore/gUnk_0810F9F4.bin" +gSpriteAnimations_Farore_0:: @ 0810F9F4 + .include "animations/gSpriteAnimations_Farore_0.s" -gUnk_0810F9F9:: @ 0810F9F9 - .incbin "farore/gUnk_0810F9F9.bin" +gSpriteAnimations_Farore_3:: @ 0810F9F9 + .include "animations/gSpriteAnimations_Farore_3.s" -gUnk_0810F9FE:: @ 0810F9FE - .incbin "farore/gUnk_0810F9FE.bin" +gSpriteAnimations_Farore_1:: @ 0810F9FE + .include "animations/gSpriteAnimations_Farore_1.s" -gUnk_0810FA03:: @ 0810FA03 - .incbin "farore/gUnk_0810FA03.bin" +gSpriteAnimations_Farore_4:: @ 0810FA03 + .include "animations/gSpriteAnimations_Farore_4.s" gSpriteAnimations_Farore:: @ 0810FA14 - .4byte gUnk_0810F9F4 - .4byte gUnk_0810F9FE - .4byte gUnk_0810F9F4 - .4byte gUnk_0810F9F9 - .4byte gUnk_0810FA03 - .4byte gUnk_0810FA03 - .4byte gUnk_0810FA03 - .4byte gUnk_0810FA03 + .4byte gSpriteAnimations_Farore_0 + .4byte gSpriteAnimations_Farore_1 + .4byte gSpriteAnimations_Farore_0 + .4byte gSpriteAnimations_Farore_3 + .4byte gSpriteAnimations_Farore_4 + .4byte gSpriteAnimations_Farore_4 + .4byte gSpriteAnimations_Farore_4 + .4byte gSpriteAnimations_Farore_4 .4byte 00000000 diff --git a/data/animations/npc/festari.s b/data/animations/npc/festari.s index 511fb6e2..60b184ed 100644 --- a/data/animations/npc/festari.s +++ b/data/animations/npc/festari.s @@ -4,48 +4,48 @@ .section .rodata .align 2 -gUnk_08109BC8:: @ 08109BC8 - .incbin "festari/gUnk_08109BC8.bin" +gSpriteAnimations_Festari_1:: @ 08109BC8 + .include "animations/gSpriteAnimations_Festari_1.s" -gUnk_08109BCD:: @ 08109BCD - .incbin "festari/gUnk_08109BCD.bin" +gSpriteAnimations_Festari_0:: @ 08109BCD + .include "animations/gSpriteAnimations_Festari_0.s" -gUnk_08109BD2:: @ 08109BD2 - .incbin "festari/gUnk_08109BD2.bin" +gSpriteAnimations_Festari_3:: @ 08109BD2 + .include "animations/gSpriteAnimations_Festari_3.s" -gUnk_08109BD7:: @ 08109BD7 - .incbin "festari/gUnk_08109BD7.bin" +gSpriteAnimations_Festari_4:: @ 08109BD7 + .include "animations/gSpriteAnimations_Festari_4.s" -gUnk_08109BE8:: @ 08109BE8 - .incbin "festari/gUnk_08109BE8.bin" +gSpriteAnimations_Festari_7:: @ 08109BE8 + .include "animations/gSpriteAnimations_Festari_7.s" -gUnk_08109BF9:: @ 08109BF9 - .incbin "festari/gUnk_08109BF9.bin" +gSpriteAnimations_Festari_9:: @ 08109BF9 + .include "animations/gSpriteAnimations_Festari_9.s" -gUnk_08109C2E:: @ 08109C2E - .incbin "festari/gUnk_08109C2E.bin" +gSpriteAnimations_Festari_8:: @ 08109C2E + .include "animations/gSpriteAnimations_Festari_8.s" -gUnk_08109C4B:: @ 08109C4B - .incbin "festari/gUnk_08109C4B.bin" +gSpriteAnimations_Festari_10:: @ 08109C4B + .include "animations/gSpriteAnimations_Festari_10.s" -gUnk_08109C54:: @ 08109C54 - .incbin "festari/gUnk_08109C54.bin" +gSpriteAnimations_Festari_11:: @ 08109C54 + .include "animations/gSpriteAnimations_Festari_11.s" -gUnk_08109C59:: @ 08109C59 - .incbin "festari/gUnk_08109C59.bin" +gSpriteAnimations_Festari_12:: @ 08109C59 + .include "animations/gSpriteAnimations_Festari_12.s" gSpriteAnimations_Festari:: @ 08109C60 - .4byte gUnk_08109BCD - .4byte gUnk_08109BC8 - .4byte gUnk_08109BCD - .4byte gUnk_08109BD2 - .4byte gUnk_08109BD7 - .4byte gUnk_08109BD7 - .4byte gUnk_08109BD7 - .4byte gUnk_08109BE8 - .4byte gUnk_08109C2E - .4byte gUnk_08109BF9 - .4byte gUnk_08109C4B - .4byte gUnk_08109C54 - .4byte gUnk_08109C59 + .4byte gSpriteAnimations_Festari_0 + .4byte gSpriteAnimations_Festari_1 + .4byte gSpriteAnimations_Festari_0 + .4byte gSpriteAnimations_Festari_3 + .4byte gSpriteAnimations_Festari_4 + .4byte gSpriteAnimations_Festari_4 + .4byte gSpriteAnimations_Festari_4 + .4byte gSpriteAnimations_Festari_7 + .4byte gSpriteAnimations_Festari_8 + .4byte gSpriteAnimations_Festari_9 + .4byte gSpriteAnimations_Festari_10 + .4byte gSpriteAnimations_Festari_11 + .4byte gSpriteAnimations_Festari_12 .4byte 00000000 diff --git a/data/animations/npc/forestMinish.s b/data/animations/npc/forestMinish.s index b0eda8e7..e5413d59 100644 --- a/data/animations/npc/forestMinish.s +++ b/data/animations/npc/forestMinish.s @@ -4,181 +4,181 @@ .section .rodata @ .align 2 -gUnk_0810A36A:: @ 0810A36A - .incbin "forestMinish/gUnk_0810A36A.bin" +gSpriteAnimations_ForestMinish_0:: @ 0810A36A + .include "animations/gSpriteAnimations_ForestMinish_0.s" -gUnk_0810A36F:: @ 0810A36F - .incbin "forestMinish/gUnk_0810A36F.bin" +gSpriteAnimations_ForestMinish_1:: @ 0810A36F + .include "animations/gSpriteAnimations_ForestMinish_1.s" -gUnk_0810A374:: @ 0810A374 - .incbin "forestMinish/gUnk_0810A374.bin" +gSpriteAnimations_ForestMinish_2:: @ 0810A374 + .include "animations/gSpriteAnimations_ForestMinish_2.s" -gUnk_0810A379:: @ 0810A379 - .incbin "forestMinish/gUnk_0810A379.bin" +gSpriteAnimations_ForestMinish_3:: @ 0810A379 + .include "animations/gSpriteAnimations_ForestMinish_3.s" -gUnk_0810A37E:: @ 0810A37E - .incbin "forestMinish/gUnk_0810A37E.bin" +gSpriteAnimations_ForestMinish_4:: @ 0810A37E + .include "animations/gSpriteAnimations_ForestMinish_4.s" -gUnk_0810A39F:: @ 0810A39F - .incbin "forestMinish/gUnk_0810A39F.bin" +gSpriteAnimations_ForestMinish_5:: @ 0810A39F + .include "animations/gSpriteAnimations_ForestMinish_5.s" -gUnk_0810A3C0:: @ 0810A3C0 - .incbin "forestMinish/gUnk_0810A3C0.bin" +gSpriteAnimations_ForestMinish_6:: @ 0810A3C0 + .include "animations/gSpriteAnimations_ForestMinish_6.s" -gUnk_0810A3E1:: @ 0810A3E1 - .incbin "forestMinish/gUnk_0810A3E1.bin" +gSpriteAnimations_ForestMinish_7:: @ 0810A3E1 + .include "animations/gSpriteAnimations_ForestMinish_7.s" -gUnk_0810A402:: @ 0810A402 - .incbin "forestMinish/gUnk_0810A402.bin" +gSpriteAnimations_ForestMinish_8:: @ 0810A402 + .include "animations/gSpriteAnimations_ForestMinish_8.s" -gUnk_0810A407:: @ 0810A407 - .incbin "forestMinish/gUnk_0810A407.bin" +gSpriteAnimations_ForestMinish_9:: @ 0810A407 + .include "animations/gSpriteAnimations_ForestMinish_9.s" -gUnk_0810A40C:: @ 0810A40C - .incbin "forestMinish/gUnk_0810A40C.bin" +gSpriteAnimations_ForestMinish_10:: @ 0810A40C + .include "animations/gSpriteAnimations_ForestMinish_10.s" -gUnk_0810A411:: @ 0810A411 - .incbin "forestMinish/gUnk_0810A411.bin" +gSpriteAnimations_ForestMinish_11:: @ 0810A411 + .include "animations/gSpriteAnimations_ForestMinish_11.s" -gUnk_0810A416:: @ 0810A416 - .incbin "forestMinish/gUnk_0810A416.bin" +gSpriteAnimations_ForestMinish_12:: @ 0810A416 + .include "animations/gSpriteAnimations_ForestMinish_12.s" -gUnk_0810A423:: @ 0810A423 - .incbin "forestMinish/gUnk_0810A423.bin" +gSpriteAnimations_ForestMinish_13:: @ 0810A423 + .include "animations/gSpriteAnimations_ForestMinish_13.s" -gUnk_0810A430:: @ 0810A430 - .incbin "forestMinish/gUnk_0810A430.bin" +gSpriteAnimations_ForestMinish_14:: @ 0810A430 + .include "animations/gSpriteAnimations_ForestMinish_14.s" -gUnk_0810A43D:: @ 0810A43D - .incbin "forestMinish/gUnk_0810A43D.bin" +gSpriteAnimations_ForestMinish_15:: @ 0810A43D + .include "animations/gSpriteAnimations_ForestMinish_15.s" -gUnk_0810A44A:: @ 0810A44A - .incbin "forestMinish/gUnk_0810A44A.bin" +gSpriteAnimations_ForestMinish_16:: @ 0810A44A + .include "animations/gSpriteAnimations_ForestMinish_16.s" -gUnk_0810A457:: @ 0810A457 - .incbin "forestMinish/gUnk_0810A457.bin" +gSpriteAnimations_ForestMinish_17:: @ 0810A457 + .include "animations/gSpriteAnimations_ForestMinish_17.s" -gUnk_0810A464:: @ 0810A464 - .incbin "forestMinish/gUnk_0810A464.bin" +gSpriteAnimations_ForestMinish_18:: @ 0810A464 + .include "animations/gSpriteAnimations_ForestMinish_18.s" -gUnk_0810A471:: @ 0810A471 - .incbin "forestMinish/gUnk_0810A471.bin" +gSpriteAnimations_ForestMinish_19:: @ 0810A471 + .include "animations/gSpriteAnimations_ForestMinish_19.s" -gUnk_0810A47E:: @ 0810A47E - .incbin "forestMinish/gUnk_0810A47E.bin" +gSpriteAnimations_ForestMinish_20:: @ 0810A47E + .include "animations/gSpriteAnimations_ForestMinish_20.s" -gUnk_0810A48B:: @ 0810A48B - .incbin "forestMinish/gUnk_0810A48B.bin" +gSpriteAnimations_ForestMinish_21:: @ 0810A48B + .include "animations/gSpriteAnimations_ForestMinish_21.s" -gUnk_0810A498:: @ 0810A498 - .incbin "forestMinish/gUnk_0810A498.bin" +gSpriteAnimations_ForestMinish_22:: @ 0810A498 + .include "animations/gSpriteAnimations_ForestMinish_22.s" -gUnk_0810A4A5:: @ 0810A4A5 - .incbin "forestMinish/gUnk_0810A4A5.bin" +gSpriteAnimations_ForestMinish_23:: @ 0810A4A5 + .include "animations/gSpriteAnimations_ForestMinish_23.s" -gUnk_0810A4B2:: @ 0810A4B2 - .incbin "forestMinish/gUnk_0810A4B2.bin" +gSpriteAnimations_ForestMinish_24:: @ 0810A4B2 + .include "animations/gSpriteAnimations_ForestMinish_24.s" -gUnk_0810A4BF:: @ 0810A4BF - .incbin "forestMinish/gUnk_0810A4BF.bin" +gSpriteAnimations_ForestMinish_25:: @ 0810A4BF + .include "animations/gSpriteAnimations_ForestMinish_25.s" -gUnk_0810A4CC:: @ 0810A4CC - .incbin "forestMinish/gUnk_0810A4CC.bin" +gSpriteAnimations_ForestMinish_26:: @ 0810A4CC + .include "animations/gSpriteAnimations_ForestMinish_26.s" -gUnk_0810A4D9:: @ 0810A4D9 - .incbin "forestMinish/gUnk_0810A4D9.bin" +gSpriteAnimations_ForestMinish_27:: @ 0810A4D9 + .include "animations/gSpriteAnimations_ForestMinish_27.s" -gUnk_0810A4E6:: @ 0810A4E6 - .incbin "forestMinish/gUnk_0810A4E6.bin" +gSpriteAnimations_ForestMinish_28:: @ 0810A4E6 + .include "animations/gSpriteAnimations_ForestMinish_28.s" -gUnk_0810A4F3:: @ 0810A4F3 - .incbin "forestMinish/gUnk_0810A4F3.bin" +gSpriteAnimations_ForestMinish_29:: @ 0810A4F3 + .include "animations/gSpriteAnimations_ForestMinish_29.s" -gUnk_0810A500:: @ 0810A500 - .incbin "forestMinish/gUnk_0810A500.bin" +gSpriteAnimations_ForestMinish_30:: @ 0810A500 + .include "animations/gSpriteAnimations_ForestMinish_30.s" -gUnk_0810A50D:: @ 0810A50D - .incbin "forestMinish/gUnk_0810A50D.bin" +gSpriteAnimations_ForestMinish_31:: @ 0810A50D + .include "animations/gSpriteAnimations_ForestMinish_31.s" -gUnk_0810A51A:: @ 0810A51A - .incbin "forestMinish/gUnk_0810A51A.bin" +gSpriteAnimations_ForestMinish_32:: @ 0810A51A + .include "animations/gSpriteAnimations_ForestMinish_32.s" -gUnk_0810A527:: @ 0810A527 - .incbin "forestMinish/gUnk_0810A527.bin" +gSpriteAnimations_ForestMinish_33:: @ 0810A527 + .include "animations/gSpriteAnimations_ForestMinish_33.s" -gUnk_0810A534:: @ 0810A534 - .incbin "forestMinish/gUnk_0810A534.bin" +gSpriteAnimations_ForestMinish_34:: @ 0810A534 + .include "animations/gSpriteAnimations_ForestMinish_34.s" -gUnk_0810A541:: @ 0810A541 - .incbin "forestMinish/gUnk_0810A541.bin" +gSpriteAnimations_ForestMinish_35:: @ 0810A541 + .include "animations/gSpriteAnimations_ForestMinish_35.s" -gUnk_0810A54E:: @ 0810A54E - .incbin "forestMinish/gUnk_0810A54E.bin" +gSpriteAnimations_ForestMinish_36:: @ 0810A54E + .include "animations/gSpriteAnimations_ForestMinish_36.s" -gUnk_0810A55B:: @ 0810A55B - .incbin "forestMinish/gUnk_0810A55B.bin" +gSpriteAnimations_ForestMinish_37:: @ 0810A55B + .include "animations/gSpriteAnimations_ForestMinish_37.s" -gUnk_0810A568:: @ 0810A568 - .incbin "forestMinish/gUnk_0810A568.bin" +gSpriteAnimations_ForestMinish_38:: @ 0810A568 + .include "animations/gSpriteAnimations_ForestMinish_38.s" -gUnk_0810A575:: @ 0810A575 - .incbin "forestMinish/gUnk_0810A575.bin" +gSpriteAnimations_ForestMinish_39:: @ 0810A575 + .include "animations/gSpriteAnimations_ForestMinish_39.s" -gUnk_0810A582:: @ 0810A582 - .incbin "forestMinish/gUnk_0810A582.bin" +gSpriteAnimations_ForestMinish_40:: @ 0810A582 + .include "animations/gSpriteAnimations_ForestMinish_40.s" -gUnk_0810A58F:: @ 0810A58F - .incbin "forestMinish/gUnk_0810A58F.bin" +gSpriteAnimations_ForestMinish_41:: @ 0810A58F + .include "animations/gSpriteAnimations_ForestMinish_41.s" -gUnk_0810A59C:: @ 0810A59C - .incbin "forestMinish/gUnk_0810A59C.bin" +gSpriteAnimations_ForestMinish_42:: @ 0810A59C + .include "animations/gSpriteAnimations_ForestMinish_42.s" -gUnk_0810A5A9:: @ 0810A5A9 - .incbin "forestMinish/gUnk_0810A5A9.bin" +gSpriteAnimations_ForestMinish_43:: @ 0810A5A9 + .include "animations/gSpriteAnimations_ForestMinish_43.s" gSpriteAnimations_ForestMinish:: @ 0810A5B8 - .4byte gUnk_0810A36A - .4byte gUnk_0810A36F - .4byte gUnk_0810A374 - .4byte gUnk_0810A379 - .4byte gUnk_0810A37E - .4byte gUnk_0810A39F - .4byte gUnk_0810A3C0 - .4byte gUnk_0810A3E1 - .4byte gUnk_0810A402 - .4byte gUnk_0810A407 - .4byte gUnk_0810A40C - .4byte gUnk_0810A411 - .4byte gUnk_0810A416 - .4byte gUnk_0810A423 - .4byte gUnk_0810A430 - .4byte gUnk_0810A43D - .4byte gUnk_0810A44A - .4byte gUnk_0810A457 - .4byte gUnk_0810A464 - .4byte gUnk_0810A471 - .4byte gUnk_0810A47E - .4byte gUnk_0810A48B - .4byte gUnk_0810A498 - .4byte gUnk_0810A4A5 - .4byte gUnk_0810A4B2 - .4byte gUnk_0810A4BF - .4byte gUnk_0810A4CC - .4byte gUnk_0810A4D9 - .4byte gUnk_0810A4E6 - .4byte gUnk_0810A4F3 - .4byte gUnk_0810A500 - .4byte gUnk_0810A50D - .4byte gUnk_0810A51A - .4byte gUnk_0810A527 - .4byte gUnk_0810A534 - .4byte gUnk_0810A541 - .4byte gUnk_0810A54E - .4byte gUnk_0810A55B - .4byte gUnk_0810A568 - .4byte gUnk_0810A575 - .4byte gUnk_0810A582 - .4byte gUnk_0810A58F - .4byte gUnk_0810A59C - .4byte gUnk_0810A5A9 + .4byte gSpriteAnimations_ForestMinish_0 + .4byte gSpriteAnimations_ForestMinish_1 + .4byte gSpriteAnimations_ForestMinish_2 + .4byte gSpriteAnimations_ForestMinish_3 + .4byte gSpriteAnimations_ForestMinish_4 + .4byte gSpriteAnimations_ForestMinish_5 + .4byte gSpriteAnimations_ForestMinish_6 + .4byte gSpriteAnimations_ForestMinish_7 + .4byte gSpriteAnimations_ForestMinish_8 + .4byte gSpriteAnimations_ForestMinish_9 + .4byte gSpriteAnimations_ForestMinish_10 + .4byte gSpriteAnimations_ForestMinish_11 + .4byte gSpriteAnimations_ForestMinish_12 + .4byte gSpriteAnimations_ForestMinish_13 + .4byte gSpriteAnimations_ForestMinish_14 + .4byte gSpriteAnimations_ForestMinish_15 + .4byte gSpriteAnimations_ForestMinish_16 + .4byte gSpriteAnimations_ForestMinish_17 + .4byte gSpriteAnimations_ForestMinish_18 + .4byte gSpriteAnimations_ForestMinish_19 + .4byte gSpriteAnimations_ForestMinish_20 + .4byte gSpriteAnimations_ForestMinish_21 + .4byte gSpriteAnimations_ForestMinish_22 + .4byte gSpriteAnimations_ForestMinish_23 + .4byte gSpriteAnimations_ForestMinish_24 + .4byte gSpriteAnimations_ForestMinish_25 + .4byte gSpriteAnimations_ForestMinish_26 + .4byte gSpriteAnimations_ForestMinish_27 + .4byte gSpriteAnimations_ForestMinish_28 + .4byte gSpriteAnimations_ForestMinish_29 + .4byte gSpriteAnimations_ForestMinish_30 + .4byte gSpriteAnimations_ForestMinish_31 + .4byte gSpriteAnimations_ForestMinish_32 + .4byte gSpriteAnimations_ForestMinish_33 + .4byte gSpriteAnimations_ForestMinish_34 + .4byte gSpriteAnimations_ForestMinish_35 + .4byte gSpriteAnimations_ForestMinish_36 + .4byte gSpriteAnimations_ForestMinish_37 + .4byte gSpriteAnimations_ForestMinish_38 + .4byte gSpriteAnimations_ForestMinish_39 + .4byte gSpriteAnimations_ForestMinish_40 + .4byte gSpriteAnimations_ForestMinish_41 + .4byte gSpriteAnimations_ForestMinish_42 + .4byte gSpriteAnimations_ForestMinish_43 .4byte 00000000 diff --git a/data/animations/npc/gentari.s b/data/animations/npc/gentari.s index e7040ddc..66907138 100644 --- a/data/animations/npc/gentari.s +++ b/data/animations/npc/gentari.s @@ -4,46 +4,46 @@ .section .rodata .align 2 -gUnk_08109AD8:: @ 08109AD8 - .incbin "gentari/gUnk_08109AD8.bin" +gSpriteAnimations_Gentari_0:: @ 08109AD8 + .include "animations/gSpriteAnimations_Gentari_0.s" -gUnk_08109ADD:: @ 08109ADD - .incbin "gentari/gUnk_08109ADD.bin" +gSpriteAnimations_Gentari_1:: @ 08109ADD + .include "animations/gSpriteAnimations_Gentari_1.s" -gUnk_08109AE2:: @ 08109AE2 - .incbin "gentari/gUnk_08109AE2.bin" +gSpriteAnimations_Gentari_2:: @ 08109AE2 + .include "animations/gSpriteAnimations_Gentari_2.s" -gUnk_08109AE7:: @ 08109AE7 - .incbin "gentari/gUnk_08109AE7.bin" +gSpriteAnimations_Gentari_3:: @ 08109AE7 + .include "animations/gSpriteAnimations_Gentari_3.s" -gUnk_08109AEC:: @ 08109AEC - .incbin "gentari/gUnk_08109AEC.bin" +gSpriteAnimations_Gentari_4:: @ 08109AEC + .include "animations/gSpriteAnimations_Gentari_4.s" -gUnk_08109AFD:: @ 08109AFD - .incbin "gentari/gUnk_08109AFD.bin" +gSpriteAnimations_Gentari_7:: @ 08109AFD + .include "animations/gSpriteAnimations_Gentari_7.s" -gUnk_08109B0E:: @ 08109B0E - .incbin "gentari/gUnk_08109B0E.bin" +gSpriteAnimations_Gentari_8:: @ 08109B0E + .include "animations/gSpriteAnimations_Gentari_8.s" -gUnk_08109B3B:: @ 08109B3B - .incbin "gentari/gUnk_08109B3B.bin" +gSpriteAnimations_Gentari_12:: @ 08109B3B + .include "animations/gSpriteAnimations_Gentari_12.s" -gUnk_08109B60:: @ 08109B60 - .incbin "gentari/gUnk_08109B60.bin" +gSpriteAnimations_Gentari_13:: @ 08109B60 + .include "animations/gSpriteAnimations_Gentari_13.s" gSpriteAnimations_Gentari:: @ 08109B80 - .4byte gUnk_08109AD8 - .4byte gUnk_08109ADD - .4byte gUnk_08109AE2 - .4byte gUnk_08109AE7 - .4byte gUnk_08109AEC - .4byte gUnk_08109AEC - .4byte gUnk_08109AEC - .4byte gUnk_08109AFD - .4byte gUnk_08109B0E - .4byte gUnk_08109ADD - .4byte gUnk_08109B0E - .4byte gUnk_08109AE7 - .4byte gUnk_08109B3B - .4byte gUnk_08109B60 + .4byte gSpriteAnimations_Gentari_0 + .4byte gSpriteAnimations_Gentari_1 + .4byte gSpriteAnimations_Gentari_2 + .4byte gSpriteAnimations_Gentari_3 + .4byte gSpriteAnimations_Gentari_4 + .4byte gSpriteAnimations_Gentari_4 + .4byte gSpriteAnimations_Gentari_4 + .4byte gSpriteAnimations_Gentari_7 + .4byte gSpriteAnimations_Gentari_8 + .4byte gSpriteAnimations_Gentari_1 + .4byte gSpriteAnimations_Gentari_8 + .4byte gSpriteAnimations_Gentari_3 + .4byte gSpriteAnimations_Gentari_12 + .4byte gSpriteAnimations_Gentari_13 .4byte 00000000 diff --git a/data/animations/npc/ghostBrothers.s b/data/animations/npc/ghostBrothers.s index 397aee6b..bdf81b21 100644 --- a/data/animations/npc/ghostBrothers.s +++ b/data/animations/npc/ghostBrothers.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_08110300:: @ 08110300 - .incbin "ghostBrothers/gUnk_08110300.bin" +gSpriteAnimations_GhostBrothers_0:: @ 08110300 + .include "animations/gSpriteAnimations_GhostBrothers_0.s" -gUnk_08110311:: @ 08110311 - .incbin "ghostBrothers/gUnk_08110311.bin" +gSpriteAnimations_GhostBrothers_3:: @ 08110311 + .include "animations/gSpriteAnimations_GhostBrothers_3.s" -gUnk_08110322:: @ 08110322 - .incbin "ghostBrothers/gUnk_08110322.bin" +gSpriteAnimations_GhostBrothers_1:: @ 08110322 + .include "animations/gSpriteAnimations_GhostBrothers_1.s" -gUnk_08110333:: @ 08110333 - .incbin "ghostBrothers/gUnk_08110333.bin" +gSpriteAnimations_GhostBrothers_4:: @ 08110333 + .include "animations/gSpriteAnimations_GhostBrothers_4.s" gSpriteAnimations_GhostBrothers:: @ 0811033C - .4byte gUnk_08110300 - .4byte gUnk_08110322 - .4byte gUnk_08110300 - .4byte gUnk_08110311 - .4byte gUnk_08110333 + .4byte gSpriteAnimations_GhostBrothers_0 + .4byte gSpriteAnimations_GhostBrothers_1 + .4byte gSpriteAnimations_GhostBrothers_0 + .4byte gSpriteAnimations_GhostBrothers_3 + .4byte gSpriteAnimations_GhostBrothers_4 .4byte 00000000 diff --git a/data/animations/npc/gina.s b/data/animations/npc/gina.s index 5e377610..c30790cc 100644 --- a/data/animations/npc/gina.s +++ b/data/animations/npc/gina.s @@ -5,42 +5,42 @@ .align 2 -gUnk_0811352C:: @ 0811352C - .incbin "gina/gUnk_0811352C.bin" +gSpriteAnimations_Gina_0:: @ 0811352C + .include "animations/gSpriteAnimations_Gina_0.s" -gUnk_0811354D:: @ 0811354D - .incbin "gina/gUnk_0811354D.bin" +gSpriteAnimations_Gina_1:: @ 0811354D + .include "animations/gSpriteAnimations_Gina_1.s" -gUnk_0811356E:: @ 0811356E - .incbin "gina/gUnk_0811356E.bin" +gSpriteAnimations_Gina_3:: @ 0811356E + .include "animations/gSpriteAnimations_Gina_3.s" -gUnk_0811358F:: @ 0811358F - .incbin "gina/gUnk_0811358F.bin" +gSpriteAnimations_Gina_8:: @ 0811358F + .include "animations/gSpriteAnimations_Gina_8.s" -gUnk_081135B0:: @ 081135B0 - .incbin "gina/gUnk_081135B0.bin" +gSpriteAnimations_Gina_12:: @ 081135B0 + .include "animations/gSpriteAnimations_Gina_12.s" -gUnk_081135DD:: @ 081135DD - .incbin "gina/gUnk_081135DD.bin" +gSpriteAnimations_Gina_5:: @ 081135DD + .include "animations/gSpriteAnimations_Gina_5.s" -gUnk_081135E2:: @ 081135E2 - .incbin "gina/gUnk_081135E2.bin" +gSpriteAnimations_Gina_4:: @ 081135E2 + .include "animations/gSpriteAnimations_Gina_4.s" gSpriteAnimations_Gina:: @ 081135E8 - .4byte gUnk_0811352C - .4byte gUnk_0811354D - .4byte gUnk_0811352C - .4byte gUnk_0811356E - .4byte gUnk_081135E2 - .4byte gUnk_081135DD - .4byte gUnk_081135E2 - .4byte gUnk_081135E2 - .4byte gUnk_0811358F - .4byte gUnk_0811358F - .4byte gUnk_0811358F - .4byte gUnk_0811358F - .4byte gUnk_081135B0 - .4byte gUnk_081135B0 - .4byte gUnk_081135B0 - .4byte gUnk_081135B0 + .4byte gSpriteAnimations_Gina_0 + .4byte gSpriteAnimations_Gina_1 + .4byte gSpriteAnimations_Gina_0 + .4byte gSpriteAnimations_Gina_3 + .4byte gSpriteAnimations_Gina_4 + .4byte gSpriteAnimations_Gina_5 + .4byte gSpriteAnimations_Gina_4 + .4byte gSpriteAnimations_Gina_4 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_8 + .4byte gSpriteAnimations_Gina_12 + .4byte gSpriteAnimations_Gina_12 + .4byte gSpriteAnimations_Gina_12 + .4byte gSpriteAnimations_Gina_12 .4byte 00000000 diff --git a/data/animations/npc/gorman.s b/data/animations/npc/gorman.s index d13c74d9..647036de 100644 --- a/data/animations/npc/gorman.s +++ b/data/animations/npc/gorman.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_08111CBC:: @ 08111CBC - .incbin "gorman/gUnk_08111CBC.bin" +gSpriteAnimations_Gorman_0:: @ 08111CBC + .include "animations/gSpriteAnimations_Gorman_0.s" -gUnk_08111CC1:: @ 08111CC1 - .incbin "gorman/gUnk_08111CC1.bin" +gSpriteAnimations_Gorman_1:: @ 08111CC1 + .include "animations/gSpriteAnimations_Gorman_1.s" -gUnk_08111CC6:: @ 08111CC6 - .incbin "gorman/gUnk_08111CC6.bin" +gSpriteAnimations_Gorman_2:: @ 08111CC6 + .include "animations/gSpriteAnimations_Gorman_2.s" -gUnk_08111CCB:: @ 08111CCB - .incbin "gorman/gUnk_08111CCB.bin" +gSpriteAnimations_Gorman_3:: @ 08111CCB + .include "animations/gSpriteAnimations_Gorman_3.s" -gUnk_08111CD0:: @ 08111CD0 - .incbin "gorman/gUnk_08111CD0.bin" +gSpriteAnimations_Gorman_4:: @ 08111CD0 + .include "animations/gSpriteAnimations_Gorman_4.s" -gUnk_08111CE9:: @ 08111CE9 - .incbin "gorman/gUnk_08111CE9.bin" +gSpriteAnimations_Gorman_6:: @ 08111CE9 + .include "animations/gSpriteAnimations_Gorman_6.s" -gUnk_08111D02:: @ 08111D02 - .incbin "gorman/gUnk_08111D02.bin" +gSpriteAnimations_Gorman_7:: @ 08111D02 + .include "animations/gSpriteAnimations_Gorman_7.s" -gUnk_08111D1B:: @ 08111D1B - .incbin "gorman/gUnk_08111D1B.bin" +gSpriteAnimations_Gorman_5:: @ 08111D1B + .include "animations/gSpriteAnimations_Gorman_5.s" gSpriteAnimations_Gorman:: @ 08111D34 - .4byte gUnk_08111CBC - .4byte gUnk_08111CC1 - .4byte gUnk_08111CC6 - .4byte gUnk_08111CCB - .4byte gUnk_08111CD0 - .4byte gUnk_08111D1B - .4byte gUnk_08111CE9 - .4byte gUnk_08111D02 + .4byte gSpriteAnimations_Gorman_0 + .4byte gSpriteAnimations_Gorman_1 + .4byte gSpriteAnimations_Gorman_2 + .4byte gSpriteAnimations_Gorman_3 + .4byte gSpriteAnimations_Gorman_4 + .4byte gSpriteAnimations_Gorman_5 + .4byte gSpriteAnimations_Gorman_6 + .4byte gSpriteAnimations_Gorman_7 .4byte 00000000 diff --git a/data/animations/npc/goron.s b/data/animations/npc/goron.s index 048f2f7d..643b65a2 100644 --- a/data/animations/npc/goron.s +++ b/data/animations/npc/goron.s @@ -4,38 +4,38 @@ .section .rodata .align 2 -gUnk_08111AC4:: @ 08111AC4 - .incbin "goron/gUnk_08111AC4.bin" +gSpriteAnimations_Goron_0:: @ 08111AC4 + .include "animations/gSpriteAnimations_Goron_0.s" -gUnk_08111AC9:: @ 08111AC9 - .incbin "goron/gUnk_08111AC9.bin" +gSpriteAnimations_Goron_1:: @ 08111AC9 + .include "animations/gSpriteAnimations_Goron_1.s" -gUnk_08111ACE:: @ 08111ACE - .incbin "goron/gUnk_08111ACE.bin" +gSpriteAnimations_Goron_2:: @ 08111ACE + .include "animations/gSpriteAnimations_Goron_2.s" -gUnk_08111AD3:: @ 08111AD3 - .incbin "goron/gUnk_08111AD3.bin" +gSpriteAnimations_Goron_3:: @ 08111AD3 + .include "animations/gSpriteAnimations_Goron_3.s" -gUnk_08111AD8:: @ 08111AD8 - .incbin "goron/gUnk_08111AD8.bin" +gSpriteAnimations_Goron_5:: @ 08111AD8 + .include "animations/gSpriteAnimations_Goron_5.s" -gUnk_08111AF9:: @ 08111AF9 - .incbin "goron/gUnk_08111AF9.bin" +gSpriteAnimations_Goron_7:: @ 08111AF9 + .include "animations/gSpriteAnimations_Goron_7.s" -gUnk_08111B1A:: @ 08111B1A - .incbin "goron/gUnk_08111B1A.bin" +gSpriteAnimations_Goron_4:: @ 08111B1A + .include "animations/gSpriteAnimations_Goron_4.s" -gUnk_08111B3B:: @ 08111B3B - .incbin "goron/gUnk_08111B3B.bin" +gSpriteAnimations_Goron_8:: @ 08111B3B + .include "animations/gSpriteAnimations_Goron_8.s" gSpriteAnimations_Goron:: @ 08111B60 - .4byte gUnk_08111AC4 - .4byte gUnk_08111AC9 - .4byte gUnk_08111ACE - .4byte gUnk_08111AD3 - .4byte gUnk_08111B1A - .4byte gUnk_08111AD8 - .4byte gUnk_08111ACE - .4byte gUnk_08111AF9 - .4byte gUnk_08111B3B + .4byte gSpriteAnimations_Goron_0 + .4byte gSpriteAnimations_Goron_1 + .4byte gSpriteAnimations_Goron_2 + .4byte gSpriteAnimations_Goron_3 + .4byte gSpriteAnimations_Goron_4 + .4byte gSpriteAnimations_Goron_5 + .4byte gSpriteAnimations_Goron_2 + .4byte gSpriteAnimations_Goron_7 + .4byte gSpriteAnimations_Goron_8 .4byte 00000000 diff --git a/data/animations/npc/goronMerchant.s b/data/animations/npc/goronMerchant.s index 63e39b37..aecfd0b3 100644 --- a/data/animations/npc/goronMerchant.s +++ b/data/animations/npc/goronMerchant.s @@ -4,28 +4,28 @@ .section .rodata @ .align 2 -gUnk_08111BBE:: @ 08111BBE - .incbin "goronMerchant/gUnk_08111BBE.bin" +gSpriteAnimations_GoronMerchant_1:: @ 08111BBE + .include "animations/gSpriteAnimations_GoronMerchant_1.s" -gUnk_08111BC3:: @ 08111BC3 - .incbin "goronMerchant/gUnk_08111BC3.bin" +gSpriteAnimations_GoronMerchant_0:: @ 08111BC3 + .include "animations/gSpriteAnimations_GoronMerchant_0.s" -gUnk_08111BC8:: @ 08111BC8 - .incbin "goronMerchant/gUnk_08111BC8.bin" +gSpriteAnimations_GoronMerchant_3:: @ 08111BC8 + .include "animations/gSpriteAnimations_GoronMerchant_3.s" -gUnk_08111BCD:: @ 08111BCD - .incbin "goronMerchant/gUnk_08111BCD.bin" +gSpriteAnimations_GoronMerchant_5:: @ 08111BCD + .include "animations/gSpriteAnimations_GoronMerchant_5.s" -gUnk_08111BF2:: @ 08111BF2 - .incbin "goronMerchant/gUnk_08111BF2.bin" +gSpriteAnimations_GoronMerchant_7:: @ 08111BF2 + .include "animations/gSpriteAnimations_GoronMerchant_7.s" gSpriteAnimations_GoronMerchant:: @ 08111C18 - .4byte gUnk_08111BC3 - .4byte gUnk_08111BBE - .4byte gUnk_08111BC3 - .4byte gUnk_08111BC8 - .4byte gUnk_08111BC3 - .4byte gUnk_08111BCD - .4byte gUnk_08111BC3 - .4byte gUnk_08111BF2 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_1 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_3 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_5 + .4byte gSpriteAnimations_GoronMerchant_0 + .4byte gSpriteAnimations_GoronMerchant_7 .4byte 00000000 diff --git a/data/animations/npc/greatFairy.s b/data/animations/npc/greatFairy.s index b96a4be6..c2f2282d 100644 --- a/data/animations/npc/greatFairy.s +++ b/data/animations/npc/greatFairy.s @@ -14,44 +14,44 @@ gUnk_081207A4:: @ 081207A4 gUnk_081207AC:: @ 081207AC .incbin "greatFairy/gUnk_081207AC.bin" -gUnk_081207B0:: @ 081207B0 - .incbin "greatFairy/gUnk_081207B0.bin" +gSpriteAnimations_GreatFairy_0:: @ 081207B0 + .include "animations/gSpriteAnimations_GreatFairy_0.s" -gUnk_081207C1:: @ 081207C1 - .incbin "greatFairy/gUnk_081207C1.bin" +gSpriteAnimations_GreatFairy_2:: @ 081207C1 + .include "animations/gSpriteAnimations_GreatFairy_2.s" -gUnk_081207D2:: @ 081207D2 - .incbin "greatFairy/gUnk_081207D2.bin" +gSpriteAnimations_GreatFairy_1:: @ 081207D2 + .include "animations/gSpriteAnimations_GreatFairy_1.s" -gUnk_081207D7:: @ 081207D7 - .incbin "greatFairy/gUnk_081207D7.bin" +gSpriteAnimations_GreatFairy_9:: @ 081207D7 + .include "animations/gSpriteAnimations_GreatFairy_9.s" -gUnk_081207F4:: @ 081207F4 - .incbin "greatFairy/gUnk_081207F4.bin" +gSpriteAnimations_GreatFairy_5:: @ 081207F4 + .include "animations/gSpriteAnimations_GreatFairy_5.s" -gUnk_08120819:: @ 08120819 - .incbin "greatFairy/gUnk_08120819.bin" +gSpriteAnimations_GreatFairy_6:: @ 08120819 + .include "animations/gSpriteAnimations_GreatFairy_6.s" -gUnk_08120826:: @ 08120826 - .incbin "greatFairy/gUnk_08120826.bin" +gSpriteAnimations_GreatFairy_7:: @ 08120826 + .include "animations/gSpriteAnimations_GreatFairy_7.s" -gUnk_0812082F:: @ 0812082F - .incbin "greatFairy/gUnk_0812082F.bin" +gSpriteAnimations_GreatFairy_3:: @ 0812082F + .include "animations/gSpriteAnimations_GreatFairy_3.s" -gUnk_08120850:: @ 08120850 - .incbin "greatFairy/gUnk_08120850.bin" +gSpriteAnimations_GreatFairy_4:: @ 08120850 + .include "animations/gSpriteAnimations_GreatFairy_4.s" -gUnk_08120855:: @ 08120855 - .incbin "greatFairy/gUnk_08120855.bin" +gSpriteAnimations_GreatFairy_8:: @ 08120855 + .include "animations/gSpriteAnimations_GreatFairy_8.s" gSpriteAnimations_GreatFairy:: @ 08120878 - .4byte gUnk_081207B0 - .4byte gUnk_081207D2 - .4byte gUnk_081207C1 - .4byte gUnk_0812082F - .4byte gUnk_08120850 - .4byte gUnk_081207F4 - .4byte gUnk_08120819 - .4byte gUnk_08120826 - .4byte gUnk_08120855 - .4byte gUnk_081207D7 + .4byte gSpriteAnimations_GreatFairy_0 + .4byte gSpriteAnimations_GreatFairy_1 + .4byte gSpriteAnimations_GreatFairy_2 + .4byte gSpriteAnimations_GreatFairy_3 + .4byte gSpriteAnimations_GreatFairy_4 + .4byte gSpriteAnimations_GreatFairy_5 + .4byte gSpriteAnimations_GreatFairy_6 + .4byte gSpriteAnimations_GreatFairy_7 + .4byte gSpriteAnimations_GreatFairy_8 + .4byte gSpriteAnimations_GreatFairy_9 diff --git a/data/animations/npc/gregal.s b/data/animations/npc/gregal.s index 959c89f0..0cc23ba8 100644 --- a/data/animations/npc/gregal.s +++ b/data/animations/npc/gregal.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_08113D9C:: @ 08113D9C - .incbin "gregal/gUnk_08113D9C.bin" +gSpriteAnimations_Gregal_0:: @ 08113D9C + .include "animations/gSpriteAnimations_Gregal_0.s" -gUnk_08113DAD:: @ 08113DAD - .incbin "gregal/gUnk_08113DAD.bin" +gSpriteAnimations_Gregal_16:: @ 08113DAD + .include "animations/gSpriteAnimations_Gregal_16.s" -gUnk_08113DB2:: @ 08113DB2 - .incbin "gregal/gUnk_08113DB2.bin" +gSpriteAnimations_Gregal_17:: @ 08113DB2 + .include "animations/gSpriteAnimations_Gregal_17.s" -gUnk_08113DDB:: @ 08113DDB - .incbin "gregal/gUnk_08113DDB.bin" +gSpriteAnimations_Gregal_4:: @ 08113DDB + .include "animations/gSpriteAnimations_Gregal_4.s" -gUnk_08113EB4:: @ 08113EB4 - .incbin "gregal/gUnk_08113EB4.bin" +gSpriteAnimations_Gregal_12:: @ 08113EB4 + .include "animations/gSpriteAnimations_Gregal_12.s" -gUnk_08113EC5:: @ 08113EC5 - .incbin "gregal/gUnk_08113EC5.bin" +gSpriteAnimations_Gregal_15:: @ 08113EC5 + .include "animations/gSpriteAnimations_Gregal_15.s" -gUnk_08113ED6:: @ 08113ED6 - .incbin "gregal/gUnk_08113ED6.bin" +gSpriteAnimations_Gregal_13:: @ 08113ED6 + .include "animations/gSpriteAnimations_Gregal_13.s" -gUnk_08113EE7:: @ 08113EE7 - .incbin "gregal/gUnk_08113EE7.bin" +gSpriteAnimations_Gregal_8:: @ 08113EE7 + .include "animations/gSpriteAnimations_Gregal_8.s" -gUnk_08113EEC:: @ 08113EEC - .incbin "gregal/gUnk_08113EEC.bin" +gSpriteAnimations_Gregal_11:: @ 08113EEC + .include "animations/gSpriteAnimations_Gregal_11.s" -gUnk_08113EF1:: @ 08113EF1 - .incbin "gregal/gUnk_08113EF1.bin" +gSpriteAnimations_Gregal_9:: @ 08113EF1 + .include "animations/gSpriteAnimations_Gregal_9.s" gSpriteAnimations_Gregal:: @ 08113EF8 - .4byte gUnk_08113D9C - .4byte gUnk_08113D9C - .4byte gUnk_08113D9C - .4byte gUnk_08113D9C - .4byte gUnk_08113DDB - .4byte gUnk_08113DDB - .4byte gUnk_08113DDB - .4byte gUnk_08113DDB - .4byte gUnk_08113EE7 - .4byte gUnk_08113EF1 - .4byte gUnk_08113EE7 - .4byte gUnk_08113EEC - .4byte gUnk_08113EB4 - .4byte gUnk_08113ED6 - .4byte gUnk_08113EB4 - .4byte gUnk_08113EC5 - .4byte gUnk_08113DAD - .4byte gUnk_08113DB2 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_0 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_4 + .4byte gSpriteAnimations_Gregal_8 + .4byte gSpriteAnimations_Gregal_9 + .4byte gSpriteAnimations_Gregal_8 + .4byte gSpriteAnimations_Gregal_11 + .4byte gSpriteAnimations_Gregal_12 + .4byte gSpriteAnimations_Gregal_13 + .4byte gSpriteAnimations_Gregal_12 + .4byte gSpriteAnimations_Gregal_15 + .4byte gSpriteAnimations_Gregal_16 + .4byte gSpriteAnimations_Gregal_17 .4byte 00000000 diff --git a/data/animations/npc/guard.s b/data/animations/npc/guard.s deleted file mode 100644 index a24050c0..00000000 --- a/data/animations/npc/guard.s +++ /dev/null @@ -1,51 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0810F560:: @ 0810F560 - .incbin "guard/gUnk_0810F560.bin" - -gUnk_0810F59A:: @ 0810F59A - .incbin "guard/gUnk_0810F59A.bin" - -gUnk_0810F5D4:: @ 0810F5D4 - .incbin "guard/gUnk_0810F5D4.bin" - -gUnk_0810F60E:: @ 0810F60E - .incbin "guard/gUnk_0810F60E.bin" -.ifdef JP - @ TODO only small differences - .incbin "guard/gUnk_0810F60E_1_JP.bin" -.else -.ifdef EU - .incbin "guard/gUnk_0810F60E_2_EU.bin" -.else - .incbin "guard/gUnk_0810F60E_3_USA-DEMO_USA-DEMO_JP.bin" -.endif -.endif -.ifdef JP - @ TODO only small differences - .incbin "guard/gUnk_0810F60E_4_JP.bin" -.else -.ifdef EU - .incbin "guard/gUnk_0810F60E_5_EU.bin" -.else - .incbin "guard/gUnk_0810F60E_6_USA-DEMO_USA-DEMO_JP.bin" -.endif -.endif - -gUnk_0810F648:: @ 0810F648 - .incbin "guard/gUnk_0810F648.bin" - -gUnk_0810F682:: @ 0810F682 - .incbin "guard/gUnk_0810F682.bin" - -gUnk_0810F6BC:: @ 0810F6BC - .4byte gUnk_0810F560 - .4byte gUnk_0810F59A - .4byte gUnk_0810F5D4 - .4byte gUnk_0810F60E - .4byte gUnk_0810F648 - .4byte gUnk_0810F682 diff --git a/data/animations/npc/guardWithSpear.s b/data/animations/npc/guardWithSpear.s index d407ceee..b942ee50 100644 --- a/data/animations/npc/guardWithSpear.s +++ b/data/animations/npc/guardWithSpear.s @@ -4,97 +4,97 @@ .section .rodata .align 2 -gUnk_0810F6E4:: @ 0810F6E4 - .incbin "guardWithSpear/gUnk_0810F6E4.bin" +gSpriteAnimations_GuardWithSpear_0:: @ 0810F6E4 + .include "animations/gSpriteAnimations_GuardWithSpear_0.s" -gUnk_0810F6E9:: @ 0810F6E9 - .incbin "guardWithSpear/gUnk_0810F6E9.bin" +gSpriteAnimations_GuardWithSpear_1:: @ 0810F6E9 + .include "animations/gSpriteAnimations_GuardWithSpear_1.s" -gUnk_0810F6EE:: @ 0810F6EE - .incbin "guardWithSpear/gUnk_0810F6EE.bin" +gSpriteAnimations_GuardWithSpear_2:: @ 0810F6EE + .include "animations/gSpriteAnimations_GuardWithSpear_2.s" -gUnk_0810F6F3:: @ 0810F6F3 - .incbin "guardWithSpear/gUnk_0810F6F3.bin" +gSpriteAnimations_GuardWithSpear_3:: @ 0810F6F3 + .include "animations/gSpriteAnimations_GuardWithSpear_3.s" -gUnk_0810F6F8:: @ 0810F6F8 - .incbin "guardWithSpear/gUnk_0810F6F8.bin" +gSpriteAnimations_GuardWithSpear_8:: @ 0810F6F8 + .include "animations/gSpriteAnimations_GuardWithSpear_8.s" -gUnk_0810F6FD:: @ 0810F6FD - .incbin "guardWithSpear/gUnk_0810F6FD.bin" +gSpriteAnimations_GuardWithSpear_9:: @ 0810F6FD + .include "animations/gSpriteAnimations_GuardWithSpear_9.s" -gUnk_0810F702:: @ 0810F702 - .incbin "guardWithSpear/gUnk_0810F702.bin" +gSpriteAnimations_GuardWithSpear_10:: @ 0810F702 + .include "animations/gSpriteAnimations_GuardWithSpear_10.s" -gUnk_0810F707:: @ 0810F707 - .incbin "guardWithSpear/gUnk_0810F707.bin" +gSpriteAnimations_GuardWithSpear_11:: @ 0810F707 + .include "animations/gSpriteAnimations_GuardWithSpear_11.s" -gUnk_0810F70C:: @ 0810F70C - .incbin "guardWithSpear/gUnk_0810F70C.bin" +gSpriteAnimations_GuardWithSpear_4:: @ 0810F70C + .include "animations/gSpriteAnimations_GuardWithSpear_4.s" -gUnk_0810F71D:: @ 0810F71D - .incbin "guardWithSpear/gUnk_0810F71D.bin" +gSpriteAnimations_GuardWithSpear_5:: @ 0810F71D + .include "animations/gSpriteAnimations_GuardWithSpear_5.s" -gUnk_0810F72E:: @ 0810F72E - .incbin "guardWithSpear/gUnk_0810F72E.bin" +gSpriteAnimations_GuardWithSpear_6:: @ 0810F72E + .include "animations/gSpriteAnimations_GuardWithSpear_6.s" -gUnk_0810F73F:: @ 0810F73F - .incbin "guardWithSpear/gUnk_0810F73F.bin" +gSpriteAnimations_GuardWithSpear_7:: @ 0810F73F + .include "animations/gSpriteAnimations_GuardWithSpear_7.s" -gUnk_0810F750:: @ 0810F750 - .incbin "guardWithSpear/gUnk_0810F750.bin" +gSpriteAnimations_GuardWithSpear_12:: @ 0810F750 + .include "animations/gSpriteAnimations_GuardWithSpear_12.s" -gUnk_0810F761:: @ 0810F761 - .incbin "guardWithSpear/gUnk_0810F761.bin" +gSpriteAnimations_GuardWithSpear_13:: @ 0810F761 + .include "animations/gSpriteAnimations_GuardWithSpear_13.s" -gUnk_0810F772:: @ 0810F772 - .incbin "guardWithSpear/gUnk_0810F772.bin" +gSpriteAnimations_GuardWithSpear_14:: @ 0810F772 + .include "animations/gSpriteAnimations_GuardWithSpear_14.s" -gUnk_0810F783:: @ 0810F783 - .incbin "guardWithSpear/gUnk_0810F783.bin" +gSpriteAnimations_GuardWithSpear_15:: @ 0810F783 + .include "animations/gSpriteAnimations_GuardWithSpear_15.s" -gUnk_0810F794:: @ 0810F794 - .incbin "guardWithSpear/gUnk_0810F794.bin" +gSpriteAnimations_GuardWithSpear_16:: @ 0810F794 + .include "animations/gSpriteAnimations_GuardWithSpear_16.s" -gUnk_0810F799:: @ 0810F799 - .incbin "guardWithSpear/gUnk_0810F799.bin" +gSpriteAnimations_GuardWithSpear_21:: @ 0810F799 + .include "animations/gSpriteAnimations_GuardWithSpear_21.s" -gUnk_0810F7BE:: @ 0810F7BE - .incbin "guardWithSpear/gUnk_0810F7BE.bin" +gSpriteAnimations_GuardWithSpear_17:: @ 0810F7BE + .include "animations/gSpriteAnimations_GuardWithSpear_17.s" -gUnk_0810F7C3:: @ 0810F7C3 - .incbin "guardWithSpear/gUnk_0810F7C3.bin" +gSpriteAnimations_GuardWithSpear_22:: @ 0810F7C3 + .include "animations/gSpriteAnimations_GuardWithSpear_22.s" -gUnk_0810F7E8:: @ 0810F7E8 - .incbin "guardWithSpear/gUnk_0810F7E8.bin" +gSpriteAnimations_GuardWithSpear_18:: @ 0810F7E8 + .include "animations/gSpriteAnimations_GuardWithSpear_18.s" -gUnk_0810F7FD:: @ 0810F7FD - .incbin "guardWithSpear/gUnk_0810F7FD.bin" +gSpriteAnimations_GuardWithSpear_19:: @ 0810F7FD + .include "animations/gSpriteAnimations_GuardWithSpear_19.s" -gUnk_0810F802:: @ 0810F802 - .incbin "guardWithSpear/gUnk_0810F802.bin" +gSpriteAnimations_GuardWithSpear_20:: @ 0810F802 + .include "animations/gSpriteAnimations_GuardWithSpear_20.s" gSpriteAnimations_GuardWithSpear:: @ 0810F814 - .4byte gUnk_0810F6E4 - .4byte gUnk_0810F6E9 - .4byte gUnk_0810F6EE - .4byte gUnk_0810F6F3 - .4byte gUnk_0810F70C - .4byte gUnk_0810F71D - .4byte gUnk_0810F72E - .4byte gUnk_0810F73F - .4byte gUnk_0810F6F8 - .4byte gUnk_0810F6FD - .4byte gUnk_0810F702 - .4byte gUnk_0810F707 - .4byte gUnk_0810F750 - .4byte gUnk_0810F761 - .4byte gUnk_0810F772 - .4byte gUnk_0810F783 - .4byte gUnk_0810F794 - .4byte gUnk_0810F7BE - .4byte gUnk_0810F7E8 - .4byte gUnk_0810F7FD - .4byte gUnk_0810F802 - .4byte gUnk_0810F799 - .4byte gUnk_0810F7C3 + .4byte gSpriteAnimations_GuardWithSpear_0 + .4byte gSpriteAnimations_GuardWithSpear_1 + .4byte gSpriteAnimations_GuardWithSpear_2 + .4byte gSpriteAnimations_GuardWithSpear_3 + .4byte gSpriteAnimations_GuardWithSpear_4 + .4byte gSpriteAnimations_GuardWithSpear_5 + .4byte gSpriteAnimations_GuardWithSpear_6 + .4byte gSpriteAnimations_GuardWithSpear_7 + .4byte gSpriteAnimations_GuardWithSpear_8 + .4byte gSpriteAnimations_GuardWithSpear_9 + .4byte gSpriteAnimations_GuardWithSpear_10 + .4byte gSpriteAnimations_GuardWithSpear_11 + .4byte gSpriteAnimations_GuardWithSpear_12 + .4byte gSpriteAnimations_GuardWithSpear_13 + .4byte gSpriteAnimations_GuardWithSpear_14 + .4byte gSpriteAnimations_GuardWithSpear_15 + .4byte gSpriteAnimations_GuardWithSpear_16 + .4byte gSpriteAnimations_GuardWithSpear_17 + .4byte gSpriteAnimations_GuardWithSpear_18 + .4byte gSpriteAnimations_GuardWithSpear_19 + .4byte gSpriteAnimations_GuardWithSpear_20 + .4byte gSpriteAnimations_GuardWithSpear_21 + .4byte gSpriteAnimations_GuardWithSpear_22 .4byte 00000000 diff --git a/data/animations/npc/hurdyGurdyMan.s b/data/animations/npc/hurdyGurdyMan.s index 1c525357..c8fc4728 100644 --- a/data/animations/npc/hurdyGurdyMan.s +++ b/data/animations/npc/hurdyGurdyMan.s @@ -4,35 +4,35 @@ .section .rodata .align 2 -gUnk_0811453C:: @ 0811453C - .incbin "hurdyGurdyMan/gUnk_0811453C.bin" +gSpriteAnimations_HurdyGurdyMan_8:: @ 0811453C + .include "animations/gSpriteAnimations_HurdyGurdyMan_8.s" -gUnk_0811454D:: @ 0811454D - .incbin "hurdyGurdyMan/gUnk_0811454D.bin" +gSpriteAnimations_HurdyGurdyMan_7:: @ 0811454D + .include "animations/gSpriteAnimations_HurdyGurdyMan_7.s" -gUnk_0811455E:: @ 0811455E - .incbin "hurdyGurdyMan/gUnk_0811455E.bin" +gSpriteAnimations_HurdyGurdyMan_4:: @ 0811455E + .include "animations/gSpriteAnimations_HurdyGurdyMan_4.s" -gUnk_0811456F:: @ 0811456F - .incbin "hurdyGurdyMan/gUnk_0811456F.bin" +gSpriteAnimations_HurdyGurdyMan_0:: @ 0811456F + .include "animations/gSpriteAnimations_HurdyGurdyMan_0.s" -gUnk_08114574:: @ 08114574 - .incbin "hurdyGurdyMan/gUnk_08114574.bin" +gSpriteAnimations_HurdyGurdyMan_1:: @ 08114574 + .include "animations/gSpriteAnimations_HurdyGurdyMan_1.s" -gUnk_08114579:: @ 08114579 - .incbin "hurdyGurdyMan/gUnk_08114579.bin" +gSpriteAnimations_HurdyGurdyMan_3:: @ 08114579 + .include "animations/gSpriteAnimations_HurdyGurdyMan_3.s" gSpriteAnimations_HurdyGurdyMan:: @ 08114580 - .4byte gUnk_0811456F - .4byte gUnk_08114574 - .4byte gUnk_0811456F - .4byte gUnk_08114579 - .4byte gUnk_0811455E - .4byte gUnk_0811455E - .4byte gUnk_0811455E - .4byte gUnk_0811454D - .4byte gUnk_0811453C - .4byte gUnk_0811453C - .4byte gUnk_0811453C - .4byte gUnk_0811453C + .4byte gSpriteAnimations_HurdyGurdyMan_0 + .4byte gSpriteAnimations_HurdyGurdyMan_1 + .4byte gSpriteAnimations_HurdyGurdyMan_0 + .4byte gSpriteAnimations_HurdyGurdyMan_3 + .4byte gSpriteAnimations_HurdyGurdyMan_4 + .4byte gSpriteAnimations_HurdyGurdyMan_4 + .4byte gSpriteAnimations_HurdyGurdyMan_4 + .4byte gSpriteAnimations_HurdyGurdyMan_7 + .4byte gSpriteAnimations_HurdyGurdyMan_8 + .4byte gSpriteAnimations_HurdyGurdyMan_8 + .4byte gSpriteAnimations_HurdyGurdyMan_8 + .4byte gSpriteAnimations_HurdyGurdyMan_8 .4byte 00000000 diff --git a/data/animations/npc/kid.s b/data/animations/npc/kid.s index 27bc544b..7c0ab4e6 100644 --- a/data/animations/npc/kid.s +++ b/data/animations/npc/kid.s @@ -4,90 +4,90 @@ .section .rodata .align 2 -gUnk_0810C0C4:: @ 0810C0C4 - .incbin "kid/gUnk_0810C0C4.bin" +gSpriteAnimations_Kid_0:: @ 0810C0C4 + .include "animations/gSpriteAnimations_Kid_0.s" -gUnk_0810C0C9:: @ 0810C0C9 - .incbin "kid/gUnk_0810C0C9.bin" +gSpriteAnimations_Kid_1:: @ 0810C0C9 + .include "animations/gSpriteAnimations_Kid_1.s" -gUnk_0810C0CE:: @ 0810C0CE - .incbin "kid/gUnk_0810C0CE.bin" +gSpriteAnimations_Kid_2:: @ 0810C0CE + .include "animations/gSpriteAnimations_Kid_2.s" -gUnk_0810C0D3:: @ 0810C0D3 - .incbin "kid/gUnk_0810C0D3.bin" +gSpriteAnimations_Kid_3:: @ 0810C0D3 + .include "animations/gSpriteAnimations_Kid_3.s" -gUnk_0810C0D8:: @ 0810C0D8 - .incbin "kid/gUnk_0810C0D8.bin" +gSpriteAnimations_Kid_4:: @ 0810C0D8 + .include "animations/gSpriteAnimations_Kid_4.s" -gUnk_0810C0E9:: @ 0810C0E9 - .incbin "kid/gUnk_0810C0E9.bin" +gSpriteAnimations_Kid_5:: @ 0810C0E9 + .include "animations/gSpriteAnimations_Kid_5.s" -gUnk_0810C0FA:: @ 0810C0FA - .incbin "kid/gUnk_0810C0FA.bin" +gSpriteAnimations_Kid_6:: @ 0810C0FA + .include "animations/gSpriteAnimations_Kid_6.s" -gUnk_0810C10B:: @ 0810C10B - .incbin "kid/gUnk_0810C10B.bin" +gSpriteAnimations_Kid_7:: @ 0810C10B + .include "animations/gSpriteAnimations_Kid_7.s" -gUnk_0810C11C:: @ 0810C11C - .incbin "kid/gUnk_0810C11C.bin" +gSpriteAnimations_Kid_20:: @ 0810C11C + .include "animations/gSpriteAnimations_Kid_20.s" -gUnk_0810C135:: @ 0810C135 - .incbin "kid/gUnk_0810C135.bin" +gSpriteAnimations_Kid_21:: @ 0810C135 + .include "animations/gSpriteAnimations_Kid_21.s" -gUnk_0810C14E:: @ 0810C14E - .incbin "kid/gUnk_0810C14E.bin" +gSpriteAnimations_Kid_22:: @ 0810C14E + .include "animations/gSpriteAnimations_Kid_22.s" -gUnk_0810C167:: @ 0810C167 - .incbin "kid/gUnk_0810C167.bin" +gSpriteAnimations_Kid_23:: @ 0810C167 + .include "animations/gSpriteAnimations_Kid_23.s" -gUnk_0810C180:: @ 0810C180 - .incbin "kid/gUnk_0810C180.bin" +gSpriteAnimations_Kid_8:: @ 0810C180 + .include "animations/gSpriteAnimations_Kid_8.s" -gUnk_0810C199:: @ 0810C199 - .incbin "kid/gUnk_0810C199.bin" +gSpriteAnimations_Kid_9:: @ 0810C199 + .include "animations/gSpriteAnimations_Kid_9.s" -gUnk_0810C1A6:: @ 0810C1A6 - .incbin "kid/gUnk_0810C1A6.bin" +gSpriteAnimations_Kid_11:: @ 0810C1A6 + .include "animations/gSpriteAnimations_Kid_11.s" -gUnk_0810C1D7:: @ 0810C1D7 - .incbin "kid/gUnk_0810C1D7.bin" +gSpriteAnimations_Kid_12:: @ 0810C1D7 + .include "animations/gSpriteAnimations_Kid_12.s" -gUnk_0810C1DC:: @ 0810C1DC - .incbin "kid/gUnk_0810C1DC.bin" +gSpriteAnimations_Kid_13:: @ 0810C1DC + .include "animations/gSpriteAnimations_Kid_13.s" gSpriteAnimations_Kid:: @ 0810C1E4 - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C9 - .4byte gUnk_0810C0CE - .4byte gUnk_0810C0D3 - .4byte gUnk_0810C0D8 - .4byte gUnk_0810C0E9 - .4byte gUnk_0810C0FA - .4byte gUnk_0810C10B - .4byte gUnk_0810C180 - .4byte gUnk_0810C199 - .4byte gUnk_0810C199 - .4byte gUnk_0810C1A6 - .4byte gUnk_0810C1D7 - .4byte gUnk_0810C1DC - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C9 - .4byte gUnk_0810C0CE - .4byte gUnk_0810C0D3 - .4byte gUnk_0810C11C - .4byte gUnk_0810C135 - .4byte gUnk_0810C14E - .4byte gUnk_0810C167 - .4byte gUnk_0810C180 - .4byte gUnk_0810C199 - .4byte gUnk_0810C199 - .4byte gUnk_0810C1A6 - .4byte gUnk_0810C1D7 - .4byte gUnk_0810C1DC - .4byte gUnk_0810C0C4 - .4byte gUnk_0810C0C4 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_1 + .4byte gSpriteAnimations_Kid_2 + .4byte gSpriteAnimations_Kid_3 + .4byte gSpriteAnimations_Kid_4 + .4byte gSpriteAnimations_Kid_5 + .4byte gSpriteAnimations_Kid_6 + .4byte gSpriteAnimations_Kid_7 + .4byte gSpriteAnimations_Kid_8 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_11 + .4byte gSpriteAnimations_Kid_12 + .4byte gSpriteAnimations_Kid_13 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_1 + .4byte gSpriteAnimations_Kid_2 + .4byte gSpriteAnimations_Kid_3 + .4byte gSpriteAnimations_Kid_20 + .4byte gSpriteAnimations_Kid_21 + .4byte gSpriteAnimations_Kid_22 + .4byte gSpriteAnimations_Kid_23 + .4byte gSpriteAnimations_Kid_8 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_9 + .4byte gSpriteAnimations_Kid_11 + .4byte gSpriteAnimations_Kid_12 + .4byte gSpriteAnimations_Kid_13 + .4byte gSpriteAnimations_Kid_0 + .4byte gSpriteAnimations_Kid_0 .4byte 00000000 gUnk_0810C268:: @ 0810C268 diff --git a/data/animations/npc/kingDaltus.s b/data/animations/npc/kingDaltus.s index 093d265b..b3d022ce 100644 --- a/data/animations/npc/kingDaltus.s +++ b/data/animations/npc/kingDaltus.s @@ -4,61 +4,61 @@ .section .rodata .align 2 -gUnk_08110500:: @ 08110500 - .incbin "kingDaltus/gUnk_08110500.bin" +gSpriteAnimations_KingDaltus_0:: @ 08110500 + .include "animations/gSpriteAnimations_KingDaltus_0.s" -gUnk_08110505:: @ 08110505 - .incbin "kingDaltus/gUnk_08110505.bin" +gSpriteAnimations_KingDaltus_1:: @ 08110505 + .include "animations/gSpriteAnimations_KingDaltus_1.s" -gUnk_0811050A:: @ 0811050A - .incbin "kingDaltus/gUnk_0811050A.bin" +gSpriteAnimations_KingDaltus_2:: @ 0811050A + .include "animations/gSpriteAnimations_KingDaltus_2.s" -gUnk_0811050F:: @ 0811050F - .incbin "kingDaltus/gUnk_0811050F.bin" +gSpriteAnimations_KingDaltus_3:: @ 0811050F + .include "animations/gSpriteAnimations_KingDaltus_3.s" -gUnk_08110514:: @ 08110514 - .incbin "kingDaltus/gUnk_08110514.bin" +gSpriteAnimations_KingDaltus_5:: @ 08110514 + .include "animations/gSpriteAnimations_KingDaltus_5.s" -gUnk_08110535:: @ 08110535 - .incbin "kingDaltus/gUnk_08110535.bin" +gSpriteAnimations_KingDaltus_6:: @ 08110535 + .include "animations/gSpriteAnimations_KingDaltus_6.s" -gUnk_08110556:: @ 08110556 - .incbin "kingDaltus/gUnk_08110556.bin" +gSpriteAnimations_KingDaltus_7:: @ 08110556 + .include "animations/gSpriteAnimations_KingDaltus_7.s" -gUnk_08110577:: @ 08110577 - .incbin "kingDaltus/gUnk_08110577.bin" +gSpriteAnimations_KingDaltus_4:: @ 08110577 + .include "animations/gSpriteAnimations_KingDaltus_4.s" -gUnk_08110598:: @ 08110598 - .incbin "kingDaltus/gUnk_08110598.bin" +gSpriteAnimations_KingDaltus_9:: @ 08110598 + .include "animations/gSpriteAnimations_KingDaltus_9.s" -gUnk_081105A9:: @ 081105A9 - .incbin "kingDaltus/gUnk_081105A9.bin" +gSpriteAnimations_KingDaltus_10:: @ 081105A9 + .include "animations/gSpriteAnimations_KingDaltus_10.s" -gUnk_081105BA:: @ 081105BA - .incbin "kingDaltus/gUnk_081105BA.bin" +gSpriteAnimations_KingDaltus_11:: @ 081105BA + .include "animations/gSpriteAnimations_KingDaltus_11.s" -gUnk_081105CB:: @ 081105CB - .incbin "kingDaltus/gUnk_081105CB.bin" +gSpriteAnimations_KingDaltus_8:: @ 081105CB + .include "animations/gSpriteAnimations_KingDaltus_8.s" -gUnk_081105DC:: @ 081105DC - .incbin "kingDaltus/gUnk_081105DC.bin" +gSpriteAnimations_KingDaltus_12:: @ 081105DC + .include "animations/gSpriteAnimations_KingDaltus_12.s" -gUnk_081105E1:: @ 081105E1 - .incbin "kingDaltus/gUnk_081105E1.bin" +gSpriteAnimations_KingDaltus_13:: @ 081105E1 + .include "animations/gSpriteAnimations_KingDaltus_13.s" gSpriteAnimations_KingDaltus:: @ 08110608 - .4byte gUnk_08110500 - .4byte gUnk_08110505 - .4byte gUnk_0811050A - .4byte gUnk_0811050F - .4byte gUnk_08110577 - .4byte gUnk_08110514 - .4byte gUnk_08110535 - .4byte gUnk_08110556 - .4byte gUnk_081105CB - .4byte gUnk_08110598 - .4byte gUnk_081105A9 - .4byte gUnk_081105BA - .4byte gUnk_081105DC - .4byte gUnk_081105E1 + .4byte gSpriteAnimations_KingDaltus_0 + .4byte gSpriteAnimations_KingDaltus_1 + .4byte gSpriteAnimations_KingDaltus_2 + .4byte gSpriteAnimations_KingDaltus_3 + .4byte gSpriteAnimations_KingDaltus_4 + .4byte gSpriteAnimations_KingDaltus_5 + .4byte gSpriteAnimations_KingDaltus_6 + .4byte gSpriteAnimations_KingDaltus_7 + .4byte gSpriteAnimations_KingDaltus_8 + .4byte gSpriteAnimations_KingDaltus_9 + .4byte gSpriteAnimations_KingDaltus_10 + .4byte gSpriteAnimations_KingDaltus_11 + .4byte gSpriteAnimations_KingDaltus_12 + .4byte gSpriteAnimations_KingDaltus_13 .4byte 00000000 diff --git a/data/animations/npc/kingGustaf.s b/data/animations/npc/kingGustaf.s index d216e9df..cd3a36cc 100644 --- a/data/animations/npc/kingGustaf.s +++ b/data/animations/npc/kingGustaf.s @@ -4,16 +4,16 @@ .section .rodata .align 2 -gUnk_081134D4:: @ 081134D4 - .incbin "kingGustaf/gUnk_081134D4.bin" +gSpriteAnimations_KingGustaf_0:: @ 081134D4 + .include "animations/gSpriteAnimations_KingGustaf_0.s" gSpriteAnimations_KingGustaf:: @ 08113508 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 - .4byte gUnk_081134D4 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 + .4byte gSpriteAnimations_KingGustaf_0 .4byte 00000000 diff --git a/data/animations/npc/librari.s b/data/animations/npc/librari.s index 2a1038c5..d261ff10 100644 --- a/data/animations/npc/librari.s +++ b/data/animations/npc/librari.s @@ -4,34 +4,34 @@ .section .rodata @ .align 2 -gUnk_08112D5A:: @ 08112D5A - .incbin "librari/gUnk_08112D5A.bin" +gSpriteAnimations_Librari_0:: @ 08112D5A + .include "animations/gSpriteAnimations_Librari_0.s" -gUnk_08112D6F:: @ 08112D6F - .incbin "librari/gUnk_08112D6F.bin" +gSpriteAnimations_Librari_8:: @ 08112D6F + .include "animations/gSpriteAnimations_Librari_8.s" -gUnk_08112D78:: @ 08112D78 - .incbin "librari/gUnk_08112D78.bin" +gSpriteAnimations_Librari_4:: @ 08112D78 + .include "animations/gSpriteAnimations_Librari_4.s" -gUnk_08112D89:: @ 08112D89 - .incbin "librari/gUnk_08112D89.bin" +gSpriteAnimations_Librari_6:: @ 08112D89 + .include "animations/gSpriteAnimations_Librari_6.s" -gUnk_08112D9A:: @ 08112D9A - .incbin "librari/gUnk_08112D9A.bin" +gSpriteAnimations_Librari_9:: @ 08112D9A + .include "animations/gSpriteAnimations_Librari_9.s" -gUnk_08112DE7:: @ 08112DE7 - .incbin "librari/gUnk_08112DE7.bin" +gSpriteAnimations_Librari_10:: @ 08112DE7 + .include "animations/gSpriteAnimations_Librari_10.s" gSpriteAnimations_Librari:: @ 08112DEC - .4byte gUnk_08112D5A - .4byte gUnk_08112D5A - .4byte gUnk_08112D5A - .4byte gUnk_08112D5A - .4byte gUnk_08112D78 - .4byte gUnk_08112D78 - .4byte gUnk_08112D89 - .4byte gUnk_08112D89 - .4byte gUnk_08112D6F - .4byte gUnk_08112D9A - .4byte gUnk_08112DE7 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_0 + .4byte gSpriteAnimations_Librari_4 + .4byte gSpriteAnimations_Librari_4 + .4byte gSpriteAnimations_Librari_6 + .4byte gSpriteAnimations_Librari_6 + .4byte gSpriteAnimations_Librari_8 + .4byte gSpriteAnimations_Librari_9 + .4byte gSpriteAnimations_Librari_10 .4byte 00000000 diff --git a/data/animations/npc/librarians.s b/data/animations/npc/librarians.s index aef631fd..a7972a32 100644 --- a/data/animations/npc/librarians.s +++ b/data/animations/npc/librarians.s @@ -4,55 +4,55 @@ .section .rodata @ .align 2 -gUnk_0811307E:: @ 0811307E - .incbin "librarians/gUnk_0811307E.bin" +gSpriteAnimations_Librarians_0_0:: @ 0811307E + .include "animations/gSpriteAnimations_Librarians_0_0.s" -gUnk_08113083:: @ 08113083 - .incbin "librarians/gUnk_08113083.bin" +gSpriteAnimations_Librarians_0_4:: @ 08113083 + .include "animations/gSpriteAnimations_Librarians_0_4.s" -gUnk_08113090:: @ 08113090 - .incbin "librarians/gUnk_08113090.bin" +gSpriteAnimations_Librarians_0_8:: @ 08113090 + .include "animations/gSpriteAnimations_Librarians_0_8.s" gSpriteAnimations_Librarians_0:: @ 081130A0 - .4byte gUnk_0811307E - .4byte gUnk_0811307E - .4byte gUnk_0811307E - .4byte gUnk_0811307E - .4byte gUnk_08113083 - .4byte gUnk_08113083 - .4byte gUnk_08113083 - .4byte gUnk_08113083 - .4byte gUnk_08113090 - .4byte gUnk_08113090 - .4byte gUnk_08113090 - .4byte gUnk_08113090 - .4byte gUnk_0811307E + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_0 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_4 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_8 + .4byte gSpriteAnimations_Librarians_0_0 .4byte 00000000 -gUnk_081130D8:: @ 081130D8 - .incbin "librarians/gUnk_081130D8.bin" +gSpriteAnimations_Librarians_1_0:: @ 081130D8 + .include "animations/gSpriteAnimations_Librarians_1_0.s" -gUnk_081130DD:: @ 081130DD - .incbin "librarians/gUnk_081130DD.bin" +gSpriteAnimations_Librarians_1_4:: @ 081130DD + .include "animations/gSpriteAnimations_Librarians_1_4.s" -gUnk_081130EA:: @ 081130EA - .incbin "librarians/gUnk_081130EA.bin" +gSpriteAnimations_Librarians_1_8:: @ 081130EA + .include "animations/gSpriteAnimations_Librarians_1_8.s" -gUnk_081130F7:: @ 081130F7 - .incbin "librarians/gUnk_081130F7.bin" +gSpriteAnimations_Librarians_1_12:: @ 081130F7 + .include "animations/gSpriteAnimations_Librarians_1_12.s" gSpriteAnimations_Librarians_1:: @ 08113108 - .4byte gUnk_081130D8 - .4byte gUnk_081130D8 - .4byte gUnk_081130D8 - .4byte gUnk_081130D8 - .4byte gUnk_081130DD - .4byte gUnk_081130DD - .4byte gUnk_081130DD - .4byte gUnk_081130DD - .4byte gUnk_081130EA - .4byte gUnk_081130EA - .4byte gUnk_081130EA - .4byte gUnk_081130EA - .4byte gUnk_081130F7 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_0 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_4 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_8 + .4byte gSpriteAnimations_Librarians_1_12 .4byte 00000000 diff --git a/data/animations/npc/maid.s b/data/animations/npc/maid.s index 47cfff6c..bcd5d8f0 100644 --- a/data/animations/npc/maid.s +++ b/data/animations/npc/maid.s @@ -5,41 +5,41 @@ .align 2 -gUnk_0810F8E4:: @ 0810F8E4 - .incbin "maid/gUnk_0810F8E4.bin" +gSpriteAnimations_Maid_0:: @ 0810F8E4 + .include "animations/gSpriteAnimations_Maid_0.s" -gUnk_0810F8E9:: @ 0810F8E9 - .incbin "maid/gUnk_0810F8E9.bin" +gSpriteAnimations_Maid_1:: @ 0810F8E9 + .include "animations/gSpriteAnimations_Maid_1.s" -gUnk_0810F8EE:: @ 0810F8EE - .incbin "maid/gUnk_0810F8EE.bin" +gSpriteAnimations_Maid_2:: @ 0810F8EE + .include "animations/gSpriteAnimations_Maid_2.s" -gUnk_0810F8F3:: @ 0810F8F3 - .incbin "maid/gUnk_0810F8F3.bin" +gSpriteAnimations_Maid_3:: @ 0810F8F3 + .include "animations/gSpriteAnimations_Maid_3.s" -gUnk_0810F8F8:: @ 0810F8F8 - .incbin "maid/gUnk_0810F8F8.bin" +gSpriteAnimations_Maid_4:: @ 0810F8F8 + .include "animations/gSpriteAnimations_Maid_4.s" -gUnk_0810F909:: @ 0810F909 - .incbin "maid/gUnk_0810F909.bin" +gSpriteAnimations_Maid_5:: @ 0810F909 + .include "animations/gSpriteAnimations_Maid_5.s" -gUnk_0810F91A:: @ 0810F91A - .incbin "maid/gUnk_0810F91A.bin" +gSpriteAnimations_Maid_6:: @ 0810F91A + .include "animations/gSpriteAnimations_Maid_6.s" -gUnk_0810F92B:: @ 0810F92B - .incbin "maid/gUnk_0810F92B.bin" +gSpriteAnimations_Maid_7:: @ 0810F92B + .include "animations/gSpriteAnimations_Maid_7.s" -gUnk_0810F93C:: @ 0810F93C - .incbin "maid/gUnk_0810F93C.bin" +gSpriteAnimations_Maid_8:: @ 0810F93C + .include "animations/gSpriteAnimations_Maid_8.s" gSpriteAnimations_Maid:: @ 0810F944 - .4byte gUnk_0810F8E4 - .4byte gUnk_0810F8E9 - .4byte gUnk_0810F8EE - .4byte gUnk_0810F8F3 - .4byte gUnk_0810F8F8 - .4byte gUnk_0810F909 - .4byte gUnk_0810F91A - .4byte gUnk_0810F92B - .4byte gUnk_0810F93C + .4byte gSpriteAnimations_Maid_0 + .4byte gSpriteAnimations_Maid_1 + .4byte gSpriteAnimations_Maid_2 + .4byte gSpriteAnimations_Maid_3 + .4byte gSpriteAnimations_Maid_4 + .4byte gSpriteAnimations_Maid_5 + .4byte gSpriteAnimations_Maid_6 + .4byte gSpriteAnimations_Maid_7 + .4byte gSpriteAnimations_Maid_8 .4byte 00000000 diff --git a/data/animations/npc/mailbox.s b/data/animations/npc/mailbox.s index 8013f5f6..3c6b24ca 100644 --- a/data/animations/npc/mailbox.s +++ b/data/animations/npc/mailbox.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_0810C814:: @ 0810C814 - .incbin "mailbox/gUnk_0810C814.bin" +gSpriteAnimations_Mailbox_0:: @ 0810C814 + .include "animations/gSpriteAnimations_Mailbox_0.s" -gUnk_0810C819:: @ 0810C819 - .incbin "mailbox/gUnk_0810C819.bin" +gSpriteAnimations_Mailbox_4:: @ 0810C819 + .include "animations/gSpriteAnimations_Mailbox_4.s" -gUnk_0810C84A:: @ 0810C84A - .incbin "mailbox/gUnk_0810C84A.bin" +gSpriteAnimations_Mailbox_8:: @ 0810C84A + .include "animations/gSpriteAnimations_Mailbox_8.s" gSpriteAnimations_Mailbox:: @ 0810C868 - .4byte gUnk_0810C814 - .4byte gUnk_0810C814 - .4byte gUnk_0810C814 - .4byte gUnk_0810C814 - .4byte gUnk_0810C819 - .4byte gUnk_0810C819 - .4byte gUnk_0810C819 - .4byte gUnk_0810C819 - .4byte gUnk_0810C84A + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_0 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_4 + .4byte gSpriteAnimations_Mailbox_8 diff --git a/data/animations/npc/malon.s b/data/animations/npc/malon.s index f334fc62..fb26e233 100644 --- a/data/animations/npc/malon.s +++ b/data/animations/npc/malon.s @@ -4,48 +4,48 @@ .section .rodata .align 2 -gUnk_0810FF70:: @ 0810FF70 - .incbin "malon/gUnk_0810FF70.bin" +gSpriteAnimations_Malon_0:: @ 0810FF70 + .include "animations/gSpriteAnimations_Malon_0.s" -gUnk_0810FF75:: @ 0810FF75 - .incbin "malon/gUnk_0810FF75.bin" +gSpriteAnimations_Malon_1:: @ 0810FF75 + .include "animations/gSpriteAnimations_Malon_1.s" -gUnk_0810FF7A:: @ 0810FF7A - .incbin "malon/gUnk_0810FF7A.bin" +gSpriteAnimations_Malon_2:: @ 0810FF7A + .include "animations/gSpriteAnimations_Malon_2.s" -gUnk_0810FF7F:: @ 0810FF7F - .incbin "malon/gUnk_0810FF7F.bin" +gSpriteAnimations_Malon_3:: @ 0810FF7F + .include "animations/gSpriteAnimations_Malon_3.s" -gUnk_0810FF84:: @ 0810FF84 - .incbin "malon/gUnk_0810FF84.bin" +gSpriteAnimations_Malon_5:: @ 0810FF84 + .include "animations/gSpriteAnimations_Malon_5.s" -gUnk_0810FFA5:: @ 0810FFA5 - .incbin "malon/gUnk_0810FFA5.bin" +gSpriteAnimations_Malon_6:: @ 0810FFA5 + .include "animations/gSpriteAnimations_Malon_6.s" -gUnk_0810FFB6:: @ 0810FFB6 - .incbin "malon/gUnk_0810FFB6.bin" +gSpriteAnimations_Malon_4:: @ 0810FFB6 + .include "animations/gSpriteAnimations_Malon_4.s" -gUnk_0810FFD7:: @ 0810FFD7 - .incbin "malon/gUnk_0810FFD7.bin" +gSpriteAnimations_Malon_12:: @ 0810FFD7 + .include "animations/gSpriteAnimations_Malon_12.s" -gUnk_08110014:: @ 08110014 - .incbin "malon/gUnk_08110014.bin" +gSpriteAnimations_Malon_10:: @ 08110014 + .include "animations/gSpriteAnimations_Malon_10.s" gSpriteAnimations_Malon:: @ 08110028 - .4byte gUnk_0810FF70 - .4byte gUnk_0810FF75 - .4byte gUnk_0810FF7A - .4byte gUnk_0810FF7F - .4byte gUnk_0810FFB6 - .4byte gUnk_0810FF84 - .4byte gUnk_0810FFA5 - .4byte gUnk_0810FFB6 - .4byte gUnk_0810FF70 - .4byte gUnk_0810FF75 - .4byte gUnk_08110014 - .4byte gUnk_0810FF7F - .4byte gUnk_0810FFD7 - .4byte gUnk_0810FFD7 - .4byte gUnk_0810FFD7 - .4byte gUnk_0810FFD7 + .4byte gSpriteAnimations_Malon_0 + .4byte gSpriteAnimations_Malon_1 + .4byte gSpriteAnimations_Malon_2 + .4byte gSpriteAnimations_Malon_3 + .4byte gSpriteAnimations_Malon_4 + .4byte gSpriteAnimations_Malon_5 + .4byte gSpriteAnimations_Malon_6 + .4byte gSpriteAnimations_Malon_4 + .4byte gSpriteAnimations_Malon_0 + .4byte gSpriteAnimations_Malon_1 + .4byte gSpriteAnimations_Malon_10 + .4byte gSpriteAnimations_Malon_3 + .4byte gSpriteAnimations_Malon_12 + .4byte gSpriteAnimations_Malon_12 + .4byte gSpriteAnimations_Malon_12 + .4byte gSpriteAnimations_Malon_12 .4byte 00000000 diff --git a/data/animations/npc/mama.s b/data/animations/npc/mama.s index 7e5e1dc2..052345d1 100644 --- a/data/animations/npc/mama.s +++ b/data/animations/npc/mama.s @@ -4,28 +4,28 @@ .section .rodata .align 2 -gUnk_081137B0:: @ 081137B0 - .incbin "mama/gUnk_081137B0.bin" +gSpriteAnimations_Mama_4:: @ 081137B0 + .include "animations/gSpriteAnimations_Mama_4.s" -gUnk_081137E9:: @ 081137E9 - .incbin "mama/gUnk_081137E9.bin" +gSpriteAnimations_Mama_0:: @ 081137E9 + .include "animations/gSpriteAnimations_Mama_0.s" -gUnk_08113892:: @ 08113892 - .incbin "mama/gUnk_08113892.bin" +gSpriteAnimations_Mama_1:: @ 08113892 + .include "animations/gSpriteAnimations_Mama_1.s" -gUnk_08113897:: @ 08113897 - .incbin "mama/gUnk_08113897.bin" +gSpriteAnimations_Mama_2:: @ 08113897 + .include "animations/gSpriteAnimations_Mama_2.s" -gUnk_081138B0:: @ 081138B0 - .incbin "mama/gUnk_081138B0.bin" +gSpriteAnimations_Mama_3:: @ 081138B0 + .include "animations/gSpriteAnimations_Mama_3.s" gSpriteAnimations_Mama:: @ 081138B8 - .4byte gUnk_081137E9 - .4byte gUnk_08113892 - .4byte gUnk_08113897 - .4byte gUnk_081138B0 - .4byte gUnk_081137B0 - .4byte gUnk_081137B0 - .4byte gUnk_081137B0 - .4byte gUnk_081137B0 + .4byte gSpriteAnimations_Mama_0 + .4byte gSpriteAnimations_Mama_1 + .4byte gSpriteAnimations_Mama_2 + .4byte gSpriteAnimations_Mama_3 + .4byte gSpriteAnimations_Mama_4 + .4byte gSpriteAnimations_Mama_4 + .4byte gSpriteAnimations_Mama_4 + .4byte gSpriteAnimations_Mama_4 .4byte 00000000 diff --git a/data/animations/npc/marcy.s b/data/animations/npc/marcy.s index f21da381..ff2711ce 100644 --- a/data/animations/npc/marcy.s +++ b/data/animations/npc/marcy.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810C360:: @ 0810C360 - .incbin "marcy/gUnk_0810C360.bin" +gSpriteAnimations_Marcy_0:: @ 0810C360 + .include "animations/gSpriteAnimations_Marcy_0.s" -gUnk_0810C365:: @ 0810C365 - .incbin "marcy/gUnk_0810C365.bin" +gSpriteAnimations_Marcy_4:: @ 0810C365 + .include "animations/gSpriteAnimations_Marcy_4.s" -gUnk_0810C382:: @ 0810C382 - .incbin "marcy/gUnk_0810C382.bin" +gSpriteAnimations_Marcy_8:: @ 0810C382 + .include "animations/gSpriteAnimations_Marcy_8.s" gSpriteAnimations_Marcy:: @ 0810C390 - .4byte gUnk_0810C360 - .4byte gUnk_0810C360 - .4byte gUnk_0810C360 - .4byte gUnk_0810C360 - .4byte gUnk_0810C365 - .4byte gUnk_0810C365 - .4byte gUnk_0810C365 - .4byte gUnk_0810C365 - .4byte gUnk_0810C382 - .4byte gUnk_0810C382 - .4byte gUnk_0810C382 - .4byte gUnk_0810C382 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_0 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_4 + .4byte gSpriteAnimations_Marcy_8 + .4byte gSpriteAnimations_Marcy_8 + .4byte gSpriteAnimations_Marcy_8 + .4byte gSpriteAnimations_Marcy_8 diff --git a/data/animations/npc/mayorHagen.s b/data/animations/npc/mayorHagen.s index f293cc27..5a03c43b 100644 --- a/data/animations/npc/mayorHagen.s +++ b/data/animations/npc/mayorHagen.s @@ -4,50 +4,50 @@ .section .rodata .align 2 -gUnk_08113FC0:: @ 08113FC0 - .incbin "mayorHagen/gUnk_08113FC0.bin" +gSpriteAnimations_MayorHagen_0:: @ 08113FC0 + .include "animations/gSpriteAnimations_MayorHagen_0.s" -gUnk_08113FC5:: @ 08113FC5 - .incbin "mayorHagen/gUnk_08113FC5.bin" +gSpriteAnimations_MayorHagen_1:: @ 08113FC5 + .include "animations/gSpriteAnimations_MayorHagen_1.s" -gUnk_08113FCA:: @ 08113FCA - .incbin "mayorHagen/gUnk_08113FCA.bin" +gSpriteAnimations_MayorHagen_2:: @ 08113FCA + .include "animations/gSpriteAnimations_MayorHagen_2.s" -gUnk_08113FCF:: @ 08113FCF - .incbin "mayorHagen/gUnk_08113FCF.bin" +gSpriteAnimations_MayorHagen_3:: @ 08113FCF + .include "animations/gSpriteAnimations_MayorHagen_3.s" -gUnk_08113FD4:: @ 08113FD4 - .incbin "mayorHagen/gUnk_08113FD4.bin" +gSpriteAnimations_MayorHagen_11:: @ 08113FD4 + .include "animations/gSpriteAnimations_MayorHagen_11.s" -gUnk_08113FE5:: @ 08113FE5 - .incbin "mayorHagen/gUnk_08113FE5.bin" +gSpriteAnimations_MayorHagen_8:: @ 08113FE5 + .include "animations/gSpriteAnimations_MayorHagen_8.s" -gUnk_08114032:: @ 08114032 - .incbin "mayorHagen/gUnk_08114032.bin" +gSpriteAnimations_MayorHagen_4:: @ 08114032 + .include "animations/gSpriteAnimations_MayorHagen_4.s" -gUnk_0811403F:: @ 0811403F - .incbin "mayorHagen/gUnk_0811403F.bin" +gSpriteAnimations_MayorHagen_7:: @ 0811403F + .include "animations/gSpriteAnimations_MayorHagen_7.s" -gUnk_08114050:: @ 08114050 - .incbin "mayorHagen/gUnk_08114050.bin" +gSpriteAnimations_MayorHagen_5:: @ 08114050 + .include "animations/gSpriteAnimations_MayorHagen_5.s" -gUnk_08114061:: @ 08114061 - .incbin "mayorHagen/gUnk_08114061.bin" +gSpriteAnimations_MayorHagen_9:: @ 08114061 + .include "animations/gSpriteAnimations_MayorHagen_9.s" -gUnk_0811408A:: @ 0811408A - .incbin "mayorHagen/gUnk_0811408A.bin" +gSpriteAnimations_MayorHagen_10:: @ 0811408A + .include "animations/gSpriteAnimations_MayorHagen_10.s" gSpriteAnimations_MayorHagen:: @ 08114098 - .4byte gUnk_08113FC0 - .4byte gUnk_08113FC5 - .4byte gUnk_08113FCA - .4byte gUnk_08113FCF - .4byte gUnk_08114032 - .4byte gUnk_08114050 - .4byte gUnk_08114032 - .4byte gUnk_0811403F - .4byte gUnk_08113FE5 - .4byte gUnk_08114061 - .4byte gUnk_0811408A - .4byte gUnk_08113FD4 + .4byte gSpriteAnimations_MayorHagen_0 + .4byte gSpriteAnimations_MayorHagen_1 + .4byte gSpriteAnimations_MayorHagen_2 + .4byte gSpriteAnimations_MayorHagen_3 + .4byte gSpriteAnimations_MayorHagen_4 + .4byte gSpriteAnimations_MayorHagen_5 + .4byte gSpriteAnimations_MayorHagen_4 + .4byte gSpriteAnimations_MayorHagen_7 + .4byte gSpriteAnimations_MayorHagen_8 + .4byte gSpriteAnimations_MayorHagen_9 + .4byte gSpriteAnimations_MayorHagen_10 + .4byte gSpriteAnimations_MayorHagen_11 .4byte 00000000 diff --git a/data/animations/npc/melari.s b/data/animations/npc/melari.s index dc94658c..cbdd7a0f 100644 --- a/data/animations/npc/melari.s +++ b/data/animations/npc/melari.s @@ -4,31 +4,31 @@ .section .rodata .align 2 -gUnk_08111544:: @ 08111544 - .incbin "melari/gUnk_08111544.bin" +gSpriteAnimations_Melari_1:: @ 08111544 + .include "animations/gSpriteAnimations_Melari_1.s" -gUnk_08111549:: @ 08111549 - .incbin "melari/gUnk_08111549.bin" +gSpriteAnimations_Melari_0:: @ 08111549 + .include "animations/gSpriteAnimations_Melari_0.s" -gUnk_0811154E:: @ 0811154E - .incbin "melari/gUnk_0811154E.bin" +gSpriteAnimations_Melari_3:: @ 0811154E + .include "animations/gSpriteAnimations_Melari_3.s" -gUnk_08111553:: @ 08111553 - .incbin "melari/gUnk_08111553.bin" +gSpriteAnimations_Melari_8:: @ 08111553 + .include "animations/gSpriteAnimations_Melari_8.s" -gUnk_0811158C:: @ 0811158C - .incbin "melari/gUnk_0811158C.bin" +gSpriteAnimations_Melari_9:: @ 0811158C + .include "animations/gSpriteAnimations_Melari_9.s" gSpriteAnimations_Melari:: @ 08111594 - .4byte gUnk_08111549 - .4byte gUnk_08111544 - .4byte gUnk_08111549 - .4byte gUnk_0811154E - .4byte gUnk_08111549 - .4byte gUnk_08111544 - .4byte gUnk_08111549 - .4byte gUnk_0811154E - .4byte gUnk_08111553 - .4byte gUnk_0811158C + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_1 + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_3 + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_1 + .4byte gSpriteAnimations_Melari_0 + .4byte gSpriteAnimations_Melari_3 + .4byte gSpriteAnimations_Melari_8 + .4byte gSpriteAnimations_Melari_9 .4byte 00000000 diff --git a/data/animations/npc/milkCart.s b/data/animations/npc/milkCart.s index ab0f3df1..28690e3f 100644 --- a/data/animations/npc/milkCart.s +++ b/data/animations/npc/milkCart.s @@ -4,19 +4,19 @@ .section .rodata .align 2 -gUnk_08110120:: @ 08110120 - .incbin "milkCart/gUnk_08110120.bin" +gSpriteAnimations_MilkCart_0:: @ 08110120 + .include "animations/gSpriteAnimations_MilkCart_0.s" -gUnk_08110125:: @ 08110125 - .incbin "milkCart/gUnk_08110125.bin" +gSpriteAnimations_MilkCart_4:: @ 08110125 + .include "animations/gSpriteAnimations_MilkCart_4.s" gSpriteAnimations_MilkCart:: @ 08110138 - .4byte gUnk_08110120 - .4byte gUnk_08110120 - .4byte gUnk_08110120 - .4byte gUnk_08110120 - .4byte gUnk_08110125 - .4byte gUnk_08110125 - .4byte gUnk_08110125 - .4byte gUnk_08110125 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_0 + .4byte gSpriteAnimations_MilkCart_4 + .4byte gSpriteAnimations_MilkCart_4 + .4byte gSpriteAnimations_MilkCart_4 + .4byte gSpriteAnimations_MilkCart_4 .4byte 00000000 diff --git a/data/animations/npc/minishEzlo.s b/data/animations/npc/minishEzlo.s index 78956a44..a232737f 100644 --- a/data/animations/npc/minishEzlo.s +++ b/data/animations/npc/minishEzlo.s @@ -4,63 +4,63 @@ .section .rodata .align 2 -gUnk_0810C4A0:: @ 0810C4A0 - .incbin "minishEzlo/gUnk_0810C4A0.bin" +gSpriteAnimations_MinishEzlo_2:: @ 0810C4A0 + .include "animations/gSpriteAnimations_MinishEzlo_2.s" -gUnk_0810C4A5:: @ 0810C4A5 - .incbin "minishEzlo/gUnk_0810C4A5.bin" +gSpriteAnimations_MinishEzlo_3:: @ 0810C4A5 + .include "animations/gSpriteAnimations_MinishEzlo_3.s" -gUnk_0810C4AA:: @ 0810C4AA - .incbin "minishEzlo/gUnk_0810C4AA.bin" +gSpriteAnimations_MinishEzlo_1:: @ 0810C4AA + .include "animations/gSpriteAnimations_MinishEzlo_1.s" -gUnk_0810C4AF:: @ 0810C4AF - .incbin "minishEzlo/gUnk_0810C4AF.bin" +gSpriteAnimations_MinishEzlo_0:: @ 0810C4AF + .include "animations/gSpriteAnimations_MinishEzlo_0.s" -gUnk_0810C4B4:: @ 0810C4B4 - .incbin "minishEzlo/gUnk_0810C4B4.bin" +gSpriteAnimations_MinishEzlo_5:: @ 0810C4B4 + .include "animations/gSpriteAnimations_MinishEzlo_5.s" -gUnk_0810C4C9:: @ 0810C4C9 - .incbin "minishEzlo/gUnk_0810C4C9.bin" +gSpriteAnimations_MinishEzlo_4:: @ 0810C4C9 + .include "animations/gSpriteAnimations_MinishEzlo_4.s" -gUnk_0810C4DE:: @ 0810C4DE - .incbin "minishEzlo/gUnk_0810C4DE.bin" +gSpriteAnimations_MinishEzlo_13:: @ 0810C4DE + .include "animations/gSpriteAnimations_MinishEzlo_13.s" -gUnk_0810C5BB:: @ 0810C5BB - .incbin "minishEzlo/gUnk_0810C5BB.bin" +gSpriteAnimations_MinishEzlo_14:: @ 0810C5BB + .include "animations/gSpriteAnimations_MinishEzlo_14.s" -gUnk_0810C698:: @ 0810C698 - .incbin "minishEzlo/gUnk_0810C698.bin" +gSpriteAnimations_MinishEzlo_12:: @ 0810C698 + .include "animations/gSpriteAnimations_MinishEzlo_12.s" -gUnk_0810C6E5:: @ 0810C6E5 - .incbin "minishEzlo/gUnk_0810C6E5.bin" +gSpriteAnimations_MinishEzlo_18:: @ 0810C6E5 + .include "animations/gSpriteAnimations_MinishEzlo_18.s" -gUnk_0810C772:: @ 0810C772 - .incbin "minishEzlo/gUnk_0810C772.bin" +gSpriteAnimations_MinishEzlo_15:: @ 0810C772 + .include "animations/gSpriteAnimations_MinishEzlo_15.s" -gUnk_0810C77F:: @ 0810C77F - .incbin "minishEzlo/gUnk_0810C77F.bin" +gSpriteAnimations_MinishEzlo_16:: @ 0810C77F + .include "animations/gSpriteAnimations_MinishEzlo_16.s" -gUnk_0810C7AC:: @ 0810C7AC - .incbin "minishEzlo/gUnk_0810C7AC.bin" +gSpriteAnimations_MinishEzlo_17:: @ 0810C7AC + .include "animations/gSpriteAnimations_MinishEzlo_17.s" gSpriteAnimations_MinishEzlo:: @ 0810C7B4 - .4byte gUnk_0810C4AF - .4byte gUnk_0810C4AA - .4byte gUnk_0810C4A0 - .4byte gUnk_0810C4A5 - .4byte gUnk_0810C4C9 - .4byte gUnk_0810C4B4 - .4byte gUnk_0810C4B4 - .4byte gUnk_0810C4B4 - .4byte gUnk_0810C4AF - .4byte gUnk_0810C4AA - .4byte gUnk_0810C4A0 - .4byte gUnk_0810C4A5 - .4byte gUnk_0810C698 - .4byte gUnk_0810C4DE - .4byte gUnk_0810C5BB - .4byte gUnk_0810C772 - .4byte gUnk_0810C77F - .4byte gUnk_0810C7AC - .4byte gUnk_0810C6E5 + .4byte gSpriteAnimations_MinishEzlo_0 + .4byte gSpriteAnimations_MinishEzlo_1 + .4byte gSpriteAnimations_MinishEzlo_2 + .4byte gSpriteAnimations_MinishEzlo_3 + .4byte gSpriteAnimations_MinishEzlo_4 + .4byte gSpriteAnimations_MinishEzlo_5 + .4byte gSpriteAnimations_MinishEzlo_5 + .4byte gSpriteAnimations_MinishEzlo_5 + .4byte gSpriteAnimations_MinishEzlo_0 + .4byte gSpriteAnimations_MinishEzlo_1 + .4byte gSpriteAnimations_MinishEzlo_2 + .4byte gSpriteAnimations_MinishEzlo_3 + .4byte gSpriteAnimations_MinishEzlo_12 + .4byte gSpriteAnimations_MinishEzlo_13 + .4byte gSpriteAnimations_MinishEzlo_14 + .4byte gSpriteAnimations_MinishEzlo_15 + .4byte gSpriteAnimations_MinishEzlo_16 + .4byte gSpriteAnimations_MinishEzlo_17 + .4byte gSpriteAnimations_MinishEzlo_18 .4byte 00000000 diff --git a/data/animations/npc/ministerPotho.s b/data/animations/npc/ministerPotho.s index 8404affc..1dc7cbd3 100644 --- a/data/animations/npc/ministerPotho.s +++ b/data/animations/npc/ministerPotho.s @@ -4,36 +4,36 @@ .section .rodata .align 2 -gUnk_08110658:: @ 08110658 - .incbin "ministerPotho/gUnk_08110658.bin" +gSpriteAnimations_MinisterPotho_0:: @ 08110658 + .include "animations/gSpriteAnimations_MinisterPotho_0.s" -gUnk_0811065D:: @ 0811065D - .incbin "ministerPotho/gUnk_0811065D.bin" +gSpriteAnimations_MinisterPotho_1:: @ 0811065D + .include "animations/gSpriteAnimations_MinisterPotho_1.s" -gUnk_08110662:: @ 08110662 - .incbin "ministerPotho/gUnk_08110662.bin" +gSpriteAnimations_MinisterPotho_2:: @ 08110662 + .include "animations/gSpriteAnimations_MinisterPotho_2.s" -gUnk_08110667:: @ 08110667 - .incbin "ministerPotho/gUnk_08110667.bin" +gSpriteAnimations_MinisterPotho_3:: @ 08110667 + .include "animations/gSpriteAnimations_MinisterPotho_3.s" -gUnk_0811066C:: @ 0811066C - .incbin "ministerPotho/gUnk_0811066C.bin" +gSpriteAnimations_MinisterPotho_4:: @ 0811066C + .include "animations/gSpriteAnimations_MinisterPotho_4.s" -gUnk_0811067D:: @ 0811067D - .incbin "ministerPotho/gUnk_0811067D.bin" +gSpriteAnimations_MinisterPotho_8:: @ 0811067D + .include "animations/gSpriteAnimations_MinisterPotho_8.s" -gUnk_08110682:: @ 08110682 - .incbin "ministerPotho/gUnk_08110682.bin" +gSpriteAnimations_MinisterPotho_9:: @ 08110682 + .include "animations/gSpriteAnimations_MinisterPotho_9.s" gSpriteAnimations_MinisterPotho:: @ 081106A8 - .4byte gUnk_08110658 - .4byte gUnk_0811065D - .4byte gUnk_08110662 - .4byte gUnk_08110667 - .4byte gUnk_0811066C - .4byte gUnk_0811066C - .4byte gUnk_0811066C - .4byte gUnk_0811066C - .4byte gUnk_0811067D - .4byte gUnk_08110682 + .4byte gSpriteAnimations_MinisterPotho_0 + .4byte gSpriteAnimations_MinisterPotho_1 + .4byte gSpriteAnimations_MinisterPotho_2 + .4byte gSpriteAnimations_MinisterPotho_3 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_4 + .4byte gSpriteAnimations_MinisterPotho_8 + .4byte gSpriteAnimations_MinisterPotho_9 .4byte 00000000 diff --git a/data/animations/npc/moblinLady.s b/data/animations/npc/moblinLady.s index b04067ad..2dc460b4 100644 --- a/data/animations/npc/moblinLady.s +++ b/data/animations/npc/moblinLady.s @@ -4,16 +4,16 @@ .section .rodata .align 2 -gUnk_08113004:: @ 08113004 - .incbin "moblinLady/gUnk_08113004.bin" +gSpriteAnimations_MoblinLady_1_0:: @ 08113004 + .include "animations/gSpriteAnimations_MoblinLady_1_0.s" gSpriteAnimations_MoblinLady_1:: @ 08113024 - .4byte gUnk_08113004 - .incbin "moblinLady/gSpriteAnimations_MoblinLady_1.bin" + .4byte gSpriteAnimations_MoblinLady_1_0 + .include "animations/gSpriteAnimations_MoblinLady_1.s" -gUnk_0811302C:: @ 0811302C - .incbin "moblinLady/gUnk_0811302C.bin" +gSpriteAnimations_MoblinLady_0:: @ 0811302C + .include "animations/gSpriteAnimations_MoblinLady_0.s" gSpriteAnimations_MoblinLady:: @ 08113070 - .4byte gUnk_0811302C + .4byte gSpriteAnimations_MoblinLady_0 .4byte 00000000 diff --git a/data/animations/npc/mountainMinish.s b/data/animations/npc/mountainMinish.s index 5a219e1e..64fd232c 100644 --- a/data/animations/npc/mountainMinish.s +++ b/data/animations/npc/mountainMinish.s @@ -4,54 +4,54 @@ .section .rodata .align 2 -gUnk_08111380:: @ 08111380 - .incbin "mountainMinish/gUnk_08111380.bin" +gSpriteAnimations_MountainMinish_0:: @ 08111380 + .include "animations/gSpriteAnimations_MountainMinish_0.s" -gUnk_08111385:: @ 08111385 - .incbin "mountainMinish/gUnk_08111385.bin" +gSpriteAnimations_MountainMinish_1:: @ 08111385 + .include "animations/gSpriteAnimations_MountainMinish_1.s" -gUnk_0811138A:: @ 0811138A - .incbin "mountainMinish/gUnk_0811138A.bin" +gSpriteAnimations_MountainMinish_2:: @ 0811138A + .include "animations/gSpriteAnimations_MountainMinish_2.s" -gUnk_0811138F:: @ 0811138F - .incbin "mountainMinish/gUnk_0811138F.bin" +gSpriteAnimations_MountainMinish_3:: @ 0811138F + .include "animations/gSpriteAnimations_MountainMinish_3.s" -gUnk_08111394:: @ 08111394 - .incbin "mountainMinish/gUnk_08111394.bin" +gSpriteAnimations_MountainMinish_7:: @ 08111394 + .include "animations/gSpriteAnimations_MountainMinish_7.s" -gUnk_081113B9:: @ 081113B9 - .incbin "mountainMinish/gUnk_081113B9.bin" +gSpriteAnimations_MountainMinish_5:: @ 081113B9 + .include "animations/gSpriteAnimations_MountainMinish_5.s" -gUnk_081113DE:: @ 081113DE - .incbin "mountainMinish/gUnk_081113DE.bin" +gSpriteAnimations_MountainMinish_4:: @ 081113DE + .include "animations/gSpriteAnimations_MountainMinish_4.s" -gUnk_081113FF:: @ 081113FF - .incbin "mountainMinish/gUnk_081113FF.bin" +gSpriteAnimations_MountainMinish_8:: @ 081113FF + .include "animations/gSpriteAnimations_MountainMinish_8.s" -gUnk_08111424:: @ 08111424 - .incbin "mountainMinish/gUnk_08111424.bin" +gSpriteAnimations_MountainMinish_9:: @ 08111424 + .include "animations/gSpriteAnimations_MountainMinish_9.s" -gUnk_08111449:: @ 08111449 - .incbin "mountainMinish/gUnk_08111449.bin" +gSpriteAnimations_MountainMinish_10:: @ 08111449 + .include "animations/gSpriteAnimations_MountainMinish_10.s" -gUnk_081114BA:: @ 081114BA - .incbin "mountainMinish/gUnk_081114BA.bin" +gSpriteAnimations_MountainMinish_11:: @ 081114BA + .include "animations/gSpriteAnimations_MountainMinish_11.s" -gUnk_081114E3:: @ 081114E3 - .incbin "mountainMinish/gUnk_081114E3.bin" +gSpriteAnimations_MountainMinish_12:: @ 081114E3 + .include "animations/gSpriteAnimations_MountainMinish_12.s" gSpriteAnimations_MountainMinish:: @ 081114E8 - .4byte gUnk_08111380 - .4byte gUnk_08111385 - .4byte gUnk_0811138A - .4byte gUnk_0811138F - .4byte gUnk_081113DE - .4byte gUnk_081113B9 - .4byte gUnk_081113DE - .4byte gUnk_08111394 - .4byte gUnk_081113FF - .4byte gUnk_08111424 - .4byte gUnk_08111449 - .4byte gUnk_081114BA - .4byte gUnk_081114E3 + .4byte gSpriteAnimations_MountainMinish_0 + .4byte gSpriteAnimations_MountainMinish_1 + .4byte gSpriteAnimations_MountainMinish_2 + .4byte gSpriteAnimations_MountainMinish_3 + .4byte gSpriteAnimations_MountainMinish_4 + .4byte gSpriteAnimations_MountainMinish_5 + .4byte gSpriteAnimations_MountainMinish_4 + .4byte gSpriteAnimations_MountainMinish_7 + .4byte gSpriteAnimations_MountainMinish_8 + .4byte gSpriteAnimations_MountainMinish_9 + .4byte gSpriteAnimations_MountainMinish_10 + .4byte gSpriteAnimations_MountainMinish_11 + .4byte gSpriteAnimations_MountainMinish_12 .4byte 00000000 diff --git a/data/animations/npc/mutoh.s b/data/animations/npc/mutoh.s index b41e3132..dcefce3d 100644 --- a/data/animations/npc/mutoh.s +++ b/data/animations/npc/mutoh.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_08110C60:: @ 08110C60 - .incbin "mutoh/gUnk_08110C60.bin" +gSpriteAnimations_Mutoh_0:: @ 08110C60 + .include "animations/gSpriteAnimations_Mutoh_0.s" -gUnk_08110C75:: @ 08110C75 - .incbin "mutoh/gUnk_08110C75.bin" +gSpriteAnimations_Mutoh_5:: @ 08110C75 + .include "animations/gSpriteAnimations_Mutoh_5.s" -gUnk_08110C7A:: @ 08110C7A - .incbin "mutoh/gUnk_08110C7A.bin" +gSpriteAnimations_Mutoh_4:: @ 08110C7A + .include "animations/gSpriteAnimations_Mutoh_4.s" -gUnk_08110C7F:: @ 08110C7F - .incbin "mutoh/gUnk_08110C7F.bin" +gSpriteAnimations_Mutoh_7:: @ 08110C7F + .include "animations/gSpriteAnimations_Mutoh_7.s" gSpriteAnimations_Mutoh:: @ 08110C84 - .4byte gUnk_08110C60 - .4byte gUnk_08110C60 - .4byte gUnk_08110C60 - .4byte gUnk_08110C60 - .4byte gUnk_08110C7A - .4byte gUnk_08110C75 - .4byte gUnk_08110C7A - .4byte gUnk_08110C7F + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_0 + .4byte gSpriteAnimations_Mutoh_4 + .4byte gSpriteAnimations_Mutoh_5 + .4byte gSpriteAnimations_Mutoh_4 + .4byte gSpriteAnimations_Mutoh_7 .4byte 00000000 diff --git a/data/animations/npc/nayru.s b/data/animations/npc/nayru.s index 635dea46..cdc148d9 100644 --- a/data/animations/npc/nayru.s +++ b/data/animations/npc/nayru.s @@ -4,25 +4,25 @@ .section .rodata .align 2 -gUnk_0810F9B0:: @ 0810F9B0 - .incbin "nayru/gUnk_0810F9B0.bin" +gSpriteAnimations_Nayru_0:: @ 0810F9B0 + .include "animations/gSpriteAnimations_Nayru_0.s" -gUnk_0810F9B5:: @ 0810F9B5 - .incbin "nayru/gUnk_0810F9B5.bin" +gSpriteAnimations_Nayru_3:: @ 0810F9B5 + .include "animations/gSpriteAnimations_Nayru_3.s" -gUnk_0810F9BA:: @ 0810F9BA - .incbin "nayru/gUnk_0810F9BA.bin" +gSpriteAnimations_Nayru_1:: @ 0810F9BA + .include "animations/gSpriteAnimations_Nayru_1.s" -gUnk_0810F9BF:: @ 0810F9BF - .incbin "nayru/gUnk_0810F9BF.bin" +gSpriteAnimations_Nayru_4:: @ 0810F9BF + .include "animations/gSpriteAnimations_Nayru_4.s" gSpriteAnimations_Nayru:: @ 0810F9D0 - .4byte gUnk_0810F9B0 - .4byte gUnk_0810F9BA - .4byte gUnk_0810F9B0 - .4byte gUnk_0810F9B5 - .4byte gUnk_0810F9BF - .4byte gUnk_0810F9BF - .4byte gUnk_0810F9BF - .4byte gUnk_0810F9BF + .4byte gSpriteAnimations_Nayru_0 + .4byte gSpriteAnimations_Nayru_1 + .4byte gSpriteAnimations_Nayru_0 + .4byte gSpriteAnimations_Nayru_3 + .4byte gSpriteAnimations_Nayru_4 + .4byte gSpriteAnimations_Nayru_4 + .4byte gSpriteAnimations_Nayru_4 + .4byte gSpriteAnimations_Nayru_4 .4byte 00000000 diff --git a/data/animations/npc/npc26.s b/data/animations/npc/npc26.s index 30fa061b..6ae8d029 100644 --- a/data/animations/npc/npc26.s +++ b/data/animations/npc/npc26.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_081106E8:: @ 081106E8 - .incbin "npc26/gUnk_081106E8.bin" +gSpriteAnimations_Npc26_0:: @ 081106E8 + .include "animations/gSpriteAnimations_Npc26_0.s" -gUnk_081106ED:: @ 081106ED - .incbin "npc26/gUnk_081106ED.bin" +gSpriteAnimations_Npc26_4:: @ 081106ED + .include "animations/gSpriteAnimations_Npc26_4.s" -gUnk_081106FE:: @ 081106FE - .incbin "npc26/gUnk_081106FE.bin" +gSpriteAnimations_Npc26_6:: @ 081106FE + .include "animations/gSpriteAnimations_Npc26_6.s" gSpriteAnimations_Npc26:: @ 08110710 - .4byte gUnk_081106E8 - .4byte gUnk_081106E8 - .4byte gUnk_081106E8 - .4byte gUnk_081106E8 - .4byte gUnk_081106ED - .4byte gUnk_081106ED - .4byte gUnk_081106FE - .4byte gUnk_081106FE + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_0 + .4byte gSpriteAnimations_Npc26_4 + .4byte gSpriteAnimations_Npc26_4 + .4byte gSpriteAnimations_Npc26_6 + .4byte gSpriteAnimations_Npc26_6 .4byte 00000000 diff --git a/data/animations/npc/npc4F.s b/data/animations/npc/npc4F.s index fcd7d9ba..a4e1ed1f 100644 --- a/data/animations/npc/npc4F.s +++ b/data/animations/npc/npc4F.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_08114208:: @ 08114208 - .incbin "npc4F/gUnk_08114208.bin" +gSpriteAnimations_Npc4F_0:: @ 08114208 + .include "animations/gSpriteAnimations_Npc4F_0.s" -gUnk_0811420D:: @ 0811420D - .incbin "npc4F/gUnk_0811420D.bin" +gSpriteAnimations_Npc4F_1:: @ 0811420D + .include "animations/gSpriteAnimations_Npc4F_1.s" -gUnk_08114216:: @ 08114216 - .incbin "npc4F/gUnk_08114216.bin" +gSpriteAnimations_Npc4F_2:: @ 08114216 + .include "animations/gSpriteAnimations_Npc4F_2.s" -gUnk_0811421F:: @ 0811421F - .incbin "npc4F/gUnk_0811421F.bin" +gSpriteAnimations_Npc4F_3:: @ 0811421F + .include "animations/gSpriteAnimations_Npc4F_3.s" gSpriteAnimations_Npc4F:: @ 08114228 - .4byte gUnk_08114208 - .4byte gUnk_0811420D - .4byte gUnk_08114216 - .4byte gUnk_0811421F + .4byte gSpriteAnimations_Npc4F_0 + .4byte gSpriteAnimations_Npc4F_1 + .4byte gSpriteAnimations_Npc4F_2 + .4byte gSpriteAnimations_Npc4F_3 .4byte 00000000 diff --git a/data/animations/npc/npc5.s b/data/animations/npc/npc5.s index 64b51230..7bd4a442 100644 --- a/data/animations/npc/npc5.s +++ b/data/animations/npc/npc5.s @@ -4,314 +4,314 @@ .section .rodata .align 2 -gUnk_0810AC78:: @ 0810AC78 - .incbin "npc5/gUnk_0810AC78.bin" +gSpriteAnimations_Npc5_0:: @ 0810AC78 + .include "animations/gSpriteAnimations_Npc5_0.s" -gUnk_0810AC81:: @ 0810AC81 - .incbin "npc5/gUnk_0810AC81.bin" +gSpriteAnimations_Npc5_1:: @ 0810AC81 + .include "animations/gSpriteAnimations_Npc5_1.s" -gUnk_0810AC9A:: @ 0810AC9A - .incbin "npc5/gUnk_0810AC9A.bin" +gSpriteAnimations_Npc5_2:: @ 0810AC9A + .include "animations/gSpriteAnimations_Npc5_2.s" -gUnk_0810ACB3:: @ 0810ACB3 - .incbin "npc5/gUnk_0810ACB3.bin" +gSpriteAnimations_Npc5_3:: @ 0810ACB3 + .include "animations/gSpriteAnimations_Npc5_3.s" -gUnk_0810ACCC:: @ 0810ACCC - .incbin "npc5/gUnk_0810ACCC.bin" +gSpriteAnimations_Npc5_4:: @ 0810ACCC + .include "animations/gSpriteAnimations_Npc5_4.s" -gUnk_0810ACED:: @ 0810ACED - .incbin "npc5/gUnk_0810ACED.bin" +gSpriteAnimations_Npc5_5:: @ 0810ACED + .include "animations/gSpriteAnimations_Npc5_5.s" -gUnk_0810AD0E:: @ 0810AD0E - .incbin "npc5/gUnk_0810AD0E.bin" +gSpriteAnimations_Npc5_6:: @ 0810AD0E + .include "animations/gSpriteAnimations_Npc5_6.s" -gUnk_0810AD2F:: @ 0810AD2F - .incbin "npc5/gUnk_0810AD2F.bin" +gSpriteAnimations_Npc5_7:: @ 0810AD2F + .include "animations/gSpriteAnimations_Npc5_7.s" -gUnk_0810AD50:: @ 0810AD50 - .incbin "npc5/gUnk_0810AD50.bin" +gSpriteAnimations_Npc5_8:: @ 0810AD50 + .include "animations/gSpriteAnimations_Npc5_8.s" -gUnk_0810AD71:: @ 0810AD71 - .incbin "npc5/gUnk_0810AD71.bin" +gSpriteAnimations_Npc5_9:: @ 0810AD71 + .include "animations/gSpriteAnimations_Npc5_9.s" -gUnk_0810AD92:: @ 0810AD92 - .incbin "npc5/gUnk_0810AD92.bin" +gSpriteAnimations_Npc5_10:: @ 0810AD92 + .include "animations/gSpriteAnimations_Npc5_10.s" -gUnk_0810ADB3:: @ 0810ADB3 - .incbin "npc5/gUnk_0810ADB3.bin" +gSpriteAnimations_Npc5_11:: @ 0810ADB3 + .include "animations/gSpriteAnimations_Npc5_11.s" -gUnk_0810ADD4:: @ 0810ADD4 - .incbin "npc5/gUnk_0810ADD4.bin" +gSpriteAnimations_Npc5_12:: @ 0810ADD4 + .include "animations/gSpriteAnimations_Npc5_12.s" -gUnk_0810ADF5:: @ 0810ADF5 - .incbin "npc5/gUnk_0810ADF5.bin" +gSpriteAnimations_Npc5_13:: @ 0810ADF5 + .include "animations/gSpriteAnimations_Npc5_13.s" -gUnk_0810AE16:: @ 0810AE16 - .incbin "npc5/gUnk_0810AE16.bin" +gSpriteAnimations_Npc5_14:: @ 0810AE16 + .include "animations/gSpriteAnimations_Npc5_14.s" -gUnk_0810AE37:: @ 0810AE37 - .incbin "npc5/gUnk_0810AE37.bin" +gSpriteAnimations_Npc5_15:: @ 0810AE37 + .include "animations/gSpriteAnimations_Npc5_15.s" -gUnk_0810AE58:: @ 0810AE58 - .incbin "npc5/gUnk_0810AE58.bin" +gSpriteAnimations_Npc5_16:: @ 0810AE58 + .include "animations/gSpriteAnimations_Npc5_16.s" -gUnk_0810AE7C:: @ 0810AE7C - .incbin "npc5/gUnk_0810AE7C.bin" +gSpriteAnimations_Npc5_17:: @ 0810AE7C + .include "animations/gSpriteAnimations_Npc5_17.s" -gUnk_0810AEA0:: @ 0810AEA0 - .incbin "npc5/gUnk_0810AEA0.bin" +gSpriteAnimations_Npc5_18:: @ 0810AEA0 + .include "animations/gSpriteAnimations_Npc5_18.s" -gUnk_0810AEC4:: @ 0810AEC4 - .incbin "npc5/gUnk_0810AEC4.bin" +gSpriteAnimations_Npc5_19:: @ 0810AEC4 + .include "animations/gSpriteAnimations_Npc5_19.s" -gUnk_0810AEE8:: @ 0810AEE8 - .incbin "npc5/gUnk_0810AEE8.bin" +gSpriteAnimations_Npc5_20:: @ 0810AEE8 + .include "animations/gSpriteAnimations_Npc5_20.s" -gUnk_0810AF19:: @ 0810AF19 - .incbin "npc5/gUnk_0810AF19.bin" +gSpriteAnimations_Npc5_21:: @ 0810AF19 + .include "animations/gSpriteAnimations_Npc5_21.s" -gUnk_0810AF4A:: @ 0810AF4A - .incbin "npc5/gUnk_0810AF4A.bin" +gSpriteAnimations_Npc5_22:: @ 0810AF4A + .include "animations/gSpriteAnimations_Npc5_22.s" -gUnk_0810AF7B:: @ 0810AF7B - .incbin "npc5/gUnk_0810AF7B.bin" +gSpriteAnimations_Npc5_23:: @ 0810AF7B + .include "animations/gSpriteAnimations_Npc5_23.s" -gUnk_0810AFAC:: @ 0810AFAC - .incbin "npc5/gUnk_0810AFAC.bin" +gSpriteAnimations_Npc5_24:: @ 0810AFAC + .include "animations/gSpriteAnimations_Npc5_24.s" -gUnk_0810AFCD:: @ 0810AFCD - .incbin "npc5/gUnk_0810AFCD.bin" +gSpriteAnimations_Npc5_25:: @ 0810AFCD + .include "animations/gSpriteAnimations_Npc5_25.s" -gUnk_0810AFEE:: @ 0810AFEE - .incbin "npc5/gUnk_0810AFEE.bin" +gSpriteAnimations_Npc5_26:: @ 0810AFEE + .include "animations/gSpriteAnimations_Npc5_26.s" -gUnk_0810B00F:: @ 0810B00F - .incbin "npc5/gUnk_0810B00F.bin" +gSpriteAnimations_Npc5_27:: @ 0810B00F + .include "animations/gSpriteAnimations_Npc5_27.s" -gUnk_0810B030:: @ 0810B030 - .incbin "npc5/gUnk_0810B030.bin" +gSpriteAnimations_Npc5_28:: @ 0810B030 + .include "animations/gSpriteAnimations_Npc5_28.s" -gUnk_0810B03C:: @ 0810B03C - .incbin "npc5/gUnk_0810B03C.bin" +gSpriteAnimations_Npc5_29:: @ 0810B03C + .include "animations/gSpriteAnimations_Npc5_29.s" -gUnk_0810B048:: @ 0810B048 - .incbin "npc5/gUnk_0810B048.bin" +gSpriteAnimations_Npc5_30:: @ 0810B048 + .include "animations/gSpriteAnimations_Npc5_30.s" -gUnk_0810B054:: @ 0810B054 - .incbin "npc5/gUnk_0810B054.bin" +gSpriteAnimations_Npc5_31:: @ 0810B054 + .include "animations/gSpriteAnimations_Npc5_31.s" -gUnk_0810B060:: @ 0810B060 - .incbin "npc5/gUnk_0810B060.bin" +gSpriteAnimations_Npc5_32:: @ 0810B060 + .include "animations/gSpriteAnimations_Npc5_32.s" -gUnk_0810B071:: @ 0810B071 - .incbin "npc5/gUnk_0810B071.bin" +gSpriteAnimations_Npc5_33:: @ 0810B071 + .include "animations/gSpriteAnimations_Npc5_33.s" -gUnk_0810B082:: @ 0810B082 - .incbin "npc5/gUnk_0810B082.bin" +gSpriteAnimations_Npc5_34:: @ 0810B082 + .include "animations/gSpriteAnimations_Npc5_34.s" -gUnk_0810B093:: @ 0810B093 - .incbin "npc5/gUnk_0810B093.bin" +gSpriteAnimations_Npc5_35:: @ 0810B093 + .include "animations/gSpriteAnimations_Npc5_35.s" -gUnk_0810B0A4:: @ 0810B0A4 - .incbin "npc5/gUnk_0810B0A4.bin" +gSpriteAnimations_Npc5_36:: @ 0810B0A4 + .include "animations/gSpriteAnimations_Npc5_36.s" -gUnk_0810B0B5:: @ 0810B0B5 - .incbin "npc5/gUnk_0810B0B5.bin" +gSpriteAnimations_Npc5_37:: @ 0810B0B5 + .include "animations/gSpriteAnimations_Npc5_37.s" -gUnk_0810B0C6:: @ 0810B0C6 - .incbin "npc5/gUnk_0810B0C6.bin" +gSpriteAnimations_Npc5_38:: @ 0810B0C6 + .include "animations/gSpriteAnimations_Npc5_38.s" -gUnk_0810B0D7:: @ 0810B0D7 - .incbin "npc5/gUnk_0810B0D7.bin" +gSpriteAnimations_Npc5_39:: @ 0810B0D7 + .include "animations/gSpriteAnimations_Npc5_39.s" -gUnk_0810B0E8:: @ 0810B0E8 - .incbin "npc5/gUnk_0810B0E8.bin" +gSpriteAnimations_Npc5_40:: @ 0810B0E8 + .include "animations/gSpriteAnimations_Npc5_40.s" -gUnk_0810B0F9:: @ 0810B0F9 - .incbin "npc5/gUnk_0810B0F9.bin" +gSpriteAnimations_Npc5_47:: @ 0810B0F9 + .include "animations/gSpriteAnimations_Npc5_47.s" -gUnk_0810B10A:: @ 0810B10A - .incbin "npc5/gUnk_0810B10A.bin" +gSpriteAnimations_Npc5_46:: @ 0810B10A + .include "animations/gSpriteAnimations_Npc5_46.s" -gUnk_0810B11B:: @ 0810B11B - .incbin "npc5/gUnk_0810B11B.bin" +gSpriteAnimations_Npc5_45:: @ 0810B11B + .include "animations/gSpriteAnimations_Npc5_45.s" -gUnk_0810B12C:: @ 0810B12C - .incbin "npc5/gUnk_0810B12C.bin" +gSpriteAnimations_Npc5_44:: @ 0810B12C + .include "animations/gSpriteAnimations_Npc5_44.s" -gUnk_0810B13D:: @ 0810B13D - .incbin "npc5/gUnk_0810B13D.bin" +gSpriteAnimations_Npc5_43:: @ 0810B13D + .include "animations/gSpriteAnimations_Npc5_43.s" -gUnk_0810B14E:: @ 0810B14E - .incbin "npc5/gUnk_0810B14E.bin" +gSpriteAnimations_Npc5_42:: @ 0810B14E + .include "animations/gSpriteAnimations_Npc5_42.s" -gUnk_0810B15F:: @ 0810B15F - .incbin "npc5/gUnk_0810B15F.bin" +gSpriteAnimations_Npc5_41:: @ 0810B15F + .include "animations/gSpriteAnimations_Npc5_41.s" -gUnk_0810B170:: @ 0810B170 - .incbin "npc5/gUnk_0810B170.bin" +gSpriteAnimations_Npc5_48:: @ 0810B170 + .include "animations/gSpriteAnimations_Npc5_48.s" -gUnk_0810B18C:: @ 0810B18C - .incbin "npc5/gUnk_0810B18C.bin" +gSpriteAnimations_Npc5_49:: @ 0810B18C + .include "animations/gSpriteAnimations_Npc5_49.s" -gUnk_0810B1A8:: @ 0810B1A8 - .incbin "npc5/gUnk_0810B1A8.bin" +gSpriteAnimations_Npc5_50:: @ 0810B1A8 + .include "animations/gSpriteAnimations_Npc5_50.s" -gUnk_0810B1C4:: @ 0810B1C4 - .incbin "npc5/gUnk_0810B1C4.bin" +gSpriteAnimations_Npc5_51:: @ 0810B1C4 + .include "animations/gSpriteAnimations_Npc5_51.s" -gUnk_0810B1E0:: @ 0810B1E0 - .incbin "npc5/gUnk_0810B1E0.bin" +gSpriteAnimations_Npc5_52:: @ 0810B1E0 + .include "animations/gSpriteAnimations_Npc5_52.s" -gUnk_0810B1FC:: @ 0810B1FC - .incbin "npc5/gUnk_0810B1FC.bin" +gSpriteAnimations_Npc5_53:: @ 0810B1FC + .include "animations/gSpriteAnimations_Npc5_53.s" -gUnk_0810B218:: @ 0810B218 - .incbin "npc5/gUnk_0810B218.bin" +gSpriteAnimations_Npc5_54:: @ 0810B218 + .include "animations/gSpriteAnimations_Npc5_54.s" -gUnk_0810B234:: @ 0810B234 - .incbin "npc5/gUnk_0810B234.bin" +gSpriteAnimations_Npc5_55:: @ 0810B234 + .include "animations/gSpriteAnimations_Npc5_55.s" -gUnk_0810B250:: @ 0810B250 - .incbin "npc5/gUnk_0810B250.bin" +gSpriteAnimations_Npc5_56:: @ 0810B250 + .include "animations/gSpriteAnimations_Npc5_56.s" -gUnk_0810B280:: @ 0810B280 - .incbin "npc5/gUnk_0810B280.bin" +gSpriteAnimations_Npc5_57:: @ 0810B280 + .include "animations/gSpriteAnimations_Npc5_57.s" -gUnk_0810B2B0:: @ 0810B2B0 - .incbin "npc5/gUnk_0810B2B0.bin" +gSpriteAnimations_Npc5_58:: @ 0810B2B0 + .include "animations/gSpriteAnimations_Npc5_58.s" -gUnk_0810B2E0:: @ 0810B2E0 - .incbin "npc5/gUnk_0810B2E0.bin" +gSpriteAnimations_Npc5_59:: @ 0810B2E0 + .include "animations/gSpriteAnimations_Npc5_59.s" -gUnk_0810B310:: @ 0810B310 - .incbin "npc5/gUnk_0810B310.bin" +gSpriteAnimations_Npc5_60:: @ 0810B310 + .include "animations/gSpriteAnimations_Npc5_60.s" -gUnk_0810B340:: @ 0810B340 - .incbin "npc5/gUnk_0810B340.bin" +gSpriteAnimations_Npc5_61:: @ 0810B340 + .include "animations/gSpriteAnimations_Npc5_61.s" -gUnk_0810B370:: @ 0810B370 - .incbin "npc5/gUnk_0810B370.bin" +gSpriteAnimations_Npc5_62:: @ 0810B370 + .include "animations/gSpriteAnimations_Npc5_62.s" -gUnk_0810B3A0:: @ 0810B3A0 - .incbin "npc5/gUnk_0810B3A0.bin" +gSpriteAnimations_Npc5_63:: @ 0810B3A0 + .include "animations/gSpriteAnimations_Npc5_63.s" -gUnk_0810B3D0:: @ 0810B3D0 - .incbin "npc5/gUnk_0810B3D0.bin" +gSpriteAnimations_Npc5_64:: @ 0810B3D0 + .include "animations/gSpriteAnimations_Npc5_64.s" -gUnk_0810B3F8:: @ 0810B3F8 - .incbin "npc5/gUnk_0810B3F8.bin" +gSpriteAnimations_Npc5_65:: @ 0810B3F8 + .include "animations/gSpriteAnimations_Npc5_65.s" -gUnk_0810B420:: @ 0810B420 - .incbin "npc5/gUnk_0810B420.bin" +gSpriteAnimations_Npc5_66:: @ 0810B420 + .include "animations/gSpriteAnimations_Npc5_66.s" -gUnk_0810B448:: @ 0810B448 - .incbin "npc5/gUnk_0810B448.bin" +gSpriteAnimations_Npc5_67:: @ 0810B448 + .include "animations/gSpriteAnimations_Npc5_67.s" -gUnk_0810B470:: @ 0810B470 - .incbin "npc5/gUnk_0810B470.bin" +gSpriteAnimations_Npc5_68:: @ 0810B470 + .include "animations/gSpriteAnimations_Npc5_68.s" -gUnk_0810B489:: @ 0810B489 - .incbin "npc5/gUnk_0810B489.bin" +gSpriteAnimations_Npc5_72:: @ 0810B489 + .include "animations/gSpriteAnimations_Npc5_72.s" -gUnk_0810B48E:: @ 0810B48E - .incbin "npc5/gUnk_0810B48E.bin" +gSpriteAnimations_Npc5_76:: @ 0810B48E + .include "animations/gSpriteAnimations_Npc5_76.s" -gUnk_0810B4A7:: @ 0810B4A7 - .incbin "npc5/gUnk_0810B4A7.bin" +gSpriteAnimations_Npc5_80:: @ 0810B4A7 + .include "animations/gSpriteAnimations_Npc5_80.s" -gUnk_0810B4DC:: @ 0810B4DC - .incbin "npc5/gUnk_0810B4DC.bin" +gSpriteAnimations_Npc5_84:: @ 0810B4DC + .include "animations/gSpriteAnimations_Npc5_84.s" gSpriteAnimations_Npc5:: @ 0810B4EC - .4byte gUnk_0810AC78 - .4byte gUnk_0810AC81 - .4byte gUnk_0810AC9A - .4byte gUnk_0810ACB3 - .4byte gUnk_0810ACCC - .4byte gUnk_0810ACED - .4byte gUnk_0810AD0E - .4byte gUnk_0810AD2F - .4byte gUnk_0810AD50 - .4byte gUnk_0810AD71 - .4byte gUnk_0810AD92 - .4byte gUnk_0810ADB3 - .4byte gUnk_0810ADD4 - .4byte gUnk_0810ADF5 - .4byte gUnk_0810AE16 - .4byte gUnk_0810AE37 - .4byte gUnk_0810AE58 - .4byte gUnk_0810AE7C - .4byte gUnk_0810AEA0 - .4byte gUnk_0810AEC4 - .4byte gUnk_0810AEE8 - .4byte gUnk_0810AF19 - .4byte gUnk_0810AF4A - .4byte gUnk_0810AF7B - .4byte gUnk_0810AFAC - .4byte gUnk_0810AFCD - .4byte gUnk_0810AFEE - .4byte gUnk_0810B00F - .4byte gUnk_0810B030 - .4byte gUnk_0810B03C - .4byte gUnk_0810B048 - .4byte gUnk_0810B054 - .4byte gUnk_0810B060 - .4byte gUnk_0810B071 - .4byte gUnk_0810B082 - .4byte gUnk_0810B093 - .4byte gUnk_0810B0A4 - .4byte gUnk_0810B0B5 - .4byte gUnk_0810B0C6 - .4byte gUnk_0810B0D7 - .4byte gUnk_0810B0E8 - .4byte gUnk_0810B15F - .4byte gUnk_0810B14E - .4byte gUnk_0810B13D - .4byte gUnk_0810B12C - .4byte gUnk_0810B11B - .4byte gUnk_0810B10A - .4byte gUnk_0810B0F9 - .4byte gUnk_0810B170 - .4byte gUnk_0810B18C - .4byte gUnk_0810B1A8 - .4byte gUnk_0810B1C4 - .4byte gUnk_0810B1E0 - .4byte gUnk_0810B1FC - .4byte gUnk_0810B218 - .4byte gUnk_0810B234 - .4byte gUnk_0810B250 - .4byte gUnk_0810B280 - .4byte gUnk_0810B2B0 - .4byte gUnk_0810B2E0 - .4byte gUnk_0810B310 - .4byte gUnk_0810B340 - .4byte gUnk_0810B370 - .4byte gUnk_0810B3A0 - .4byte gUnk_0810B3D0 - .4byte gUnk_0810B3F8 - .4byte gUnk_0810B420 - .4byte gUnk_0810B448 - .4byte gUnk_0810B470 - .4byte gUnk_0810B470 - .4byte gUnk_0810B470 - .4byte gUnk_0810B470 - .4byte gUnk_0810B489 - .4byte gUnk_0810B489 - .4byte gUnk_0810B489 - .4byte gUnk_0810B489 - .4byte gUnk_0810B48E - .4byte gUnk_0810B48E - .4byte gUnk_0810B48E - .4byte gUnk_0810B48E - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4A7 - .4byte gUnk_0810B4DC - .4byte gUnk_0810B4DC - .4byte gUnk_0810B4DC - .4byte gUnk_0810B4DC + .4byte gSpriteAnimations_Npc5_0 + .4byte gSpriteAnimations_Npc5_1 + .4byte gSpriteAnimations_Npc5_2 + .4byte gSpriteAnimations_Npc5_3 + .4byte gSpriteAnimations_Npc5_4 + .4byte gSpriteAnimations_Npc5_5 + .4byte gSpriteAnimations_Npc5_6 + .4byte gSpriteAnimations_Npc5_7 + .4byte gSpriteAnimations_Npc5_8 + .4byte gSpriteAnimations_Npc5_9 + .4byte gSpriteAnimations_Npc5_10 + .4byte gSpriteAnimations_Npc5_11 + .4byte gSpriteAnimations_Npc5_12 + .4byte gSpriteAnimations_Npc5_13 + .4byte gSpriteAnimations_Npc5_14 + .4byte gSpriteAnimations_Npc5_15 + .4byte gSpriteAnimations_Npc5_16 + .4byte gSpriteAnimations_Npc5_17 + .4byte gSpriteAnimations_Npc5_18 + .4byte gSpriteAnimations_Npc5_19 + .4byte gSpriteAnimations_Npc5_20 + .4byte gSpriteAnimations_Npc5_21 + .4byte gSpriteAnimations_Npc5_22 + .4byte gSpriteAnimations_Npc5_23 + .4byte gSpriteAnimations_Npc5_24 + .4byte gSpriteAnimations_Npc5_25 + .4byte gSpriteAnimations_Npc5_26 + .4byte gSpriteAnimations_Npc5_27 + .4byte gSpriteAnimations_Npc5_28 + .4byte gSpriteAnimations_Npc5_29 + .4byte gSpriteAnimations_Npc5_30 + .4byte gSpriteAnimations_Npc5_31 + .4byte gSpriteAnimations_Npc5_32 + .4byte gSpriteAnimations_Npc5_33 + .4byte gSpriteAnimations_Npc5_34 + .4byte gSpriteAnimations_Npc5_35 + .4byte gSpriteAnimations_Npc5_36 + .4byte gSpriteAnimations_Npc5_37 + .4byte gSpriteAnimations_Npc5_38 + .4byte gSpriteAnimations_Npc5_39 + .4byte gSpriteAnimations_Npc5_40 + .4byte gSpriteAnimations_Npc5_41 + .4byte gSpriteAnimations_Npc5_42 + .4byte gSpriteAnimations_Npc5_43 + .4byte gSpriteAnimations_Npc5_44 + .4byte gSpriteAnimations_Npc5_45 + .4byte gSpriteAnimations_Npc5_46 + .4byte gSpriteAnimations_Npc5_47 + .4byte gSpriteAnimations_Npc5_48 + .4byte gSpriteAnimations_Npc5_49 + .4byte gSpriteAnimations_Npc5_50 + .4byte gSpriteAnimations_Npc5_51 + .4byte gSpriteAnimations_Npc5_52 + .4byte gSpriteAnimations_Npc5_53 + .4byte gSpriteAnimations_Npc5_54 + .4byte gSpriteAnimations_Npc5_55 + .4byte gSpriteAnimations_Npc5_56 + .4byte gSpriteAnimations_Npc5_57 + .4byte gSpriteAnimations_Npc5_58 + .4byte gSpriteAnimations_Npc5_59 + .4byte gSpriteAnimations_Npc5_60 + .4byte gSpriteAnimations_Npc5_61 + .4byte gSpriteAnimations_Npc5_62 + .4byte gSpriteAnimations_Npc5_63 + .4byte gSpriteAnimations_Npc5_64 + .4byte gSpriteAnimations_Npc5_65 + .4byte gSpriteAnimations_Npc5_66 + .4byte gSpriteAnimations_Npc5_67 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_68 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_72 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_76 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_80 + .4byte gSpriteAnimations_Npc5_84 + .4byte gSpriteAnimations_Npc5_84 + .4byte gSpriteAnimations_Npc5_84 + .4byte gSpriteAnimations_Npc5_84 .4byte 00000000 diff --git a/data/animations/npc/percy.s b/data/animations/npc/percy.s index 21363341..c5ff4d88 100644 --- a/data/animations/npc/percy.s +++ b/data/animations/npc/percy.s @@ -4,45 +4,45 @@ .section .rodata .align 2 -gUnk_08112E5C:: @ 08112E5C - .incbin "percy/gUnk_08112E5C.bin" +gSpriteAnimations_Percy_0:: @ 08112E5C + .include "animations/gSpriteAnimations_Percy_0.s" -gUnk_08112EA5:: @ 08112EA5 - .incbin "percy/gUnk_08112EA5.bin" +gSpriteAnimations_Percy_4:: @ 08112EA5 + .include "animations/gSpriteAnimations_Percy_4.s" -gUnk_08112EAA:: @ 08112EAA - .incbin "percy/gUnk_08112EAA.bin" +gSpriteAnimations_Percy_7:: @ 08112EAA + .include "animations/gSpriteAnimations_Percy_7.s" -gUnk_08112EAF:: @ 08112EAF - .incbin "percy/gUnk_08112EAF.bin" +gSpriteAnimations_Percy_5:: @ 08112EAF + .include "animations/gSpriteAnimations_Percy_5.s" -gUnk_08112EB4:: @ 08112EB4 - .incbin "percy/gUnk_08112EB4.bin" +gSpriteAnimations_Percy_8:: @ 08112EB4 + .include "animations/gSpriteAnimations_Percy_8.s" -gUnk_08112F25:: @ 08112F25 - .incbin "percy/gUnk_08112F25.bin" +gSpriteAnimations_Percy_12:: @ 08112F25 + .include "animations/gSpriteAnimations_Percy_12.s" -gUnk_08112F2A:: @ 08112F2A - .incbin "percy/gUnk_08112F2A.bin" +gSpriteAnimations_Percy_15:: @ 08112F2A + .include "animations/gSpriteAnimations_Percy_15.s" -gUnk_08112F2F:: @ 08112F2F - .incbin "percy/gUnk_08112F2F.bin" +gSpriteAnimations_Percy_13:: @ 08112F2F + .include "animations/gSpriteAnimations_Percy_13.s" gSpriteAnimations_Percy:: @ 08112F34 - .4byte gUnk_08112E5C - .4byte gUnk_08112E5C - .4byte gUnk_08112E5C - .4byte gUnk_08112E5C - .4byte gUnk_08112EA5 - .4byte gUnk_08112EAF - .4byte gUnk_08112EA5 - .4byte gUnk_08112EAA - .4byte gUnk_08112EB4 - .4byte gUnk_08112EB4 - .4byte gUnk_08112EB4 - .4byte gUnk_08112EB4 - .4byte gUnk_08112F25 - .4byte gUnk_08112F2F - .4byte gUnk_08112F25 - .4byte gUnk_08112F2A + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_0 + .4byte gSpriteAnimations_Percy_4 + .4byte gSpriteAnimations_Percy_5 + .4byte gSpriteAnimations_Percy_4 + .4byte gSpriteAnimations_Percy_7 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_8 + .4byte gSpriteAnimations_Percy_12 + .4byte gSpriteAnimations_Percy_13 + .4byte gSpriteAnimations_Percy_12 + .4byte gSpriteAnimations_Percy_15 .4byte 00000000 diff --git a/data/animations/npc/pina.s b/data/animations/npc/pina.s index 59b63d2a..04efb6b7 100644 --- a/data/animations/npc/pina.s +++ b/data/animations/npc/pina.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0810CE54:: @ 0810CE54 - .incbin "pina/gUnk_0810CE54.bin" +gSpriteAnimations_Pina_0:: @ 0810CE54 + .include "animations/gSpriteAnimations_Pina_0.s" -gUnk_0810CEA1:: @ 0810CEA1 - .incbin "pina/gUnk_0810CEA1.bin" +gSpriteAnimations_Pina_8:: @ 0810CEA1 + .include "animations/gSpriteAnimations_Pina_8.s" -gUnk_0810CEEE:: @ 0810CEEE - .incbin "pina/gUnk_0810CEEE.bin" +gSpriteAnimations_Pina_9:: @ 0810CEEE + .include "animations/gSpriteAnimations_Pina_9.s" -gUnk_0810CF0F:: @ 0810CF0F - .incbin "pina/gUnk_0810CF0F.bin" +gSpriteAnimations_Pina_4:: @ 0810CF0F + .include "animations/gSpriteAnimations_Pina_4.s" -gUnk_0810CF14:: @ 0810CF14 - .incbin "pina/gUnk_0810CF14.bin" +gSpriteAnimations_Pina_5:: @ 0810CF14 + .include "animations/gSpriteAnimations_Pina_5.s" -gUnk_0810CF19:: @ 0810CF19 - .incbin "pina/gUnk_0810CF19.bin" +gSpriteAnimations_Pina_7:: @ 0810CF19 + .include "animations/gSpriteAnimations_Pina_7.s" gSpriteAnimations_Pina:: @ 0810CF20 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CE54 - .4byte gUnk_0810CF0F - .4byte gUnk_0810CF14 - .4byte gUnk_0810CF0F - .4byte gUnk_0810CF19 - .4byte gUnk_0810CEA1 - .4byte gUnk_0810CEEE + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_0 + .4byte gSpriteAnimations_Pina_4 + .4byte gSpriteAnimations_Pina_5 + .4byte gSpriteAnimations_Pina_4 + .4byte gSpriteAnimations_Pina_7 + .4byte gSpriteAnimations_Pina_8 + .4byte gSpriteAnimations_Pina_9 .4byte 00000000 diff --git a/data/animations/npc/pita.s b/data/animations/npc/pita.s index c121abcf..1cd2e612 100644 --- a/data/animations/npc/pita.s +++ b/data/animations/npc/pita.s @@ -4,19 +4,19 @@ .section .rodata @ .align 2 -gUnk_0810C445:: @ 0810C445 - .incbin "pita/gUnk_0810C445.bin" +gSpriteAnimations_Pita_0:: @ 0810C445 + .include "animations/gSpriteAnimations_Pita_0.s" -gUnk_0810C44A:: @ 0810C44A - .incbin "pita/gUnk_0810C44A.bin" +gSpriteAnimations_Pita_4:: @ 0810C44A + .include "animations/gSpriteAnimations_Pita_4.s" gSpriteAnimations_Pita:: @ 0810C468 - .4byte gUnk_0810C445 - .4byte gUnk_0810C445 - .4byte gUnk_0810C445 - .4byte gUnk_0810C445 - .4byte gUnk_0810C44A - .4byte gUnk_0810C44A - .4byte gUnk_0810C44A - .4byte gUnk_0810C44A + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_0 + .4byte gSpriteAnimations_Pita_4 + .4byte gSpriteAnimations_Pita_4 + .4byte gSpriteAnimations_Pita_4 + .4byte gSpriteAnimations_Pita_4 .4byte 00000000 diff --git a/data/animations/npc/postman.s b/data/animations/npc/postman.s index b9135efa..383efe4c 100644 --- a/data/animations/npc/postman.s +++ b/data/animations/npc/postman.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_0810AA90:: @ 0810AA90 - .incbin "postman/gUnk_0810AA90.bin" +gSpriteAnimations_Postman_0:: @ 0810AA90 + .include "animations/gSpriteAnimations_Postman_0.s" -gUnk_0810AAB9:: @ 0810AAB9 - .incbin "postman/gUnk_0810AAB9.bin" +gSpriteAnimations_Postman_1:: @ 0810AAB9 + .include "animations/gSpriteAnimations_Postman_1.s" -gUnk_0810AAE2:: @ 0810AAE2 - .incbin "postman/gUnk_0810AAE2.bin" +gSpriteAnimations_Postman_2:: @ 0810AAE2 + .include "animations/gSpriteAnimations_Postman_2.s" -gUnk_0810AB0B:: @ 0810AB0B - .incbin "postman/gUnk_0810AB0B.bin" +gSpriteAnimations_Postman_3:: @ 0810AB0B + .include "animations/gSpriteAnimations_Postman_3.s" -gUnk_0810AB34:: @ 0810AB34 - .incbin "postman/gUnk_0810AB34.bin" +gSpriteAnimations_Postman_4:: @ 0810AB34 + .include "animations/gSpriteAnimations_Postman_4.s" -gUnk_0810AB65:: @ 0810AB65 - .incbin "postman/gUnk_0810AB65.bin" +gSpriteAnimations_Postman_5:: @ 0810AB65 + .include "animations/gSpriteAnimations_Postman_5.s" -gUnk_0810AB96:: @ 0810AB96 - .incbin "postman/gUnk_0810AB96.bin" +gSpriteAnimations_Postman_6:: @ 0810AB96 + .include "animations/gSpriteAnimations_Postman_6.s" -gUnk_0810ABC7:: @ 0810ABC7 - .incbin "postman/gUnk_0810ABC7.bin" +gSpriteAnimations_Postman_7:: @ 0810ABC7 + .include "animations/gSpriteAnimations_Postman_7.s" gSpriteAnimations_Postman:: @ 0810ABF8 - .4byte gUnk_0810AA90 - .4byte gUnk_0810AAB9 - .4byte gUnk_0810AAE2 - .4byte gUnk_0810AB0B - .4byte gUnk_0810AB34 - .4byte gUnk_0810AB65 - .4byte gUnk_0810AB96 - .4byte gUnk_0810ABC7 + .4byte gSpriteAnimations_Postman_0 + .4byte gSpriteAnimations_Postman_1 + .4byte gSpriteAnimations_Postman_2 + .4byte gSpriteAnimations_Postman_3 + .4byte gSpriteAnimations_Postman_4 + .4byte gSpriteAnimations_Postman_5 + .4byte gSpriteAnimations_Postman_6 + .4byte gSpriteAnimations_Postman_7 .4byte 00000000 diff --git a/data/animations/npc/rem.s b/data/animations/npc/rem.s index e6387836..0f3cd5a1 100644 --- a/data/animations/npc/rem.s +++ b/data/animations/npc/rem.s @@ -4,87 +4,87 @@ .section .rodata .align 2 -gUnk_081122C0:: @ 081122C0 - .incbin "rem/gUnk_081122C0.bin" +gSpriteAnimations_Rem_1:: @ 081122C0 + .include "animations/gSpriteAnimations_Rem_1.s" -gUnk_081122C9:: @ 081122C9 - .incbin "rem/gUnk_081122C9.bin" +gSpriteAnimations_Rem_0:: @ 081122C9 + .include "animations/gSpriteAnimations_Rem_0.s" -gUnk_081122D2:: @ 081122D2 - .incbin "rem/gUnk_081122D2.bin" +gSpriteAnimations_Rem_3:: @ 081122D2 + .include "animations/gSpriteAnimations_Rem_3.s" -gUnk_081122DB:: @ 081122DB - .incbin "rem/gUnk_081122DB.bin" +gSpriteAnimations_Rem_5:: @ 081122DB + .include "animations/gSpriteAnimations_Rem_5.s" -gUnk_08112300:: @ 08112300 - .incbin "rem/gUnk_08112300.bin" +gSpriteAnimations_Rem_4:: @ 08112300 + .include "animations/gSpriteAnimations_Rem_4.s" -gUnk_08112325:: @ 08112325 - .incbin "rem/gUnk_08112325.bin" +gSpriteAnimations_Rem_7:: @ 08112325 + .include "animations/gSpriteAnimations_Rem_7.s" -gUnk_0811234A:: @ 0811234A - .incbin "rem/gUnk_0811234A.bin" +gSpriteAnimations_Rem_8:: @ 0811234A + .include "animations/gSpriteAnimations_Rem_8.s" -gUnk_08112387:: @ 08112387 - .incbin "rem/gUnk_08112387.bin" +gSpriteAnimations_Rem_9:: @ 08112387 + .include "animations/gSpriteAnimations_Rem_9.s" -gUnk_081123A0:: @ 081123A0 - .incbin "rem/gUnk_081123A0.bin" +gSpriteAnimations_Rem_10:: @ 081123A0 + .include "animations/gSpriteAnimations_Rem_10.s" -gUnk_081123C9:: @ 081123C9 - .incbin "rem/gUnk_081123C9.bin" +gSpriteAnimations_Rem_11:: @ 081123C9 + .include "animations/gSpriteAnimations_Rem_11.s" -gUnk_081123EE:: @ 081123EE - .incbin "rem/gUnk_081123EE.bin" +gSpriteAnimations_Rem_15:: @ 081123EE + .include "animations/gSpriteAnimations_Rem_15.s" -gUnk_08112467:: @ 08112467 - .incbin "rem/gUnk_08112467.bin" +gSpriteAnimations_Rem_12:: @ 08112467 + .include "animations/gSpriteAnimations_Rem_12.s" -gUnk_081124AC:: @ 081124AC - .incbin "rem/gUnk_081124AC.bin" +gSpriteAnimations_Rem_13:: @ 081124AC + .include "animations/gSpriteAnimations_Rem_13.s" -gUnk_081124B5:: @ 081124B5 - .incbin "rem/gUnk_081124B5.bin" +gSpriteAnimations_Rem_14:: @ 081124B5 + .include "animations/gSpriteAnimations_Rem_14.s" -gUnk_081124D2:: @ 081124D2 - .incbin "rem/gUnk_081124D2.bin" +gSpriteAnimations_Rem_16:: @ 081124D2 + .include "animations/gSpriteAnimations_Rem_16.s" -gUnk_081124EB:: @ 081124EB - .incbin "rem/gUnk_081124EB.bin" +gSpriteAnimations_Rem_17:: @ 081124EB + .include "animations/gSpriteAnimations_Rem_17.s" -gUnk_081124FF:: @ 081124FF - .incbin "rem/gUnk_081124FF.bin" +gSpriteAnimations_Rem_18:: @ 081124FF + .include "animations/gSpriteAnimations_Rem_18.s" -gUnk_08112524:: @ 08112524 - .incbin "rem/gUnk_08112524.bin" +gSpriteAnimations_Rem_19:: @ 08112524 + .include "animations/gSpriteAnimations_Rem_19.s" -gUnk_0811253D:: @ 0811253D - .incbin "rem/gUnk_0811253D.bin" +gSpriteAnimations_Rem_20:: @ 0811253D + .include "animations/gSpriteAnimations_Rem_20.s" -gUnk_08112582:: @ 08112582 - .incbin "rem/gUnk_08112582.bin" +gSpriteAnimations_Rem_21:: @ 08112582 + .include "animations/gSpriteAnimations_Rem_21.s" gSpriteAnimations_Rem:: @ 08112598 - .4byte gUnk_081122C9 - .4byte gUnk_081122C0 - .4byte gUnk_081122C9 - .4byte gUnk_081122D2 - .4byte gUnk_08112300 - .4byte gUnk_081122DB - .4byte gUnk_08112300 - .4byte gUnk_08112325 - .4byte gUnk_0811234A - .4byte gUnk_08112387 - .4byte gUnk_081123A0 - .4byte gUnk_081123C9 - .4byte gUnk_08112467 - .4byte gUnk_081124AC - .4byte gUnk_081124B5 - .4byte gUnk_081123EE - .4byte gUnk_081124D2 - .4byte gUnk_081124EB - .4byte gUnk_081124FF - .4byte gUnk_08112524 - .4byte gUnk_0811253D - .4byte gUnk_08112582 + .4byte gSpriteAnimations_Rem_0 + .4byte gSpriteAnimations_Rem_1 + .4byte gSpriteAnimations_Rem_0 + .4byte gSpriteAnimations_Rem_3 + .4byte gSpriteAnimations_Rem_4 + .4byte gSpriteAnimations_Rem_5 + .4byte gSpriteAnimations_Rem_4 + .4byte gSpriteAnimations_Rem_7 + .4byte gSpriteAnimations_Rem_8 + .4byte gSpriteAnimations_Rem_9 + .4byte gSpriteAnimations_Rem_10 + .4byte gSpriteAnimations_Rem_11 + .4byte gSpriteAnimations_Rem_12 + .4byte gSpriteAnimations_Rem_13 + .4byte gSpriteAnimations_Rem_14 + .4byte gSpriteAnimations_Rem_15 + .4byte gSpriteAnimations_Rem_16 + .4byte gSpriteAnimations_Rem_17 + .4byte gSpriteAnimations_Rem_18 + .4byte gSpriteAnimations_Rem_19 + .4byte gSpriteAnimations_Rem_20 + .4byte gSpriteAnimations_Rem_21 .4byte 00000000 diff --git a/data/animations/npc/simon.s b/data/animations/npc/simon.s index 3109a3d5..41cda78a 100644 --- a/data/animations/npc/simon.s +++ b/data/animations/npc/simon.s @@ -4,35 +4,35 @@ .section .rodata .align 2 -gUnk_0811362C:: @ 0811362C - .incbin "simon/gUnk_0811362C.bin" +gSpriteAnimations_Simon_0:: @ 0811362C + .include "animations/gSpriteAnimations_Simon_0.s" -gUnk_08113631:: @ 08113631 - .incbin "simon/gUnk_08113631.bin" +gSpriteAnimations_Simon_1:: @ 08113631 + .include "animations/gSpriteAnimations_Simon_1.s" -gUnk_08113636:: @ 08113636 - .incbin "simon/gUnk_08113636.bin" +gSpriteAnimations_Simon_3:: @ 08113636 + .include "animations/gSpriteAnimations_Simon_3.s" -gUnk_0811363B:: @ 0811363B - .incbin "simon/gUnk_0811363B.bin" +gSpriteAnimations_Simon_4:: @ 0811363B + .include "animations/gSpriteAnimations_Simon_4.s" -gUnk_08113640:: @ 08113640 - .incbin "simon/gUnk_08113640.bin" +gSpriteAnimations_Simon_5:: @ 08113640 + .include "animations/gSpriteAnimations_Simon_5.s" -gUnk_08113645:: @ 08113645 - .incbin "simon/gUnk_08113645.bin" +gSpriteAnimations_Simon_7:: @ 08113645 + .include "animations/gSpriteAnimations_Simon_7.s" -gUnk_0811364A:: @ 0811364A - .incbin "simon/gUnk_0811364A.bin" +gSpriteAnimations_Simon_8:: @ 0811364A + .include "animations/gSpriteAnimations_Simon_8.s" gSpriteAnimations_Simon:: @ 081136B0 - .4byte gUnk_0811362C - .4byte gUnk_08113631 - .4byte gUnk_0811362C - .4byte gUnk_08113636 - .4byte gUnk_0811363B - .4byte gUnk_08113640 - .4byte gUnk_0811363B - .4byte gUnk_08113645 - .4byte gUnk_0811364A + .4byte gSpriteAnimations_Simon_0 + .4byte gSpriteAnimations_Simon_1 + .4byte gSpriteAnimations_Simon_0 + .4byte gSpriteAnimations_Simon_3 + .4byte gSpriteAnimations_Simon_4 + .4byte gSpriteAnimations_Simon_5 + .4byte gSpriteAnimations_Simon_4 + .4byte gSpriteAnimations_Simon_7 + .4byte gSpriteAnimations_Simon_8 .4byte 00000000 diff --git a/data/animations/npc/sittingPerson.s b/data/animations/npc/sittingPerson.s index bb29d1b8..8eb01f03 100644 --- a/data/animations/npc/sittingPerson.s +++ b/data/animations/npc/sittingPerson.s @@ -4,22 +4,22 @@ .section .rodata .align 2 -gUnk_0810CDA0:: @ 0810CDA0 - .incbin "sittingPerson/gUnk_0810CDA0.bin" +gSpriteAnimations_SittingPerson_0:: @ 0810CDA0 + .include "animations/gSpriteAnimations_SittingPerson_0.s" -gUnk_0810CDB1:: @ 0810CDB1 - .incbin "sittingPerson/gUnk_0810CDB1.bin" +gSpriteAnimations_SittingPerson_2:: @ 0810CDB1 + .include "animations/gSpriteAnimations_SittingPerson_2.s" -gUnk_0810CDC2:: @ 0810CDC2 - .incbin "sittingPerson/gUnk_0810CDC2.bin" +gSpriteAnimations_SittingPerson_3:: @ 0810CDC2 + .include "animations/gSpriteAnimations_SittingPerson_3.s" gSpriteAnimations_SittingPerson:: @ 0810CDD4 - .4byte gUnk_0810CDA0 - .4byte gUnk_0810CDA0 - .4byte gUnk_0810CDB1 - .4byte gUnk_0810CDC2 - .4byte gUnk_0810CDC2 - .4byte gUnk_0810CDC2 - .4byte gUnk_0810CDB1 - .4byte gUnk_0810CDA0 + .4byte gSpriteAnimations_SittingPerson_0 + .4byte gSpriteAnimations_SittingPerson_0 + .4byte gSpriteAnimations_SittingPerson_2 + .4byte gSpriteAnimations_SittingPerson_3 + .4byte gSpriteAnimations_SittingPerson_3 + .4byte gSpriteAnimations_SittingPerson_3 + .4byte gSpriteAnimations_SittingPerson_2 + .4byte gSpriteAnimations_SittingPerson_0 .4byte 00000000 diff --git a/data/animations/npc/smallTownMinish.s b/data/animations/npc/smallTownMinish.s index 941807f1..55df575e 100644 --- a/data/animations/npc/smallTownMinish.s +++ b/data/animations/npc/smallTownMinish.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_081144C8:: @ 081144C8 - .incbin "smallTownMinish/gUnk_081144C8.bin" +gSpriteAnimations_SmallTownMinish_0:: @ 081144C8 + .include "animations/gSpriteAnimations_SmallTownMinish_0.s" -gUnk_081144CD:: @ 081144CD - .incbin "smallTownMinish/gUnk_081144CD.bin" +gSpriteAnimations_SmallTownMinish_1:: @ 081144CD + .include "animations/gSpriteAnimations_SmallTownMinish_1.s" -gUnk_081144D2:: @ 081144D2 - .incbin "smallTownMinish/gUnk_081144D2.bin" +gSpriteAnimations_SmallTownMinish_2:: @ 081144D2 + .include "animations/gSpriteAnimations_SmallTownMinish_2.s" -gUnk_081144D7:: @ 081144D7 - .incbin "smallTownMinish/gUnk_081144D7.bin" +gSpriteAnimations_SmallTownMinish_3:: @ 081144D7 + .include "animations/gSpriteAnimations_SmallTownMinish_3.s" gSpriteAnimations_SmallTownMinish:: @ 081144DC - .4byte gUnk_081144C8 - .4byte gUnk_081144CD - .4byte gUnk_081144D2 - .4byte gUnk_081144D7 + .4byte gSpriteAnimations_SmallTownMinish_0 + .4byte gSpriteAnimations_SmallTownMinish_1 + .4byte gSpriteAnimations_SmallTownMinish_2 + .4byte gSpriteAnimations_SmallTownMinish_3 .4byte 00000000 diff --git a/data/animations/npc/smith.s b/data/animations/npc/smith.s index ede103a3..5b7039c0 100644 --- a/data/animations/npc/smith.s +++ b/data/animations/npc/smith.s @@ -4,66 +4,66 @@ .section .rodata .align 2 -gUnk_081103E4:: @ 081103E4 - .incbin "smith/gUnk_081103E4.bin" +gSpriteAnimations_Smith_0:: @ 081103E4 + .include "animations/gSpriteAnimations_Smith_0.s" -gUnk_081103E9:: @ 081103E9 - .incbin "smith/gUnk_081103E9.bin" +gSpriteAnimations_Smith_1:: @ 081103E9 + .include "animations/gSpriteAnimations_Smith_1.s" -gUnk_081103EE:: @ 081103EE - .incbin "smith/gUnk_081103EE.bin" +gSpriteAnimations_Smith_2:: @ 081103EE + .include "animations/gSpriteAnimations_Smith_2.s" -gUnk_081103F3:: @ 081103F3 - .incbin "smith/gUnk_081103F3.bin" +gSpriteAnimations_Smith_3:: @ 081103F3 + .include "animations/gSpriteAnimations_Smith_3.s" -gUnk_081103F8:: @ 081103F8 - .incbin "smith/gUnk_081103F8.bin" +gSpriteAnimations_Smith_4:: @ 081103F8 + .include "animations/gSpriteAnimations_Smith_4.s" -gUnk_08110409:: @ 08110409 - .incbin "smith/gUnk_08110409.bin" +gSpriteAnimations_Smith_6:: @ 08110409 + .include "animations/gSpriteAnimations_Smith_6.s" -gUnk_0811041A:: @ 0811041A - .incbin "smith/gUnk_0811041A.bin" +gSpriteAnimations_Smith_5:: @ 0811041A + .include "animations/gSpriteAnimations_Smith_5.s" -gUnk_0811042B:: @ 0811042B - .incbin "smith/gUnk_0811042B.bin" +gSpriteAnimations_Smith_7:: @ 0811042B + .include "animations/gSpriteAnimations_Smith_7.s" -gUnk_0811043C:: @ 0811043C - .incbin "smith/gUnk_0811043C.bin" +gSpriteAnimations_Smith_8:: @ 0811043C + .include "animations/gSpriteAnimations_Smith_8.s" -gUnk_08110441:: @ 08110441 - .incbin "smith/gUnk_08110441.bin" +gSpriteAnimations_Smith_9:: @ 08110441 + .include "animations/gSpriteAnimations_Smith_9.s" -gUnk_08110446:: @ 08110446 - .incbin "smith/gUnk_08110446.bin" +gSpriteAnimations_Smith_11:: @ 08110446 + .include "animations/gSpriteAnimations_Smith_11.s" -gUnk_0811044B:: @ 0811044B - .incbin "smith/gUnk_0811044B.bin" +gSpriteAnimations_Smith_12:: @ 0811044B + .include "animations/gSpriteAnimations_Smith_12.s" -gUnk_08110474:: @ 08110474 - .incbin "smith/gUnk_08110474.bin" +gSpriteAnimations_Smith_13:: @ 08110474 + .include "animations/gSpriteAnimations_Smith_13.s" -gUnk_08110479:: @ 08110479 - .incbin "smith/gUnk_08110479.bin" +gSpriteAnimations_Smith_14:: @ 08110479 + .include "animations/gSpriteAnimations_Smith_14.s" -gUnk_0811047E:: @ 0811047E - .incbin "smith/gUnk_0811047E.bin" +gSpriteAnimations_Smith_15:: @ 0811047E + .include "animations/gSpriteAnimations_Smith_15.s" gSpriteAnimations_Smith:: @ 08110484 - .4byte gUnk_081103E4 - .4byte gUnk_081103E9 - .4byte gUnk_081103EE - .4byte gUnk_081103F3 - .4byte gUnk_081103F8 - .4byte gUnk_0811041A - .4byte gUnk_08110409 - .4byte gUnk_0811042B - .4byte gUnk_0811043C - .4byte gUnk_08110441 - .4byte gUnk_0811043C - .4byte gUnk_08110446 - .4byte gUnk_0811044B - .4byte gUnk_08110474 - .4byte gUnk_08110479 - .4byte gUnk_0811047E + .4byte gSpriteAnimations_Smith_0 + .4byte gSpriteAnimations_Smith_1 + .4byte gSpriteAnimations_Smith_2 + .4byte gSpriteAnimations_Smith_3 + .4byte gSpriteAnimations_Smith_4 + .4byte gSpriteAnimations_Smith_5 + .4byte gSpriteAnimations_Smith_6 + .4byte gSpriteAnimations_Smith_7 + .4byte gSpriteAnimations_Smith_8 + .4byte gSpriteAnimations_Smith_9 + .4byte gSpriteAnimations_Smith_8 + .4byte gSpriteAnimations_Smith_11 + .4byte gSpriteAnimations_Smith_12 + .4byte gSpriteAnimations_Smith_13 + .4byte gSpriteAnimations_Smith_14 + .4byte gSpriteAnimations_Smith_15 .4byte 00000000 diff --git a/data/animations/npc/stamp.s b/data/animations/npc/stamp.s index 1d2852fc..15efe269 100644 --- a/data/animations/npc/stamp.s +++ b/data/animations/npc/stamp.s @@ -4,18 +4,18 @@ .section .rodata .align 2 -gUnk_0810C2F4:: @ 0810C2F4 - .incbin "stamp/gUnk_0810C2F4.bin" +gSpriteAnimations_Stamp_0:: @ 0810C2F4 + .include "animations/gSpriteAnimations_Stamp_0.s" -gUnk_0810C325:: @ 0810C325 - .incbin "stamp/gUnk_0810C325.bin" +gSpriteAnimations_Stamp_4:: @ 0810C325 + .include "animations/gSpriteAnimations_Stamp_4.s" gSpriteAnimations_Stamp:: @ 0810C32C - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C2F4 - .4byte gUnk_0810C325 - .4byte gUnk_0810C325 - .4byte gUnk_0810C325 - .4byte gUnk_0810C325 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_0 + .4byte gSpriteAnimations_Stamp_4 + .4byte gSpriteAnimations_Stamp_4 + .4byte gSpriteAnimations_Stamp_4 + .4byte gSpriteAnimations_Stamp_4 diff --git a/data/animations/npc/stockwell.s b/data/animations/npc/stockwell.s index 9226b9ba..b2590bc7 100644 --- a/data/animations/npc/stockwell.s +++ b/data/animations/npc/stockwell.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0810FDE8:: @ 0810FDE8 - .incbin "stockwell/gUnk_0810FDE8.bin" +gSpriteAnimations_Stockwell_1:: @ 0810FDE8 + .include "animations/gSpriteAnimations_Stockwell_1.s" -gUnk_0810FDED:: @ 0810FDED - .incbin "stockwell/gUnk_0810FDED.bin" +gSpriteAnimations_Stockwell_0:: @ 0810FDED + .include "animations/gSpriteAnimations_Stockwell_0.s" -gUnk_0810FDF2:: @ 0810FDF2 - .incbin "stockwell/gUnk_0810FDF2.bin" +gSpriteAnimations_Stockwell_3:: @ 0810FDF2 + .include "animations/gSpriteAnimations_Stockwell_3.s" -gUnk_0810FDF7:: @ 0810FDF7 - .incbin "stockwell/gUnk_0810FDF7.bin" +gSpriteAnimations_Stockwell_4:: @ 0810FDF7 + .include "animations/gSpriteAnimations_Stockwell_4.s" -gUnk_0810FE03:: @ 0810FE03 - .incbin "stockwell/gUnk_0810FE03.bin" +gSpriteAnimations_Stockwell_5:: @ 0810FE03 + .include "animations/gSpriteAnimations_Stockwell_5.s" -gUnk_0810FE1F:: @ 0810FE1F - .incbin "stockwell/gUnk_0810FE1F.bin" +gSpriteAnimations_Stockwell_6:: @ 0810FE1F + .include "animations/gSpriteAnimations_Stockwell_6.s" -gUnk_0810FE68:: @ 0810FE68 - .incbin "stockwell/gUnk_0810FE68.bin" +gSpriteAnimations_Stockwell_7:: @ 0810FE68 + .include "animations/gSpriteAnimations_Stockwell_7.s" gSpriteAnimations_Stockwell:: @ 0810FE90 - .4byte gUnk_0810FDED - .4byte gUnk_0810FDE8 - .4byte gUnk_0810FDED - .4byte gUnk_0810FDF2 - .4byte gUnk_0810FDF7 - .4byte gUnk_0810FE03 - .4byte gUnk_0810FE1F - .4byte gUnk_0810FE68 + .4byte gSpriteAnimations_Stockwell_0 + .4byte gSpriteAnimations_Stockwell_1 + .4byte gSpriteAnimations_Stockwell_0 + .4byte gSpriteAnimations_Stockwell_3 + .4byte gSpriteAnimations_Stockwell_4 + .4byte gSpriteAnimations_Stockwell_5 + .4byte gSpriteAnimations_Stockwell_6 + .4byte gSpriteAnimations_Stockwell_7 diff --git a/data/animations/npc/sturgeon.s b/data/animations/npc/sturgeon.s index 68d7ef44..9b38a7b6 100644 --- a/data/animations/npc/sturgeon.s +++ b/data/animations/npc/sturgeon.s @@ -4,33 +4,33 @@ .section .rodata .align 2 -gUnk_0810FB78:: @ 0810FB78 - .incbin "sturgeon/gUnk_0810FB78.bin" +gSpriteAnimations_Sturgeon_0:: @ 0810FB78 + .include "animations/gSpriteAnimations_Sturgeon_0.s" -gUnk_0810FB7D:: @ 0810FB7D - .incbin "sturgeon/gUnk_0810FB7D.bin" +gSpriteAnimations_Sturgeon_1:: @ 0810FB7D + .include "animations/gSpriteAnimations_Sturgeon_1.s" -gUnk_0810FB82:: @ 0810FB82 - .incbin "sturgeon/gUnk_0810FB82.bin" +gSpriteAnimations_Sturgeon_2:: @ 0810FB82 + .include "animations/gSpriteAnimations_Sturgeon_2.s" -gUnk_0810FB87:: @ 0810FB87 - .incbin "sturgeon/gUnk_0810FB87.bin" +gSpriteAnimations_Sturgeon_3:: @ 0810FB87 + .include "animations/gSpriteAnimations_Sturgeon_3.s" -gUnk_0810FB8C:: @ 0810FB8C - .incbin "sturgeon/gUnk_0810FB8C.bin" +gSpriteAnimations_Sturgeon_8:: @ 0810FB8C + .include "animations/gSpriteAnimations_Sturgeon_8.s" -gUnk_0810FBAD:: @ 0810FBAD - .incbin "sturgeon/gUnk_0810FBAD.bin" +gSpriteAnimations_Sturgeon_9:: @ 0810FBAD + .include "animations/gSpriteAnimations_Sturgeon_9.s" gSpriteAnimations_Sturgeon:: @ 0810FBD0 - .4byte gUnk_0810FB78 - .4byte gUnk_0810FB7D - .4byte gUnk_0810FB82 - .4byte gUnk_0810FB87 - .4byte gUnk_0810FB24 - .4byte gUnk_0810FB39 - .4byte gUnk_0810FB4E - .4byte gUnk_0810FB63 - .4byte gUnk_0810FB8C - .4byte gUnk_0810FBAD + .4byte gSpriteAnimations_Sturgeon_0 + .4byte gSpriteAnimations_Sturgeon_1 + .4byte gSpriteAnimations_Sturgeon_2 + .4byte gSpriteAnimations_Sturgeon_3 + .4byte gSpriteAnimations_Sturgeon_4 + .4byte gSpriteAnimations_Sturgeon_5 + .4byte gSpriteAnimations_Sturgeon_6 + .4byte gSpriteAnimations_Sturgeon_7 + .4byte gSpriteAnimations_Sturgeon_8 + .4byte gSpriteAnimations_Sturgeon_9 .4byte 00000000 diff --git a/data/animations/npc/syrup.s b/data/animations/npc/syrup.s index f2436a3b..023595fb 100644 --- a/data/animations/npc/syrup.s +++ b/data/animations/npc/syrup.s @@ -4,20 +4,20 @@ .section .rodata .align 2 -gUnk_08112208:: @ 08112208 - .incbin "syrup/gUnk_08112208.bin" +gSpriteAnimations_Syrup_0:: @ 08112208 + .include "animations/gSpriteAnimations_Syrup_0.s" gSpriteAnimations_Syrup:: @ 0811222C - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 - .4byte gUnk_08112208 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 + .4byte gSpriteAnimations_Syrup_0 .4byte 00000000 diff --git a/data/animations/npc/talon.s b/data/animations/npc/talon.s index 433a170e..16d800b6 100644 --- a/data/animations/npc/talon.s +++ b/data/animations/npc/talon.s @@ -4,37 +4,37 @@ .section .rodata .align 2 -gUnk_0810FEE0:: @ 0810FEE0 - .incbin "talon/gUnk_0810FEE0.bin" +gSpriteAnimations_Talon_2:: @ 0810FEE0 + .include "animations/gSpriteAnimations_Talon_2.s" -gUnk_0810FEE5:: @ 0810FEE5 - .incbin "talon/gUnk_0810FEE5.bin" +gSpriteAnimations_Talon_0:: @ 0810FEE5 + .include "animations/gSpriteAnimations_Talon_0.s" -gUnk_0810FEEA:: @ 0810FEEA - .incbin "talon/gUnk_0810FEEA.bin" +gSpriteAnimations_Talon_3:: @ 0810FEEA + .include "animations/gSpriteAnimations_Talon_3.s" -gUnk_0810FEEF:: @ 0810FEEF - .incbin "talon/gUnk_0810FEEF.bin" +gSpriteAnimations_Talon_1:: @ 0810FEEF + .include "animations/gSpriteAnimations_Talon_1.s" -gUnk_0810FEF4:: @ 0810FEF4 - .incbin "talon/gUnk_0810FEF4.bin" +gSpriteAnimations_Talon_4:: @ 0810FEF4 + .include "animations/gSpriteAnimations_Talon_4.s" -gUnk_0810FF05:: @ 0810FF05 - .incbin "talon/gUnk_0810FF05.bin" +gSpriteAnimations_Talon_5:: @ 0810FF05 + .include "animations/gSpriteAnimations_Talon_5.s" -gUnk_0810FF16:: @ 0810FF16 - .incbin "talon/gUnk_0810FF16.bin" +gSpriteAnimations_Talon_6:: @ 0810FF16 + .include "animations/gSpriteAnimations_Talon_6.s" -gUnk_0810FF27:: @ 0810FF27 - .incbin "talon/gUnk_0810FF27.bin" +gSpriteAnimations_Talon_7:: @ 0810FF27 + .include "animations/gSpriteAnimations_Talon_7.s" gSpriteAnimations_Talon:: @ 0810FF38 - .4byte gUnk_0810FEE5 - .4byte gUnk_0810FEEF - .4byte gUnk_0810FEE0 - .4byte gUnk_0810FEEA - .4byte gUnk_0810FEF4 - .4byte gUnk_0810FF05 - .4byte gUnk_0810FF16 - .4byte gUnk_0810FF27 + .4byte gSpriteAnimations_Talon_0 + .4byte gSpriteAnimations_Talon_1 + .4byte gSpriteAnimations_Talon_2 + .4byte gSpriteAnimations_Talon_3 + .4byte gSpriteAnimations_Talon_4 + .4byte gSpriteAnimations_Talon_5 + .4byte gSpriteAnimations_Talon_6 + .4byte gSpriteAnimations_Talon_7 .4byte 00000000 diff --git a/data/animations/npc/teachers.s b/data/animations/npc/teachers.s index 22185e3e..4230cd0b 100644 --- a/data/animations/npc/teachers.s +++ b/data/animations/npc/teachers.s @@ -4,18 +4,18 @@ .section .rodata .align 2 -gUnk_081139B0:: @ 081139B0 - .incbin "teachers/gUnk_081139B0.bin" +gSpriteAnimations_Teachers_0:: @ 081139B0 + .include "animations/gSpriteAnimations_Teachers_0.s" -gUnk_081139CD:: @ 081139CD - .incbin "teachers/gUnk_081139CD.bin" +gSpriteAnimations_Teachers_3:: @ 081139CD + .include "animations/gSpriteAnimations_Teachers_3.s" -gUnk_081139EA:: @ 081139EA - .incbin "teachers/gUnk_081139EA.bin" +gSpriteAnimations_Teachers_1:: @ 081139EA + .include "animations/gSpriteAnimations_Teachers_1.s" gSpriteAnimations_Teachers:: @ 08113A08 - .4byte gUnk_081139B0 - .4byte gUnk_081139EA - .4byte gUnk_081139B0 - .4byte gUnk_081139CD + .4byte gSpriteAnimations_Teachers_0 + .4byte gSpriteAnimations_Teachers_1 + .4byte gSpriteAnimations_Teachers_0 + .4byte gSpriteAnimations_Teachers_3 .4byte 00000000 diff --git a/data/animations/npc/tingleSiblings.s b/data/animations/npc/tingleSiblings.s index 1e8115fb..36c9d609 100644 --- a/data/animations/npc/tingleSiblings.s +++ b/data/animations/npc/tingleSiblings.s @@ -4,32 +4,32 @@ .section .rodata .align 2 -gUnk_0810FC54:: @ 0810FC54 - .incbin "tingleSiblings/gUnk_0810FC54.bin" +gSpriteAnimations_TingleSiblings_1:: @ 0810FC54 + .include "animations/gSpriteAnimations_TingleSiblings_1.s" -gUnk_0810FC5E:: @ 0810FC5E - .incbin "tingleSiblings/gUnk_0810FC5E.bin" +gSpriteAnimations_TingleSiblings_0:: @ 0810FC5E + .include "animations/gSpriteAnimations_TingleSiblings_0.s" -gUnk_0810FC68:: @ 0810FC68 - .incbin "tingleSiblings/gUnk_0810FC68.bin" +gSpriteAnimations_TingleSiblings_3:: @ 0810FC68 + .include "animations/gSpriteAnimations_TingleSiblings_3.s" -gUnk_0810FCAD:: @ 0810FCAD - .incbin "tingleSiblings/gUnk_0810FCAD.bin" +gSpriteAnimations_TingleSiblings_4:: @ 0810FCAD + .include "animations/gSpriteAnimations_TingleSiblings_4.s" -gUnk_0810FCCE:: @ 0810FCCE - .incbin "tingleSiblings/gUnk_0810FCCE.bin" +gSpriteAnimations_TingleSiblings_8:: @ 0810FCCE + .include "animations/gSpriteAnimations_TingleSiblings_8.s" gSpriteAnimations_TingleSiblings:: @ 0810FD6C - .4byte gUnk_0810FC5E - .4byte gUnk_0810FC54 - .4byte gUnk_0810FC5E - .4byte gUnk_0810FC68 - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCAD - .4byte gUnk_0810FCCE - .4byte gUnk_0810FCCE - .4byte gUnk_0810FCCE - .4byte gUnk_0810FCCE + .4byte gSpriteAnimations_TingleSiblings_0 + .4byte gSpriteAnimations_TingleSiblings_1 + .4byte gSpriteAnimations_TingleSiblings_0 + .4byte gSpriteAnimations_TingleSiblings_3 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_4 + .4byte gSpriteAnimations_TingleSiblings_8 + .4byte gSpriteAnimations_TingleSiblings_8 + .4byte gSpriteAnimations_TingleSiblings_8 + .4byte gSpriteAnimations_TingleSiblings_8 .4byte 00000000 diff --git a/data/animations/npc/townMinish.s b/data/animations/npc/townMinish.s index ca059318..555b236b 100644 --- a/data/animations/npc/townMinish.s +++ b/data/animations/npc/townMinish.s @@ -4,53 +4,53 @@ .section .rodata .align 2 -gUnk_08112C68:: @ 08112C68 - .incbin "townMinish/gUnk_08112C68.bin" +gSpriteAnimations_TownMinish_0:: @ 08112C68 + .include "animations/gSpriteAnimations_TownMinish_0.s" -gUnk_08112C6D:: @ 08112C6D - .incbin "townMinish/gUnk_08112C6D.bin" +gSpriteAnimations_TownMinish_1:: @ 08112C6D + .include "animations/gSpriteAnimations_TownMinish_1.s" -gUnk_08112C72:: @ 08112C72 - .incbin "townMinish/gUnk_08112C72.bin" +gSpriteAnimations_TownMinish_2:: @ 08112C72 + .include "animations/gSpriteAnimations_TownMinish_2.s" -gUnk_08112C77:: @ 08112C77 - .incbin "townMinish/gUnk_08112C77.bin" +gSpriteAnimations_TownMinish_3:: @ 08112C77 + .include "animations/gSpriteAnimations_TownMinish_3.s" -gUnk_08112C7C:: @ 08112C7C - .incbin "townMinish/gUnk_08112C7C.bin" +gSpriteAnimations_TownMinish_4:: @ 08112C7C + .include "animations/gSpriteAnimations_TownMinish_4.s" -gUnk_08112C9D:: @ 08112C9D - .incbin "townMinish/gUnk_08112C9D.bin" +gSpriteAnimations_TownMinish_5:: @ 08112C9D + .include "animations/gSpriteAnimations_TownMinish_5.s" -gUnk_08112CBE:: @ 08112CBE - .incbin "townMinish/gUnk_08112CBE.bin" +gSpriteAnimations_TownMinish_6:: @ 08112CBE + .include "animations/gSpriteAnimations_TownMinish_6.s" -gUnk_08112CDF:: @ 08112CDF - .incbin "townMinish/gUnk_08112CDF.bin" +gSpriteAnimations_TownMinish_7:: @ 08112CDF + .include "animations/gSpriteAnimations_TownMinish_7.s" -gUnk_08112D00:: @ 08112D00 - .incbin "townMinish/gUnk_08112D00.bin" +gSpriteAnimations_TownMinish_8:: @ 08112D00 + .include "animations/gSpriteAnimations_TownMinish_8.s" -gUnk_08112D05:: @ 08112D05 - .incbin "townMinish/gUnk_08112D05.bin" +gSpriteAnimations_TownMinish_9:: @ 08112D05 + .include "animations/gSpriteAnimations_TownMinish_9.s" -gUnk_08112D0A:: @ 08112D0A - .incbin "townMinish/gUnk_08112D0A.bin" +gSpriteAnimations_TownMinish_10:: @ 08112D0A + .include "animations/gSpriteAnimations_TownMinish_10.s" -gUnk_08112D0F:: @ 08112D0F - .incbin "townMinish/gUnk_08112D0F.bin" +gSpriteAnimations_TownMinish_11:: @ 08112D0F + .include "animations/gSpriteAnimations_TownMinish_11.s" gSpriteAnimations_TownMinish:: @ 08112D14 - .4byte gUnk_08112C68 - .4byte gUnk_08112C6D - .4byte gUnk_08112C72 - .4byte gUnk_08112C77 - .4byte gUnk_08112C7C - .4byte gUnk_08112C9D - .4byte gUnk_08112CBE - .4byte gUnk_08112CDF - .4byte gUnk_08112D00 - .4byte gUnk_08112D05 - .4byte gUnk_08112D0A - .4byte gUnk_08112D0F + .4byte gSpriteAnimations_TownMinish_0 + .4byte gSpriteAnimations_TownMinish_1 + .4byte gSpriteAnimations_TownMinish_2 + .4byte gSpriteAnimations_TownMinish_3 + .4byte gSpriteAnimations_TownMinish_4 + .4byte gSpriteAnimations_TownMinish_5 + .4byte gSpriteAnimations_TownMinish_6 + .4byte gSpriteAnimations_TownMinish_7 + .4byte gSpriteAnimations_TownMinish_8 + .4byte gSpriteAnimations_TownMinish_9 + .4byte gSpriteAnimations_TownMinish_10 + .4byte gSpriteAnimations_TownMinish_11 .4byte 00000000 diff --git a/data/animations/npc/townsperson.s b/data/animations/npc/townsperson.s index 33b67bfe..d859bc7c 100644 --- a/data/animations/npc/townsperson.s +++ b/data/animations/npc/townsperson.s @@ -5,37 +5,37 @@ .align 2 -gUnk_0810BD00:: @ 0810BD00 - .incbin "townsperson/gUnk_0810BD00.bin" +gSpriteAnimations_Townsperson_0:: @ 0810BD00 + .include "animations/gSpriteAnimations_Townsperson_0.s" -gUnk_0810BD05:: @ 0810BD05 - .incbin "townsperson/gUnk_0810BD05.bin" +gSpriteAnimations_Townsperson_1:: @ 0810BD05 + .include "animations/gSpriteAnimations_Townsperson_1.s" -gUnk_0810BD0A:: @ 0810BD0A - .incbin "townsperson/gUnk_0810BD0A.bin" +gSpriteAnimations_Townsperson_2:: @ 0810BD0A + .include "animations/gSpriteAnimations_Townsperson_2.s" -gUnk_0810BD0F:: @ 0810BD0F - .incbin "townsperson/gUnk_0810BD0F.bin" +gSpriteAnimations_Townsperson_3:: @ 0810BD0F + .include "animations/gSpriteAnimations_Townsperson_3.s" -gUnk_0810BD14:: @ 0810BD14 - .incbin "townsperson/gUnk_0810BD14.bin" +gSpriteAnimations_Townsperson_4:: @ 0810BD14 + .include "animations/gSpriteAnimations_Townsperson_4.s" -gUnk_0810BD25:: @ 0810BD25 - .incbin "townsperson/gUnk_0810BD25.bin" +gSpriteAnimations_Townsperson_5:: @ 0810BD25 + .include "animations/gSpriteAnimations_Townsperson_5.s" -gUnk_0810BD36:: @ 0810BD36 - .incbin "townsperson/gUnk_0810BD36.bin" +gSpriteAnimations_Townsperson_6:: @ 0810BD36 + .include "animations/gSpriteAnimations_Townsperson_6.s" -gUnk_0810BD47:: @ 0810BD47 - .incbin "townsperson/gUnk_0810BD47.bin" +gSpriteAnimations_Townsperson_7:: @ 0810BD47 + .include "animations/gSpriteAnimations_Townsperson_7.s" gSpriteAnimations_Townsperson:: @ 0810BD58 - .4byte gUnk_0810BD00 - .4byte gUnk_0810BD05 - .4byte gUnk_0810BD0A - .4byte gUnk_0810BD0F - .4byte gUnk_0810BD14 - .4byte gUnk_0810BD25 - .4byte gUnk_0810BD36 - .4byte gUnk_0810BD47 + .4byte gSpriteAnimations_Townsperson_0 + .4byte gSpriteAnimations_Townsperson_1 + .4byte gSpriteAnimations_Townsperson_2 + .4byte gSpriteAnimations_Townsperson_3 + .4byte gSpriteAnimations_Townsperson_4 + .4byte gSpriteAnimations_Townsperson_5 + .4byte gSpriteAnimations_Townsperson_6 + .4byte gSpriteAnimations_Townsperson_7 .4byte 00000000 diff --git a/data/animations/npc/vaati.s b/data/animations/npc/vaati.s index d6153821..7693586e 100644 --- a/data/animations/npc/vaati.s +++ b/data/animations/npc/vaati.s @@ -74,117 +74,117 @@ gSpriteAnimation_Vaati_1:: @ 081107CC .4byte gUnk_081107BC .4byte 00000000 -gUnk_08110840:: @ 08110840 - .incbin "vaati/gUnk_08110840.bin" +gSpriteAnimations_Vaati_0:: @ 08110840 + .include "animations/gSpriteAnimations_Vaati_0.s" -gUnk_08110859:: @ 08110859 - .incbin "vaati/gUnk_08110859.bin" +gSpriteAnimations_Vaati_1:: @ 08110859 + .include "animations/gSpriteAnimations_Vaati_1.s" -gUnk_0811085E:: @ 0811085E - .incbin "vaati/gUnk_0811085E.bin" +gSpriteAnimations_Vaati_2:: @ 0811085E + .include "animations/gSpriteAnimations_Vaati_2.s" -gUnk_08110877:: @ 08110877 - .incbin "vaati/gUnk_08110877.bin" +gSpriteAnimations_Vaati_3:: @ 08110877 + .include "animations/gSpriteAnimations_Vaati_3.s" -gUnk_0811087C:: @ 0811087C - .incbin "vaati/gUnk_0811087C.bin" +gSpriteAnimations_Vaati_4:: @ 0811087C + .include "animations/gSpriteAnimations_Vaati_4.s" -gUnk_0811089A:: @ 0811089A - .incbin "vaati/gUnk_0811089A.bin" +gSpriteAnimations_Vaati_6:: @ 0811089A + .include "animations/gSpriteAnimations_Vaati_6.s" -gUnk_081108B3:: @ 081108B3 - .incbin "vaati/gUnk_081108B3.bin" +gSpriteAnimations_Vaati_16:: @ 081108B3 + .include "animations/gSpriteAnimations_Vaati_16.s" -gUnk_081108CC:: @ 081108CC - .incbin "vaati/gUnk_081108CC.bin" +gSpriteAnimations_Vaati_18:: @ 081108CC + .include "animations/gSpriteAnimations_Vaati_18.s" -gUnk_081108E5:: @ 081108E5 - .incbin "vaati/gUnk_081108E5.bin" +gSpriteAnimations_Vaati_24:: @ 081108E5 + .include "animations/gSpriteAnimations_Vaati_24.s" -gUnk_081108F2:: @ 081108F2 - .incbin "vaati/gUnk_081108F2.bin" +gSpriteAnimations_Vaati_26:: @ 081108F2 + .include "animations/gSpriteAnimations_Vaati_26.s" -gUnk_081108FF:: @ 081108FF - .incbin "vaati/gUnk_081108FF.bin" +gSpriteAnimations_Vaati_40:: @ 081108FF + .include "animations/gSpriteAnimations_Vaati_40.s" -gUnk_08110918:: @ 08110918 - .incbin "vaati/gUnk_08110918.bin" +gSpriteAnimations_Vaati_28:: @ 08110918 + .include "animations/gSpriteAnimations_Vaati_28.s" -gUnk_0811091D:: @ 0811091D - .incbin "vaati/gUnk_0811091D.bin" +gSpriteAnimations_Vaati_30:: @ 0811091D + .include "animations/gSpriteAnimations_Vaati_30.s" -gUnk_08110922:: @ 08110922 - .incbin "vaati/gUnk_08110922.bin" +gSpriteAnimations_Vaati_31:: @ 08110922 + .include "animations/gSpriteAnimations_Vaati_31.s" -gUnk_08110927:: @ 08110927 - .incbin "vaati/gUnk_08110927.bin" +gSpriteAnimations_Vaati_29:: @ 08110927 + .include "animations/gSpriteAnimations_Vaati_29.s" -gUnk_0811092C:: @ 0811092C - .incbin "vaati/gUnk_0811092C.bin" +gSpriteAnimations_Vaati_44:: @ 0811092C + .include "animations/gSpriteAnimations_Vaati_44.s" -gUnk_08110931:: @ 08110931 - .incbin "vaati/gUnk_08110931.bin" +gSpriteAnimations_Vaati_32:: @ 08110931 + .include "animations/gSpriteAnimations_Vaati_32.s" -gUnk_081109F2:: @ 081109F2 - .incbin "vaati/gUnk_081109F2.bin" +gSpriteAnimations_Vaati_36:: @ 081109F2 + .include "animations/gSpriteAnimations_Vaati_36.s" -gUnk_08110AD7:: @ 08110AD7 - .incbin "vaati/gUnk_08110AD7.bin" +gSpriteAnimations_Vaati_48:: @ 08110AD7 + .include "animations/gSpriteAnimations_Vaati_48.s" -gUnk_08110AEC:: @ 08110AEC - .incbin "vaati/gUnk_08110AEC.bin" +gSpriteAnimations_Vaati_50:: @ 08110AEC + .include "animations/gSpriteAnimations_Vaati_50.s" gSpriteAnimations_Vaati:: @ 08110B04 - .4byte gUnk_08110840 - .4byte gUnk_08110859 - .4byte gUnk_0811085E - .4byte gUnk_08110877 - .4byte gUnk_0811087C - .4byte gUnk_0811087C - .4byte gUnk_0811089A - .4byte gUnk_0811087C - .4byte gUnk_08110840 - .4byte gUnk_08110859 - .4byte gUnk_0811085E - .4byte gUnk_08110877 - .4byte gUnk_0811087C - .4byte gUnk_0811087C - .4byte gUnk_0811089A - .4byte gUnk_0811087C - .4byte gUnk_081108B3 - .4byte gUnk_081108B3 - .4byte gUnk_081108CC - .4byte gUnk_081108B3 - .4byte gUnk_081108B3 - .4byte gUnk_081108B3 - .4byte gUnk_081108CC - .4byte gUnk_081108B3 - .4byte gUnk_081108E5 - .4byte gUnk_081108E5 - .4byte gUnk_081108F2 - .4byte gUnk_081108E5 - .4byte gUnk_08110918 - .4byte gUnk_08110927 - .4byte gUnk_0811091D - .4byte gUnk_08110922 - .4byte gUnk_08110931 - .4byte gUnk_08110931 - .4byte gUnk_08110931 - .4byte gUnk_08110931 - .4byte gUnk_081109F2 - .4byte gUnk_081109F2 - .4byte gUnk_081109F2 - .4byte gUnk_081109F2 - .4byte gUnk_081108FF - .4byte gUnk_081108FF - .4byte gUnk_081108FF - .4byte gUnk_081108FF - .4byte gUnk_0811092C - .4byte gUnk_0811092C - .4byte gUnk_0811092C - .4byte gUnk_0811092C - .4byte gUnk_08110AD7 - .4byte gUnk_08110AD7 - .4byte gUnk_08110AEC - .4byte gUnk_08110AEC + .4byte gSpriteAnimations_Vaati_0 + .4byte gSpriteAnimations_Vaati_1 + .4byte gSpriteAnimations_Vaati_2 + .4byte gSpriteAnimations_Vaati_3 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_6 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_0 + .4byte gSpriteAnimations_Vaati_1 + .4byte gSpriteAnimations_Vaati_2 + .4byte gSpriteAnimations_Vaati_3 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_6 + .4byte gSpriteAnimations_Vaati_4 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_18 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_18 + .4byte gSpriteAnimations_Vaati_16 + .4byte gSpriteAnimations_Vaati_24 + .4byte gSpriteAnimations_Vaati_24 + .4byte gSpriteAnimations_Vaati_26 + .4byte gSpriteAnimations_Vaati_24 + .4byte gSpriteAnimations_Vaati_28 + .4byte gSpriteAnimations_Vaati_29 + .4byte gSpriteAnimations_Vaati_30 + .4byte gSpriteAnimations_Vaati_31 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_32 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_36 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_40 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_44 + .4byte gSpriteAnimations_Vaati_48 + .4byte gSpriteAnimations_Vaati_48 + .4byte gSpriteAnimations_Vaati_50 + .4byte gSpriteAnimations_Vaati_50 .4byte 00000000 diff --git a/data/animations/npc/vaatiReborn.s b/data/animations/npc/vaatiReborn.s index 854c765a..6a439e07 100644 --- a/data/animations/npc/vaatiReborn.s +++ b/data/animations/npc/vaatiReborn.s @@ -4,17 +4,17 @@ .section .rodata .align 2 -gUnk_08112F88:: @ 08112F88 - .incbin "vaatiReborn/gUnk_08112F88.bin" +gSpriteAnimations_VaatiReborn_0:: @ 08112F88 + .include "animations/gSpriteAnimations_VaatiReborn_0.s" -gUnk_08112FC4:: @ 08112FC4 - .incbin "vaatiReborn/gUnk_08112FC4.bin" +gSpriteAnimations_VaatiReborn_1:: @ 08112FC4 + .include "animations/gSpriteAnimations_VaatiReborn_1.s" -gUnk_08112FD5:: @ 08112FD5 - .incbin "vaatiReborn/gUnk_08112FD5.bin" +gSpriteAnimations_VaatiReborn_2:: @ 08112FD5 + .include "animations/gSpriteAnimations_VaatiReborn_2.s" gSpriteAnimations_VaatiReborn:: @ 08112FF4 - .4byte gUnk_08112F88 - .4byte gUnk_08112FC4 - .4byte gUnk_08112FD5 + .4byte gSpriteAnimations_VaatiReborn_0 + .4byte gSpriteAnimations_VaatiReborn_1 + .4byte gSpriteAnimations_VaatiReborn_2 .4byte 00000000 diff --git a/data/animations/npc/wheaton.s b/data/animations/npc/wheaton.s index 777e4489..22ab8b0c 100644 --- a/data/animations/npc/wheaton.s +++ b/data/animations/npc/wheaton.s @@ -4,21 +4,21 @@ .section .rodata .align 2 -gUnk_0810C3C8:: @ 0810C3C8 - .incbin "wheaton/gUnk_0810C3C8.bin" +gSpriteAnimations_Wheaton_0:: @ 0810C3C8 + .include "animations/gSpriteAnimations_Wheaton_0.s" -gUnk_0810C3E1:: @ 0810C3E1 - .incbin "wheaton/gUnk_0810C3E1.bin" +gSpriteAnimations_Wheaton_1:: @ 0810C3E1 + .include "animations/gSpriteAnimations_Wheaton_1.s" -gUnk_0810C3F2:: @ 0810C3F2 - .incbin "wheaton/gUnk_0810C3F2.bin" +gSpriteAnimations_Wheaton_2:: @ 0810C3F2 + .include "animations/gSpriteAnimations_Wheaton_2.s" -gUnk_0810C403:: @ 0810C403 - .incbin "wheaton/gUnk_0810C403.bin" +gSpriteAnimations_Wheaton_3:: @ 0810C403 + .include "animations/gSpriteAnimations_Wheaton_3.s" gSpriteAnimations_Wheaton:: @ 0810C414 - .4byte gUnk_0810C3C8 - .4byte gUnk_0810C3E1 - .4byte gUnk_0810C3F2 - .4byte gUnk_0810C403 + .4byte gSpriteAnimations_Wheaton_0 + .4byte gSpriteAnimations_Wheaton_1 + .4byte gSpriteAnimations_Wheaton_2 + .4byte gSpriteAnimations_Wheaton_3 .4byte 00000000 diff --git a/data/animations/npc/windTribespeople.s b/data/animations/npc/windTribespeople.s index bf6f1eab..08ec239e 100644 --- a/data/animations/npc/windTribespeople.s +++ b/data/animations/npc/windTribespeople.s @@ -4,176 +4,176 @@ .section .rodata @ .align 2 -gUnk_08113B3F:: @ 08113B3F - .incbin "windTribespeople/gUnk_08113B3F.bin" +gSpriteAnimations_WindTribespeople_0_0:: @ 08113B3F + .include "animations/gSpriteAnimations_WindTribespeople_0_0.s" -gUnk_08113B44:: @ 08113B44 - .incbin "windTribespeople/gUnk_08113B44.bin" +gSpriteAnimations_WindTribespeople_0_1:: @ 08113B44 + .include "animations/gSpriteAnimations_WindTribespeople_0_1.s" -gUnk_08113B49:: @ 08113B49 - .incbin "windTribespeople/gUnk_08113B49.bin" +gSpriteAnimations_WindTribespeople_0_2:: @ 08113B49 + .include "animations/gSpriteAnimations_WindTribespeople_0_2.s" -gUnk_08113B4E:: @ 08113B4E - .incbin "windTribespeople/gUnk_08113B4E.bin" +gSpriteAnimations_WindTribespeople_0_3:: @ 08113B4E + .include "animations/gSpriteAnimations_WindTribespeople_0_3.s" -gUnk_08113B53:: @ 08113B53 - .incbin "windTribespeople/gUnk_08113B53.bin" +gSpriteAnimations_WindTribespeople_0_4:: @ 08113B53 + .include "animations/gSpriteAnimations_WindTribespeople_0_4.s" -gUnk_08113B64:: @ 08113B64 - .incbin "windTribespeople/gUnk_08113B64.bin" +gSpriteAnimations_WindTribespeople_0_5:: @ 08113B64 + .include "animations/gSpriteAnimations_WindTribespeople_0_5.s" -gUnk_08113B75:: @ 08113B75 - .incbin "windTribespeople/gUnk_08113B75.bin" +gSpriteAnimations_WindTribespeople_0_6:: @ 08113B75 + .include "animations/gSpriteAnimations_WindTribespeople_0_6.s" -gUnk_08113B86:: @ 08113B86 - .incbin "windTribespeople/gUnk_08113B86.bin" +gSpriteAnimations_WindTribespeople_0_7:: @ 08113B86 + .include "animations/gSpriteAnimations_WindTribespeople_0_7.s" gSpriteAnimations_WindTribespeople_0:: @ 08113B98 - .4byte gUnk_08113B3F - .4byte gUnk_08113B44 - .4byte gUnk_08113B49 - .4byte gUnk_08113B4E - .4byte gUnk_08113B53 - .4byte gUnk_08113B64 - .4byte gUnk_08113B75 - .4byte gUnk_08113B86 + .4byte gSpriteAnimations_WindTribespeople_0_0 + .4byte gSpriteAnimations_WindTribespeople_0_1 + .4byte gSpriteAnimations_WindTribespeople_0_2 + .4byte gSpriteAnimations_WindTribespeople_0_3 + .4byte gSpriteAnimations_WindTribespeople_0_4 + .4byte gSpriteAnimations_WindTribespeople_0_5 + .4byte gSpriteAnimations_WindTribespeople_0_6 + .4byte gSpriteAnimations_WindTribespeople_0_7 .4byte 00000000 -gUnk_08113BBC:: @ 08113BBC - .incbin "windTribespeople/gUnk_08113BBC.bin" +gSpriteAnimations_WindTribespeople_1_0:: @ 08113BBC + .include "animations/gSpriteAnimations_WindTribespeople_1_0.s" -gUnk_08113BC1:: @ 08113BC1 - .incbin "windTribespeople/gUnk_08113BC1.bin" +gSpriteAnimations_WindTribespeople_1_1:: @ 08113BC1 + .include "animations/gSpriteAnimations_WindTribespeople_1_1.s" -gUnk_08113BC6:: @ 08113BC6 - .incbin "windTribespeople/gUnk_08113BC6.bin" +gSpriteAnimations_WindTribespeople_1_2:: @ 08113BC6 + .include "animations/gSpriteAnimations_WindTribespeople_1_2.s" -gUnk_08113BCB:: @ 08113BCB - .incbin "windTribespeople/gUnk_08113BCB.bin" +gSpriteAnimations_WindTribespeople_1_3:: @ 08113BCB + .include "animations/gSpriteAnimations_WindTribespeople_1_3.s" -gUnk_08113BD0:: @ 08113BD0 - .incbin "windTribespeople/gUnk_08113BD0.bin" +gSpriteAnimations_WindTribespeople_1_4:: @ 08113BD0 + .include "animations/gSpriteAnimations_WindTribespeople_1_4.s" -gUnk_08113BE1:: @ 08113BE1 - .incbin "windTribespeople/gUnk_08113BE1.bin" +gSpriteAnimations_WindTribespeople_1_5:: @ 08113BE1 + .include "animations/gSpriteAnimations_WindTribespeople_1_5.s" -gUnk_08113BF2:: @ 08113BF2 - .incbin "windTribespeople/gUnk_08113BF2.bin" +gSpriteAnimations_WindTribespeople_1_6:: @ 08113BF2 + .include "animations/gSpriteAnimations_WindTribespeople_1_6.s" -gUnk_08113C03:: @ 08113C03 - .incbin "windTribespeople/gUnk_08113C03.bin" +gSpriteAnimations_WindTribespeople_1_7:: @ 08113C03 + .include "animations/gSpriteAnimations_WindTribespeople_1_7.s" gSpriteAnimations_WindTribespeople_1:: @ 08113C14 - .4byte gUnk_08113BBC - .4byte gUnk_08113BC1 - .4byte gUnk_08113BC6 - .4byte gUnk_08113BCB - .4byte gUnk_08113BD0 - .4byte gUnk_08113BE1 - .4byte gUnk_08113BF2 - .4byte gUnk_08113C03 + .4byte gSpriteAnimations_WindTribespeople_1_0 + .4byte gSpriteAnimations_WindTribespeople_1_1 + .4byte gSpriteAnimations_WindTribespeople_1_2 + .4byte gSpriteAnimations_WindTribespeople_1_3 + .4byte gSpriteAnimations_WindTribespeople_1_4 + .4byte gSpriteAnimations_WindTribespeople_1_5 + .4byte gSpriteAnimations_WindTribespeople_1_6 + .4byte gSpriteAnimations_WindTribespeople_1_7 .4byte 00000000 -gUnk_08113C38:: @ 08113C38 - .incbin "windTribespeople/gUnk_08113C38.bin" +gSpriteAnimations_WindTribespeople_2_1:: @ 08113C38 + .include "animations/gSpriteAnimations_WindTribespeople_2_1.s" -gUnk_08113C3D:: @ 08113C3D - .incbin "windTribespeople/gUnk_08113C3D.bin" +gSpriteAnimations_WindTribespeople_2_0:: @ 08113C3D + .include "animations/gSpriteAnimations_WindTribespeople_2_0.s" -gUnk_08113C42:: @ 08113C42 - .incbin "windTribespeople/gUnk_08113C42.bin" +gSpriteAnimations_WindTribespeople_2_3:: @ 08113C42 + .include "animations/gSpriteAnimations_WindTribespeople_2_3.s" -gUnk_08113C47:: @ 08113C47 - .incbin "windTribespeople/gUnk_08113C47.bin" +gSpriteAnimations_WindTribespeople_2_4:: @ 08113C47 + .include "animations/gSpriteAnimations_WindTribespeople_2_4.s" gSpriteAnimations_WindTribespeople_2:: @ 08113C58 - .4byte gUnk_08113C3D - .4byte gUnk_08113C38 - .4byte gUnk_08113C3D - .4byte gUnk_08113C42 - .4byte gUnk_08113C47 - .4byte gUnk_08113C47 - .4byte gUnk_08113C47 - .4byte gUnk_08113C47 + .4byte gSpriteAnimations_WindTribespeople_2_0 + .4byte gSpriteAnimations_WindTribespeople_2_1 + .4byte gSpriteAnimations_WindTribespeople_2_0 + .4byte gSpriteAnimations_WindTribespeople_2_3 + .4byte gSpriteAnimations_WindTribespeople_2_4 + .4byte gSpriteAnimations_WindTribespeople_2_4 + .4byte gSpriteAnimations_WindTribespeople_2_4 + .4byte gSpriteAnimations_WindTribespeople_2_4 .4byte 00000000 -gUnk_08113C7C:: @ 08113C7C - .incbin "windTribespeople/gUnk_08113C7C.bin" +gSpriteAnimations_WindTribespeople_3_0:: @ 08113C7C + .include "animations/gSpriteAnimations_WindTribespeople_3_0.s" -gUnk_08113C81:: @ 08113C81 - .incbin "windTribespeople/gUnk_08113C81.bin" +gSpriteAnimations_WindTribespeople_3_1:: @ 08113C81 + .include "animations/gSpriteAnimations_WindTribespeople_3_1.s" -gUnk_08113C86:: @ 08113C86 - .incbin "windTribespeople/gUnk_08113C86.bin" +gSpriteAnimations_WindTribespeople_3_2:: @ 08113C86 + .include "animations/gSpriteAnimations_WindTribespeople_3_2.s" -gUnk_08113C8B:: @ 08113C8B - .incbin "windTribespeople/gUnk_08113C8B.bin" +gSpriteAnimations_WindTribespeople_3_3:: @ 08113C8B + .include "animations/gSpriteAnimations_WindTribespeople_3_3.s" -gUnk_08113C90:: @ 08113C90 - .incbin "windTribespeople/gUnk_08113C90.bin" +gSpriteAnimations_WindTribespeople_3_4:: @ 08113C90 + .include "animations/gSpriteAnimations_WindTribespeople_3_4.s" -gUnk_08113CA1:: @ 08113CA1 - .incbin "windTribespeople/gUnk_08113CA1.bin" +gSpriteAnimations_WindTribespeople_3_5:: @ 08113CA1 + .include "animations/gSpriteAnimations_WindTribespeople_3_5.s" -gUnk_08113CB2:: @ 08113CB2 - .incbin "windTribespeople/gUnk_08113CB2.bin" +gSpriteAnimations_WindTribespeople_3_6:: @ 08113CB2 + .include "animations/gSpriteAnimations_WindTribespeople_3_6.s" -gUnk_08113CC3:: @ 08113CC3 - .incbin "windTribespeople/gUnk_08113CC3.bin" +gSpriteAnimations_WindTribespeople_3_7:: @ 08113CC3 + .include "animations/gSpriteAnimations_WindTribespeople_3_7.s" gSpriteAnimations_WindTribespeople_3:: @ 08113CD4 - .4byte gUnk_08113C7C - .4byte gUnk_08113C81 - .4byte gUnk_08113C86 - .4byte gUnk_08113C8B - .4byte gUnk_08113C90 - .4byte gUnk_08113CA1 - .4byte gUnk_08113CB2 - .4byte gUnk_08113CC3 + .4byte gSpriteAnimations_WindTribespeople_3_0 + .4byte gSpriteAnimations_WindTribespeople_3_1 + .4byte gSpriteAnimations_WindTribespeople_3_2 + .4byte gSpriteAnimations_WindTribespeople_3_3 + .4byte gSpriteAnimations_WindTribespeople_3_4 + .4byte gSpriteAnimations_WindTribespeople_3_5 + .4byte gSpriteAnimations_WindTribespeople_3_6 + .4byte gSpriteAnimations_WindTribespeople_3_7 .4byte 00000000 -gUnk_08113CF8:: @ 08113CF8 - .incbin "windTribespeople/gUnk_08113CF8.bin" +gSpriteAnimations_WindTribespeople_4_1:: @ 08113CF8 + .include "animations/gSpriteAnimations_WindTribespeople_4_1.s" -gUnk_08113CFD:: @ 08113CFD - .incbin "windTribespeople/gUnk_08113CFD.bin" +gSpriteAnimations_WindTribespeople_4_0:: @ 08113CFD + .include "animations/gSpriteAnimations_WindTribespeople_4_0.s" -gUnk_08113D02:: @ 08113D02 - .incbin "windTribespeople/gUnk_08113D02.bin" +gSpriteAnimations_WindTribespeople_4_3:: @ 08113D02 + .include "animations/gSpriteAnimations_WindTribespeople_4_3.s" -gUnk_08113D07:: @ 08113D07 - .incbin "windTribespeople/gUnk_08113D07.bin" +gSpriteAnimations_WindTribespeople_4_4:: @ 08113D07 + .include "animations/gSpriteAnimations_WindTribespeople_4_4.s" gSpriteAnimations_WindTribespeople_4:: @ 08113D1C - .4byte gUnk_08113CFD - .4byte gUnk_08113CF8 - .4byte gUnk_08113CFD - .4byte gUnk_08113D02 - .4byte gUnk_08113D07 - .4byte gUnk_08113D07 - .4byte gUnk_08113D07 - .4byte gUnk_08113D07 + .4byte gSpriteAnimations_WindTribespeople_4_0 + .4byte gSpriteAnimations_WindTribespeople_4_1 + .4byte gSpriteAnimations_WindTribespeople_4_0 + .4byte gSpriteAnimations_WindTribespeople_4_3 + .4byte gSpriteAnimations_WindTribespeople_4_4 + .4byte gSpriteAnimations_WindTribespeople_4_4 + .4byte gSpriteAnimations_WindTribespeople_4_4 + .4byte gSpriteAnimations_WindTribespeople_4_4 .4byte 00000000 -gUnk_08113D40:: @ 08113D40 - .incbin "windTribespeople/gUnk_08113D40.bin" +gSpriteAnimations_WindTribespeople_5_1:: @ 08113D40 + .include "animations/gSpriteAnimations_WindTribespeople_5_1.s" -gUnk_08113D45:: @ 08113D45 - .incbin "windTribespeople/gUnk_08113D45.bin" +gSpriteAnimations_WindTribespeople_5_0:: @ 08113D45 + .include "animations/gSpriteAnimations_WindTribespeople_5_0.s" -gUnk_08113D4A:: @ 08113D4A - .incbin "windTribespeople/gUnk_08113D4A.bin" +gSpriteAnimations_WindTribespeople_5_3:: @ 08113D4A + .include "animations/gSpriteAnimations_WindTribespeople_5_3.s" -gUnk_08113D4F:: @ 08113D4F - .incbin "windTribespeople/gUnk_08113D4F.bin" +gSpriteAnimations_WindTribespeople_5_4:: @ 08113D4F + .include "animations/gSpriteAnimations_WindTribespeople_5_4.s" gSpriteAnimations_WindTribespeople_5:: @ 08113D60 - .4byte gUnk_08113D45 - .4byte gUnk_08113D40 - .4byte gUnk_08113D45 - .4byte gUnk_08113D4A - .4byte gUnk_08113D4F - .4byte gUnk_08113D4F - .4byte gUnk_08113D4F - .4byte gUnk_08113D4F + .4byte gSpriteAnimations_WindTribespeople_5_0 + .4byte gSpriteAnimations_WindTribespeople_5_1 + .4byte gSpriteAnimations_WindTribespeople_5_0 + .4byte gSpriteAnimations_WindTribespeople_5_3 + .4byte gSpriteAnimations_WindTribespeople_5_4 + .4byte gSpriteAnimations_WindTribespeople_5_4 + .4byte gSpriteAnimations_WindTribespeople_5_4 + .4byte gSpriteAnimations_WindTribespeople_5_4 .4byte 00000000 |