Merge pull request #405 from octorock/crenelBeanSprout

data/animations/object/crenalBeanSprout.s

@@ -1,41 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-@    .align 2
-
-gSpriteAnimations_CrenalBeanSprout_0:: @ 081231BA
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_0.s"
-
-gSpriteAnimations_CrenalBeanSprout_3:: @ 081231BF
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_3.s"
-
-gSpriteAnimations_CrenalBeanSprout_6:: @ 081231CC
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_6.s"
-
-gSpriteAnimations_CrenalBeanSprout_8:: @ 081231D5
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_8.s"
-
-gSpriteAnimations_CrenalBeanSprout_10:: @ 081231E6
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_10.s"
-
-gSpriteAnimations_CrenalBeanSprout_1:: @ 081231FB
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_1.s"
-
-gSpriteAnimations_CrenalBeanSprout_12:: @ 08123204
-	.include "animations/gSpriteAnimations_CrenalBeanSprout_12.s"
-
-gSpriteAnimations_CrenalBeanSprout:: @ 08123208
-	.4byte gSpriteAnimations_CrenalBeanSprout_0
-	.4byte gSpriteAnimations_CrenalBeanSprout_1
-	.4byte gSpriteAnimations_CrenalBeanSprout_0
-	.4byte gSpriteAnimations_CrenalBeanSprout_3
-	.4byte gSpriteAnimations_CrenalBeanSprout_1
-	.4byte gSpriteAnimations_CrenalBeanSprout_3
-	.4byte gSpriteAnimations_CrenalBeanSprout_6
-	.4byte gSpriteAnimations_CrenalBeanSprout_6
-	.4byte gSpriteAnimations_CrenalBeanSprout_8
-	.4byte gSpriteAnimations_CrenalBeanSprout_8
-	.4byte gSpriteAnimations_CrenalBeanSprout_10
-	.4byte gSpriteAnimations_CrenalBeanSprout_10
-	.4byte gSpriteAnimations_CrenalBeanSprout_12

data/animations/object/crenelBeanSprout.s

@@ -0,0 +1,41 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+@    .align 2
+
+gSpriteAnimations_CrenelBeanSprout_0:: @ 081231BA
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_0.s"
+
+gSpriteAnimations_CrenelBeanSprout_3:: @ 081231BF
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_3.s"
+
+gSpriteAnimations_CrenelBeanSprout_6:: @ 081231CC
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_6.s"
+
+gSpriteAnimations_CrenelBeanSprout_8:: @ 081231D5
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_8.s"
+
+gSpriteAnimations_CrenelBeanSprout_10:: @ 081231E6
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_10.s"
+
+gSpriteAnimations_CrenelBeanSprout_1:: @ 081231FB
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_1.s"
+
+gSpriteAnimations_CrenelBeanSprout_12:: @ 08123204
+	.include "animations/gSpriteAnimations_CrenelBeanSprout_12.s"
+
+gSpriteAnimations_CrenelBeanSprout:: @ 08123208
+	.4byte gSpriteAnimations_CrenelBeanSprout_0
+	.4byte gSpriteAnimations_CrenelBeanSprout_1
+	.4byte gSpriteAnimations_CrenelBeanSprout_0
+	.4byte gSpriteAnimations_CrenelBeanSprout_3
+	.4byte gSpriteAnimations_CrenelBeanSprout_1
+	.4byte gSpriteAnimations_CrenelBeanSprout_3
+	.4byte gSpriteAnimations_CrenelBeanSprout_6
+	.4byte gSpriteAnimations_CrenelBeanSprout_6
+	.4byte gSpriteAnimations_CrenelBeanSprout_8
+	.4byte gSpriteAnimations_CrenelBeanSprout_8
+	.4byte gSpriteAnimations_CrenelBeanSprout_10
+	.4byte gSpriteAnimations_CrenelBeanSprout_10
+	.4byte gSpriteAnimations_CrenelBeanSprout_12

data/const/object/crenalBeanSprout.s

@@ -1,40 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-    .align 2
-
-gUnk_08123168:: @ 08123168
-	.4byte sub_08096334
-	.4byte sub_0809651C
-	.4byte sub_08096704
-	.4byte sub_08096758
-	.4byte sub_08096780
-	.4byte sub_080967E4
-	.4byte sub_08096834
-
-gUnk_08123184:: @ 08123184
-	.incbin "crenalBeanSprout/gUnk_08123184.bin"
-
-gUnk_0812318C:: @ 0812318C
-	.4byte sub_0809671C
-	.4byte nullsub_121
-	.4byte sub_08096734
-	.4byte sub_08096740
-
-gUnk_0812319C:: @ 0812319C
-	.incbin "crenalBeanSprout/gUnk_0812319C.bin"
-
-gUnk_081231A0:: @ 081231A0
-	.4byte sub_08096858
-	.4byte sub_08096904
-	.4byte sub_08096988
-
-gUnk_081231AC:: @ 081231AC
-	.incbin "crenalBeanSprout/gUnk_081231AC.bin"
-
-gUnk_081231AE:: @ 081231AE
-	.incbin "crenalBeanSprout/gUnk_081231AE.bin"
-
-gUnk_081231B4:: @ 081231B4
-	.incbin "crenalBeanSprout/gUnk_081231B4.bin"

data/gfx/sprite_ptrs.s

@@ -1095,7 +1095,7 @@ gSpritePtrs:: @ 080029B4
 	.4byte 00000000
 	.4byte 00000000
 
-	.4byte gSpriteAnimations_CrenalBeanSprout
+	.4byte gSpriteAnimations_CrenelBeanSprout
 	.4byte 00000000
 	.4byte 00000000
 	.4byte 00000000