From eff0caf759b5e17384f2365ab74344a28501bddc Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 26 Dec 2017 01:42:08 -0600 Subject: [PATCH] Split and extract roulette data --- asm/roulette.s | 30 +- data/data4d.s | 240 +++---- data/graphics.s | 25 +- data/roulette.s | 928 ++++++++++++++++++++++++++ graphics/pokedex/85B8BF0.pal | 19 + graphics/pokedex/cry_meter.png | Bin 0 -> 673 bytes graphics/pokedex/cry_meter_map.bin | Bin 0 -> 160 bytes graphics/pokedex/cry_meter_needle.png | Bin 0 -> 156 bytes graphics/roulette/85B5BFC.pal | 259 +++++++ graphics/roulette/85B5DFC.bin | Bin 0 -> 768 bytes graphics/roulette/85B65D0.pal | 19 + graphics/roulette/85B65F0.pal | 19 + graphics/roulette/85B6610.pal | 19 + graphics/roulette/85B6630.pal | 19 + graphics/roulette/azurill.png | Bin 0 -> 345 bytes graphics/roulette/ball.png | Bin 0 -> 310 bytes graphics/roulette/ball_counter.png | Bin 0 -> 246 bytes graphics/roulette/center.png | Bin 0 -> 589 bytes graphics/roulette/credit.png | Bin 0 -> 325 bytes graphics/roulette/cursor.png | Bin 0 -> 153 bytes graphics/roulette/headers.png | Bin 0 -> 1060 bytes graphics/roulette/makuhita.png | Bin 0 -> 386 bytes graphics/roulette/multiplier.png | Bin 0 -> 399 bytes graphics/roulette/numbers.png | Bin 0 -> 300 bytes graphics/roulette/poke_icons.png | Bin 0 -> 409 bytes graphics/roulette/shadow.png | Bin 0 -> 210 bytes graphics/roulette/shroomish.png | Bin 0 -> 531 bytes graphics/roulette/skitty.png | Bin 0 -> 394 bytes graphics/roulette/tailow.png | Bin 0 -> 297 bytes graphics/roulette/wheel.png | Bin 0 -> 3248 bytes graphics/roulette/wheel_map.bin | Bin 0 -> 1024 bytes graphics/roulette/wynaut.png | Bin 0 -> 399 bytes graphics_file_rules.mk | 7 + ld_script.txt | 1 + 34 files changed, 1407 insertions(+), 178 deletions(-) create mode 100644 data/roulette.s create mode 100644 graphics/pokedex/85B8BF0.pal create mode 100644 graphics/pokedex/cry_meter.png create mode 100644 graphics/pokedex/cry_meter_map.bin create mode 100644 graphics/pokedex/cry_meter_needle.png create mode 100644 graphics/roulette/85B5BFC.pal create mode 100644 graphics/roulette/85B5DFC.bin create mode 100644 graphics/roulette/85B65D0.pal create mode 100644 graphics/roulette/85B65F0.pal create mode 100644 graphics/roulette/85B6610.pal create mode 100644 graphics/roulette/85B6630.pal create mode 100644 graphics/roulette/azurill.png create mode 100644 graphics/roulette/ball.png create mode 100644 graphics/roulette/ball_counter.png create mode 100644 graphics/roulette/center.png create mode 100644 graphics/roulette/credit.png create mode 100644 graphics/roulette/cursor.png create mode 100644 graphics/roulette/headers.png create mode 100644 graphics/roulette/makuhita.png create mode 100644 graphics/roulette/multiplier.png create mode 100644 graphics/roulette/numbers.png create mode 100644 graphics/roulette/poke_icons.png create mode 100644 graphics/roulette/shadow.png create mode 100644 graphics/roulette/shroomish.png create mode 100644 graphics/roulette/skitty.png create mode 100644 graphics/roulette/tailow.png create mode 100644 graphics/roulette/wheel.png create mode 100644 graphics/roulette/wheel_map.bin create mode 100644 graphics/roulette/wynaut.png diff --git a/asm/roulette.s b/asm/roulette.s index 85d857f39..74a4d455b 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -459,7 +459,7 @@ _08140662: movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DBCA14 + ldr r1, =gRouletteWheelTiles str r4, [sp] movs r0, 0x2 movs r2, 0 @@ -3619,7 +3619,7 @@ _08142174: cmp r3, 0x3 bls _08142144 movs r6, 0 - ldr r0, =gUnknown_085B62E8 + ldr r0, =gUnknown_085B62E4+0x4 add r0, r12 ldr r7, [r0] ldr r4, =gUnknown_0203AB88 @@ -4985,7 +4985,7 @@ _08142D24: lsls r1, r5, 1 adds r1, r5 lsls r1, 3 - ldr r0, =gUnknown_085B75B0 + ldr r0, =gSpriteTemplate_85B75B0 adds r0, r1, r0 adds r1, 0x94 adds r2, r4, 0 @@ -5035,7 +5035,7 @@ _08142D86: lsls r1, r6, 1 adds r1, r6 lsls r1, 3 - ldr r0, =gUnknown_085B7508 + ldr r0, =gSpriteTemplate_85B7508 adds r0, r1, r0 adds r1, 0x94 lsls r1, 16 @@ -5070,7 +5070,7 @@ _08142DCC: lsls r2, r6, 1 adds r2, r6 lsls r2, 3 - ldr r0, =gUnknown_085B7568 + ldr r0, =gSpriteTemplate_85B7568 adds r0, r2, r0 adds r2, 0x5C lsls r2, 16 @@ -5278,7 +5278,7 @@ sub_8142F7C: @ 8142F7C movs r0, 0x4 mov r8, r0 _08142F8C: - ldr r0, =gUnknown_085B7928 + ldr r0, =gSpriteTemplate_85B7928 movs r1, 0x74 movs r2, 0x14 movs r3, 0xA @@ -5600,7 +5600,7 @@ _08143216: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r1, =gUnknown_085B7610 + ldr r1, =gSpriteTemplate_85B7610 adds r0, r1 movs r1, 0x28 mov r2, sp @@ -5749,7 +5749,7 @@ _08143322: lsrs r5, r0, 24 cmp r5, 0x4 bls _08143322 - ldr r0, =gUnknown_085B77E4 + ldr r0, =gSpriteTemplate_85B77E4 movs r1, 0xD0 movs r2, 0x10 movs r3, 0x4 @@ -6459,7 +6459,7 @@ sub_814391C: @ 814391C str r0, [sp, 0x4] mov r0, sp bl LoadSpriteSheet - ldr r0, =gUnknown_085B7950 + ldr r0, =gSpriteTemplate_85B7950 movs r1, 0x74 movs r2, 0x50 movs r3, 0x51 @@ -6530,7 +6530,7 @@ _081439D0: subs r3, r4 lsls r3, 24 lsrs r3, 24 - ldr r0, =gUnknown_085B7928 + ldr r0, =gSpriteTemplate_85B7928 movs r1, 0x74 movs r2, 0x50 bl CreateSprite @@ -8128,7 +8128,7 @@ sub_81446DC: @ 81446DC lsrs r0, 16 mov r9, r0 ldr r5, =gUnknown_0203AB88 - ldr r0, =gUnknown_085B79F8 + ldr r0, =gSpriteTemplate_85B79F8 movs r2, 0xC negs r2, r2 movs r1, 0x24 @@ -8137,7 +8137,7 @@ sub_81446DC: @ 81446DC ldr r1, [r5] adds r1, 0x73 strb r0, [r1] - ldr r4, =gUnknown_085B7ABC + ldr r4, =gSpriteTemplate_85B7ABC mov r3, r8 movs r0, 0x2E ldrsh r2, [r3, r0] @@ -8353,7 +8353,7 @@ sub_81448B8: @ 81448B8 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r0, =gUnknown_085B7A10 + ldr r0, =gSpriteTemplate_85B7A10 movs r1, 0x2E ldrsh r2, [r7, r1] lsls r2, 2 @@ -8709,12 +8709,12 @@ _08144BAC: mov r5, r10 cmp r5, r8 bcs _08144C18 - ldr r1, =gUnknown_085B6160 + ldr r1, =gUnknown_085B6154+0xC mov r10, r1 _08144BBC: ldr r3, [r4] lsls r0, r6, 3 - ldr r1, =gUnknown_085B62E8 + ldr r1, =gUnknown_085B62E4+0x4 adds r0, r1 ldr r1, [r3, 0x8] ldr r2, [r0] diff --git a/data/data4d.s b/data/data4d.s index cbf109f67..2004fecc5 100644 --- a/data/data4d.s +++ b/data/data4d.s @@ -4,183 +4,98 @@ .section .rodata -gUnknown_085B5BFC:: @ 85B5BFC - .incbin "baserom.gba", 0x5b5bfc, 0x200 + .align 2 +CryMeterNeedlePalette: @ 85B7B58 + .incbin "graphics/pokedex/cry_meter_needle.gbapal" -gUnknown_085B5DFC:: @ 85B5DFC - .incbin "baserom.gba", 0x5b5dfc, 0x1a4 + .align 2 +CryMeterNeedleTiles: @ 85B7B78 + .incbin "graphics/pokedex/cry_meter_needle.4bpp" -gUnknown_085B5FA0:: @ 85B5FA0 - .incbin "baserom.gba", 0x5b5fa0, 0x1a0 - -gUnknown_085B6140:: @ 85B6140 - .incbin "baserom.gba", 0x5b6140, 0xc - -gUnknown_085B614C:: @ 85B614C - .incbin "baserom.gba", 0x5b614c, 0x8 - -gUnknown_085B6154:: @ 85B6154 - .incbin "baserom.gba", 0x5b6154, 0xc - -gUnknown_085B6160:: @ 85B6160 - .incbin "baserom.gba", 0x5b6160, 0x184 - -gUnknown_085B62E4:: @ 85B62E4 - .incbin "baserom.gba", 0x5b62e4, 0x4 - -gUnknown_085B62E8:: @ 85B62E8 - .incbin "baserom.gba", 0x5b62e8, 0x5c - -gUnknown_085B6344:: @ 85B6344 - .incbin "baserom.gba", 0x5b6344, 0x4 - -gUnknown_085B6348:: @ 85B6348 - .incbin "baserom.gba", 0x5b6348, 0x40 - -gUnknown_085B6388:: @ 85B6388 - .incbin "baserom.gba", 0x5b6388, 0x68 - -gUnknown_085B63F0:: @ 85B63F0 - .incbin "baserom.gba", 0x5b63f0, 0x18 - -gUnknown_085B6408:: @ 85B6408 - .incbin "baserom.gba", 0x5b6408, 0x8 - -gUnknown_085B6410:: @ 85B6410 - .incbin "baserom.gba", 0x5b6410, 0x8 - -gUnknown_085B6418:: @ 85B6418 - .incbin "baserom.gba", 0x5b6418, 0x6 - -gUnknown_085B641E:: @ 85B641E - .incbin "baserom.gba", 0x5b641e, 0x4 - -gUnknown_085B6422:: @ 85B6422 - .incbin "baserom.gba", 0x5b6422, 0xa - -gUnknown_085B642C:: @ 85B642C - .incbin "baserom.gba", 0x5b642c, 0x10 - -gUnknown_085B643C:: @ 85B643C - .incbin "baserom.gba", 0x5b643c, 0xc - -gUnknown_085B6448:: @ 85B6448 - .incbin "baserom.gba", 0x5b6448, 0xf3c - -gUnknown_085B7384:: @ 85B7384 - .incbin "baserom.gba", 0x5b7384, 0x98 - -gUnknown_085B741C:: @ 85B741C - .incbin "baserom.gba", 0x5b741c, 0x6c - -gUnknown_085B7488:: @ 85B7488 - .incbin "baserom.gba", 0x5b7488, 0x8 - -gUnknown_085B7490:: @ 85B7490 - .incbin "baserom.gba", 0x5b7490, 0x78 - -gUnknown_085B7508:: @ 85B7508 - .incbin "baserom.gba", 0x5b7508, 0x60 - -gUnknown_085B7568:: @ 85B7568 - .incbin "baserom.gba", 0x5b7568, 0x48 - -gUnknown_085B75B0:: @ 85B75B0 - .incbin "baserom.gba", 0x5b75b0, 0x60 - -gUnknown_085B7610:: @ 85B7610 - .incbin "baserom.gba", 0x5b7610, 0x140 - -gUnknown_085B7750:: @ 85B7750 - .incbin "baserom.gba", 0x5b7750, 0x94 - -gUnknown_085B77E4:: @ 85B77E4 - .incbin "baserom.gba", 0x5b77e4, 0x18 - -gUnknown_085B77FC:: @ 85B77FC - .incbin "baserom.gba", 0x5b77fc, 0x18 - -gUnknown_085B7814:: @ 85B7814 - .incbin "baserom.gba", 0x5b7814, 0x18 - -gUnknown_085B782C:: @ 85B782C - .incbin "baserom.gba", 0x5b782c, 0x18 - -gUnknown_085B7844:: @ 85B7844 - .incbin "baserom.gba", 0x5b7844, 0x20 - -gUnknown_085B7864:: @ 85B7864 - .incbin "baserom.gba", 0x5b7864, 0xc4 - -gUnknown_085B7928:: @ 85B7928 - .incbin "baserom.gba", 0x5b7928, 0x20 - -gUnknown_085B7948:: @ 85B7948 - .incbin "baserom.gba", 0x5b7948, 0x8 - -gUnknown_085B7950:: @ 85B7950 - .incbin "baserom.gba", 0x5b7950, 0x28 - -gUnknown_085B7978:: @ 85B7978 - .incbin "baserom.gba", 0x5b7978, 0x80 - -gUnknown_085B79F8:: @ 85B79F8 - .incbin "baserom.gba", 0x5b79f8, 0x18 - -gUnknown_085B7A10:: @ 85B7A10 - .incbin "baserom.gba", 0x5b7a10, 0x30 - -gUnknown_085B7A40:: @ 85B7A40 - .incbin "baserom.gba", 0x5b7a40, 0x7c - -gUnknown_085B7ABC:: @ 85B7ABC - .incbin "baserom.gba", 0x5b7abc, 0x30 - -gUnknown_085B7AEC:: @ 85B7AEC - .incbin "baserom.gba", 0x5b7aec, 0x18 - -gUnknown_085B7B04:: @ 85B7B04 - .incbin "baserom.gba", 0x5b7b04, 0x6 - -gUnknown_085B7B0A:: @ 85B7B0A - .incbin "baserom.gba", 0x5b7b0a, 0x8 - -gUnknown_085B7B12:: @ 85B7B12 - .incbin "baserom.gba", 0x5b7b12, 0x8 - -gUnknown_085B7B1A:: @ 85B7B1A - .incbin "baserom.gba", 0x5b7b1a, 0x14 - -gUnknown_085B7B2E:: @ 85B7B2E - .incbin "baserom.gba", 0x5b7b2e, 0x18 - -gUnknown_085B7B46:: @ 85B7B46 - .incbin "baserom.gba", 0x5b7b46, 0x2 - -gUnknown_085B7B48:: @ 85B7B48 - .incbin "baserom.gba", 0x5b7b48, 0x8d0 + .align 1 +gUnknown_085B8378:: @ 85B8378 + .incbin "graphics/pokedex/cry_meter_map.bin" + .align 1 gUnknown_085B8418:: @ 85B8418 - .incbin "baserom.gba", 0x5b8418, 0x20 + .incbin "graphics/pokedex/cry_meter.gbapal" + .align 2 gUnknown_085B8438:: @ 85B8438 - .incbin "baserom.gba", 0x5b8438, 0x338 + .incbin "graphics/pokedex/cry_meter.4bpp.lz" + .align 1 gUnknown_085B8770:: @ 85B8770 - .incbin "baserom.gba", 0x5b8770, 0x480 + .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C + .2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C + .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D + .2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D + .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E + .2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E + .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F + .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F + .align 1 gUnknown_085B8BF0:: @ 85B8BF0 - .incbin "baserom.gba", 0x5b8bf0, 0x20 + .incbin "graphics/pokedex/85B8BF0.gbapal" gUnknown_085B8C10:: @ 85B8C10 - .incbin "baserom.gba", 0x5b8c10, 0x20 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 gUnknown_085B8C30:: @ 85B8C30 - .incbin "baserom.gba", 0x5b8c30, 0x2 + .byte 0xF0, 0x0F gUnknown_085B8C32:: @ 85B8C32 - .incbin "baserom.gba", 0x5b8c32, 0x36 + .byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F + .byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0 + .align 2 +gSpriteAnim_85B8C54:: @ 85B8C54 + obj_image_anim_frame 0, 30 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B8C5C:: @ 85B8C5C + .4byte gSpriteAnim_85B8C54 + + .align 2 +gOamData_85B8C60:: @ 85B8C60 + .2byte 0x01A0 + .2byte 0xC000 + .2byte 0x0400 + + .align 2 gUnknown_085B8C68:: @ 85B8C68 .incbin "baserom.gba", 0x5b8c68, 0x18 @@ -188,7 +103,10 @@ gUnknown_085B8C80:: @ 85B8C80 .incbin "baserom.gba", 0x5b8c80, 0x10 gUnknown_085B8C90:: @ 85B8C90 - .incbin "baserom.gba", 0x5b8c90, 0x528 + .incbin "baserom.gba", 0x5b8c90, 0x10 + +gUnknown_085B8CA0:: @ 85B8CA0 + .incbin "baserom.gba", 0x5b8cA0, 0x518 gUnknown_085B91B8:: @ 85B91B8 .incbin "baserom.gba", 0x5b91b8, 0x178 diff --git a/data/graphics.s b/data/graphics.s index 6acd23d7f..2f1a2c956 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1129,8 +1129,29 @@ gCableCarCord_Gfx:: @ 8DBC2C0 gUnknown_08DBC2E8:: @ 8DBC2E8 .incbin "baserom.gba", 0xdbc2e8, 0x72c -gUnknown_08DBCA14:: @ 0x08DBCA14 - .incbin "baserom.gba", 0xdbca14, 0x1e04 + .align 2 +gRouletteWheelTiles:: @ 0x08DBCA14 + .incbin "graphics/roulette/wheel.8bpp.lz" + + .align 2 +gRouletteCenter_Gfx:: @ 0x08DBDABC + .incbin "graphics/roulette/center.4bpp.lz" + + .align 2 +gRouletteHeadersTiles:: @ 0x08DBDE38 + .incbin "graphics/roulette/headers.4bpp.lz" + + .align 2 +gRouletteCreditTiles:: @ 0x08DBE45C + .incbin "graphics/roulette/credit.4bpp.lz" + + .align 2 +gRouletteNumbersTiles:: @ 0x08DBE5AC + .incbin "graphics/roulette/numbers.4bpp.lz" + + .align 2 +gRouletteMultiplierTiles:: @ 0x08DBE690 + .incbin "graphics/roulette/multiplier.4bpp.lz" gUnknown_08DBE818:: @ 0x08DBE818 .incbin "baserom.gba", 0xdbe818, 0x20 diff --git a/data/roulette.s b/data/roulette.s new file mode 100644 index 000000000..3cb412084 --- /dev/null +++ b/data/roulette.s @@ -0,0 +1,928 @@ + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 1 +gUnknown_085B5BFC:: @ 85B5BFC + .incbin "graphics/roulette/85B5BFC.gbapal" + + .align 2 +gUnknown_085B5DFC:: @ 85B5DFC + .incbin "graphics/roulette/85B5DFC.bin.lz" + + .align 2 +gUnknown_085B5FA0:: @ 85B5FA0 + .incbin "graphics/roulette/wheel_map.bin.lz" + + .align 2 +gUnknown_085B6140:: @ 85B6140 + .4byte 0x000001f8, 0x00001241, 0x00002a66 + + .align 2 +gUnknown_085B614C:: @ 85B614C + window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x00c5 + + .align 2 +gUnknown_085B6154:: @ 85B6154 + .byte 0xFF, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x0C, 0x14, 0x00, 0x11, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x42, 0x08, 0x01, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x0D, 0x24, 0x00, 0x14, 0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x10, 0x02, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x0E, 0x34, 0x00, 0x17, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x21, 0x04, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x0F, 0x44, 0x00, 0x1A, 0x07, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x42, 0x08, 0x00, 0x00, 0xE0, 0x00, 0x00 + .byte 0x10, 0x03, 0x01, 0x0E, 0x0A, 0x00, 0x0C, 0x00, 0x20, 0x00, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0x49, 0x02, 0x00, 0x00 + .byte 0x00, 0x1C, 0x01, 0x11, 0x0A, 0x03, 0x03, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00 + .byte 0x09, 0x2C, 0x01, 0x14, 0x0A, 0x03, 0x03, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00 + .byte 0x06, 0x3C, 0x01, 0x17, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00 + .byte 0x03, 0x4C, 0x01, 0x1A, 0x0A, 0x03, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00 + .byte 0x11, 0x03, 0x02, 0x0E, 0x0D, 0x03, 0x0F, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x92, 0x04, 0x00, 0x00 + .byte 0x04, 0x1C, 0x02, 0x11, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00 + .byte 0x01, 0x2C, 0x02, 0x14, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00 + .byte 0x0A, 0x3C, 0x02, 0x17, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00 + .byte 0x07, 0x4C, 0x02, 0x1A, 0x0D, 0x06, 0x06, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x80, 0x20, 0x00, 0x00 + .byte 0x12, 0x03, 0x03, 0x0E, 0x10, 0x06, 0x12, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x0F, 0x00, 0x24, 0x09, 0x00, 0x00 + .byte 0x08, 0x1C, 0x03, 0x11, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00 + .byte 0x05, 0x2C, 0x03, 0x14, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x20, 0x20, 0x00, 0x00 + .byte 0x02, 0x3C, 0x03, 0x17, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x20, 0x00, 0x00 + .byte 0x0B, 0x4C, 0x03, 0x1A, 0x10, 0x09, 0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x28, 0x00, 0x00 + + .align 2 +gUnknown_085B62E4:: @ 85B62E4 + .byte 0, 1, 6, 0, 64, 0, 0, 0 + .byte 1, 3, 12, 0, 0, 16, 0, 0 + .byte 2, 5, 18, 0, 0, 0, 4, 0 + .byte 3, 7, 9, 0, 0, 2, 0, 0 + .byte 4, 9, 11, 0, 0, 8, 0, 0 + .byte 5, 11, 17, 0, 0, 0, 2, 0 + .byte 6, 13, 8, 0, 0, 1, 0, 0 + .byte 7, 15, 14, 0, 0, 64, 0, 0 + .byte 8, 17, 16, 0, 0, 0, 1, 0 + .byte 9, 19, 7, 0, 128, 0, 0, 0 + .byte 10, 21, 13, 0, 0, 32, 0, 0 + .byte 11, 23, 19, 0, 0, 0, 8, 0 + +gUnknown_085B6344:: @ 85B6344 + .byte 1, 3 + .byte 1, 6 + + .align 2 +gUnknown_085B6348:: @ 85B6348 + .byte 0x01, 0x3C, 0x1E, 0x01, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x1E, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x1B, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x68, 0x01, 0x00, 0x00, 0x00, 0xBF + .byte 0x03, 0x1E, 0x0F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x3C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0E, 0x01, 0x00, 0x00, 0x80, 0xBF + + .align 2 +gUnknown_085B6388:: @ 85B6388 + .byte 0x00, 0x80, 0x05, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x0A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x15, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x55, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x5A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x65, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x75, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x7A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x85, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x95, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0x9A, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0x00, 0x80, 0xA5, 0x00, 0x01, 0x01, 0xFF, 0x48 + .byte 0xD6, 0x77, 0x28, 0x00, 0x02, 0x0A, 0xFF, 0x4E + + .align 1 +gUnknown_085B63F0:: @ 85B63F0 + .2byte 0x53FF + .2byte 0x0101 + .2byte 0x1E05 + .2byte 0x4EFF + .2byte 0x7FFB + .2byte 0x0106 + .2byte 0x1E05 + .2byte 0x4EFF + .2byte 0x7F7F + .2byte 0x010B + .2byte 0x1E05 + .2byte 0x4EFF + + .align 2 +gUnknown_085B6408:: @ 85B6408 + .4byte sub_8142918 + .4byte sub_814297C + + .align 2 +gUnknown_085B6410:: @ 85B6410 + .4byte sub_8140968 + .4byte sub_8140994 + + .align 1 +gUnknown_085B6418:: @ 85B6418 + .2byte 0x2898 + .2byte 0x1A6A + .2byte 0x2898 + +gUnknown_085B641E:: @ 85B641E + .byte 0xFB, 0x05, 0xFF, 0x01 + + .align 1 +gUnknown_085B6422:: @ 85B6422 + .2byte 0, 180 + .2byte 90, 270 + + .align 2 +gUnknown_085B642C:: @ 85B642C + .4byte 0x10842 + .4byte 0x21084 + .4byte 0x42108 + .4byte 0x84210 + + .align 2 +gUnknown_085B643C:: @ 85B643C + .4byte 0x3E0 + .4byte 0x7C00 + .4byte 0xF8000 + +gUnknown_085B6448:: @ 85B6448 + .byte 0, 3, 4, 6, 12 + + .align 2 +RouletteSpritePalette_01: @ 85B6450 + .incbin "graphics/roulette/shadow.gbapal" + + .align 2 +RouletteSpritePalette_02: @ 85B6470 + .incbin "graphics/roulette/ball.gbapal" + + .align 2 +RouletteSpritePalette_03: @ 85B6490 + .incbin "graphics/roulette/ball_counter.gbapal" + + .align 2 +RouletteSpritePalette_04: @ 85B64B0 + .incbin "graphics/roulette/cursor.gbapal" + + .align 2 +RouletteSpritePalette_05: @ 85B64D0 + .incbin "graphics/roulette/credit.gbapal" + + .align 2 +RouletteSpritePalette_06: @ 85B64F0 + .incbin "graphics/roulette/shroomish.gbapal" + + .align 2 +RouletteSpritePalette_07: @ 85B6510 + .incbin "graphics/roulette/tailow.gbapal" + + .align 2 +RouletteSpritePalette_08: @ 85B6530 + .incbin "graphics/roulette/poke_icons.gbapal" + + .align 2 +RouletteSpritePalette_09: @ 85B6550 + .incbin "graphics/roulette/wynaut.gbapal" + + .align 2 +RouletteSpritePalette_10: @ 85B6570 + .incbin "graphics/roulette/azurill.gbapal" + + .align 2 +RouletteSpritePalette_11: @ 85B6590 + .incbin "graphics/roulette/skitty.gbapal" + + .align 2 +RouletteSpritePalette_12: @ 85B65B0 + .incbin "graphics/roulette/makuhita.gbapal" + + .align 2 +RouletteSpritePalette_13: @ 85B65D0 + .incbin "graphics/roulette/85B65D0.gbapal" + + .align 2 +RouletteSpritePalette_14: @ 85B65F0 + .incbin "graphics/roulette/85B65F0.gbapal" + + .align 2 +RouletteSpritePalette_15: @ 85B6610 + .incbin "graphics/roulette/85B6610.gbapal" + + .align 2 +RouletteSpritePalette_16: @ 85B6630 + .incbin "graphics/roulette/85B6630.gbapal" + + .align 2 +gUnknown_085B6650:: @ 85B6650 + .incbin "graphics/roulette/ball.4bpp.lz" + + .align 2 +RouletteBallCounterTiles: @ 85B6798 + .incbin "graphics/roulette/ball_counter.4bpp.lz" + + .align 2 +gUnknown_085B67FC:: @ 85B67FC + .incbin "graphics/roulette/roulette_tilt.4bpp.lz" + + .align 2 +RoulettePokeIconsTiles: @ 85B6BEC + .incbin "graphics/roulette/poke_icons.4bpp.lz" + + .align 2 +RoulettePokeIcons2Tiles: @ 85B6D90 + .incbin "graphics/roulette/poke_icons2.4bpp.lz" + + .align 2 +gUnknown_085B7290:: @ 85B7290 + .incbin "graphics/roulette/shadow.4bpp.lz" + + .align 2 +RouletteCursorTiles: @ 85B7328 + .incbin "graphics/roulette/cursor.4bpp.lz" + + .align 2 +gUnknown_085B7384:: @ 85B7384 + obj_pal RouletteSpritePalette_01, 1 + obj_pal RouletteSpritePalette_02, 2 + obj_pal RouletteSpritePalette_03, 3 + obj_pal RouletteSpritePalette_04, 4 + obj_pal RouletteSpritePalette_05, 5 + obj_pal RouletteSpritePalette_06, 6 + obj_pal RouletteSpritePalette_07, 7 + obj_pal RouletteSpritePalette_08, 8 + obj_pal RouletteSpritePalette_09, 9 + obj_pal RouletteSpritePalette_10, 10 + obj_pal RouletteSpritePalette_11, 11 + obj_pal RouletteSpritePalette_12, 12 + null_obj_pal + + .align 2 +gOamData_85B73EC:: @ 85B73EC + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gOamData_85B73F4:: @ 85B73F4 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 + + .align 2 +gOamData_85B73FC:: @ 85B73FC + .2byte 0x833C + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_85B7404:: @ 85B7404 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B740C:: @ 85B740C + .4byte gSpriteAnim_85B7404 + + .align 2 +gSpriteAffineAnim_85B7410:: @ 85B7410 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_85B7418:: @ 85B7418 + .4byte gSpriteAffineAnim_85B7410 + + .align 2 +gUnknown_085B741C:: @ 85B741C + obj_tiles RoulettePokeIcons2Tiles, 0xC00, 0 + + .align 2 +gSpriteAnim_85B7420:: @ 85B7420 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 32, 0 + obj_image_anim_frame 64, 0 + obj_image_anim_frame 72, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 40, 0 + obj_image_anim_frame 48, 0 + obj_image_anim_frame 80, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 24, 0 + obj_image_anim_frame 56, 0 + obj_image_anim_frame 88, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B7458:: @ 85B7458 + .4byte gSpriteAnim_85B7420 + + .align 2 +gSpriteAnimTable_85B745C:: @ 85B745C + .4byte gSpriteAnim_85B7420 + 0x4 + + .align 2 +gSpriteAnimTable_85B7460:: @ 85B7460 + .4byte gSpriteAnim_85B7420 + 0x8 + + .align 2 +gSpriteAnimTable_85B7464:: @ 85B7464 + .4byte gSpriteAnim_85B7420 + 0xC + + .align 2 +gSpriteAnimTable_85B7468:: @ 85B7468 + .4byte gSpriteAnim_85B7420 + 0x10 + + .align 2 +gSpriteAnimTable_85B746C:: @ 85B746C + .4byte gSpriteAnim_85B7420 + 0x14 + + .align 2 +gSpriteAnimTable_85B7470:: @ 85B7470 + .4byte gSpriteAnim_85B7420 + 0x18 + + .align 2 +gSpriteAnimTable_85B7474:: @ 85B7474 + .4byte gSpriteAnim_85B7420 + 0x1C + + .align 2 +gSpriteAnimTable_85B7478:: @ 85B7478 + .4byte gSpriteAnim_85B7420 + 0x20 + + .align 2 +gSpriteAnimTable_85B747C:: @ 85B747C + .4byte gSpriteAnim_85B7420 + 0x24 + + .align 2 +gSpriteAnimTable_85B7480:: @ 85B7480 + .4byte gSpriteAnim_85B7420 + 0x28 + + .align 2 +gSpriteAnimTable_85B7484:: @ 85B7484 + .4byte gSpriteAnim_85B7420 + 0x2C + + .align 2 +gUnknown_085B7488:: @ 85B7488 + obj_tiles gRouletteHeadersTiles, 0x1600, 4 + + .align 2 +gUnknown_085B7490:: @ 85B7490 + obj_tiles RoulettePokeIconsTiles, 0x400, 5 + + .align 2 +gSpriteAnim_85B7498:: @ 85B7498 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 32, 0 + obj_image_anim_frame 48, 0 + obj_image_anim_frame 64, 0 + obj_image_anim_frame 80, 0 + obj_image_anim_frame 96, 0 + obj_image_anim_frame 112, 0 + obj_image_anim_frame 128, 0 + obj_image_anim_frame 144, 0 + obj_image_anim_frame 160, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B74C8:: @ 85B74C8 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 12, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B74DC:: @ 85B74DC + .4byte gSpriteAnim_85B7498 + + .align 2 +gSpriteAnimTable_85B74E0:: @ 85B74E0 + .4byte gSpriteAnim_85B7498 + 0x8 + + .align 2 +gSpriteAnimTable_85B74E4:: @ 85B74E4 + .4byte gSpriteAnim_85B7498 + 0x10 + + .align 2 +gSpriteAnimTable_85B74E8:: @ 85B74E8 + .4byte gSpriteAnim_85B7498 + 0x18 + + .align 2 +gSpriteAnimTable_85B74EC:: @ 85B74EC + .4byte gSpriteAnim_85B7498 + 0x20 + + .align 2 +gSpriteAnimTable_85B74F0:: @ 85B74F0 + .4byte gSpriteAnim_85B7498 + 0x24 + + .align 2 +gSpriteAnimTable_85B74F4:: @ 85B74F4 + .4byte gSpriteAnim_85B7498 + 0x28 + + .align 2 +gSpriteAnimTable_85B74F8:: @ 85B74F8 + .4byte gSpriteAnim_85B74C8 + + .align 2 +gSpriteAnimTable_85B74FC:: @ 85B74FC + .4byte gSpriteAnim_85B74C8 + 0x4 + + .align 2 +gSpriteAnimTable_85B7500:: @ 85B7500 + .4byte gSpriteAnim_85B74C8 + 0x8 + + .align 2 +gSpriteAnimTable_85B7504:: @ 85B7504 + .4byte gSpriteAnim_85B74C8 + 0xC + + .align 2 +gSpriteTemplate_85B7508:: @ 85B7508 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74DC, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7520:: @ 85B7520 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E0, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7538:: @ 85B7538 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E4, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7550:: @ 85B7550 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74E8, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7568:: @ 85B7568 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74EC, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7580:: @ 85B7580 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F0, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7598:: @ 85B7598 + spr_template 4, 8, gOamData_85B73EC, gSpriteAnimTable_85B74F4, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75B0:: @ 85B75B0 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74F8, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75C8:: @ 85B75C8 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B74FC, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75E0:: @ 85B75E0 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7500, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B75F8:: @ 85B75F8 + spr_template 5, 8, gOamData_85B73F4, gSpriteAnimTable_85B7504, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gSpriteTemplate_85B7610:: @ 85B7610 + spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7458, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7628:: @ 85B7628 + spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B745C, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7640:: @ 85B7640 + spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7460, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7658:: @ 85B7658 + spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7464, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7670:: @ 85B7670 + spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7468, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7688:: @ 85B7688 + spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B746C, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76A0:: @ 85B76A0 + spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7470, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76B8:: @ 85B76B8 + spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7474, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76D0:: @ 85B76D0 + spr_template 0, 9, gOamData_85B73FC, gSpriteAnimTable_85B7478, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B76E8:: @ 85B76E8 + spr_template 0, 10, gOamData_85B73FC, gSpriteAnimTable_85B747C, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7700:: @ 85B7700 + spr_template 0, 11, gOamData_85B73FC, gSpriteAnimTable_85B7480, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gSpriteTemplate_85B7718:: @ 85B7718 + spr_template 0, 12, gOamData_85B73FC, gSpriteAnimTable_85B7484, NULL, gDummySpriteAffineAnimTable, sub_8143280 + + .align 2 +gOamData_85B7730:: @ 85B7730 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0400 + + .align 2 +gOamData_85B7738:: @ 85B7738 + .2byte 0x8000 + .2byte 0x0000 + .2byte 0x0400 + + .align 2 +gOamData_85B7740:: @ 85B7740 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gOamData_85B7748:: @ 85B7748 + .2byte 0x4000 + .2byte 0x0000 + .2byte 0x0400 + + .align 2 +gUnknown_085B7750:: @ 85B7750 + obj_tiles gRouletteCreditTiles, 0x400, 7 + obj_tiles gRouletteNumbersTiles, 0x280, 8 + obj_tiles gRouletteMultiplierTiles, 0x500, 9 + obj_tiles RouletteBallCounterTiles, 0x140, 10 + obj_tiles RouletteCursorTiles, 0x200, 11 + null_obj_tiles + + .align 2 +gSpriteAnim_85B7780:: @ 85B7780 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 2, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 6, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 10, 0 + obj_image_anim_frame 12, 0 + obj_image_anim_frame 14, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 18, 0 + + .align 2 +gSpriteAnimTable_85B77A8:: @ 85B77A8 + .4byte gSpriteAnim_85B7780 + + .align 2 +gSpriteAnim_85B77AC:: @ 85B77AC + obj_image_anim_frame 0, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 16, 0 + obj_image_anim_frame 24, 0 + obj_image_anim_frame 32, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B77C4:: @ 85B77C4 + .4byte gSpriteAnim_85B77AC + + .align 2 +gSpriteAnim_85B77C8:: @ 85B77C8 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 2, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 6, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B77E0:: @ 85B77E0 + .4byte gSpriteAnim_85B77C8 + + .align 2 +gSpriteTemplate_85B77E4:: @ 85B77E4 + spr_template 7, 5, gOamData_85B7730, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B77FC:: @ 85B77FC + spr_template 8, 5, gOamData_85B7738, gSpriteAnimTable_85B77A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B7814:: @ 85B7814 + spr_template 9, 5, gOamData_85B7740, gSpriteAnimTable_85B77C4, NULL, gDummySpriteAffineAnimTable, sub_814390C + + .align 2 +gUnknown_085B782C:: @ 85B782C + spr_template 10, 3, gOamData_85B7748, gSpriteAnimTable_85B77E0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gUnknown_085B7844:: @ 85B7844 + spr_template 11, 5, gOamData_85B73EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_85B785C:: @ 85B785C + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7864:: @ 85B7864 + obj_tiles gUnknown_085B6650, 0x200, 0xC + + .align 2 +gSpriteAnim_85B786C:: @ 85B786C + obj_image_anim_frame 0, 5 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 8, 5 + obj_image_anim_frame 4, 5 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B7880:: @ 85B7880 + obj_image_anim_frame 0, 10 + obj_image_anim_frame 4, 10 + obj_image_anim_frame 8, 10 + obj_image_anim_frame 4, 10 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B7894:: @ 85B7894 + obj_image_anim_frame 0, 15 + obj_image_anim_frame 4, 15 + obj_image_anim_frame 8, 15 + obj_image_anim_frame 4, 15 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B78A8:: @ 85B78A8 + obj_image_anim_frame 4, 2 + obj_image_anim_frame 8, 5 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 12, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78BC:: @ 85B78BC + obj_image_anim_frame 4, 2 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_frame 12, 4 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78D4:: @ 85B78D4 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 8, 5 + obj_image_anim_frame 12, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78E8:: @ 85B78E8 + obj_image_anim_frame 12, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B78F0:: @ 85B78F0 + obj_image_anim_frame 8, 2 + obj_image_anim_frame 4, 5 + obj_image_anim_frame 0, 5 + obj_image_anim_frame 12, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B7904:: @ 85B7904 + .4byte gSpriteAnim_85B786C + .4byte gSpriteAnim_85B7880 + .4byte gSpriteAnim_85B7894 + .4byte gSpriteAnim_85B78A8 + .4byte gSpriteAnim_85B78F0 + .4byte gSpriteAnim_85B78BC + .4byte gSpriteAnim_85B78D4 + .4byte gSpriteAnim_85B78D4 + .4byte gSpriteAnim_85B78E8 + + .align 2 +gSpriteTemplate_85B7928:: @ 85B7928 + spr_template 12, 2, gOamData_85B785C, gSpriteAnimTable_85B7904, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_85B7940:: @ 85B7940 + .2byte 0x0351 + .2byte 0xC000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7948:: @ 85B7948 + obj_tiles gRouletteCenter_Gfx, 2048, 0x0006 + + .align 2 +gSpriteTemplate_85B7950:: @ 85B7950 + spr_template 6, 2, gOamData_85B7940, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_814399C + + .align 2 +gOamData_85B7968:: @ 85B7968 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gOamData_85B7970:: @ 85B7970 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7978:: @ 85B7978 + obj_tiles gUnknown_085B67FC, 0xE00, 0x000D + + .align 2 +gSpriteAnim_85B7980:: @ 85B7980 + obj_image_anim_frame 0x00, 6 + obj_image_anim_frame 0x10, 6 + obj_image_anim_frame 0x20, 6 + obj_image_anim_frame 0x30, 6 + obj_image_anim_frame 0x20, 6 + obj_image_anim_frame 0x40, 6 + obj_image_anim_jump 2 + + .align 2 +gSpriteAnim_85B799C:: @ 85B799C + obj_image_anim_frame 0x50, 10 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B79A4:: @ 85B79A4 + obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnim_85B79AC:: @ 85B79AC + obj_image_anim_frame 0x50, 20 + obj_image_anim_frame 0x60, 20 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B79B8:: @ 85B79B8 + obj_image_anim_frame 0x50, 20, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 0x60, 20, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B79C4:: @ 85B79C4 + obj_image_anim_frame 0x50, 10 + obj_image_anim_frame 0x60, 10 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_85B79D0:: @ 85B79D0 + obj_image_anim_frame 0x50, 10, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 0x60, 10, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_85B79DC:: @ 85B79DC + .4byte gSpriteAnim_85B7980 + + .align 2 +gSpriteAnimTable_85B79E0:: @ 85B79E0 + .4byte gSpriteAnim_85B799C + .4byte gSpriteAnim_85B79A4 + .4byte gSpriteAnim_85B79AC + .4byte gSpriteAnim_85B79B8 + .4byte gSpriteAnim_85B79C4 + .4byte gSpriteAnim_85B79D0 + + .align 2 +gSpriteTemplate_85B79F8:: @ 85B79F8 + spr_template 13, 6, gOamData_85B7968, gSpriteAnimTable_85B79DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_85B7A10:: @ 85B7A10 + spr_template 13, 7, gOamData_85B7970, gSpriteAnimTable_85B79E0, NULL, gDummySpriteAffineAnimTable, sub_8145294 + + .align 2 +gOamData_85B7A28:: @ 85B7A28 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gOamData_85B7A30:: @ 85B7A30 + .2byte 0x4000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gOamData_85B7A38:: @ 85B7A38 + .2byte 0x4100 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gUnknown_085B7A40:: @ 85B7A40 + obj_tiles gUnknown_085B7290, 0x180, 0x000E + + .align 2 +gSpriteAffineAnim_85B7A48:: @ 85B7A48 + obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 + obj_rot_scal_anim_frame 0x2, 0x2, 0, 60 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_85B7A60:: @ 85B7A60 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_frame 0xFFFE, 0x0, 0, 15 + obj_rot_scal_anim_frame 0xFFFF, 0xFFFE, 0, 15 + obj_rot_scal_anim_frame 0xFFFF, 0xFFFB, 0, 24 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_85B7A88:: @ 85B7A88 + .4byte gSpriteAffineAnim_85B7A48 + + .align 2 +gSpriteAffineAnimTable_85B7A8C:: @ 85B7A8C + .4byte gSpriteAffineAnim_85B7A60 + + .align 2 +gSpriteAffineAnim_85B7A90:: @ 85B7A90 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_85B7AA0:: @ 85B7AA0 + .4byte gSpriteAffineAnim_85B7A90 + + .align 2 +gSpriteAnim_85B7AA4:: @ 85B7AA4 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_85B7AAC:: @ 85B7AAC + obj_image_anim_frame 4, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_85B7AB4:: @ 85B7AB4 + .4byte gSpriteAnim_85B7AA4 + + .align 2 +gSpriteAnimTable_85B7AB8:: @ 85B7AB8 + .4byte gSpriteAnim_85B7AAC + + .align 2 +gSpriteTemplate_85B7ABC:: @ 85B7ABC + spr_template 14, 1, gOamData_85B7A28, gSpriteAnimTable_85B7AB4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_83FA5D8:: @ 83FA5D8 + spr_template 14, 1, gOamData_85B7A30, gSpriteAnimTable_85B7AB8, NULL, gDummySpriteAffineAnimTable, sub_8144E60 + + .align 2 +gUnknown_085B7AEC:: @ 85B7AEC + spr_template 14, 1, gOamData_85B7A38, gSpriteAnimTable_85B7AB8, NULL, gSpriteAffineAnimTable_85B7A8C, sub_8145294 + +gUnknown_085B7B04:: @ 85B7B04 + .byte 0, 1, 2, 3, 4 + + .align 1 +gUnknown_085B7B0A:: @ 85B7B0A + .2byte 0x74, 0x2C + .2byte 0x74, 0x70 + + .align 1 +gUnknown_085B7B12:: @ 85B7B12 + .2byte 256, 84 + .2byte -16, 84 + + .align 1 +gUnknown_085B7B1A:: @ 85B7B1A + .2byte 0x907 + .2byte 0x808 + .2byte 0x709 + .2byte 0x60A + .2byte 0x50B + .2byte 0x40C + .2byte 0x30D + .2byte 0x20E + .2byte 0x10F + .2byte 0x10 + + .align 1 +gUnknown_085B7B2E:: @ 85B7B2E + .2byte -1, 0, 1, 0 + .2byte -2, 0, 2, 0 + .2byte -3, 0, 3, 0 + +gUnknown_085B7B46:: @ 85B7B46 + .byte -1, 1 + +gUnknown_085B7B48:: @ 85B7B48 + .byte 2, 0 + .byte 2, 0 + .byte 2, -1 + .byte 2, -1 + .byte 2, -1 + .byte 2, -1 + .byte 2, -2 + .byte 2, -2 diff --git a/graphics/pokedex/85B8BF0.pal b/graphics/pokedex/85B8BF0.pal new file mode 100644 index 000000000..969c38cbd --- /dev/null +++ b/graphics/pokedex/85B8BF0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 148 +0 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 255 +156 156 255 +172 172 255 +189 189 255 +205 205 255 +222 222 255 +238 238 255 +255 255 255 diff --git a/graphics/pokedex/cry_meter.png b/graphics/pokedex/cry_meter.png new file mode 100644 index 0000000000000000000000000000000000000000..ec6b0ed43b889eef2a1a4145ffddddd547837159 GIT binary patch literal 673 zcmV;S0$%-zP)R z5i-ag0)&Zs<&j6~NXn9X2x5cz^52mbED2TKRFz1U3RB5)1b2B}P~8nc&GH{$>UT^< z=!g-$>xTg&+6VLeCq(tmq=&ow7(0MV*Ijs*GOTqS!L+Zf4;jLEA6>mj4zD%Fk~M?Z z8nfmG?pWiqeOa>RwTC<~g*H;e6TVgWTYZnGG>}iYots+lDIH{iYVNCIkrwXPfm^uT zPU3bnEbiSl6l=LfIqSBA(8Vo+e)_*2SZ@a58+Rzb1aMEC;XGeLP^WCx?VG{iNKAdr zI4q7XFm?bg@*)wsz-0Xr|s0d!AR;YYhgc^Gth*hf(?U^ z*+YNP@ZL0b6N;(+Vepi#?6wKQmf&WhM8%;!^bRVTz7?$i24NLJS4wOq&`$Jgu$)2= zdP)o(g&VzZJ*Li$;ja*yD1o`W@OX+4s)>me!4-!GUPiFL_(d@epV>mjYSt~A%Pih@ zUxior7`$c3ru;uR+WXVO__Imt^~ruot;b+P-)4v7NarU9IYM=r~`Q z3m#_<0sYf-eItmH=taK?T>Qv|l&TK@l0L*)mMn`~9}E8hJmXh?>?Qn$00000NkvXX Hu0mjf(_T1Q literal 0 HcmV?d00001 diff --git a/graphics/pokedex/cry_meter_map.bin b/graphics/pokedex/cry_meter_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..cd58849a4602b39a10e406f48d648a19aa0a928b GIT binary patch literal 160 zcmV~$2SNb=006+Fh-i=^GAa$D%w!ZYN+SRNjXMH@4jc*zI}#CfEGF*6sWayik}jlN zx{{W0Ei30nUO`dGtvmP19z1&TtfH!>?!~Kyrk1vjt~WjJ`UZwZK71ORnEEm^x3Ki> N$I7p@KO0;BcJ`Z23|RmG literal 0 HcmV?d00001 diff --git a/graphics/pokedex/cry_meter_needle.png b/graphics/pokedex/cry_meter_needle.png new file mode 100644 index 0000000000000000000000000000000000000000..34e5ab410ba9ff2a37cff429551ea0f097a968a8 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|eg8-ipS0Mc@s`^{^l5a=P{{R0U z$i)u|Uv3BKQTKFl4DskpPLN=|!Laziil#u;#awQpJz5g~xOiGQH3URd79=cTVyHXE UT*~6(b_rytr>mdKI;Vst08+gq?f?J) literal 0 HcmV?d00001 diff --git a/graphics/roulette/85B5BFC.pal b/graphics/roulette/85B5BFC.pal new file mode 100644 index 000000000..ed68618ff --- /dev/null +++ b/graphics/roulette/85B5BFC.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +82 156 49 +41 41 41 +98 98 115 +172 180 197 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +255 255 0 +74 106 156 +41 41 41 +98 98 115 +156 156 164 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +74 106 156 +41 41 41 +123 123 131 +172 180 197 +255 255 255 +238 238 156 +189 180 106 +131 90 32 +255 131 90 +189 106 98 +230 222 255 +74 189 156 +255 255 255 +123 180 172 +255 255 255 +255 255 255 +74 106 156 +57 57 65 +98 98 115 +156 156 164 +255 255 255 +106 205 205 +246 98 90 +106 156 255 +255 255 255 +156 255 106 +246 230 74 +255 230 123 +255 255 255 +255 255 156 +156 255 148 +205 156 255 +74 106 156 +41 41 41 +98 98 115 +205 205 213 +255 255 255 +123 238 139 +255 172 139 +16 156 74 +197 164 255 +49 106 32 +115 197 131 +197 139 189 +255 82 57 +255 238 82 +205 180 8 +255 205 8 +74 106 156 +106 139 230 +82 115 205 +255 255 255 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +255 255 255 +74 106 156 +255 246 65 +255 255 164 +255 246 65 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +74 106 156 +172 255 238 +222 255 255 +148 255 238 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +65 65 57 +74 106 156 +255 205 255 +255 222 255 +255 197 255 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +74 106 156 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 205 41 +255 172 0 +213 164 65 +205 164 82 +139 106 65 +131 222 189 +74 189 156 +115 189 148 +123 180 172 +74 115 115 +255 255 255 +74 106 156 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +205 156 205 +164 106 164 +172 131 164 +156 123 156 +90 57 106 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +74 106 156 +255 246 82 +164 255 222 +172 180 197 +255 255 255 +255 246 65 +246 205 24 +238 197 98 +205 172 90 +164 131 90 +156 246 222 +90 213 180 +131 222 172 +115 189 156 +98 148 148 +65 65 57 +74 106 156 +238 189 238 +156 148 148 +172 180 197 +255 255 255 +255 205 255 +222 156 230 +197 156 197 +172 139 172 +139 106 148 +205 205 230 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +74 106 156 +238 230 246 +205 205 230 +172 180 197 +255 255 255 +255 255 230 +255 255 164 +255 255 255 +222 255 255 +255 246 255 +255 222 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +65 65 57 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 +255 255 255 diff --git a/graphics/roulette/85B5DFC.bin b/graphics/roulette/85B5DFC.bin new file mode 100644 index 0000000000000000000000000000000000000000..6950027c3155bb0a2ff421d20f54eb5ac4f8cf0d GIT binary patch literal 768 zcmbu*H#5Xx5XbRnWDbSQp^!O@Ou4dBro5N%m->@>IaA8aRx-1d%xonyD8vS@z}}4R zp7}TSGxKeJ-72NjBf610d5~*ml>5RU3Z@Wptx`YujZY@KCwhr2%*Gr|Efk7j0KS9q0oc$fEh-+mx2?3d!j{wfZQBXMP1i#Ow496L_L zjpJ5)I6j3^{ty6x5DhU93+a#nnP5N*w1NXVq3d7mgMJu*HfT4|0o~AJq8A2X$iy%> H|7&)?vJzF% literal 0 HcmV?d00001 diff --git a/graphics/roulette/85B65D0.pal b/graphics/roulette/85B65D0.pal new file mode 100644 index 000000000..9d44b25c8 --- /dev/null +++ b/graphics/roulette/85B65D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +106 222 222 +246 98 90 +222 255 255 +106 222 222 +246 98 90 +255 222 255 +106 222 222 +246 98 90 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/85B65F0.pal b/graphics/roulette/85B65F0.pal new file mode 100644 index 000000000..81b0328a5 --- /dev/null +++ b/graphics/roulette/85B65F0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +106 156 255 +222 222 230 +222 255 255 +106 156 255 +222 222 230 +255 222 255 +106 156 255 +222 222 230 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/85B6610.pal b/graphics/roulette/85B6610.pal new file mode 100644 index 000000000..42a1bae94 --- /dev/null +++ b/graphics/roulette/85B6610.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +255 156 139 +246 246 156 +222 255 255 +255 156 139 +246 246 156 +255 222 255 +255 156 139 +246 246 156 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/85B6630.pal b/graphics/roulette/85B6630.pal new file mode 100644 index 000000000..ff76379c8 --- /dev/null +++ b/graphics/roulette/85B6630.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +57 57 65 +106 106 123 +255 255 164 +255 230 123 +222 222 230 +222 255 255 +255 230 123 +222 222 230 +255 222 255 +255 230 123 +222 222 230 +222 222 230 +222 222 230 +222 222 230 +222 222 230 diff --git a/graphics/roulette/azurill.png b/graphics/roulette/azurill.png new file mode 100644 index 0000000000000000000000000000000000000000..b99bc1a33abbf4b54d15767ade3fe49e4cd8694c GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=!VDyz{eM3hNErn9gt&TT&9Ss}?Cx&<|Nnp1 zod5slbmQm#Jag|hQ125@7sn8diD&x{b}}nUwAO!kbhP=+lnG2qVFqh5UCX>q=&EmQ zO7zv<6zp^&c1=RW+eC;$8OznC+E1W^_RVKa3`|^ z4_~7)+l2!~?e8LD?065K*l;?@9`|rt_`mftt@vPw9fF0-V#ak~a z_DXM$U>=m%-E3&t;ucLK6Uyv!3?= literal 0 HcmV?d00001 diff --git a/graphics/roulette/ball.png b/graphics/roulette/ball.png new file mode 100644 index 0000000000000000000000000000000000000000..2352e9be5ab55154b6d56129adbfffc1af900a27 GIT binary patch literal 310 zcmV-60m=S}P))SK0|Iex=q6C1vIsd1eo%5e(m&A6U-bPOs#}J9BwS5P9 z8x%yGPdlFP5^j(_z@hh`b+`IAdB;P?amU$`N0Yw z3i(;|j666>LPgg&ebxsLQ0P{|3dH?_b literal 0 HcmV?d00001 diff --git a/graphics/roulette/center.png b/graphics/roulette/center.png new file mode 100644 index 0000000000000000000000000000000000000000..0653b0e97264c0a6412f23374726243381690a70 GIT binary patch literal 589 zcmV-T0;cGPViOqv#{odt1AjIvij7wZ1t8Gqa<#Ik zR3ZX&J(s6ejTq1XBH&<7Ws`pTmV#wK;#D@5)A=p_@Bx(;)_Q(&ZFddQ3ZfO zM3C<-n~;dX(h7Kf69M&uUk9M*_%9t<(cO$ty9Pzvx*a0<5(xJVLGDg!h}07L^ISw?`SAQiAAQowS2 zmwtHavs?mXD`x;}Y4vT#Nn48nqTc})B1i`bARQJKatL;&>qUSR@ba5pfoUDw^9Km{ zPhDCllv)8b08y!Rv%&}jTG-7x1}59B4Kv0#b(4m%EC-3uOOD%gX b{<-}CaUglwFBfL700000NkvXXu0mjf8e;d< literal 0 HcmV?d00001 diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png new file mode 100644 index 0000000000000000000000000000000000000000..687d4793445e8419339fefbb1490e8a58ea049a2 GIT binary patch literal 325 zcmV-L0lNN)P)s?o!RP2>;Cp>rn7|0002c zNklBOoCHMOg* z`Y{Yco}v>3_(kYLq;C#aHD?r%>!28cRWgA>d%JuDm%Ve~URB2n;=Y#JO~5r-?MRBq zkpsvYl9~Y{5MvtR3UTcr4Is4yvB80v1%!3LftU!_L7(<~lDmf|(Hls-Cy&1MUaG^m zZz1VsP{eVdK|>~fg^>XaQ=s`AwvT!PSX(Nwb^s5pUzWE&Sb$0g)c}r_nmc~;>uux- X;&S?b6CNdb00000NkvXXu0mjfK@y3^ literal 0 HcmV?d00001 diff --git a/graphics/roulette/cursor.png b/graphics/roulette/cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..962ebb2c7ed158a0ce7f45b7624b69927c0b36b8 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipSFfx&nwpx`%}dUnz54(E z|LVQ({##lK%<)QE0^&k}CCC4FK|qyf=ls_bIyV=nSH;uCF+^ix@&ij|cAkWW2lFi% q1QQw<=LIqvv0gYVqI`v2n}MOh-Z4^6=l2YtdInEdKbLh*2~7ZNFF4@< literal 0 HcmV?d00001 diff --git a/graphics/roulette/headers.png b/graphics/roulette/headers.png new file mode 100644 index 0000000000000000000000000000000000000000..70f5fec90e1b09f7b2db7ee332fec1adce48bf76 GIT binary patch literal 1060 zcmV+<1l#+GP)Q~Pj&+hZ=M2Np=%2*C~p&SEryugEI%*RS06)cf3 zCI(6WHJL>@O)f%v?g2hSKv4)wV-HAWD{o~F5UKaxWm2Jy_1C}ug0Apio1V$l924ro|ClhZViVQ9?1IMM0 z%DDZIj7o=3!`@`LBtO~G7yxK>tT6exRPlai(tZ756(+bqh4B%9!ll_q_{)n-uvNk8SSoU;?U+8QUsuLB1T5(Riz6K0JQqF zp$qgu^QJ+4L;&>>U9K|VBk;*_5A->G(_A&5-!h} zv1L(68eD*s_N*|9yj!KDNNrEHSh0X2F5unO0FYEa&?PWR_P%|@Hq^&;(#QM&s2B5~ zk2dS0Xl;94wD}elMN3w|g9-Dtr=UmQF4}f+?Xt_wvZV_+mcbSP+@39$1^~JILO-{e z)ZEZ~nWM)GzTW=AwF%!`j|w z0EB&34vS8xl@<$I*u|iyf4nx(M@RScas?~ORk!MxK1x$^eRN&7LVa8k(4jt7W!D)X zJ(&g4Y4#~+!DW_#=QDCCrw%r@HnszfGKMWRE-<*nuPJERt=9(Z{ve{I2v&m89CK^23mtp=5lCc4RTqs+bW443)aqRX`^zn52-6Kkh8$(LtL$zE`q)JSeY_6yUyzIq0M`f2 eG24GoAHM<1O%vMWf%?_}0000TC=gRx;TE@V@$m{9i7@{%pZ2!T`!v-R4@-H5B^RJrB>czg|Ba7K7hSqZntRfeD znKt~vi7YE_7@;`CmpVC6FBztmBqh{_4}vmC+C*g+`Y{=6Bwurp00i_>zopr E06ERMK>z>% literal 0 HcmV?d00001 diff --git a/graphics/roulette/multiplier.png b/graphics/roulette/multiplier.png new file mode 100644 index 0000000000000000000000000000000000000000..b993f8091482d0058b69747176056e04cb25427e GIT binary patch literal 399 zcmV;A0dW3_P)s?o!RP2>;Cp>rn7|0003R zNklb;z6o6q5J;?(v85rt;6(LJV8BIwls9?(lK=RJSIS?!!S+gN^%PDez z3|xQ)UV`5XL}I8A9)H=6{mF_DADWDT5JIzY38A}<-8Jkdw=sP-zyw&>YS5C+=;|R~ zV(JNX=%`P=hXTd+aNzh??vCEP+}-v6)8k9)QCmQd*sey*gUmn=63`>I%RciME7fNn zK2#pDwe}r6zSkSs7SO|o%7e^6k6D@?mI%b5oW=rJ#foO$?Ac^CkAy+s?o!RP2>;Cp>rn7|0002D zNklySQpB)C?w4u zkQ7LY1Hc^=+iv>~@Bfv8< zYak?f%Q%l?3QG8$sLJ(M@`ZgX^W~QB-S`g+CN=VwLEfIvb0iqPt*DEAeDq7GYP^*E yYad%a2C}mE(M#Ez9^Los{q^<#v+u_Het%C0i_>(@9H>wL0000|BBY>oWYf7Yc5h zvlI?xaBeSbR%Y{8&CEzxhElPR~Pi)OUc$>yM zj_>XZUbdSoc&)?1?)k0% z!5n6D4KHb#ExUO(JB~MI=HWf77Q78)EURAf(~-r&*WKY3&&0&cj(4}026TU35wl%V ztg&Ek$edTg;!k}YcRhH#?3|?h)_re`>||smeDvnSBq4)4TG#W=+OaJvt5xifzEi@-pL*x=dB(*_ zx{=F&i@PwdV(k7Kt}5T86}&I`=uErfzxU+ZFUc=o_aJ$aTDQ|cX*!yoo@PbM9v)(=U^RVY*gMG_!W&4F^ zKTt8=p9m=>A43M#2j#$8(7>>Huc}p|MMRnOlR2E;M6U&#fI@jm&*CaN!%+n z9z}GRpJ3tCzxX?@Luh7(@=-sw3T4%UH`h&B%ELO@Yl@fV_Y)4&xCAfzO*vZVS1s_= z{^$SF8mZM6cS$XH`+D8#U&d#&3vqr zxw5xhOHWylJ7rZy`_|B_t)bUS^?!X|zst6_KckFg#`KF(o9`qPbsL_GO(;{@^I?5^ zv9{5lS9kBS|9EA4@N@0g)%-v+=I{B=pOP?dj`5bm>B%_}Pp|F!@cjO3>Fdioz4#X| RY5)cv+*jkq*|+at`^CW?eh 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 V+Q8tgVaZJdaCP!;pN?Jx%PF_J#Nm=Cvx&l=- zbq!4|ZEYQ0T|IpR!<)Cz6c`zsn3|beSXx=z*xK1U+`fY<@95<0V&>}R?&0a>?c;0b zclX|X6b1ePfkD9`P@&MU@COecp~y!>Mn%WOLWSbu6COW#iXxwwlpLLs3KdFAPk8qH z1&Vw|W>$7iE>tKlzu@Jo*C_IZMa3nhWl*8=ipn={-=WA?Ro9f%)~&r<*LPRYjV8~qW$U)>J9h5cy=U*f{Ra;IL6>G= oICS{P(PPI?oIG{<%-M68(m;{(7cO49eC6u3>sVz+1qUVs0P_=peEvfQ}?394A<=XE8nmROzN~`>aXb+j;WX)uHE!m#dDp%=h{g}mOj-fiEZl^ zjp$)){y)(u{+5`zxA;~a&aN%%SiG!P8)|G9@(i)eF^)WKb#|dbus2I&>PnRg5Bd3K zEZ==E+uWaY%cOU~({%!ijvPJrc2mnIkNW>oraEu8=zI6OX*X>&4(`76l9%miobuMo z48P-~b9XVi8M!IHSoz-Mp!@fqTa_#3KmYlA>Xp2C(NXt~Z42FD(Y#n>#bVokwR~&k WdP;6aF46;rFoUP7pUXO@geCxWPp&oq literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index e180c2856..b0d30751c 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -4,6 +4,7 @@ monfrontdir := graphics/pokemon/anim_front_pics monpaldir := graphics/pokemon/palettes tilesetdir := data/tilesets fontdir := data/graphics/fonts +roulgfxdir := graphics/roulette $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ @@ -295,3 +296,9 @@ graphics/misc/japanese_hof.4bpp: %.4bpp: %.png graphics/picture_frame/frame5.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 86 + +$(roulgfxdir)/roulette_tilt.4bpp: $(roulgfxdir)/shroomish.4bpp $(roulgfxdir)/tailow.4bpp + @cat $(roulgfxdir)/shroomish.4bpp $(roulgfxdir)/tailow.4bpp >$@ + +$(roulgfxdir)/poke_icons2.4bpp: $(roulgfxdir)/wynaut.4bpp $(roulgfxdir)/azurill.4bpp $(roulgfxdir)/skitty.4bpp $(roulgfxdir)/makuhita.4bpp + @cat $(roulgfxdir)/wynaut.4bpp $(roulgfxdir)/azurill.4bpp $(roulgfxdir)/skitty.4bpp $(roulgfxdir)/makuhita.4bpp >$@ diff --git a/ld_script.txt b/ld_script.txt index e88c04f3d..ccb8c2b7f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -432,6 +432,7 @@ SECTIONS { data/battle_records.o(.rodata); data/pokedex_area_screen.o(.rodata); src/evolution_scene.o(.rodata); + data/roulette.o(.rodata); data/data4d.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata);