4 files changed, 0 insertions, 991 deletions
diff --git a/data/battle_pyramid_bag.s b/data/battle_pyramid_bag.s
deleted file mode 100644
index de459075f..000000000
--- a/data/battle_pyramid_bag.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-
-	.align 2
-gOamData_861F378:: @ 861F378
-	.2byte 0x0100, 0xc000, 0x0400, 0x0000
-
-	.align 2
-gSpriteAnim_861F380:: @ 861F380
-	.2byte 0x0000, 0x0004, 0xffff, 0x0000
-
-	.align 2
-gSpriteAnimTable_861F388:: @ 861F388
-	.4byte gSpriteAnim_861F380
-
-	.align 2
-gSpriteAffineAnim_861F38C:: @ 861F38C
-	.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gSpriteAffineAnim_861F39C:: @ 861F39C
-	.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
-	.2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
-	.4byte gSpriteAffineAnim_861F38C
-	.4byte gSpriteAffineAnim_861F39C
-
-	.align 2
-gUnknown_0861F3CC:: @ 861F3CC
-	obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
-
-	.align 2
-gUnknown_0861F3D4:: @ 861F3D4
-	spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy
-
diff --git a/data/berries.inc b/data/berries.inc
deleted file mode 100644
index f06c32a1a..000000000
--- a/data/berries.inc
+++ /dev/null
@@ -1,689 +0,0 @@
-	.align 2
-gBerries:: @ 858A670
-	.string "CHERI$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 20 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Cheri
-	.4byte gBerryDescriptionPart2_Cheri
-	.byte 3 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "CHESTO$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 80 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Chesto
-	.4byte gBerryDescriptionPart2_Chesto
-	.byte 3 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "PECHA$", 7
-	.byte BERRY_FIRMNESS_VERY_SOFT
-	.2byte 40 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Pecha
-	.4byte gBerryDescriptionPart2_Pecha
-	.byte 3 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "RAWST$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 32 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Rawst
-	.4byte gBerryDescriptionPart2_Rawst
-	.byte 3 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "ASPEAR$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 50 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Aspear
-	.4byte gBerryDescriptionPart2_Aspear
-	.byte 3 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 10 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "LEPPA$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 28 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Leppa
-	.4byte gBerryDescriptionPart2_Leppa
-	.byte 4 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "ORAN$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 35 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Oran
-	.4byte gBerryDescriptionPart2_Oran
-	.byte 3 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "PERSIM$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 47 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Persim
-	.4byte gBerryDescriptionPart2_Persim
-	.byte 3 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "LUM$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 34 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Lum
-	.4byte gBerryDescriptionPart2_Lum
-	.byte 12 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "SITRUS$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 95 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Sitrus
-	.4byte gBerryDescriptionPart2_Sitrus
-	.byte 6 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "FIGY$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 100 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Figy
-	.4byte gBerryDescriptionPart2_Figy
-	.byte 6 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "WIKI$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 115 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Wiki
-	.4byte gBerryDescriptionPart2_Wiki
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "MAGO$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 126 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Mago
-	.4byte gBerryDescriptionPart2_Mago
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "AGUAV$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 64 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Aguav
-	.4byte gBerryDescriptionPart2_Aguav
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "IAPAPA$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 223 @ size (in millimeters)
-	.byte 3 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Iapapa
-	.4byte gBerryDescriptionPart2_Iapapa
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 10 @ sour
-	.byte 25 @ smoothness
-	.byte 0 @ padding
-
-	.string "RAZZ$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 120 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 3 @ min yield
-	.4byte gBerryDescriptionPart1_Razz
-	.4byte gBerryDescriptionPart2_Razz
-	.byte 1 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "BLUK$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 108 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 3 @ min yield
-	.4byte gBerryDescriptionPart1_Bluk
-	.4byte gBerryDescriptionPart2_Bluk
-	.byte 1 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "NANAB$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 77 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 3 @ min yield
-	.4byte gBerryDescriptionPart1_Nanab
-	.4byte gBerryDescriptionPart2_Nanab
-	.byte 1 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "WEPEAR$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 74 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 3 @ min yield
-	.4byte gBerryDescriptionPart1_Wepear
-	.4byte gBerryDescriptionPart2_Wepear
-	.byte 1 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "PINAP$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 80 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 3 @ min yield
-	.4byte gBerryDescriptionPart1_Pinap
-	.4byte gBerryDescriptionPart2_Pinap
-	.byte 1 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "POMEG$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 135 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Pomeg
-	.4byte gBerryDescriptionPart2_Pomeg
-	.byte 3 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "KELPSY$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 150 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Kelpsy
-	.4byte gBerryDescriptionPart2_Kelpsy
-	.byte 3 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "QUALOT$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 110 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Qualot
-	.4byte gBerryDescriptionPart2_Qualot
-	.byte 3 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "HONDEW$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 162 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Hondew
-	.4byte gBerryDescriptionPart2_Hondew
-	.byte 3 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "GREPA$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 149 @ size (in millimeters)
-	.byte 6 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Grepa
-	.4byte gBerryDescriptionPart2_Grepa
-	.byte 3 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 10 @ sour
-	.byte 20 @ smoothness
-	.byte 0 @ padding
-
-	.string "TAMATO$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 200 @ size (in millimeters)
-	.byte 4 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Tamato
-	.4byte gBerryDescriptionPart2_Tamato
-	.byte 6 @ stage duration (in hours)
-	.byte 20 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "CORNN$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 75 @ size (in millimeters)
-	.byte 4 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Cornn
-	.4byte gBerryDescriptionPart2_Cornn
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 20 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "MAGOST$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 140 @ size (in millimeters)
-	.byte 4 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Magost
-	.4byte gBerryDescriptionPart2_Magost
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 20 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "RABUTA$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 226 @ size (in millimeters)
-	.byte 4 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Rabuta
-	.4byte gBerryDescriptionPart2_Rabuta
-	.byte 6 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 20 @ bitter
-	.byte 10 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "NOMEL$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 285 @ size (in millimeters)
-	.byte 4 @ max yield
-	.byte 2 @ min yield
-	.4byte gBerryDescriptionPart1_Nomel
-	.4byte gBerryDescriptionPart2_Nomel
-	.byte 6 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 20 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "SPELON$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 133 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Spelon
-	.4byte gBerryDescriptionPart2_Spelon
-	.byte 18 @ stage duration (in hours)
-	.byte 40 @ spicy
-	.byte 10 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 70 @ smoothness
-	.byte 0 @ padding
-
-	.string "PAMTRE$", 7
-	.byte BERRY_FIRMNESS_VERY_SOFT
-	.2byte 244 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Pamtre
-	.4byte gBerryDescriptionPart2_Pamtre
-	.byte 18 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 40 @ dry
-	.byte 10 @ sweet
-	.byte 0 @ bitter
-	.byte 0 @ sour
-	.byte 70 @ smoothness
-	.byte 0 @ padding
-
-	.string "WATMEL$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 250 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Watmel
-	.4byte gBerryDescriptionPart2_Watmel
-	.byte 18 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 40 @ sweet
-	.byte 10 @ bitter
-	.byte 0 @ sour
-	.byte 70 @ smoothness
-	.byte 0 @ padding
-
-	.string "DURIN$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 280 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Durin
-	.4byte gBerryDescriptionPart2_Durin
-	.byte 18 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 40 @ bitter
-	.byte 10 @ sour
-	.byte 70 @ smoothness
-	.byte 0 @ padding
-
-	.string "BELUE$", 7
-	.byte BERRY_FIRMNESS_VERY_SOFT
-	.2byte 300 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Belue
-	.4byte gBerryDescriptionPart2_Belue
-	.byte 18 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 40 @ sour
-	.byte 70 @ smoothness
-	.byte 0 @ padding
-
-	.string "LIECHI$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 111 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Liechi
-	.4byte gBerryDescriptionPart2_Liechi
-	.byte 24 @ stage duration (in hours)
-	.byte 40 @ spicy
-	.byte 0 @ dry
-	.byte 40 @ sweet
-	.byte 0 @ bitter
-	.byte 10 @ sour
-	.byte 80 @ smoothness
-	.byte 0 @ padding
-
-	.string "GANLON$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 33 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Ganlon
-	.4byte gBerryDescriptionPart2_Ganlon
-	.byte 24 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 40 @ dry
-	.byte 0 @ sweet
-	.byte 40 @ bitter
-	.byte 0 @ sour
-	.byte 80 @ smoothness
-	.byte 0 @ padding
-
-	.string "SALAC$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 95 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Salac
-	.4byte gBerryDescriptionPart2_Salac
-	.byte 24 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 0 @ dry
-	.byte 40 @ sweet
-	.byte 0 @ bitter
-	.byte 40 @ sour
-	.byte 80 @ smoothness
-	.byte 0 @ padding
-
-	.string "PETAYA$", 7
-	.byte BERRY_FIRMNESS_VERY_HARD
-	.2byte 237 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Petaya
-	.4byte gBerryDescriptionPart2_Petaya
-	.byte 24 @ stage duration (in hours)
-	.byte 40 @ spicy
-	.byte 0 @ dry
-	.byte 0 @ sweet
-	.byte 40 @ bitter
-	.byte 0 @ sour
-	.byte 80 @ smoothness
-	.byte 0 @ padding
-
-	.string "APICOT$", 7
-	.byte BERRY_FIRMNESS_HARD
-	.2byte 75 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Apicot
-	.4byte gBerryDescriptionPart2_Apicot
-	.byte 24 @ stage duration (in hours)
-	.byte 0 @ spicy
-	.byte 40 @ dry
-	.byte 0 @ sweet
-	.byte 0 @ bitter
-	.byte 40 @ sour
-	.byte 80 @ smoothness
-	.byte 0 @ padding
-
-	.string "LANSAT$", 7
-	.byte BERRY_FIRMNESS_SOFT
-	.2byte 97 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Lansat
-	.4byte gBerryDescriptionPart2_Lansat
-	.byte 24 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "STARF$", 7
-	.byte BERRY_FIRMNESS_SUPER_HARD
-	.2byte 153 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Starf
-	.4byte gBerryDescriptionPart2_Starf
-	.byte 24 @ stage duration (in hours)
-	.byte 10 @ spicy
-	.byte 10 @ dry
-	.byte 10 @ sweet
-	.byte 10 @ bitter
-	.byte 10 @ sour
-	.byte 30 @ smoothness
-	.byte 0 @ padding
-
-	.string "ENIGMA$", 7
-	.byte BERRY_FIRMNESS_UNKNOWN
-	.2byte 0 @ size (in millimeters)
-	.byte 2 @ max yield
-	.byte 1 @ min yield
-	.4byte gBerryDescriptionPart1_Enigma
-	.4byte gBerryDescriptionPart2_Enigma
-	.byte 24 @ stage duration (in hours)
-	.byte 40 @ spicy
-	.byte 40 @ dry
-	.byte 40 @ sweet
-	.byte 40 @ bitter
-	.byte 40 @ sour
-	.byte 40 @ smoothness
-	.byte 0 @ padding
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
deleted file mode 100644
index cc3ff2447..000000000
--- a/data/field_player_avatar.s
+++ /dev/null
@@ -1,103 +0,0 @@
-@ the third big chunk of data
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_084974B8:: @ 84974B8
-	.4byte PlayerAvatarTransition_Normal
-	.4byte PlayerAvatarTransition_MachBike
-	.4byte PlayerAvatarTransition_AcroBike
-	.4byte PlayerAvatarTransition_Surfing
-	.4byte PlayerAvatarTransition_Underwater
-	.4byte PlayerAvatarTransition_ReturnToField
-	.4byte PlayerAvatarTransition_Dummy
-	.4byte PlayerAvatarTransition_Dummy
-
-gUnknown_084974D8:: @ 84974D8
-	.4byte MetatileBehavior_IsSouthArrowWarp
-	.4byte MetatileBehavior_IsNorthArrowWarp
-	.4byte MetatileBehavior_IsWestArrowWarp
-	.4byte MetatileBehavior_IsEastArrowWarp
-
-gUnknown_084974E8:: @ 84974E8
-	.byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0
-
-gUnknown_084974F8:: @ 84974F8
-	.byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0
-
-gUnknown_08497508:: @ 8497508
-	.byte 0xe6, 0xe7
-
-gUnknown_0849750A:: @ 849750A
-	.byte 0xeb, 0xec
-
-gUnknown_0849750C:: @ 849750C
-	.byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10
-
-gUnknown_08497520:: @ 8497520
-	.4byte MetatileBehavior_IsSouthArrowWarp
-	.4byte MetatileBehavior_IsNorthArrowWarp
-	.4byte MetatileBehavior_IsWestArrowWarp
-	.4byte MetatileBehavior_IsEastArrowWarp
-
-gUnknown_08497530:: @ 8497530
-	.4byte sub_808C3A4
-	.4byte do_boulder_dust
-	.4byte sub_808C484
-
-gUnknown_0849753C:: @ 849753C
-	.4byte sub_808C544
-
-gUnknown_08497540:: @ 8497540
-	.4byte sub_808C61C
-	.4byte sub_808C644
-	.4byte sub_808C6BC
-	.4byte sub_808C6FC
-
-gUnknown_08497550:: @ 8497550
-	.byte 3, 4, 2, 1
-
-gUnknown_08497554:: @ 8497554
-	.byte 16, 16, 17, 18, 19
-
-	.align 2
-gUnknown_0849755C:: @ 849755C
-	.4byte fish0
-	.4byte fish1
-	.4byte fish2
-	.4byte fish3
-	.4byte fish4
-	.4byte fish5
-	.4byte fish6
-	.4byte fish7
-	.4byte fish8
-	.4byte fish9
-	.4byte fishA_wait_for_a_pressed
-	.4byte fishB
-	.4byte fishC
-	.4byte fishD
-	.4byte fishE
-	.4byte fishF
-
-gUnknown_0849759C:: @ 849759C
-	.2byte 1, 1, 1
-
-gUnknown_084975A2:: @ 84975A2
-	.2byte 1, 3, 6
-
-gUnknown_084975A8:: @ 84975A8
-	.string "·$"
-
-gUnknown_084975AA:: @ 84975AA
-	.2byte 36, 33, 30
-
-gUnknown_084975B0:: @ 84975B0
-	.2byte 0, 0
-	.2byte 0x28, 10
-	.2byte 0x46, 30
-
-gUnknown_084975BC:: @ 84975BC
-	.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
diff --git a/data/starter_choose.s b/data/starter_choose.s
deleted file mode 100644
index 92b95d80c..000000000
--- a/data/starter_choose.s
+++ /dev/null
@@ -1,159 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.include "include/constants/species.h"
-
-	.section .rodata
-
-	.align 2
-gBirchBagGrassPal:: @ 85B0A00
-	.incbin "graphics/misc/birch_bag.gbapal"
-	.incbin "graphics/misc/birch_grass.gbapal"
-
-	.align 2
-gBirchBallarrow_Pal:: @ 85B0A40
-	.incbin "graphics/misc/birch_ballarrow.gbapal"
-
-	.align 2
-gBirchCircle_Pal:: @ 85B0A60
-	.incbin "graphics/misc/birch_circle.gbapal"
-
-	.align 2
-gBirchBagTilemap:: @ 85B0A80
-	.incbin "graphics/misc/birch_bag_map.bin.lz"
-
-	.align 2
-gBirchGrassTilemap:: @ 85B0C0C
-	.incbin "graphics/misc/birch_grass_map.bin.lz"
-
-	.align 2
-gBirchHelpGfx:: @ 85B0E04
-	.incbin "graphics/misc/birch_help.4bpp.lz"
-
-	.align 2
-gUnknown_085B18AC:: @ 85B18AC
-	.incbin "graphics/misc/birch_ballarrow.4bpp.lz"
-
-	.align 2
-gUnknown_085B1BCC:: @ 85B1BCC
-	.incbin "graphics/misc/birch_circle.4bpp.lz"
-
-	.align 2
-gUnknown_085B1DCC:: @ 85B1DCC
-	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0200
-	null_window_template
-
-	.align 2
-gUnknown_085B1DDC:: @ 85B1DDC
-	window_template 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x0260
-
-	.align 2
-gUnknown_085B1DE4:: @ 85B1DE4
-	window_template 0x00, 0x00, 0x00, 0x0d, 0x04, 0x0e, 0x0274
-
-sPokeballCoords:: @ 85B1DEC
-	.byte 0x3c, 0x40, 0x78, 0x58, 0xb4, 0x40
-
-gStarterChoose_LabelCoords:: @ 85B1DF2
-	.byte 0x00, 0x09, 0x10, 0x0a, 0x08, 0x04
-
-sStarterMon:: @ 85B1DF8
-	.2byte SPECIES_TREECKO
-	.2byte SPECIES_TORCHIC
-	.2byte SPECIES_MUDKIP
-
-	.align 2
-gUnknown_085B1E00:: @ 85B1E00
-	.4byte 0x000001f8, 0x00003072, 0x00001063
-
-gUnknown_085B1E0C:: @ 85B1E0C
-	.byte 0x00, 0x01, 0x03
-
-	.align 2
-gOamData_85B1E10:: @ 85B1E10
-	.2byte 0x00a0, 0x8000, 0x0400, 0x0000
-
-	.align 2
-gOamData_85B1E18:: @ 85B1E18
-	.2byte 0x00a0, 0x8000, 0x0400, 0x0000
-
-	.align 2
-gOamData_85B1E20:: @ 85B1E20
-	.2byte 0x03a0, 0xc000, 0x0400, 0x0000
-
-gUnknown_085B1E28:: @ 85B1E28
-	.byte 0x3c, 0x20, 0x78, 0x38, 0xb4, 0x20, 0x00, 0x00
-
-	.align 2
-gSpriteAnim_85B1E30:: @ 85B1E30
-	.2byte 0x0030, 0x001e, 0xffff, 0x0000
-
-	.align 2
-gSpriteAnim_85B1E38:: @ 85B1E38
-	.2byte 0x0000, 0x001e, 0xffff, 0x0000
-
-	.align 2
-gSpriteAnim_85B1E40:: @ 85B1E40
-	.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
-	.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
-	.2byte 0x0000, 0x0008, 0xfffe, 0x0000
-
-	.align 2
-gSpriteAnim_85B1E88:: @ 85B1E88
-	.2byte 0x0000, 0x0008, 0xffff, 0x0000
-
-	.align 2
-gSpriteAnimTable_85B1E90:: @ 85B1E90
-	.4byte gSpriteAnim_85B1E30
-
-	.align 2
-gSpriteAnimTable_85B1E94:: @ 85B1E94
-	.4byte gSpriteAnim_85B1E38
-	.4byte gSpriteAnim_85B1E40
-
-	.align 2
-gSpriteAnimTable_85B1E9C:: @ 85B1E9C
-	.4byte gSpriteAnim_85B1E88
-
-	.align 2
-gSpriteAffineAnim_85B1EA0:: @ 85B1EA0
-	.2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gSpriteAffineAnim_85B1EB8:: @ 85B1EB8
-	.2byte 0x0014, 0x0014, 0x0000, 0x0000, 0x0014, 0x0014, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gUnknown_085B1ED0:: @ 85B1ED0
-	.4byte gSpriteAffineAnim_85B1EA0
-
-	.align 2
-gSpriteAffineAnimTable_85B1ED4:: @ 85B1ED4
-	.4byte gSpriteAffineAnim_85B1EB8
-
-	.align 2
-gUnknown_085B1ED8:: @ 85B1ED8
-	obj_tiles gUnknown_085B18AC, 0x0800, 0x1000
-	null_obj_tiles
-
-	.align 2
-gUnknown_085B1EE8:: @ 85B1EE8
-	obj_tiles gUnknown_085B1BCC, 0x0800, 0x1001
-	null_obj_tiles
-
-	.align 2
-gUnknown_085B1EF8:: @ 85B1EF8
-	obj_pal gBirchBallarrow_Pal, 0x1000
-	obj_pal gBirchCircle_Pal, 0x1001
-	null_obj_pal
-
-	.align 2
-sSpriteTemplate_Hand:: @ 85B1F10
-	spr_template 0x1000, 0x1000, gOamData_85B1E10, gSpriteAnimTable_85B1E90, NULL, gDummySpriteAffineAnimTable, sub_81346DC
-
-	.align 2
-sSpriteTemplate_PokeBall:: @ 85B1F28
-	spr_template 0x1000, 0x1000, gOamData_85B1E18, gSpriteAnimTable_85B1E94, NULL, gDummySpriteAffineAnimTable, sub_813473C
-
-	.align 2
-gUnknown_085B1F40:: @ 85B1F40
-	spr_template 0x1001, 0x1001, gOamData_85B1E20, gSpriteAnimTable_85B1E9C, NULL, gSpriteAffineAnimTable_85B1ED4, StarterPokemonSpriteCallback