Merge branch 'master' into decompile_battle_5

5 files changed, 2 insertions, 960 deletions

diff --git a/data/berry_blender.s b/data/berry_blender.s
deleted file mode 100644
index ff0f06473..000000000
--- a/data/berry_blender.s
+++ /dev/null
@@ -1,456 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_08215C0C:: @ 8215C0C
-	.incbin "graphics/berry_blender/center.gbapal"
-
-	.align 2
-gUnknown_08215C2C:: @ 8215C2C
-	.incbin "graphics/berry_blender/center_map.bin"
-
-	.align 2
-gUnknown_0821602C:: @ 821602C
-	.incbin "graphics/berry_blender/outer.gbapal"
-
-	.incbin "graphics/unused/unknown/821604C.gbapal"
-
-	.space 0x1C0
-
-	.string "▶$"
-	.string " $"
-	.string "カッコイ$" @ "cool" (missing an イ at the end)
-	.string "カワイイ$" @ "cute"
-	.string "ウツクシ$" @ "beautiful" (missing an イ at the end)
-	.string "カシコイ$" @ "smart"
-	.string "タクマシ$" @ "tough" (missing an イ at the end)
-
-gUnknown_08216249:: @ 8216249
-	.string "\p$"
-
-@ unreferenced
-@ These appear to be the first names of four people who worked on the game.
-	.string "てつじ$", 10 @ Tetsuji (Ohta)
-	.string "あきと$", 10 @ Akito (Mori)
-	.string "シゲル$", 10 @ Shigeru (Ohmori)
-	.string "ヨシノリ$", 10 @ Yoshinori (Matsuda)
-
-UnknownText_2Pok:
-	.string "2Pok$"
-UnknownText_3Pok:
-	.string "3Pok$"
-UnknownText_4Pok:
-	.string "4Pok$"
-
-	.align 2
-gUnknown_08216284:: @ 8216284
-	.4byte UnknownText_2Pok
-	.4byte UnknownText_3Pok
-	.4byte UnknownText_4Pok
-
-@ unreferenced
-	.string "1P$", 4
-	.string "2P$", 4
-	.string "3P$", 4
-	.string "4P$", 4
-
-.ifdef ENGLISH
-UnknownText_Mister:
-	.string "MISTER$"
-UnknownText_Laddie:
-	.string "LADDIE$"
-UnknownText_Lassie:
-	.string "LASSIE$"
-.else
-UnknownText_Mister:
-	.string "OPI$"
-UnknownText_Laddie:
-	.string "KUMPEL$"
-UnknownText_Lassie:
-	.string "TUSSI$"
-.endif
-
-	.align 2
-gUnknown_082162B8:: @ 82162B8
-	.4byte UnknownText_Mister
-	.4byte UnknownText_Laddie
-	.4byte UnknownText_Lassie
-
-gUnknown_082162C4:: @ 82162C4
-	.string "{COLOR RED}$"
-
-gUnknown_082162C8:: @ 82162C8
-	.string "\n$"
-
-	.string " $"
-
-gUnknown_082162CC:: @ 82162CC
-	.byte -1, -1
-	.byte  1, -1
-	.byte -1,  1
-	.byte  1,  1
-
-gUnknown_082162D4:: @ 82162D4
-	.byte  2,  6
-	.byte 23,  6
-	.byte  2, 12
-	.byte 23, 12
-	.byte  1,  6
-	.byte 22,  6
-	.byte  1, 12
-	.byte 22, 12
-
-gUnknown_082162E4:: @ 82162E4
-	.byte  72,  32
-	.byte 168,  32
-	.byte  72, 128
-	.byte 168, 128
-
-gUnknown_082162EC:: @ 82162EC
-	.byte -1,  0,  1, -1
-	.byte -1,  0,  1,  2
-	.byte  0,  1,  2,  3
-
-	.align 1
-gUnknown_082162F8:: @ 82162F8
-	.2byte 0x0000, 0xC000, 0x4000, 0x8000
-
-gUnknown_08216300:: @ 8216300
-	.byte 1
-	.byte 1
-	.byte 0
-
-gUnknown_08216303:: @ 8216303
-	.byte 32
-	.byte 224
-	.byte 96
-	.byte 160
-	.byte 0
-
-	.align 2
-gUnknown_08216308:: @ 8216308
-	.4byte sub_804F8C8
-	.4byte sub_804F9F4
-	.4byte sub_804FB1C
-
-	.align 2
-gOamData_8216314:: @ 8216314
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821631C:: @ 821631C
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216324:: @ 8216324
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821632C:: @ 821632C
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216334:: @ 8216334
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821633C:: @ 821633C
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216350:: @ 8216350
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 32, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216364:: @ 8216364
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216378:: @ 8216378
-	obj_image_anim_frame 48, 2
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821638C:: @ 821638C
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216394:: @ 8216394
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821639C:: @ 821639C
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82163A4:: @ 82163A4
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82163AC:: @ 82163AC
-	.4byte gSpriteAnim_821631C
-	.4byte gSpriteAnim_8216324
-	.4byte gSpriteAnim_821632C
-	.4byte gSpriteAnim_8216334
-	.4byte gSpriteAnim_821633C
-	.4byte gSpriteAnim_8216350
-	.4byte gSpriteAnim_8216364
-	.4byte gSpriteAnim_8216378
-	.4byte gSpriteAnim_821638C
-	.4byte gSpriteAnim_8216394
-	.4byte gSpriteAnim_821639C
-	.4byte gSpriteAnim_82163A4
-
-	.align 2
-gUnknown_082163DC:: @ 82163DC
-	obj_tiles gBerryBlenderArrowTiles, 0x800, 46545
-
-	.align 2
-gUnknown_082163E4:: @ 82163E4
-	obj_pal gBerryBlenderMiscPalette, 46546
-
-	.align 2
-gUnknown_082163EC:: @ 82163EC
-	obj_pal gBerryBlenderArrowPalette, 12312
-
-	.align 2
-gSpriteTemplate_82163F4:: @ 82163F4
-	spr_template 46545, 12312, gOamData_8216314, gSpriteAnimTable_82163AC, NULL, gDummySpriteAffineAnimTable, sub_8051C04
-
-	.align 2
-gOamData_821640C:: @ 821640C
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_8216414:: @ 8216414
-	obj_image_anim_frame 0, 20
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821641C:: @ 821641C
-	obj_image_anim_frame 4, 20, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216424:: @ 8216424
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821643C:: @ 821643C
-	obj_image_anim_frame 8, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8216444:: @ 8216444
-	.4byte gSpriteAnim_8216414
-	.4byte gSpriteAnim_821641C
-	.4byte gSpriteAnim_8216424
-	.4byte gSpriteAnim_821643C
-
-	.align 2
-gUnknown_08216454:: @ 8216454
-	obj_tiles gBerryBlenderMarubatsuTiles, 0x200, 48888
-
-	.align 2
-gSpriteTemplate_821645C:: @ 821645C
-	spr_template 48888, 46546, gOamData_821640C, gSpriteAnimTable_8216444, NULL, gDummySpriteAffineAnimTable, sub_8051650
-
-	.align 2
-gOamData_8216474:: @ 8216474
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821647C:: @ 821647C
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 3, 5
-	obj_image_anim_frame 1, 4
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216494:: @ 8216494
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 2, 4
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82164AC:: @ 82164AC
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 3, 3
-	obj_image_anim_frame 2, 2
-	obj_image_anim_frame 1, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82164D0:: @ 82164D0
-	obj_image_anim_frame 5, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_82164D8:: @ 82164D8
-	obj_image_anim_frame 6, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_82164E0:: @ 82164E0
-	.4byte gSpriteAnim_821647C
-	.4byte gSpriteAnim_8216494
-	.4byte gSpriteAnim_82164AC
-	.4byte gSpriteAnim_82164D0
-	.4byte gSpriteAnim_82164D8
-
-	.align 2
-gUnknown_082164F4:: @ 82164F4
-	obj_tiles gBerryBlenderParticlesTiles, 0xE0, 23456
-
-	.align 2
-gSpriteTemplate_82164FC:: @ 82164FC
-	spr_template 23456, 46546, gOamData_8216474, gSpriteAnimTable_82164E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_8216514:: @ 8216514
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_821651C:: @ 821651C
-	obj_image_anim_frame 32, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8216524:: @ 8216524
-	obj_image_anim_frame 16, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_821652C:: @ 821652C
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8216534:: @ 8216534
-	.4byte gSpriteAnim_821651C
-	.4byte gSpriteAnim_8216524
-	.4byte gSpriteAnim_821652C
-
-	.align 2
-gUnknown_08216540:: @ 8216540
-	obj_tiles gBerryBlenderCountdownNumbersTiles, 0x600, 12345
-
-	.align 2
-gSpriteTemplate_8216548:: @ 8216548
-	spr_template 12345, 46546, gOamData_8216514, gSpriteAnimTable_8216534, NULL, gDummySpriteAffineAnimTable, sub_805181C
-
-	.align 2
-gOamData_8216560:: @ 8216560
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_8216568:: @ 8216568
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8216570:: @ 8216570
-	.4byte gSpriteAnim_8216568
-
-	.align 2
-gUnknown_08216574:: @ 8216574
-	obj_tiles gBerryBlenderStartTiles, 0x400, 12346
-
-	.align 2
-gSpriteTemplate_821657C:: @ 821657C
-	spr_template 12346, 46546, gOamData_8216560, gSpriteAnimTable_8216570, NULL, gDummySpriteAffineAnimTable, sub_80518CC
-
-	.align 1
-gUnknown_08216594:: @ 8216594
-	.2byte -10,  20,  10,   2,   1
-	.2byte 250,  20,  10,  -2,   1
-	.2byte -10, 140,  10,   2,  -1
-	.2byte 250, 140,  10,  -2,  -1
-
-gUnknown_082165BC:: @ 82165BC
-	.byte 4, 3, 2
-	.byte 0, 4, 3
-	.byte 1, 0, 4
-	.byte 2, 1, 0
-	.byte 3, 2, 1
-	.byte 0, 2, 3
-	.byte 1, 3, 4
-	.byte 2, 4, 0
-	.byte 3, 0, 1
-	.byte 4, 1, 2
-
-gUnknown_082165DA:: @ 82165DA
-	.byte 1, 1, 2, 3, 4
-
-gUnknown_082165DF:: @ 82165DF
-	.byte 0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15
-
-gUnknown_082165E9:: @ 82165E9
-	.byte 6, 6, 6, 6, 5
-
-gUnknown_082165EE:: @ 82165EE
-	.byte 3, 3, 3, 2, 2
-
-gUnknown_082165F3:: @ 82165F3
-	.byte 3, 3, 3, 3, 2
-
-gUnknown_082165F8:: @ 82165F8
-	.string " $"
-
-gOtherText_BPMAndDash:: @ 82165FA
-	.string "BPM$"
-	.string "-$"
-
-gUnknown_08216600:: @ 8216600
-	.string "\n$"
-
-	.string "\n$"
diff --git a/data/egg_hatch.s b/data/egg_hatch.s
deleted file mode 100644
index 1823409dd..000000000
--- a/data/egg_hatch.s
+++ /dev/null
@@ -1,122 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-EggPalette:: @ 8209AD8
-	.incbin "graphics/pokemon/egg/palette.gbapal"
-
-EggHatchTiles:: @ 8209AF8
-	.incbin "graphics/misc/egg_hatch.4bpp"
-
-EggShardTiles:: @ 820A2F8
-	.incbin "graphics/misc/egg_shard.4bpp"
-
-	.align 2
-gOamData_820A378:: @ 820A378
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteAnim_820A380:: @ 820A380
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A388:: @ 820A388
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A390:: @ 820A390
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A398:: @ 820A398
-	obj_image_anim_frame 48, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_820A3A0:: @ 820A3A0
-	.4byte gSpriteAnim_820A380
-	.4byte gSpriteAnim_820A388
-	.4byte gSpriteAnim_820A390
-	.4byte gSpriteAnim_820A398
-
-	.align 2
-gUnknown_0820A3B0:: @ 820A3B0
-	obj_tiles EggHatchTiles, 2048, 12345
-
-	.align 2
-gUnknown_0820A3B8:: @ 820A3B8
-	obj_tiles EggShardTiles, 128, 23456
-
-	.align 2
-gUnknown_0820A3C0:: @ 820A3C0
-	obj_pal EggPalette, 54321
-
-	.align 2
-gSpriteTemplate_820A3C8:: @ 820A3C8
-	spr_template 12345, 54321, gOamData_820A378, gSpriteAnimTable_820A3A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_820A3E0:: @ 820A3E0
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0800
-
-	.align 2
-gSpriteAnim_820A3E8:: @ 820A3E8
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A3F0:: @ 820A3F0
-	obj_image_anim_frame 1, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A3F8:: @ 820A3F8
-	obj_image_anim_frame 2, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_820A400:: @ 820A400
-	obj_image_anim_frame 3, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_820A408:: @ 820A408
-	.4byte gSpriteAnim_820A3E8
-	.4byte gSpriteAnim_820A3F0
-	.4byte gSpriteAnim_820A3F8
-	.4byte gSpriteAnim_820A400
-
-	.align 2
-gSpriteTemplate_820A418:: @ 820A418
-	spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, SpriteCB_EggShard
-
-@ The values are Q8.8 fixed-point numbers.
-	.align 1
-gEggShardVelocities:: @ 820A430
-	.2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
-	.2byte 0xFB00, 0xFD00 @ (-5, -3)
-	.2byte 0x0380, 0xFD00 @ (3.5, -3)
-	.2byte 0xFC00, 0xFC40 @ (-4, -3.75)
-	.2byte 0x0200, 0xFE80 @ (2, -1.5)
-	.2byte 0xFF80, 0xF940 @ (-0.5, -6.75)
-	.2byte 0x0500, 0xFDC0 @ (5, -2.25)
-	.2byte 0xFE80, 0xFC40 @ (-1.5, -3.75)
-	.2byte 0x0480, 0xFE80 @ (4.5, -1.5)
-	.2byte 0xFF00, 0xF940 @ (-1, -6.75)
-	.2byte 0x0400, 0xFDC0 @ (4, -2.25)
-	.2byte 0xFC80, 0xFC40 @ (-3.5, -3.75)
-	.2byte 0x0100, 0xFE80 @ (1, -1.5)
-	.2byte 0xFC7C, 0xF940 @ (-3.515625, -6.75)
-	.2byte 0x0480, 0xFDC0 @ (4.5, -2.25)
-	.2byte 0xFF80, 0xF880 @ (-0.5, -7.5)
-	.2byte 0x0100, 0xFB80 @ (1, -4.5)
-	.2byte 0xFD80, 0xFDC0 @ (-2.5, -2.25)
-	.2byte 0x0280, 0xF880 @ (2.5, -7.5)
diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s
deleted file mode 100644
index 0795e7389..000000000
--- a/data/hall_of_fame.s
+++ /dev/null
@@ -1,230 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_0840B514:: @ 840B514
-	obj_tiles gContestConfetti_Gfx, 0x220, 1001
-	.space 8
-
-gUnknown_0840B524:: @ 840B524
-	obj_pal gContestConfetti_Pal, 1001
-	.space 8
-
-	.align 2
-gUnknown_0840B534:: @ 840B534
-	.2byte 120,210,120, 40
-	.2byte 326,220, 56, 40
-	.2byte -86,220,184, 40
-	.2byte 120,-62,120, 88
-	.2byte -25,-62,200, 88
-	.2byte 265,-62, 40, 88
-
-	.align 2
-gUnknown_0840B564:: @ 840B564
-	.2byte 120,214,120, 64
-	.2byte 281,214, 56, 64
-	.2byte -41,214,184, 64
-
-	.align 2
-gUnknown_0840B57C:: @ 840B57C
-	.2byte 1002
-	.2byte 1002
-	.space 0x10
-
-@ unused data?
-	.byte 2, 1, 3, 6, 4, 5
-
-	.align 2
-gOamData_840B598:: @ 840B598
-	.2byte 0x0000
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gUnknown_0840B5A0:: @ 840B5A0
-	.4byte 0x02008000
-	.4byte 0x0200A000
-	.4byte 0x0200C000
-	.4byte 0x0200E000
-	.4byte 0x02010000
-	.4byte 0x02014000
-	.4byte 0x02018000
-
-	.align 2
-gSpriteImageTable_840B5BC:: @ 840B5BC
-	obj_frame_tiles 0x02008000, 0x800
-	obj_frame_tiles 0x02008800, 0x800
-	obj_frame_tiles 0x02009000, 0x800
-	obj_frame_tiles 0x02009800, 0x800
-
-	.align 2
-gSpriteImageTable_840B5DC:: @ 840B5DC
-	obj_frame_tiles 0x0200A000, 0x800
-	obj_frame_tiles 0x0200A800, 0x800
-	obj_frame_tiles 0x0200B000, 0x800
-	obj_frame_tiles 0x0200B800, 0x800
-
-	.align 2
-gSpriteImageTable_840B5FC:: @ 840B5FC
-	obj_frame_tiles 0x0200C000, 0x800
-	obj_frame_tiles 0x0200C800, 0x800
-	obj_frame_tiles 0x0200D000, 0x800
-	obj_frame_tiles 0x0200D800, 0x800
-
-	.align 2
-gSpriteImageTable_840B61C:: @ 840B61C
-	obj_frame_tiles 0x0200E000, 0x800
-	obj_frame_tiles 0x0200E800, 0x800
-	obj_frame_tiles 0x0200F000, 0x800
-	obj_frame_tiles 0x0200F800, 0x800
-
-	.align 2
-gSpriteImageTable_840B63C:: @ 840B63C
-	obj_frame_tiles 0x02010000, 0x800
-	obj_frame_tiles 0x02010800, 0x800
-	obj_frame_tiles 0x02011000, 0x800
-	obj_frame_tiles 0x02011800, 0x800
-
-	.align 2
-gSpriteImageTable_840B65C:: @ 840B65C
-	obj_frame_tiles 0x02014000, 0x800
-	obj_frame_tiles 0x02014800, 0x800
-	obj_frame_tiles 0x02015000, 0x800
-	obj_frame_tiles 0x02015800, 0x800
-
-	.align 2
-gSpriteImageTable_840B67C:: @ 840B67C
-	obj_frame_tiles 0x02018000, 0x800
-	obj_frame_tiles 0x02018800, 0x800
-	obj_frame_tiles 0x02019000, 0x800
-	obj_frame_tiles 0x02019800, 0x800
-
-	.align 2
-gUnknown_0840B69C:: @ 840B69C
-	.4byte gSpriteImageTable_840B5BC
-	.4byte gSpriteImageTable_840B5DC
-	.4byte gSpriteImageTable_840B5FC
-	.4byte gSpriteImageTable_840B61C
-	.4byte gSpriteImageTable_840B63C
-	.4byte gSpriteImageTable_840B65C
-	.4byte gSpriteImageTable_840B67C
-
-gUnknown_0840B6B8:: @ 840B6B8
-	spr_template -1, -1, gOamData_840B598, NULL, gSpriteImageTable_840B5BC, gDummySpriteAffineAnimTable, nullsub_81
-
-	.align 2
-gOamData_840B6D0:: @ 840B6D0
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_840B6D8:: @ 840B6D8
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6E0:: @ 840B6E0
-	obj_image_anim_frame 1, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6E8:: @ 840B6E8
-	obj_image_anim_frame 2, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6F0:: @ 840B6F0
-	obj_image_anim_frame 3, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B6F8:: @ 840B6F8
-	obj_image_anim_frame 4, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B700:: @ 840B700
-	obj_image_anim_frame 5, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B708:: @ 840B708
-	obj_image_anim_frame 6, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B710:: @ 840B710
-	obj_image_anim_frame 7, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B718:: @ 840B718
-	obj_image_anim_frame 8, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B720:: @ 840B720
-	obj_image_anim_frame 9, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B728:: @ 840B728
-	obj_image_anim_frame 10, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B730:: @ 840B730
-	obj_image_anim_frame 11, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B738:: @ 840B738
-	obj_image_anim_frame 12, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B740:: @ 840B740
-	obj_image_anim_frame 13, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B748:: @ 840B748
-	obj_image_anim_frame 14, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B750:: @ 840B750
-	obj_image_anim_frame 15, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_840B758:: @ 840B758
-	obj_image_anim_frame 16, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_840B760:: @ 840B760
-	.4byte gSpriteAnim_840B6D8
-	.4byte gSpriteAnim_840B6E0
-	.4byte gSpriteAnim_840B6E8
-	.4byte gSpriteAnim_840B6F0
-	.4byte gSpriteAnim_840B6F8
-	.4byte gSpriteAnim_840B700
-	.4byte gSpriteAnim_840B708
-	.4byte gSpriteAnim_840B710
-	.4byte gSpriteAnim_840B718
-	.4byte gSpriteAnim_840B720
-	.4byte gSpriteAnim_840B728
-	.4byte gSpriteAnim_840B730
-	.4byte gSpriteAnim_840B738
-	.4byte gSpriteAnim_840B740
-	.4byte gSpriteAnim_840B748
-	.4byte gSpriteAnim_840B750
-	.4byte gSpriteAnim_840B758
-
-	.align 2
-gSpriteTemplate_840B7A4:: @ 840B7A4
-	spr_template 1001, 1001, gOamData_840B6D0, gSpriteAnimTable_840B760, NULL, gDummySpriteAffineAnimTable, sub_814386C
diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s
index 82931f6ee..8c096e1cd 100644
--- a/data/intro_credits_graphics.s
+++ b/data/intro_credits_graphics.s
@@ -338,11 +338,11 @@ gSpriteAnimTable_8416D28:: @ 8416D28
 	.4byte gSpriteAnim_8416D14
 
 	.align 2
