From aafeac8fcf4162d83d8fa2d9f8738c602ef2aa03 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 21 May 2019 12:31:54 -0400 Subject: Dump slot machine data --- data/slot_machine.s | 358 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 327 insertions(+), 31 deletions(-) (limited to 'data') 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 -- cgit v1.2.3 From 5a03fca0374e2c9e13360ac184acb321096fb527 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 22 May 2019 12:19:01 -0400 Subject: slot_machine nonmatching sub_81406E8 Register allocation differences --- data/slot_machine.s | 55 ----------------------------------------------------- 1 file changed, 55 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index a85e26b75..5c2093bd0 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,61 +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" -- cgit v1.2.3 From 8d6eac996f0e69666b47aefb3dadb37eb1f40e74 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 22 May 2019 16:09:19 -0400 Subject: slot_machine through sub_8140C6C --- data/slot_machine.s | 47 +---------------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 5c2093bd0..6a53f4426 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -2,52 +2,7 @@ .include "constants/constants.inc" .section .rodata - .align 2 -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 - + .align 1 gUnknown_8465608:: @ 8465608 .2byte 0x0002, 0x0002, 0x0000, 0x0000, 0x0002, 0x0004, 0x0003 -- cgit v1.2.3 From d3aa5a0b97e08c7824eea6b38b2904e443267eab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 22 May 2019 17:48:56 -0400 Subject: slot_machine sub_8140CA0 --- data/slot_machine.s | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 6a53f4426..25b5a6817 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -2,23 +2,6 @@ .include "constants/constants.inc" .section .rodata - .align 1 -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 -- cgit v1.2.3 From dcdabbf6f2feeebece89114aa9e537a78ec14601 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 23 May 2019 12:14:43 -0400 Subject: slot_machine sprite templates --- data/slot_machine.s | 163 ---------------------------------------------------- 1 file changed, 163 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 25b5a6817..b6212ba71 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,169 +3,6 @@ .section .rodata .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 - 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 - 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 - spr_template 1, 5, gUnknown_8465894, gUnknown_84658C8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_84658F0:: @ 84658F0 .4byte sub_8141198 -- cgit v1.2.3 From f111acf92a56bed70b15df882857d8081a092889 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 23 May 2019 17:16:32 -0400 Subject: slot_machine through sub_8141180 --- data/slot_machine.s | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index b6212ba71..c2854d6e4 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -4,24 +4,6 @@ .section .rodata .align 2 -gUnknown_84658F0:: @ 84658F0 - .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 "graphics/slot_machine/unk_8465930.gbapal" -- cgit v1.2.3 From 36fc72f25e178d53342acff66870e518ed7a144a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 May 2019 18:57:01 -0400 Subject: slot_machine nonmatching sub_8141198 --- data/slot_machine.s | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index c2854d6e4..5c95ae7bf 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -2,57 +2,6 @@ .include "constants/constants.inc" .section .rodata - .align 2 - -gUnknown_8465930:: @ 8465930 - .incbin "graphics/slot_machine/unk_8465930.gbapal" - -gUnknown_8465950:: @ 8465950 - .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 "graphics/slot_machine/unk_84659d0.4bpp.lz" - -gUnknown_84661D4:: @ 84661D4 - .incbin "graphics/slot_machine/unk_84661d4.bin.lz" - -gUnknown_84664BC:: @ 84664BC - .incbin "graphics/slot_machine/unk_84664bc.gbapal" - -gUnknown_84664DC:: @ 84664DC - .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 "graphics/slot_machine/unk_846653c.4bpp.lz" - -gUnknown_84665C0:: @ 84665C0 - .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 "graphics/slot_machine/unk_8466620.4bpp.lz" - -gUnknown_8466998:: @ 8466998 - .incbin "graphics/slot_machine/unk_8466998.bin.lz" - - .align 2 @ bg templates -gUnknown_8466B10:: @ 8466B10 - .4byte 0x000001d0 - .4byte 0x000031ff - .4byte 0x000021ea - .4byte 0x000001c5 - -gUnknown_8466B20:: @ 8466B20 - 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 -- cgit v1.2.3 From ef4c86fbfdd18b78700f61b629907a85579197c0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 29 Jul 2019 20:50:06 -0400 Subject: slot_machine: through sub_81418C4 --- data/slot_machine.s | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 5c95ae7bf..1ff90742f 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -2,34 +2,8 @@ .include "constants/constants.inc" .section .rodata -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 - .4byte gUnknown_8466B38, 0x14 - .4byte gUnknown_8466B60, 0x16 - .4byte gUnknown_8466B8C, 0x16 - .4byte gUnknown_8466BB8, 0x16 - .4byte gUnknown_8466BE4, 0x14 - gUnknown_8466C34:: @ 8466C34 .byte 0x02, 0x04 -- cgit v1.2.3 From 8384ed7a25f2fed140786b90a9893f47f8379f9a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 29 Jul 2019 21:52:37 -0400 Subject: Finish slot_machine --- data/slot_machine.s | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 data/slot_machine.s (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s deleted file mode 100644 index 1ff90742f..000000000 --- a/data/slot_machine.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_8466C34:: @ 8466C34 - .byte 0x02, 0x04 - - .align 2 -gUnknown_8466C38:: @ 8466C38 - window_template 0x00, 0x13, 0x09, 0x06, 0x04, 0x0f, 0x009f - -gUnknown_8466C40:: @ 8466C40 - .2byte 0x0229, 0x022a, 0x0249, 0x024a, 0x022e, 0x022f, 0x024e, 0x024f, 0x0233, 0x0234, 0x0253, 0x0254 -- cgit v1.2.3 From a74d770de1bd0b989350f8f4833ec92f48139bf8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 29 Jul 2019 21:56:42 -0400 Subject: Move string decls to strings.h --- data/strings.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index e1804aae0..4f6b40d85 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3067,13 +3067,13 @@ gText_HatchedFromEgg:: @ 841B6FD gText_NickHatchPrompt:: @ 841B716 .string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$" -gUnknown_841B747:: @ 841B747 +gString_OutOfCoins:: @ 841B747 .string "You've run out of COINS.\nGame over!$" -gUnknown_841B76B:: @ 841B76B +gString_QuitPlaying:: @ 841B76B .string "Quit playing?$" -gUnknown_841B779:: @ 841B779 +gString_SlotMachineControls:: @ 841B779 .string "{KEYGFX_DPAD_LEFT_RIGHT}COMBOS {KEYGFX_DPAD_DOWN}WAGER {KEYGFX_A_BUTTON}STOP {KEYGFX_B_BUTTON}EXIT$" gUnknown_841B798:: @ 0x841B798 -- cgit v1.2.3