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 From ea8f529f2d5bb520b83d5b7721dc47ba1b489d45 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 30 Jul 2019 22:07:15 -0400 Subject: title_screen: data and code thru sub_8078C9C --- data/field_weather.s | 3 ++ data/graphics.s | 5 +- data/graphics/title_screen/unk_83BF58C.png | Bin 0 -> 78 bytes data/graphics/title_screen/unk_83BF5A8.bin | 1 + data/graphics/title_screen/unk_83bf64c.png | Bin 0 -> 188 bytes data/graphics/title_screen/unk_83bf79c.png | Bin 0 -> 539 bytes data/graphics/title_screen/unk_83bfa14.png | Bin 0 -> 150 bytes data/title_screen.s | 80 ++++++++++++++++++++++++----- 8 files changed, 74 insertions(+), 15 deletions(-) create mode 100644 data/graphics/title_screen/unk_83BF58C.png create mode 100644 data/graphics/title_screen/unk_83BF5A8.bin create mode 100644 data/graphics/title_screen/unk_83bf64c.png create mode 100644 data/graphics/title_screen/unk_83bf79c.png create mode 100644 data/graphics/title_screen/unk_83bfa14.png (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index a25e44344..517480d9a 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -1,6 +1,9 @@ .section .rodata .align 2 +gUnknown_83BFBE4:: @ 83BFBE4 + .incbin "baserom.gba", 0x3BFBE4, 0x2FD8 + gUnknown_83C2BBC:: @ 83C2BBC .incbin "baserom.gba", 0x3C2BBC, 0x4 diff --git a/data/graphics.s b/data/graphics.s index 83d14001d..f62234529 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16379,11 +16379,12 @@ gUnknown_8EAE0B4:: @ 8EAE0B4 gUnknown_8EAE374:: @ 8EAE374 .incbin "baserom.gba", 0xEAE374, 0x114 + @ title_screen gUnknown_8EAE488:: @ 8EAE488 - .incbin "baserom.gba", 0xEAE488, 0x20 @UNKNOWN + .incbin "graphics/title_screen/unk_8eae488.gbapal" gUnknown_8EAE4A8:: @ 8EAE4A8 - .incbin "baserom.gba", 0xEAE4A8, 0x80 + .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz" gUnknown_8EAE528:: @ 8EAE528 .incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN diff --git a/data/graphics/title_screen/unk_83BF58C.png b/data/graphics/title_screen/unk_83BF58C.png new file mode 100644 index 000000000..895457c3c Binary files /dev/null and b/data/graphics/title_screen/unk_83BF58C.png differ diff --git a/data/graphics/title_screen/unk_83BF5A8.bin b/data/graphics/title_screen/unk_83BF5A8.bin new file mode 100644 index 000000000..375fbeb7a --- /dev/null +++ b/data/graphics/title_screen/unk_83BF5A8.bin @@ -0,0 +1 @@ +àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà \ No newline at end of file diff --git a/data/graphics/title_screen/unk_83bf64c.png b/data/graphics/title_screen/unk_83bf64c.png new file mode 100644 index 000000000..3c9b7630d Binary files /dev/null and b/data/graphics/title_screen/unk_83bf64c.png differ diff --git a/data/graphics/title_screen/unk_83bf79c.png b/data/graphics/title_screen/unk_83bf79c.png new file mode 100644 index 000000000..246252bed Binary files /dev/null and b/data/graphics/title_screen/unk_83bf79c.png differ diff --git a/data/graphics/title_screen/unk_83bfa14.png b/data/graphics/title_screen/unk_83bfa14.png new file mode 100644 index 000000000..f4f030a5b Binary files /dev/null and b/data/graphics/title_screen/unk_83bfa14.png differ diff --git a/data/title_screen.s b/data/title_screen.s index 93d0f2f83..e0186afe3 100644 --- a/data/title_screen.s +++ b/data/title_screen.s @@ -1,34 +1,88 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_83BF58C:: @ 83BF58C - .incbin "baserom.gba", 0x3BF58C, 0x1C +gUnknown_83BF64C:: @ 83BF64C + .incbin "data/graphics/title_screen/unk_83bf64c.4bpp.lz" -gUnknown_83BF5A8:: @ 83BF5A8 - .incbin "baserom.gba", 0x3BF5A8, 0x55C +gUnknown_83BF77C:: + .incbin "data/graphics/title_screen/unk_83bf77c.gbapal" + +gUnknown_83BF79C:: + .incbin "data/graphics/title_screen/unk_83bf79c.4bpp.lz" + +gUnknown_83BFA14:: + .incbin "data/graphics/title_screen/unk_83bfa14.4bpp.lz" + +gOamData_83BFAB4:: + .4byte 0x40000000, 0x00000c00 + +gSpriteAnims_83BFABC:: + obj_image_anim_frame 0x0, 0x3 + obj_image_anim_frame 0x4, 0x6 + obj_image_anim_frame 0x8, 0x6 + obj_image_anim_frame 0xc, 0x6 + obj_image_anim_frame 0x10, 0x6 + obj_image_anim_frame 0x14, 0x6 + obj_image_anim_frame 0x18, 0x6 + obj_image_anim_frame 0x1c, 0x6 + obj_image_anim_frame 0x20, 0x6 + obj_image_anim_frame 0x24, 0x6 + obj_image_anim_end + +gSpriteAnims_83BFAE8:: + obj_image_anim_frame 0x18, 0x6 + obj_image_anim_frame 0x1c, 0x6 + obj_image_anim_frame 0x20, 0x6 + obj_image_anim_frame 0x24, 0x6 + obj_image_anim_end + +gSpriteAnimTable_83BFAFC:: + .4byte gSpriteAnims_83BFABC + .4byte gSpriteAnims_83BFAE8 gUnknown_83BFB04:: @ 83BFB04 - .incbin "baserom.gba", 0x3BFB04, 0x18 + spr_template 0, 0, gOamData_83BFAB4, gSpriteAnimTable_83BFAFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_83BFB1C:: @ 83BFB1C - .incbin "baserom.gba", 0x3BFB1C, 0x20 + spr_template 1, 0, gOamData_83BFAB4, gSpriteAnimTable_83BFAFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gOamData_83BFB34:: + .4byte 0xc0008000, 0x00000000 gUnknown_83BFB3C:: @ 83BFB3C - .incbin "baserom.gba", 0x3BFB3C, 0x20 + spr_template 2, 2, gOamData_83BFB34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gOamData_83BFB54:: + .4byte 0xc0000800, 0x00000000 gUnknown_83BFB5C:: @ 83BFB5C - .incbin "baserom.gba", 0x3BFB5C, 0x18 + spr_template 3, 2, gOamData_83BFB54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_83BFB74:: @ 83BFB74 - .incbin "baserom.gba", 0x3BFB74, 0x10 + .4byte 0x000009f0 + .4byte 0x000011e5 + .4byte 0x000021da + .4byte 0x000031cf gUnknown_83BFB84:: @ 83BFB84 - .incbin "baserom.gba", 0x3BFB84, 0x18 + .4byte sub_8078C9C + .4byte sub_8078D24 + .4byte sub_8078DA4 + .4byte sub_8078FC4 + .4byte sub_80790CC + .4byte sub_80791C0 gUnknown_83BFB9C:: @ 83BFB9C - .incbin "baserom.gba", 0x3BFB9C, 0x20 + obj_tiles gUnknown_83BF79C, 0x500, 0 + obj_tiles gUnknown_83BFA14, 0x500, 1 + obj_tiles gUnknown_8EAE4A8, 0x400, 2 + obj_tiles gUnknown_83BF64C, 0x800, 3 gUnknown_83BFBBC:: @ 83BFBBC - .incbin "baserom.gba", 0x3BFBBC, 0x18 + obj_pal gUnknown_83BF77C, 0 + obj_pal gUnknown_8EAE488, 2 + null_obj_pal gUnknown_83BFBD4:: @ 83BFBD4 - .incbin "baserom.gba", 0x3BFBD4, 0x2FE8 + .incbin "baserom.gba", 0x3BFBD4, 0xF -- cgit v1.2.3 From e96ecee460c5cd0c3139432ebbb191a36ad31912 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 31 Jul 2019 12:32:57 -0400 Subject: title_screen through sub_80791C0 --- data/title_screen.s | 88 ----------------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 data/title_screen.s (limited to 'data') diff --git a/data/title_screen.s b/data/title_screen.s deleted file mode 100644 index e0186afe3..000000000 --- a/data/title_screen.s +++ /dev/null @@ -1,88 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 -gUnknown_83BF64C:: @ 83BF64C - .incbin "data/graphics/title_screen/unk_83bf64c.4bpp.lz" - -gUnknown_83BF77C:: - .incbin "data/graphics/title_screen/unk_83bf77c.gbapal" - -gUnknown_83BF79C:: - .incbin "data/graphics/title_screen/unk_83bf79c.4bpp.lz" - -gUnknown_83BFA14:: - .incbin "data/graphics/title_screen/unk_83bfa14.4bpp.lz" - -gOamData_83BFAB4:: - .4byte 0x40000000, 0x00000c00 - -gSpriteAnims_83BFABC:: - obj_image_anim_frame 0x0, 0x3 - obj_image_anim_frame 0x4, 0x6 - obj_image_anim_frame 0x8, 0x6 - obj_image_anim_frame 0xc, 0x6 - obj_image_anim_frame 0x10, 0x6 - obj_image_anim_frame 0x14, 0x6 - obj_image_anim_frame 0x18, 0x6 - obj_image_anim_frame 0x1c, 0x6 - obj_image_anim_frame 0x20, 0x6 - obj_image_anim_frame 0x24, 0x6 - obj_image_anim_end - -gSpriteAnims_83BFAE8:: - obj_image_anim_frame 0x18, 0x6 - obj_image_anim_frame 0x1c, 0x6 - obj_image_anim_frame 0x20, 0x6 - obj_image_anim_frame 0x24, 0x6 - obj_image_anim_end - -gSpriteAnimTable_83BFAFC:: - .4byte gSpriteAnims_83BFABC - .4byte gSpriteAnims_83BFAE8 - -gUnknown_83BFB04:: @ 83BFB04 - spr_template 0, 0, gOamData_83BFAB4, gSpriteAnimTable_83BFAFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83BFB1C:: @ 83BFB1C - spr_template 1, 0, gOamData_83BFAB4, gSpriteAnimTable_83BFAFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gOamData_83BFB34:: - .4byte 0xc0008000, 0x00000000 - -gUnknown_83BFB3C:: @ 83BFB3C - spr_template 2, 2, gOamData_83BFB34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gOamData_83BFB54:: - .4byte 0xc0000800, 0x00000000 - -gUnknown_83BFB5C:: @ 83BFB5C - spr_template 3, 2, gOamData_83BFB54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83BFB74:: @ 83BFB74 - .4byte 0x000009f0 - .4byte 0x000011e5 - .4byte 0x000021da - .4byte 0x000031cf - -gUnknown_83BFB84:: @ 83BFB84 - .4byte sub_8078C9C - .4byte sub_8078D24 - .4byte sub_8078DA4 - .4byte sub_8078FC4 - .4byte sub_80790CC - .4byte sub_80791C0 - -gUnknown_83BFB9C:: @ 83BFB9C - obj_tiles gUnknown_83BF79C, 0x500, 0 - obj_tiles gUnknown_83BFA14, 0x500, 1 - obj_tiles gUnknown_8EAE4A8, 0x400, 2 - obj_tiles gUnknown_83BF64C, 0x800, 3 - -gUnknown_83BFBBC:: @ 83BFBBC - obj_pal gUnknown_83BF77C, 0 - obj_pal gUnknown_8EAE488, 2 - null_obj_pal - -gUnknown_83BFBD4:: @ 83BFBD4 - .incbin "baserom.gba", 0x3BFBD4, 0xF -- cgit v1.2.3 From e2c552f1df045719652e1d91fb6a6ad67d00a045 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 31 Jul 2019 16:11:20 -0400 Subject: Static decl/def; gfx dump --- data/graphics.s | 20 ++++++++++---------- data/graphics/title_screen/unk_83bf64c.png | Bin 188 -> 188 bytes data/graphics/title_screen/unk_83bf77c.pal | 19 +++++++++++++++++++ data/graphics/title_screen/unk_83bf79c.png | Bin 539 -> 539 bytes 4 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 data/graphics/title_screen/unk_83bf77c.pal (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index f62234529..189826238 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16352,34 +16352,34 @@ gUnknown_8EAAB98:: @ 8EAAB98 gUnknown_8EAB30C:: @ 8EAB30C .incbin "baserom.gba", 0xEAB30C, 0x3B8 + @ title_screen gUnknown_8EAB6C4:: @ 8EAB6C4 - .incbin "baserom.gba", 0xEAB6C4, 0x200 @UNKNOWN + .incbin "graphics/title_screen/unk_8eab6c4.gbapal" gUnknown_8EAB8C4:: @ 8EAB8C4 - .incbin "baserom.gba", 0xEAB8C4, 0x1ACC + .incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz" gUnknown_8EAD390:: @ 8EAD390 - .incbin "baserom.gba", 0xEAD390, 0x258 + .incbin "graphics/title_screen/unk_8ead390.bin.lz" gUnknown_8EAD5E8:: @ 8EAD5E8 - .incbin "baserom.gba", 0xEAD5E8, 0x20 @UNKNOWN + .incbin "graphics/title_screen/unk_8ead5e8.gbapal" gUnknown_8EAD608:: @ 8EAD608 - .incbin "baserom.gba", 0xEAD608, 0x8DC + .incbin "graphics/title_screen/unk_8ead608.4bpp.lz" gUnknown_8EADEE4:: @ 8EADEE4 - .incbin "baserom.gba", 0xEADEE4, 0x1B0 + .incbin "graphics/title_screen/unk_8eadee4.bin.lz" gUnknown_8EAE094:: @ 8EAE094 - .incbin "baserom.gba", 0xEAE094, 0x20 @UNKNOWN + .incbin "graphics/title_screen/unk_8eae094.gbapal" gUnknown_8EAE0B4:: @ 8EAE0B4 - .incbin "baserom.gba", 0xEAE0B4, 0x2C0 + .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz" gUnknown_8EAE374:: @ 8EAE374 - .incbin "baserom.gba", 0xEAE374, 0x114 + .incbin "graphics/title_screen/unk_8eae374.bin.lz" - @ title_screen gUnknown_8EAE488:: @ 8EAE488 .incbin "graphics/title_screen/unk_8eae488.gbapal" diff --git a/data/graphics/title_screen/unk_83bf64c.png b/data/graphics/title_screen/unk_83bf64c.png index 3c9b7630d..260e00a01 100644 Binary files a/data/graphics/title_screen/unk_83bf64c.png and b/data/graphics/title_screen/unk_83bf64c.png differ diff --git a/data/graphics/title_screen/unk_83bf77c.pal b/data/graphics/title_screen/unk_83bf77c.pal new file mode 100644 index 000000000..815547f37 --- /dev/null +++ b/data/graphics/title_screen/unk_83bf77c.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +82 205 180 +0 0 0 +255 255 189 +255 246 139 +255 213 65 +255 172 0 +197 164 49 +115 180 139 +98 189 156 +90 197 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 205 180 diff --git a/data/graphics/title_screen/unk_83bf79c.png b/data/graphics/title_screen/unk_83bf79c.png index 246252bed..66a57a899 100644 Binary files a/data/graphics/title_screen/unk_83bf79c.png and b/data/graphics/title_screen/unk_83bf79c.png differ -- cgit v1.2.3 From 6032159d1bc099d4ed112e5e387ebba1d35fe6a9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 31 Jul 2019 17:15:57 -0400 Subject: Name stuff --- data/graphics.s | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 189826238..4b00c1c4b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16353,37 +16353,37 @@ gUnknown_8EAB30C:: @ 8EAB30C .incbin "baserom.gba", 0xEAB30C, 0x3B8 @ title_screen -gUnknown_8EAB6C4:: @ 8EAB6C4 +gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4 .incbin "graphics/title_screen/unk_8eab6c4.gbapal" -gUnknown_8EAB8C4:: @ 8EAB8C4 +gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4 .incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz" -gUnknown_8EAD390:: @ 8EAD390 +gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390 .incbin "graphics/title_screen/unk_8ead390.bin.lz" -gUnknown_8EAD5E8:: @ 8EAD5E8 +gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8 .incbin "graphics/title_screen/unk_8ead5e8.gbapal" -gUnknown_8EAD608:: @ 8EAD608 +gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608 .incbin "graphics/title_screen/unk_8ead608.4bpp.lz" -gUnknown_8EADEE4:: @ 8EADEE4 +gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4 .incbin "graphics/title_screen/unk_8eadee4.bin.lz" -gUnknown_8EAE094:: @ 8EAE094 +gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094 .incbin "graphics/title_screen/unk_8eae094.gbapal" -gUnknown_8EAE0B4:: @ 8EAE0B4 +gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4 .incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz" -gUnknown_8EAE374:: @ 8EAE374 +gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374 .incbin "graphics/title_screen/unk_8eae374.bin.lz" -gUnknown_8EAE488:: @ 8EAE488 +gGraphics_TitleScreen_FirePals:: @ 8EAE488 .incbin "graphics/title_screen/unk_8eae488.gbapal" -gUnknown_8EAE4A8:: @ 8EAE4A8 +gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8 .incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz" gUnknown_8EAE528:: @ 8EAE528 -- cgit v1.2.3