merge

2 files changed, 0 insertions, 352 deletions

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