all data moved from asm to c

2 files changed, 0 insertions, 358 deletions

diff --git a/data/mon_pokeblock_anims.inc b/data/mon_pokeblock_anims.inc
deleted file mode 100644
index d8df29c1d..000000000
--- a/data/mon_pokeblock_anims.inc
+++ /dev/null
@@ -1,133 +0,0 @@
-gNatureToMonPokeblockAnim:: @ 8411A10
-	.byte  0, 0 @ HARDY
-	.byte  3, 0 @ LONELY
-	.byte  4, 1 @ BRAVE
-	.byte  5, 0 @ ADAMANT
-	.byte 10, 0 @ NAUGHTY
-	.byte 13, 0 @ BOLD
-	.byte 15, 0 @ DOCILE
-	.byte 16, 2 @ RELAXED
-	.byte 18, 0 @ IMPISH
-	.byte 19, 0 @ LAX
-	.byte 20, 0 @ TIMID
-	.byte 25, 0 @ HASTY
-	.byte 27, 3 @ SERIOUS
-	.byte 28, 0 @ JOLLY
-	.byte 29, 0 @ NAIVE
-	.byte 33, 4 @ MODEST
-	.byte 36, 0 @ MILD
-	.byte 37, 0 @ QUIET
-	.byte 39, 0 @ BASHFUL
-	.byte 42, 0 @ RASH
-	.byte 45, 0 @ CALM
-	.byte 46, 5 @ GENTLE
-	.byte 47, 6 @ SASSY
-	.byte 48, 0 @ CAREFUL
-	.byte 53, 0 @ QUIRKY
-
-	.align 1
-gMonPokeblockAnims:: @ 8411A42
-	@ HARDY
-	.2byte   0,   4,   0,   8,  24,   0,   0,   0,  12,   0
-	.2byte   0,   4,   0,  16,  24,   0,   0,   0,  12,   0
-	.2byte   0,   4,   0,  32,  32,   0,   0,   0,  16,   1
-
-	@ LONELY
-	.2byte   0,   3,   6,   0,  48,   0,   0,   0,  24,   1
-
-	@ BRAVE
-	.2byte  64,  16, -24,   0,  32,   0,   0,   0,   0,   1
-
-	@ ADAMANT
-	.2byte   0,   4,   8,   0,  16,   0,  -8,   0,   0,   0
-	.2byte   0,   0,   0,   0,  16,   0,   0,   0,   0,   0
-	.2byte   0,   4,   8,   0,  16,   0,  -8,   0,   0,   0
-	.2byte   0,   0,   0,   0,  16,   0,   0,   0,   0,   0
-	.2byte   0,   4, -16,   0,   4,   0,  16,   0,   0,   1
-
-	@ NAUGHTY
-	.2byte   0,   3,   6,   0,  12,   0,   0,   0,   6,   0
-	.2byte   0,   3,  -6,   0,  12,   0,   0,   0,   6,   0
-	.2byte   0,  16,  16,   0,  45,   1,   0,   0,   0,   1
-
-	@ BOLD
-	.2byte   0,  16,   0,  24,  32,   0,   0,   0,  16,   0
-	.2byte   0,  16,   0,  23,  32,   0,   0,   0,  16,   1
-
-	@ DOCILE
-	.2byte   0,   0,   0,   0,  80,   0,   0,   0,   0,   1
-
-	@ RELAXED
-	.2byte   0,   2,   8,   0,  32,   0,   0,   0,   0,   0
-	.2byte   0,   2,  -8,   0,  32,   0,   0,   0,   0,   1
-
-	@ IMPISH
-	.2byte   0,  32,   2,   1,  48,   1,   0,   0,  24,   1
-
-	@ LAX
-	.2byte   0,   2,  16,  16, 128,   0,   0,   0,   0,   1
-
-	@ TIMID
-	.2byte   0,   2,  -8,   0,  48,   0, -24,   0,   0,   0
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   0
-	.2byte  64,  32,   2,   0,  36,   0,   0,   0,   0,   0
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   0
-	.2byte   0,   2,   8,   0,  48,   0,  24,   0,   0,   1
-
-	@ HASTY
-	.2byte  64,  24,  16,   0,  32,   0,   0,   0,   0,   0
-	.2byte   0,  28,   2,   1,  32,   1,   0,   0,  16,   1
-
-	@ SERIOUS
-	.2byte   0,   0,   0,   0,  32,   0,   0,   0,   0,   1
-
-	@ JOLLY
-	.2byte  64,  16, -16,   2,  48,   0,   0,   0,  32,   1
-
-	@ NAIVE
-	.2byte   0,  12,  -8,   4,  24,   0,   8,   0,  12,   0
-	.2byte   0,  12,   8,   8,  24,   0, -16,   0,  12,   0
-	.2byte   0,  12,  -8,  16,  24,   0,  16,   0,  12,   0
-	.2byte   0,  12,   8,  28,  24,   0,  -8,   0,  12,   1
-
-	@ MODEST
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   0
-	.2byte  64,  16,  -4,   0,  32,   0,   0,   0,   0,   0
-	.2byte   0,   0,   0,   0,   8,   0,   0,   0,   0,   1
-
-	@ MILD
-	.2byte 128,   4,   0,   8,  64,   0,   0,   0,   0,   1
-
-	@ QUIET
-	.2byte   0,   2,  16,   0,  48,   0,   0,   0,   0,   0
-	.2byte 128,   2,  16,   0,  48,   0,   0,   0,   0,   1
-
-	@ BASHFUL
-	.2byte   0,   2,  -4,   0,  48,   0, -48,   0,   0,   0
-	.2byte   0,   0,   0,   0,  80,   0,   0,   0,   0,   0
-	.2byte   0,   2,   8,   0,  24,   0,  48,   0,   0,   1
-
-	@ RASH
-	.2byte  64,   4,  64,  58,  52,   0, -88,   0,   0,   0
-	.2byte   0,   0,   0,   0,  80,   0,   0,   0,   0,   0
-	.2byte   0,  24,  80,   0,  32,   0,  88,   0,   0,   1
-
-	@ CALM
-	.2byte   0,   2,  16,   4,  64,   0,   0,   0,   0,   1
-
-	@ GENTLE
-	.2byte   0,   0,   0,   0,  32,   0,   0,   0,   0,   1
-
-	@ SASSY
-	.2byte   0,   0,   0,   0,  42,   0,   0,   0,   0,   1
-
-	@ CAREFUL
-	.2byte   0,   4,   0,   8,  24,   0,   0,   0,  12,   0
-	.2byte   0,   0,   0,   0,  12,   0,   0,   0,   0,   0
-	.2byte   0,   4,   0,  12,  24,   0,   0,   0,  12,   0
-	.2byte   0,   0,   0,   0,  12,   0,   0,   0,   0,   0
-	.2byte   0,   4,   0,   4,  24,   0,   0,   0,  12,   1
-
-	@ QUIRKY
-	.2byte   0,   4,  16,  12,  64,   0,   0,   0,   0,   0
-	.2byte   0,  -4,  16,  12,  64,   0,   0,   0,   0,   1
diff --git a/data/pokeblock_feed.s b/data/pokeblock_feed.s
deleted file mode 100644
index ae5b17d12..000000000
--- a/data/pokeblock_feed.s
+++ /dev/null
@@ -1,225 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-@ 8411A10
-	.include "data/mon_pokeblock_anims.inc"
-
-	.align 2
-gSpriteAffineAnim_8411E90:: @ 8411E90
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411EA0:: @ 8411EA0
-	obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 30
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411EC0:: @ 8411EC0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 12, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 28
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 3
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411EE8:: @ 8411EE8
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F08:: @ 8411F08
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 16
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F30:: @ 8411F30
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F50:: @ 8411F50
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F78:: @ 8411F78
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411F98:: @ 8411F98
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411FC0:: @ 8411FC0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8411FE0:: @ 8411FE0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8412008:: @ 8412008
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8412028:: @ 8412028
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 2
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_8412050:: @ 8412050
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411EA0
-	.4byte gSpriteAffineAnim_8411EE8
-	.4byte gSpriteAffineAnim_8411F30
-	.4byte gSpriteAffineAnim_8411F78
-	.4byte gSpriteAffineAnim_8411FC0
-	.4byte gSpriteAffineAnim_8412008
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411EC0
-	.4byte gSpriteAffineAnim_8411F08
-	.4byte gSpriteAffineAnim_8411F50
-	.4byte gSpriteAffineAnim_8411F98
-	.4byte gSpriteAffineAnim_8411FE0
-	.4byte gSpriteAffineAnim_8412028
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-	.4byte gSpriteAffineAnim_8411E90
-
-	.align 2
-gUnknown_084120A4:: @ 84120A4
-	.4byte gPokeblockRed_Pal
-	.4byte gPokeblockBlue_Pal
-	.4byte gPokeblockPink_Pal
-	.4byte gPokeblockGreen_Pal
-	.4byte gPokeblockYellow_Pal
-	.4byte gPokeblockPurple_Pal
-	.4byte gPokeblockIndigo_Pal
-	.4byte gPokeblockBrown_Pal
-	.4byte gPokeblockLiteBlue_Pal
-	.4byte gPokeblockOlive_Pal
-	.4byte gPokeblockGray_Pal
-	.4byte gPokeblockBlack_Pal
-	.4byte gPokeblockWhite_Pal
-	.4byte gPokeblockGold_Pal
-
-	.align 2
-gSpriteAffineAnim_84120DC:: @ 84120DC
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_84120EC:: @ 84120EC
-	.4byte gSpriteAffineAnim_84120DC
-
-	.align 2
-gSpriteAffineAnim_84120F0:: @ 84120F0
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 16, 1
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_8412148:: @ 8412148
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 1
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_84121A0:: @ 84121A0
-	.4byte gSpriteAffineAnim_84120DC
-
-	.align 2
-gSpriteAffineAnimTable_84121A4:: @ 84121A4
-	.4byte gSpriteAffineAnim_84120F0
-
-	.align 2
-gSpriteAffineAnimTable_84121A8:: @ 84121A8
-	.4byte gSpriteAffineAnim_8412148
-
-	.align 2
-gOamData_84121AC:: @ 84121AC
-	.2byte 0x0300
-	.2byte 0x0000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_84121B4:: @ 84121B4
-	obj_image_anim_frame 0, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_84121BC:: @ 84121BC
-	.4byte gSpriteAnim_84121B4
-
-	.align 2
-gSpriteAffineAnim_84121C0:: @ 84121C0
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_84121D8:: @ 84121D8
-	.4byte gSpriteAffineAnim_84121C0
-
-	.align 2
-gUnknown_084121DC:: @ 84121DC
-	obj_tiles gPokeblock_Gfx, 0x20, 14818
-
-	.align 2
-gSpriteTemplate_84121E4:: @ 84121E4
-	spr_template 14818, 14818, gOamData_84121AC, gSpriteAnimTable_84121BC, NULL, gSpriteAffineAnimTable_84121D8, sub_81481B0