diff options
30 files changed, 752 insertions, 41 deletions
diff --git a/data/slot_machine.s b/data/slot_machine.s index dac396602..a85e26b75 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -1,94 +1,390 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata .align 2 gUnknown_8464890:: @ 8464890 - .incbin "baserom.gba", 0x464890, 0x1E + .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 - .incbin "baserom.gba", 0x4648AE, 0xF + .byte 0x00, 0x03, 0x06 + .byte 0x01, 0x04, 0x07 + .byte 0x02, 0x05, 0x08 + .byte 0x00, 0x04, 0x08 + .byte 0x02, 0x04, 0x06 gUnknown_84648BD:: @ 84648BD - .incbin "baserom.gba", 0x4648BD, 0x15 + .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 - .incbin "baserom.gba", 0x4648D2, 0x54 + .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 - .incbin "baserom.gba", 0x464926, 0x40 + .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 - .incbin "baserom.gba", 0x464966, 0xC4A + .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 - .incbin "baserom.gba", 0x4655B0, 0x18 + obj_tiles gUnknown_8464A14, 0x0e00, 0 + obj_tiles gUnknown_846506C, 0x0c00, 1 + obj_tiles gUnknown_8465544, 0x0280, 2 gUnknown_84655C8:: @ 84655C8 - .incbin "baserom.gba", 0x4655C8, 0x40 + 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 - .incbin "baserom.gba", 0x465608, 0xE + .2byte 0x0002, 0x0002, 0x0000, 0x0000, 0x0002, 0x0004, 0x0003 gUnknown_8465616:: @ 8465616 - .incbin "baserom.gba", 0x465616, 0xC0 + .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 - .incbin "baserom.gba", 0x4656D6, 0x10E + .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 + +gUnknown_8465740:: + obj_image_anim_frame 0x00, 4 + obj_image_anim_end + +gUnknown_8465748:: + obj_image_anim_frame 0x10, 4 + obj_image_anim_end + +gUnknown_8465750:: + obj_image_anim_frame 0x20, 4 + obj_image_anim_end + +gUnknown_8465758:: + obj_image_anim_frame 0x30, 4 + obj_image_anim_end + +gUnknown_8465760:: + obj_image_anim_frame 0x40, 4 + obj_image_anim_end + +gUnknown_8465768:: + obj_image_anim_frame 0x50, 4 + obj_image_anim_end + +gUnknown_8465770:: + obj_image_anim_frame 0x60, 4 + obj_image_anim_end + +gUnknown_8465778:: + obj_image_anim_frame 0x20, 4 + obj_image_anim_end + +gUnknown_8465780:: + obj_image_anim_frame 0x30, 4 + obj_image_anim_end + +gUnknown_8465788:: + obj_image_anim_frame 0x40, 4 + obj_image_anim_end + +gUnknown_8465790:: + obj_image_anim_frame 0x50, 4 + obj_image_anim_end + +gUnknown_8465798:: + obj_image_anim_frame 0x60, 4 + obj_image_anim_end + +gUnknown_84657A0:: + .4byte gUnknown_8465740 + .4byte gUnknown_8465748 + .4byte gUnknown_8465750 + .4byte gUnknown_8465758 + .4byte gUnknown_8465760 + .4byte gUnknown_8465768 + .4byte gUnknown_8465770 + .4byte gUnknown_8465778 + .4byte gUnknown_8465780 + .4byte gUnknown_8465788 + .4byte gUnknown_8465790 + .4byte gUnknown_8465798 + +gUnknown_84657D0:: + obj_rot_scal_anim_frame 0x100, 0x100, 0, 1 + obj_rot_scal_anim_end + +gUnknown_84657E0:: @ unused + .4byte gUnknown_84657D0 gUnknown_84657E4:: @ 84657E4 - .incbin "baserom.gba", 0x4657E4, 0x98 + spr_template 0, 0, gUnknown_8465738, gUnknown_84657A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_84657FC:: + .4byte 0x00008000, 0x00000400 + +gUnknown_8465804:: + obj_image_anim_frame 0x00, 4 + obj_image_anim_end + +gUnknown_846580C:: + obj_image_anim_frame 0x02, 4 + obj_image_anim_end + +gUnknown_8465814:: + obj_image_anim_frame 0x04, 4 + obj_image_anim_end + +gUnknown_846581C:: + obj_image_anim_frame 0x06, 4 + obj_image_anim_end + +gUnknown_8465824:: + obj_image_anim_frame 0x08, 4 + obj_image_anim_end + +gUnknown_846582C:: + obj_image_anim_frame 0x0a, 4 + obj_image_anim_end + +gUnknown_8465834:: + obj_image_anim_frame 0x0c, 4 + obj_image_anim_end + +gUnknown_846583C:: + obj_image_anim_frame 0x0e, 4 + obj_image_anim_end + +gUnknown_8465844:: + obj_image_anim_frame 0x10, 4 + obj_image_anim_end + +gUnknown_846584C:: + obj_image_anim_frame 0x12, 4 + obj_image_anim_end + +gUnknown_8465854:: + .4byte gUnknown_8465804 + .4byte gUnknown_846580C + .4byte gUnknown_8465814 + .4byte gUnknown_846581C + .4byte gUnknown_8465824 + .4byte gUnknown_846582C + .4byte gUnknown_8465834 + .4byte gUnknown_846583C + .4byte gUnknown_8465844 + .4byte gUnknown_846584C gUnknown_846587C:: @ 846587C - .incbin "baserom.gba", 0x46587C, 0x5C + spr_template 2, 6, gUnknown_84657FC, gUnknown_8465854, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_8465894:: + .4byte 0x80000000, 0x00000400 + +gUnknown_846589C:: + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gUnknown_84658A4:: + obj_image_anim_frame 0, 24 + obj_image_anim_frame 16, 24 + obj_image_anim_jump 0 + +gUnknown_84658B0:: + obj_image_anim_frame 32, 28 + obj_image_anim_frame 48, 28 + obj_image_anim_jump 0 + +gUnknown_84658BC:: + obj_image_anim_frame 64, 12 + obj_image_anim_frame 80, 12 + obj_image_anim_jump 0 + +gUnknown_84658C8:: + .4byte gUnknown_846589C + .4byte gUnknown_84658A4 + .4byte gUnknown_84658B0 + .4byte gUnknown_84658BC gUnknown_84658D8:: @ 84658D8 - .incbin "baserom.gba", 0x4658D8, 0x18 + spr_template 1, 5, gUnknown_8465894, gUnknown_84658C8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_84658F0:: @ 84658F0 - .incbin "baserom.gba", 0x4658F0, 0x40 + .4byte sub_8141198 + .4byte sub_8141460 + .4byte sub_81414AC + .4byte sub_81414EC + .4byte sub_81414FC + .4byte sub_8141518 + .4byte sub_8141558 + .4byte sub_8141568 + .4byte sub_8141578 + .4byte sub_8141584 + .4byte sub_81415C8 + .4byte sub_8141610 + .4byte sub_8141650 + .4byte sub_8141690 + .4byte sub_81416C8 + .4byte sub_8141764 gUnknown_8465930:: @ 8465930 - .incbin "baserom.gba", 0x465930, 0x20 + .incbin "graphics/slot_machine/unk_8465930.gbapal" gUnknown_8465950:: @ 8465950 - .incbin "baserom.gba", 0x465950, 0x80 + .incbin "graphics/slot_machine/unk_8465950.gbapal" + .incbin "graphics/slot_machine/unk_8465970.gbapal" + .incbin "graphics/slot_machine/unk_8465990.gbapal" + .incbin "graphics/slot_machine/unk_84659b0.gbapal" gUnknown_84659D0:: @ 84659D0 - .incbin "baserom.gba", 0x4659D0, 0x804 + .incbin "graphics/slot_machine/unk_84659d0.4bpp.lz" gUnknown_84661D4:: @ 84661D4 - .incbin "baserom.gba", 0x4661D4, 0x2E8 + .incbin "graphics/slot_machine/unk_84661d4.bin.lz" gUnknown_84664BC:: @ 84664BC - .incbin "baserom.gba", 0x4664BC, 0x20 + .incbin "graphics/slot_machine/unk_84664bc.gbapal" gUnknown_84664DC:: @ 84664DC - .incbin "baserom.gba", 0x4664DC, 0x60 + .incbin "graphics/slot_machine/unk_84664dc.gbapal" + .incbin "graphics/slot_machine/unk_84664fc.gbapal" + .incbin "graphics/slot_machine/unk_846651c.gbapal" gUnknown_846653C:: @ 846653C - .incbin "baserom.gba", 0x46653C, 0x84 + .incbin "graphics/slot_machine/unk_846653c.4bpp.lz" gUnknown_84665C0:: @ 84665C0 - .incbin "baserom.gba", 0x4665C0, 0x60 + .incbin "graphics/slot_machine/unk_84665c0.gbapal" + .incbin "graphics/slot_machine/unk_84665e0.gbapal" + .incbin "graphics/slot_machine/unk_8466600.gbapal" gUnknown_8466620:: @ 8466620 - .incbin "baserom.gba", 0x466620, 0x378 + .incbin "graphics/slot_machine/unk_8466620.4bpp.lz" gUnknown_8466998:: @ 8466998 - .incbin "baserom.gba", 0x466998, 0x178 + .incbin "graphics/slot_machine/unk_8466998.bin.lz" + .align 2 @ bg templates gUnknown_8466B10:: @ 8466B10 - .incbin "baserom.gba", 0x466B10, 0x10 + .4byte 0x000001d0 + .4byte 0x000031ff + .4byte 0x000021ea + .4byte 0x000001c5 gUnknown_8466B20:: @ 8466B20 - .incbin "baserom.gba", 0x466B20, 0xEC + window_template 0x00, 0x05, 0x0f, 0x14, 0x04, 0x0f, 0x004f + window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0e, 0x0013 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 + +gUnknown_8466B38:: + .2byte 0x00a4, 0x00a5, 0x00a6, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00e7, 0x012c, 0x014c, 0x0191, 0x01b1, 0x01f6, 0x0216, 0x0217, 0x0218 + .2byte 0x0219, 0x0237, 0x0238, 0x0239 +gUnknown_8466B60:: + .2byte 0x00e4, 0x00e5, 0x00e6, 0x00f7, 0x00f8, 0x00f9, 0x0104, 0x0105, 0x0106, 0x0107, 0x010c, 0x0111, 0x0116, 0x0117, 0x0118, 0x0119 + .2byte 0x0124, 0x0125, 0x0126, 0x0137, 0x0138, 0x0139 + +gUnknown_8466B8C:: + .2byte 0x0144, 0x0145, 0x0146, 0x0157, 0x0158, 0x0159, 0x0164, 0x0165, 0x0166, 0x0167, 0x016c, 0x0171, 0x0176, 0x0177, 0x0178, 0x0179 + .2byte 0x0184, 0x0185, 0x0186, 0x0197, 0x0198, 0x0199 + +gUnknown_8466BB8:: + .2byte 0x01a4, 0x01a5, 0x01a6, 0x01b7, 0x01b8, 0x01b9, 0x01c4, 0x01c5, 0x01c6, 0x01c7, 0x01cc, 0x01d1, 0x01d6, 0x01d7, 0x01d8, 0x01d9 + .2byte 0x01e4, 0x01e5, 0x01e6, 0x01f7, 0x01f8, 0x01f9 + +gUnknown_8466BE4:: + .2byte 0x0204, 0x0205, 0x0206, 0x0224, 0x0225, 0x0226, 0x01e7, 0x0207, 0x018c, 0x01ac, 0x0131, 0x0151, 0x00d6, 0x00f6, 0x00b7, 0x00b8 + .2byte 0x00b9, 0x00d7, 0x00d8, 0x00d9 + + .align 2 gUnknown_8466C0C:: @ 8466C0C - .incbin "baserom.gba", 0x466C0C, 0x28 + .4byte gUnknown_8466B38, 0x14 + .4byte gUnknown_8466B60, 0x16 + .4byte gUnknown_8466B8C, 0x16 + .4byte gUnknown_8466BB8, 0x16 + .4byte gUnknown_8466BE4, 0x14 gUnknown_8466C34:: @ 8466C34 - .incbin "baserom.gba", 0x466C34, 0x4 + .byte 0x02, 0x04 + .align 2 gUnknown_8466C38:: @ 8466C38 - .incbin "baserom.gba", 0x466C38, 0x8 + window_template 0x00, 0x13, 0x09, 0x06, 0x04, 0x0f, 0x009f gUnknown_8466C40:: @ 8466C40 - .incbin "baserom.gba", 0x466C40, 0x18 + .2byte 0x0229, 0x022a, 0x0249, 0x024a, 0x022e, 0x022f, 0x024e, 0x024f, 0x0233, 0x0234, 0x0253, 0x0254 diff --git a/graphics/slot_machine/unk_8464974.pal b/graphics/slot_machine/unk_8464974.pal new file mode 100644 index 000000000..6bc8bed9a --- /dev/null +++ b/graphics/slot_machine/unk_8464974.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +65 65 65 +255 246 0 +255 172 0 +246 246 255 +255 246 213 +246 213 156 +238 222 0 +98 98 98 +131 98 41 +255 106 0 +222 57 0 +213 180 0 +222 222 230 +0 0 0 +0 0 0 diff --git a/graphics/slot_machine/unk_8464994.pal b/graphics/slot_machine/unk_8464994.pal new file mode 100644 index 000000000..8dee9dd3e --- /dev/null +++ b/graphics/slot_machine/unk_8464994.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +123 255 255 +65 65 65 +246 246 255 +246 74 0 +205 65 0 +255 205 189 +222 222 230 +0 0 0 +255 238 238 +164 32 0 +205 123 24 +255 222 115 +123 82 0 +255 246 0 +230 205 0 +164 123 41 diff --git a/graphics/slot_machine/unk_84649b4.pal b/graphics/slot_machine/unk_84649b4.pal new file mode 100644 index 000000000..d54cfc65f --- /dev/null +++ b/graphics/slot_machine/unk_84649b4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 255 139 +65 65 65 +255 0 0 +255 255 255 +255 131 0 +255 205 0 +0 0 255 +0 131 255 +0 205 255 +156 238 74 +205 205 230 +222 0 0 +0 156 0 +131 131 148 +164 164 189 +180 0 0 diff --git a/graphics/slot_machine/unk_84649d4.pal b/graphics/slot_machine/unk_84649d4.pal new file mode 100644 index 000000000..d06616c5d --- /dev/null +++ b/graphics/slot_machine/unk_84649d4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 156 230 +57 65 65 +255 246 213 +246 213 123 +255 205 172 +255 172 115 +172 156 90 +246 246 255 +213 98 41 +222 222 230 +148 148 156 +238 172 255 +246 131 180 +197 74 106 +148 74 197 +205 131 255 diff --git a/graphics/slot_machine/unk_84649f4.pal b/graphics/slot_machine/unk_84649f4.pal new file mode 100644 index 000000000..ef5e9a7ae --- /dev/null +++ b/graphics/slot_machine/unk_84649f4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 230 115 +57 65 65 +106 115 115 +197 205 205 +230 238 238 +246 246 255 +164 172 172 +255 90 65 +65 90 255 +189 213 255 +255 213 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/slot_machine/unk_8464a14.png b/graphics/slot_machine/unk_8464a14.png Binary files differnew file mode 100644 index 000000000..be8dfb6e8 --- /dev/null +++ b/graphics/slot_machine/unk_8464a14.png diff --git a/graphics/slot_machine/unk_846504c.pal b/graphics/slot_machine/unk_846504c.pal new file mode 100644 index 000000000..9a5bab429 --- /dev/null +++ b/graphics/slot_machine/unk_846504c.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +238 172 0 +156 115 115 +246 205 205 +123 90 90 +222 164 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 123 32 +255 205 32 +205 90 0 diff --git a/graphics/slot_machine/unk_846506c.png b/graphics/slot_machine/unk_846506c.png Binary files differnew file mode 100644 index 000000000..1fe951e50 --- /dev/null +++ b/graphics/slot_machine/unk_846506c.png diff --git a/graphics/slot_machine/unk_8465524.pal b/graphics/slot_machine/unk_8465524.pal new file mode 100644 index 000000000..b8cf64bae --- /dev/null +++ b/graphics/slot_machine/unk_8465524.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +98 98 90 +255 255 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 255 0 diff --git a/graphics/slot_machine/unk_8465544.png b/graphics/slot_machine/unk_8465544.png Binary files differnew file mode 100644 index 000000000..0e3154f61 --- /dev/null +++ b/graphics/slot_machine/unk_8465544.png diff --git a/graphics/slot_machine/unk_8465930.pal b/graphics/slot_machine/unk_8465930.pal new file mode 100644 index 000000000..f2c377a3f --- /dev/null +++ b/graphics/slot_machine/unk_8465930.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +57 57 49 +230 230 230 +255 255 255 +238 172 0 +197 74 24 +205 90 0 +255 205 32 +222 123 32 +255 164 41 +57 148 255 +164 222 255 +0 49 123 +139 0 0 +98 98 90 +0 0 0 diff --git a/graphics/slot_machine/unk_8465950.pal b/graphics/slot_machine/unk_8465950.pal new file mode 100644 index 000000000..634aa770d --- /dev/null +++ b/graphics/slot_machine/unk_8465950.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +238 172 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 90 0 +222 41 0 +255 205 32 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/unk_8465970.pal b/graphics/slot_machine/unk_8465970.pal new file mode 100644 index 000000000..1d932206e --- /dev/null +++ b/graphics/slot_machine/unk_8465970.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +74 74 213 +115 172 255 +115 164 74 +156 238 74 +255 90 0 +255 164 41 +255 238 32 +222 41 0 +189 189 189 +156 156 156 +123 123 123 +90 90 90 +65 65 65 +0 0 0 diff --git a/graphics/slot_machine/unk_8465990.pal b/graphics/slot_machine/unk_8465990.pal new file mode 100644 index 000000000..2c2b3d843 --- /dev/null +++ b/graphics/slot_machine/unk_8465990.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +238 172 0 +172 106 106 +222 156 156 +148 82 82 +197 131 131 +8 123 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +222 123 32 +255 205 32 +205 90 0 diff --git a/graphics/slot_machine/unk_84659b0.pal b/graphics/slot_machine/unk_84659b0.pal new file mode 100644 index 000000000..742063525 --- /dev/null +++ b/graphics/slot_machine/unk_84659b0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +213 57 0 +205 90 0 +255 255 255 +238 172 0 +0 0 197 +180 65 0 +180 65 0 +0 106 0 +0 106 0 +82 123 255 +246 156 0 +246 156 0 +41 180 82 +41 180 82 +0 0 0 diff --git a/graphics/slot_machine/unk_84659d0.png b/graphics/slot_machine/unk_84659d0.png Binary files differnew file mode 100644 index 000000000..5223d0d3f --- /dev/null +++ b/graphics/slot_machine/unk_84659d0.png diff --git a/graphics/slot_machine/unk_84661d4.bin b/graphics/slot_machine/unk_84661d4.bin Binary files differnew file mode 100644 index 000000000..23182cba7 --- /dev/null +++ b/graphics/slot_machine/unk_84661d4.bin diff --git a/graphics/slot_machine/unk_84664bc.pal b/graphics/slot_machine/unk_84664bc.pal new file mode 100644 index 000000000..87103918b --- /dev/null +++ b/graphics/slot_machine/unk_84664bc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +213 57 0 +205 90 0 +255 255 255 +238 172 0 +0 164 238 +238 131 0 +238 131 0 +0 222 0 +0 222 0 +139 255 255 +255 238 106 +255 238 106 +148 255 148 +148 255 148 +0 0 0 diff --git a/graphics/slot_machine/unk_84664dc.pal b/graphics/slot_machine/unk_84664dc.pal new file mode 100644 index 000000000..12dfa2b28 --- /dev/null +++ b/graphics/slot_machine/unk_84664dc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +238 172 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 180 65 +255 90 0 +255 90 0 +222 41 0 +255 205 32 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/unk_84664fc.pal b/graphics/slot_machine/unk_84664fc.pal new file mode 100644 index 000000000..fe26d000a --- /dev/null +++ b/graphics/slot_machine/unk_84664fc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +238 172 0 +255 180 65 +255 90 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 180 65 +255 90 0 +255 205 32 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/unk_846651c.pal b/graphics/slot_machine/unk_846651c.pal new file mode 100644 index 000000000..339886b3b --- /dev/null +++ b/graphics/slot_machine/unk_846651c.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +238 172 0 +255 90 0 +222 41 0 +255 180 65 +255 90 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 205 32 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/unk_846653c.png b/graphics/slot_machine/unk_846653c.png Binary files differnew file mode 100644 index 000000000..4fb62b7a3 --- /dev/null +++ b/graphics/slot_machine/unk_846653c.png diff --git a/graphics/slot_machine/unk_84665c0.pal b/graphics/slot_machine/unk_84665c0.pal new file mode 100644 index 000000000..362860109 --- /dev/null +++ b/graphics/slot_machine/unk_84665c0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +230 189 230 +65 65 65 +255 255 255 +139 238 255 +172 255 255 +106 205 222 +246 222 123 +255 230 180 +213 189 90 +222 49 0 +255 238 0 +246 205 115 +213 156 41 +246 49 0 +222 255 205 +255 230 230 diff --git a/graphics/slot_machine/unk_84665e0.pal b/graphics/slot_machine/unk_84665e0.pal new file mode 100644 index 000000000..758d58497 --- /dev/null +++ b/graphics/slot_machine/unk_84665e0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 255 255 +65 65 65 +246 246 246 +255 82 82 +49 180 255 +65 213 255 +255 156 82 +0 156 0 +156 238 74 +164 164 189 +255 238 0 +255 246 164 +197 164 57 +238 222 0 +222 255 205 +255 230 230 diff --git a/graphics/slot_machine/unk_8466600.pal b/graphics/slot_machine/unk_8466600.pal new file mode 100644 index 000000000..bf0a84def --- /dev/null +++ b/graphics/slot_machine/unk_8466600.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 255 255 +65 65 65 +246 246 246 +123 131 131 +197 205 205 +255 139 115 +90 123 255 +213 131 255 +148 74 197 +189 90 65 +255 180 172 +246 230 106 +246 74 0 +197 255 255 +222 255 205 +255 230 230 diff --git a/graphics/slot_machine/unk_8466620.png b/graphics/slot_machine/unk_8466620.png Binary files differnew file mode 100644 index 000000000..73b5d1046 --- /dev/null +++ b/graphics/slot_machine/unk_8466620.png diff --git a/graphics/slot_machine/unk_8466998.bin b/graphics/slot_machine/unk_8466998.bin Binary files differnew file mode 100644 index 000000000..d7dc278da --- /dev/null +++ b/graphics/slot_machine/unk_8466998.bin diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 145dc0810..27931e87e 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -23,6 +23,7 @@ PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/event_objects MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window +SLOTMACHINEGFXDIR := graphics/slot_machine types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -483,3 +484,9 @@ $(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 + +$(SLOTMACHINEGFXDIR)/unk_8466620.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 66 + +$(SLOTMACHINEGFXDIR)/unk_84659d0.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 138 diff --git a/src/slot_machine.c b/src/slot_machine.c index 7293b6444..3a19fdbd5 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -16,7 +16,7 @@ struct SlotMachineState MainCallback savedCallback; u16 machineidx; u16 field_06; - u8 filler_08[2]; + u16 field_08; u16 slotRewardClass; u8 filler_0C[2]; u16 bet; @@ -46,11 +46,12 @@ void MainTask_ExitSlots(u8 taskId); static void SetMainTask(TaskFunc taskFunc); void sub_8140060(u8 taskId); void sub_8140148(void); -void sub_814016C(u16 whichPosition, u16 whichReel); -void sub_81401F0(u16 whichPosition); -void sub_81403BC(u16 whichPosition); -void sub_81404B8(u16 whichPosition); +void sub_814016C(u16 whichReel, u16 whichReel2); bool32 sub_81401A0(u16); +void sub_81401F0(u16 whichReel); +void sub_81403BC(u16 whichReel); +void sub_81404B8(u16 whichReel); +bool32 sub_81408F4(u32 a0, u32 a1); void sub_81409B4(void); void sub_8140A70(void); u16 sub_8140A80(void); @@ -61,6 +62,8 @@ void sub_8141148(u16 a0, u8 a1); bool32 sub_8141180(u8 a0); void sub_8141C30(u8, u8); +extern const u8 gUnknown_8464926[][21]; + void PlaySlotMachine(u16 machineIdx, MainCallback savedCallback) { ResetTasks(); @@ -511,18 +514,18 @@ void sub_8140148(void) } } -void sub_814016C(u16 whichPosition, u16 whichReel) +void sub_814016C(u16 whichReel, u16 whichReel2) { - switch (whichReel) + switch (whichReel2) { case 0: - sub_81401F0(whichPosition); + sub_81401F0(whichReel); break; case 1: - sub_81403BC(whichPosition); + sub_81403BC(whichReel); break; case 2: - sub_81404B8(whichPosition); + sub_81404B8(whichReel); break; } } @@ -543,3 +546,47 @@ s16 sub_81401B4(u16 whichReel) } return position; } + +/* +void sub_81401F0(u16 whichReel) +{ + s32 i; + s16 r2; + s16 r6; + s16 sp0C = sub_81401B4(whichReel); + u32 r8 = 0; + u32 sp08; + u32 r10; + u8 sp0[5]; + + if (sSlotMachineState->field_08 == 0 && whichReel == 0) + { + sp08 = 0; + r10 = 0; + for (i = 0; i < 5; i++) + { + r6 = 0; + r2 = sp0C - i + 1; + for (; r6 < 3; r6++) + { + if (r2 >= 21) + r2 = 0; + if (sub_81408F4(1, gUnknown_8464926[r10][r2])) + break; + } + if (r6 == 3) + { + sp0[r8] = i; + r8++; + } + } + } + else if (sSlotMachineState->field_08 != 1 || whichReel == 0) + { + for (i = 0, r2 = whichReel + 1; i < 3; i++) + { + if (sub_81408F4(sSlotMachineState->field_08, gUnknown_8464926[])) + } + } +} +*/ |
