Merge branch 'slot_machine' of github.com:pret/pokefirered into slot_machine

1 files changed, 0 insertions, 117 deletions

diff --git a/data/slot_machine.s b/data/slot_machine.s
index a85e26b75..25b5a6817 100644
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -3,123 +3,6 @@
 
 	.section .rodata
 	.align 2
-gUnknown_8464890:: @ 8464890
-	.byte 0x00, 0x03
-	.byte 0x00, 0x06
-	.byte 0x03, 0x06
-	.byte 0x01, 0x04
-	.byte 0x01, 0x07
-	.byte 0x04, 0x07
-	.byte 0x02, 0x05
-	.byte 0x02, 0x08
-	.byte 0x05, 0x08
-	.byte 0x00, 0x04
-	.byte 0x00, 0x08
-	.byte 0x04, 0x08
-	.byte 0x02, 0x04
-	.byte 0x02, 0x06
-	.byte 0x04, 0x06
-
-gUnknown_84648AE:: @ 84648AE
-	.byte 0x00, 0x03, 0x06
-	.byte 0x01, 0x04, 0x07
-	.byte 0x02, 0x05, 0x08
-	.byte 0x00, 0x04, 0x08
-	.byte 0x02, 0x04, 0x06
-
-gUnknown_84648BD:: @ 84648BD
-	.byte 0x00, 0x04, 0x08, 0x03
-	.byte 0x00, 0x03, 0x06, 0x02
-	.byte 0x01, 0x04, 0x07, 0x01
-	.byte 0x02, 0x05, 0x08, 0x02
-	.byte 0x02, 0x04, 0x06, 0x03
-
-	.align 1
-gUnknown_84648D2:: @ 84648D2
-	.2byte 0x1fa1, 0x2eab, 0x3630, 0x39f3, 0x3bd4, 0x3bfc, 0x0049
-	.2byte 0x1f97, 0x2ea2, 0x3627, 0x39e9, 0x3bca, 0x3bf8, 0x0049
-	.2byte 0x1f91, 0x2e9b, 0x3620, 0x39e3, 0x3bc4, 0x3bf4, 0x0049
-	.2byte 0x1f87, 0x2e92, 0x3617, 0x39d9, 0x3bba, 0x3bef, 0x0050
-	.2byte 0x1f7f, 0x2e89, 0x360e, 0x39d1, 0x3bb2, 0x3bea, 0x0050
-	.2byte 0x1fc9, 0x2efc, 0x3696, 0x3a63, 0x3c49, 0x3c8b, 0x0073
-
-gUnknown_8464926:: @ 8464926
-	.byte 0x00, 0x03, 0x04, 0x01, 0x02, 0x06, 0x02, 0x05, 0x00, 0x06, 0x03, 0x01, 0x04, 0x02, 0x06, 0x00, 0x05, 0x02, 0x01, 0x06, 0x02
-	.byte 0x00, 0x05, 0x04, 0x03, 0x01, 0x05, 0x04, 0x03, 0x02, 0x05, 0x04, 0x03, 0x00, 0x05, 0x04, 0x01, 0x03, 0x06, 0x05, 0x03, 0x04
-	.byte 0x00, 0x03, 0x06, 0x05, 0x02, 0x03, 0x06, 0x05, 0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x05, 0x06, 0x01
-
-	.align 1
-gUnknown_8464966:: @ 8464966
-	.2byte   0
-	.2byte   2
-	.2byte   6
-	.2byte   8
-	.2byte  15
-	.2byte 100
-	.2byte 300
-
-gUnknown_8464974::
-	.incbin "graphics/slot_machine/unk_8464974.gbapal"
-
-gUnknown_8464994::
-	.incbin "graphics/slot_machine/unk_8464994.gbapal"
-
-gUnknown_84649B4::
-	.incbin "graphics/slot_machine/unk_84649b4.gbapal"
-
-gUnknown_84649D4::
-	.incbin "graphics/slot_machine/unk_84649d4.gbapal"
-
-gUnknown_84649F4::
-	.incbin "graphics/slot_machine/unk_84649f4.gbapal"
-
-gUnknown_8464A14::
-	.incbin "graphics/slot_machine/unk_8464a14.4bpp.lz"
-
-gUnknown_846504C::
-	.incbin "graphics/slot_machine/unk_846504c.gbapal"
-
-gUnknown_846506C::
-	.incbin "graphics/slot_machine/unk_846506c.4bpp.lz"
-
-gUnknown_8465524::
-	.incbin "graphics/slot_machine/unk_8465524.gbapal"
-
-gUnknown_8465544::
-	.incbin "graphics/slot_machine/unk_8465544.4bpp.lz"
-
-gUnknown_84655B0:: @ 84655B0
-	obj_tiles gUnknown_8464A14, 0x0e00, 0
-	obj_tiles gUnknown_846506C, 0x0c00, 1
-	obj_tiles gUnknown_8465544, 0x0280, 2
-
-gUnknown_84655C8:: @ 84655C8
-	obj_pal gUnknown_8464974, 0
-	obj_pal gUnknown_8464994, 1
-	obj_pal gUnknown_84649B4, 2
-	obj_pal gUnknown_84649D4, 3
-	obj_pal gUnknown_84649F4, 4
-	obj_pal gUnknown_846504C, 5
-	obj_pal gUnknown_8465524, 6
-	null_obj_pal
-
-gUnknown_8465608:: @ 8465608
-	.2byte 0x0002, 0x0002, 0x0000, 0x0000, 0x0002, 0x0004, 0x0003
-
-gUnknown_8465616:: @ 8465616
-	.2byte 0x0120, 0x011f, 0x011e, 0x011d, 0x011c, 0x011b, 0x011a, 0x0119, 0x0118, 0x0117, 0x0116, 0x0115, 0x0114, 0x0113, 0x0112, 0x0111
-	.2byte 0x0110, 0x010f, 0x010e, 0x010d, 0x010c, 0x010b, 0x010a, 0x0109, 0x0108, 0x0107, 0x0106, 0x0105, 0x0104, 0x0103, 0x0102, 0x0101
-	.2byte 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100
-	.2byte 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100
-	.2byte 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0109, 0x010a, 0x010b, 0x010c, 0x010d, 0x010e, 0x010f, 0x0110
-	.2byte 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011a, 0x011b, 0x011c, 0x011d, 0x011e, 0x011f, 0x0120
-
-gUnknown_84656D6:: @ 84656D6
-	.byte 0x10, 0x10, 0x10, 0x10, 0x0f, 0x0e, 0x0d, 0x0d, 0x0c, 0x0b, 0x0a, 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06, 0x05, 0x04, 0x04, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x09, 0x09, 0x0a, 0x0b, 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f
-
-	.align 2
 gUnknown_8465738::
 	.4byte 0x80000100, 0x00000c00