-gSpriteTemplate_8416D2C:: @ 8416D2C
+gSpriteTemplate_Brendan:: @ 8416D2C
 	spr_template 1001, 1002, gOamData_8416D0C, gSpriteAnimTable_8416D28, NULL, gDummySpriteAffineAnimTable, sub_81492A0
 
 	.align 2
-gSpriteTemplate_8416D44:: @ 8416D44
+gSpriteTemplate_May:: @ 8416D44
 	spr_template 1001, 1003, gOamData_8416D0C, gSpriteAnimTable_8416D28, NULL, gDummySpriteAffineAnimTable, sub_81492A0
 
 	.align 2
diff --git a/data/learn_move.s b/data/learn_move.s
deleted file mode 100644
index 369fbfdf0..000000000
--- a/data/learn_move.s
+++ /dev/null
@@ -1,150 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gDexArrows_Pal::
-	.incbin "graphics/pokedex/arrows.gbapal"
-
-	.align 2
-gDexArrows_Gfx::
-	.incbin "graphics/pokedex/arrows.4bpp"
-
-gUnknown_08402CF8:: @ 8402CF8
-	.byte 0,  0,  9,  13
-	.byte 10, 0,  29, 7
-	.byte 2,  14, 27, 19
-	.byte 10, 8,  29, 13
-
-gUnknown_08402D08:: @ 8402D08
-	.4byte OtherText_Battle
-	.byte 1, 1, 0, 0
-	.4byte OtherText_Power
-	.byte 1, 4, 1, 0
-	.4byte OtherText_Accuracy
-	.byte 1, 9, 2, 0
-	.space 8
-
-	.4byte OtherText_Contest
-	.byte 1, 1, 0, 0
-	.4byte OtherText_Appeal
-	.byte 1, 4, 1, 0
-	.4byte OtherText_Jam
-	.byte 1, 9, 2, 0
-	.space 8
-
-	.4byte 0xFF00FFEF
-	.4byte gTileBuffer
-
-	.align 2
-gOamData_8402D50:: @ 8402D50
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_8402D58:: @ 8402D58
-	.2byte 0x8000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_8402D60:: @ 8402D60
-	.2byte 0x4000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_8402D68:: @ 8402D68
-	obj_image_anim_frame 2, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402D70:: @ 8402D70
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402D78:: @ 8402D78
-	.4byte gSpriteAnim_8402D68
-	.4byte gSpriteAnim_8402D70
-
-	.align 2
-gUnknown_08402D80:: @ 8402D80
-	obj_tiles gDexArrows_Gfx, 384, 0x1595
-
-	.align 2
-gUnknown_08402D88:: @ 8402D88
-	obj_pal gDexArrows_Pal, 0x1596
-
-	.align 2
-gSpriteTemplate_8402D90:: @ 8402D90
-	spr_template 5525, 5526, gOamData_8402D58, gSpriteAnimTable_8402D78, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.align 2
-gSpriteAnim_8402DA8:: @ 8402DA8
-	obj_image_anim_frame 4, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DB0:: @ 8402DB0
-	obj_image_anim_frame 6, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402DB8:: @ 8402DB8
-	.4byte gSpriteAnim_8402DA8
-	.4byte gSpriteAnim_8402DB0
-
-	.align 2
-gSpriteTemplate_8402DC0:: @ 8402DC0
-	spr_template 5525, 5526, gOamData_8402D60, gSpriteAnimTable_8402DB8, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.align 2
-gSpriteAnim_8402DD8:: @ 8402DD8
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DE0:: @ 8402DE0
-	obj_image_anim_frame 9, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DE8:: @ 8402DE8
-	obj_image_anim_frame 10, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DF0:: @ 8402DF0
-	obj_image_anim_frame 11, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402DF8:: @ 8402DF8
-	.4byte gSpriteAnim_8402DD8
-	.4byte gSpriteAnim_8402DE0
-	.4byte gSpriteAnim_8402DE8
-	.4byte gSpriteAnim_8402DF0
-
-	.align 2
-gSpriteTemplate_8402E08:: @ 8402E08
-	spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.string "あきと$" @ programmer Akito Mori?
-
-gUnknown_08402E24:: @ 8402E24
-	.byte 11,  1,  1
-	.byte  3,  6,  2
-	.byte 24,  1,  3
-	.byte  3, 11,  4
-	.byte  5,  4,  5
-	.byte  3,  6,  6
-	.byte  3, 11,  7
-
-gUnknown_08402E39:: @ 8402E39
-	.byte 0, 1, 2, 3
-
-gUnknown_08402E3D:: @ 8402E3D
-	.byte 4, 5, 6