From 35f88987254544aa77ec3fb1906e4b545b5b5f2d Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 21:52:43 -0500 Subject: [PATCH 1/5] start dumping slot_machine.s --- data/slot_machine.s | 163 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 127 insertions(+), 36 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index df1f71be96..0b4b8eb139 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -5,112 +5,203 @@ .align 2, 0 gUnknown_085A7424:: @ 85A7424 - .incbin "baserom.gba", 0x5a7424, 0x10 + .4byte 0x1F8 + .4byte 0x11C5 + .4byte 0x21D6 + .4byte 0x11E7 gUnknown_085A7434:: @ 85A7434 - .incbin "baserom.gba", 0x5a7434, 0x10 + window_template 0, 2, 15, 0x1B, 4, 15, 0x194 + window_template_terminator gUnknown_085A7444:: @ 85A7444 - .incbin "baserom.gba", 0x5a7444, 0x8 + window_template 0, 1, 3, 20, 13, 13, 1 gUnknown_085A744C:: @ 85A744C - .incbin "baserom.gba", 0x5a744c, 0x4 + .byte 3, 1, 2, 0 gUnknown_085A7450:: @ 85A7450 - .incbin "baserom.gba", 0x5a7450, 0x74 + .4byte sub_812AB04 + .4byte sub_812AB38 + .4byte sub_812AB60 + .4byte sub_812ABA8 + .4byte sub_812ABC8 + .4byte sub_812ABF8 + .4byte sub_812ACF4 + .4byte sub_812AD34 + .4byte sub_812AD60 + .4byte sub_812AD80 + .4byte sub_812ADF4 + .4byte sub_812AE24 + .4byte sub_812AE4C + .4byte sub_812AE88 + .4byte sub_812AEC4 + .4byte sub_812AFFC + .4byte sub_812B01C + .4byte sub_812B094 + .4byte sub_812B0D8 + .4byte sub_812B108 + .4byte sub_812B130 + .4byte sub_812B158 + .4byte sub_812B1B0 + .4byte sub_812B214 + .4byte sub_812B254 + .4byte sub_812B280 + .4byte sub_812B2C0 + .4byte sub_812B2EC + .4byte sub_812B32C gUnknown_085A74C4:: @ 85A74C4 - .incbin "baserom.gba", 0x5a74c4, 0xc + .4byte sub_812BB34 + .4byte sub_812BB68 + .4byte sub_812BC20 gUnknown_085A74D0:: @ 85A74D0 - .incbin "baserom.gba", 0x5a74d0, 0x14 + .4byte sub_812BF64 + .4byte sub_812BF68 + .4byte sub_812BF88 + .4byte sub_812C01C + .4byte sub_812C0E0 gUnknown_085A74E4:: @ 85A74E4 - .incbin "baserom.gba", 0x5a74e4, 0xc + .4byte sub_812C138 + .4byte sub_812C3A0 + .4byte sub_812C4BC gUnknown_085A74F0:: @ 85A74F0 - .incbin "baserom.gba", 0x5a74f0, 0xc + .4byte sub_812C5DC + .4byte sub_812C628 + .4byte sub_812C8FC gUnknown_085A74FC:: @ 85A74FC - .incbin "baserom.gba", 0x5a74fc, 0xc + .2byte 2, 4, 4, 4, 8, 0 gUnknown_085A7508:: @ 85A7508 - .incbin "baserom.gba", 0x5a7508, 0xc + .4byte sub_812C238 + .4byte sub_812C290 + .4byte sub_812C290 gUnknown_085A7514:: @ 85A7514 - .incbin "baserom.gba", 0x5a7514, 0xc + .4byte sub_812C3C8 + .4byte sub_812C3C8 + .4byte sub_812C414 gUnknown_085A7520:: @ 85A7520 - .incbin "baserom.gba", 0x5a7520, 0xc + .4byte sub_812C500 + .4byte sub_812C500 + .4byte sub_812C55C gUnknown_085A752C:: @ 85A752C - .incbin "baserom.gba", 0x5a752c, 0xc + .4byte sub_812C64C + .4byte j5_08111E84 + .4byte sub_812C74C gUnknown_085A7538:: @ 85A7538 - .incbin "baserom.gba", 0x5a7538, 0xc + .4byte sub_812C920 + .4byte sub_812CA08 + .4byte sub_812CB80 gUnknown_085A7544:: @ 85A7544 - .incbin "baserom.gba", 0x5a7544, 0xc + .4byte sub_812CDA4 + .4byte sub_812CDD8 + .4byte sub_812CDF4 gUnknown_085A7550:: @ 85A7550 - .incbin "baserom.gba", 0x5a7550, 0x8 + .2byte 5, 10, 15, 0 gUnknown_085A7558:: @ 85A7558 - .incbin "baserom.gba", 0x5a7558, 0x10 + .4byte nullsub_50 + .4byte sub_812D264 + .4byte sub_812D28C + .4byte sub_812D30C gUnknown_085A7568:: @ 85A7568 - .incbin "baserom.gba", 0x5a7568, 0x2 + .2byte 0x9E gUnknown_085A756A:: @ 85A756A - .incbin "baserom.gba", 0x5a756a, 0xa + .2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F gUnknown_085A7574:: @ 85A7574 - .incbin "baserom.gba", 0x5a7574, 0x4c + .4byte sub_812D51C + .4byte sub_812D594 + .4byte sub_812D60C + .4byte sub_812D63C + .4byte sub_812D6EC + .4byte sub_812D740 + .4byte sub_812D774 + .4byte sub_812D7E4 + .4byte sub_812D870 + .4byte sub_812D920 + .4byte sub_812D950 + .4byte sub_812D9A4 + .4byte sub_812DA20 + .4byte sub_812DA6C + .4byte sub_812DA90 + .4byte sub_812DB04 + .4byte sub_812DB8C + .4byte sub_812D950 + .4byte sub_812DBBC gUnknown_085A75C0:: @ 85A75C0 - .incbin "baserom.gba", 0x5a75c0, 0x4 + .byte 1, 1, 2, 2 gUnknown_085A75C4:: @ 85A75C4 - .incbin "baserom.gba", 0x5a75c4, 0x8 + .2byte 0x40, 0x30, 0x18, 8 gUnknown_085A75CC:: @ 85A75CC - .incbin "baserom.gba", 0x5a75cc, 0x8 + .2byte 10, 8, 6, 4 gUnknown_085A75D4:: @ 85A75D4 - .incbin "baserom.gba", 0x5a75d4, 0x3c + .4byte sub_812DD04 + .4byte sub_812DD28 + .4byte sub_812DD48 + .4byte sub_812DD28 + .4byte sub_812DD78 + .4byte sub_812DD28 + .4byte sub_812DDC4 + .4byte sub_812DD28 + .4byte sub_812DE14 + .4byte sub_812DD28 + .4byte sub_812DE30 + .4byte sub_812DD28 + .4byte sub_812DE48 + .4byte sub_812DD28 + .4byte sub_812DE7C gUnknown_085A7610:: @ 85A7610 - .incbin "baserom.gba", 0x5a7610, 0x4 + .4byte nullsub_51 gUnknown_085A7614:: @ 85A7614 - .incbin "baserom.gba", 0x5a7614, 0x2 + .2byte 16 gUnknown_085A7616:: @ 85A7616 - .incbin "baserom.gba", 0x5a7616, 0x8 + .2byte 0, 0x40, 0x80, 0xC0 gUnknown_085A761E:: @ 85A761E - .incbin "baserom.gba", 0x5a761e, 0x8 + .2byte 4, -4, 4, -4 gUnknown_085A7626:: @ 85A7626 - .incbin "baserom.gba", 0x5a7626, 0x8 + .2byte 4, 4, -4, -4 gUnknown_085A762E:: @ 85A762E - .incbin "baserom.gba", 0x5a762e, 0x10 + .2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0 gUnknown_085A763E:: @ 85A763E - .incbin "baserom.gba", 0x5a763e, 0x10 + .2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0 gUnknown_085A764E:: @ 85A764E - .incbin "baserom.gba", 0x5a764e, 0x10 + .2byte 16, 12, 16, 0, 0, 4, 8, 8 gUnknown_085A765E:: @ 85A765E - .incbin "baserom.gba", 0x5a765e, 0x10 + .2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18 gUnknown_085A766E:: @ 85A766E - .incbin "baserom.gba", 0x5a766e, 0x3f + .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 + .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 + .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 gUnknown_085A76AD:: @ 85A76AD - .incbin "baserom.gba", 0x5a76ad, 0x7 + .byte 1, 0, 5, 4, 3, 2, 0 gUnknown_085A76B4:: @ 85A76B4 .incbin "baserom.gba", 0x5a76b4, 0xc From 84c6a97429ca125483064c25bcd0d079ada0a334 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 14:44:38 -0500 Subject: [PATCH 2/5] dump slot_machine.s --- data/slot_machine.s | 1241 +++++++++++++++++++++++++---- graphics/slot_machine/85A843E.pal | 19 + graphics/slot_machine/85A845E.pal | 19 + graphics/slot_machine/85A847E.pal | 19 + graphics/slot_machine/85A84B0.pal | 19 + graphics/slot_machine/85A84D0.pal | 19 + graphics/slot_machine/85A84F0.pal | 19 + graphics/slot_machine/85A8524.bin | Bin 0 -> 32 bytes graphics/slot_machine/85A96E0.bin | 1 + 9 files changed, 1210 insertions(+), 146 deletions(-) create mode 100755 graphics/slot_machine/85A843E.pal create mode 100755 graphics/slot_machine/85A845E.pal create mode 100755 graphics/slot_machine/85A847E.pal create mode 100755 graphics/slot_machine/85A84B0.pal create mode 100755 graphics/slot_machine/85A84D0.pal create mode 100755 graphics/slot_machine/85A84F0.pal create mode 100644 graphics/slot_machine/85A8524.bin create mode 100644 graphics/slot_machine/85A96E0.bin diff --git a/data/slot_machine.s b/data/slot_machine.s index 0b4b8eb139..68adf50475 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - window_template_terminator + window_template_terminator gUnknown_085A7444:: @ 85A7444 window_template 0, 1, 3, 20, 13, 13, 1 @@ -22,98 +22,98 @@ gUnknown_085A744C:: @ 85A744C gUnknown_085A7450:: @ 85A7450 .4byte sub_812AB04 - .4byte sub_812AB38 - .4byte sub_812AB60 - .4byte sub_812ABA8 - .4byte sub_812ABC8 - .4byte sub_812ABF8 - .4byte sub_812ACF4 - .4byte sub_812AD34 - .4byte sub_812AD60 - .4byte sub_812AD80 - .4byte sub_812ADF4 - .4byte sub_812AE24 - .4byte sub_812AE4C - .4byte sub_812AE88 - .4byte sub_812AEC4 - .4byte sub_812AFFC - .4byte sub_812B01C - .4byte sub_812B094 - .4byte sub_812B0D8 - .4byte sub_812B108 - .4byte sub_812B130 - .4byte sub_812B158 - .4byte sub_812B1B0 - .4byte sub_812B214 - .4byte sub_812B254 - .4byte sub_812B280 - .4byte sub_812B2C0 - .4byte sub_812B2EC - .4byte sub_812B32C + .4byte sub_812AB38 + .4byte sub_812AB60 + .4byte sub_812ABA8 + .4byte sub_812ABC8 + .4byte sub_812ABF8 + .4byte sub_812ACF4 + .4byte sub_812AD34 + .4byte sub_812AD60 + .4byte sub_812AD80 + .4byte sub_812ADF4 + .4byte sub_812AE24 + .4byte sub_812AE4C + .4byte sub_812AE88 + .4byte sub_812AEC4 + .4byte sub_812AFFC + .4byte sub_812B01C + .4byte sub_812B094 + .4byte sub_812B0D8 + .4byte sub_812B108 + .4byte sub_812B130 + .4byte sub_812B158 + .4byte sub_812B1B0 + .4byte sub_812B214 + .4byte sub_812B254 + .4byte sub_812B280 + .4byte sub_812B2C0 + .4byte sub_812B2EC + .4byte sub_812B32C gUnknown_085A74C4:: @ 85A74C4 .4byte sub_812BB34 - .4byte sub_812BB68 - .4byte sub_812BC20 + .4byte sub_812BB68 + .4byte sub_812BC20 gUnknown_085A74D0:: @ 85A74D0 .4byte sub_812BF64 - .4byte sub_812BF68 - .4byte sub_812BF88 - .4byte sub_812C01C - .4byte sub_812C0E0 + .4byte sub_812BF68 + .4byte sub_812BF88 + .4byte sub_812C01C + .4byte sub_812C0E0 gUnknown_085A74E4:: @ 85A74E4 .4byte sub_812C138 - .4byte sub_812C3A0 - .4byte sub_812C4BC + .4byte sub_812C3A0 + .4byte sub_812C4BC gUnknown_085A74F0:: @ 85A74F0 .4byte sub_812C5DC - .4byte sub_812C628 - .4byte sub_812C8FC + .4byte sub_812C628 + .4byte sub_812C8FC gUnknown_085A74FC:: @ 85A74FC .2byte 2, 4, 4, 4, 8, 0 gUnknown_085A7508:: @ 85A7508 .4byte sub_812C238 - .4byte sub_812C290 - .4byte sub_812C290 + .4byte sub_812C290 + .4byte sub_812C290 gUnknown_085A7514:: @ 85A7514 .4byte sub_812C3C8 - .4byte sub_812C3C8 - .4byte sub_812C414 + .4byte sub_812C3C8 + .4byte sub_812C414 gUnknown_085A7520:: @ 85A7520 .4byte sub_812C500 - .4byte sub_812C500 - .4byte sub_812C55C + .4byte sub_812C500 + .4byte sub_812C55C gUnknown_085A752C:: @ 85A752C .4byte sub_812C64C - .4byte j5_08111E84 - .4byte sub_812C74C + .4byte j5_08111E84 + .4byte sub_812C74C gUnknown_085A7538:: @ 85A7538 .4byte sub_812C920 - .4byte sub_812CA08 - .4byte sub_812CB80 + .4byte sub_812CA08 + .4byte sub_812CB80 gUnknown_085A7544:: @ 85A7544 .4byte sub_812CDA4 - .4byte sub_812CDD8 - .4byte sub_812CDF4 + .4byte sub_812CDD8 + .4byte sub_812CDF4 gUnknown_085A7550:: @ 85A7550 .2byte 5, 10, 15, 0 gUnknown_085A7558:: @ 85A7558 .4byte nullsub_50 - .4byte sub_812D264 - .4byte sub_812D28C - .4byte sub_812D30C + .4byte sub_812D264 + .4byte sub_812D28C + .4byte sub_812D30C gUnknown_085A7568:: @ 85A7568 .2byte 0x9E @@ -123,24 +123,24 @@ gUnknown_085A756A:: @ 85A756A gUnknown_085A7574:: @ 85A7574 .4byte sub_812D51C - .4byte sub_812D594 - .4byte sub_812D60C - .4byte sub_812D63C - .4byte sub_812D6EC - .4byte sub_812D740 - .4byte sub_812D774 - .4byte sub_812D7E4 - .4byte sub_812D870 - .4byte sub_812D920 - .4byte sub_812D950 - .4byte sub_812D9A4 - .4byte sub_812DA20 - .4byte sub_812DA6C - .4byte sub_812DA90 - .4byte sub_812DB04 - .4byte sub_812DB8C - .4byte sub_812D950 - .4byte sub_812DBBC + .4byte sub_812D594 + .4byte sub_812D60C + .4byte sub_812D63C + .4byte sub_812D6EC + .4byte sub_812D740 + .4byte sub_812D774 + .4byte sub_812D7E4 + .4byte sub_812D870 + .4byte sub_812D920 + .4byte sub_812D950 + .4byte sub_812D9A4 + .4byte sub_812DA20 + .4byte sub_812DA6C + .4byte sub_812DA90 + .4byte sub_812DB04 + .4byte sub_812DB8C + .4byte sub_812D950 + .4byte sub_812DBBC gUnknown_085A75C0:: @ 85A75C0 .byte 1, 1, 2, 2 @@ -153,20 +153,20 @@ gUnknown_085A75CC:: @ 85A75CC gUnknown_085A75D4:: @ 85A75D4 .4byte sub_812DD04 - .4byte sub_812DD28 - .4byte sub_812DD48 - .4byte sub_812DD28 - .4byte sub_812DD78 - .4byte sub_812DD28 - .4byte sub_812DDC4 - .4byte sub_812DD28 - .4byte sub_812DE14 - .4byte sub_812DD28 - .4byte sub_812DE30 - .4byte sub_812DD28 - .4byte sub_812DE48 - .4byte sub_812DD28 - .4byte sub_812DE7C + .4byte sub_812DD28 + .4byte sub_812DD48 + .4byte sub_812DD28 + .4byte sub_812DD78 + .4byte sub_812DD28 + .4byte sub_812DDC4 + .4byte sub_812DD28 + .4byte sub_812DE14 + .4byte sub_812DD28 + .4byte sub_812DE30 + .4byte sub_812DD28 + .4byte sub_812DE48 + .4byte sub_812DD28 + .4byte sub_812DE7C gUnknown_085A7610:: @ 85A7610 .4byte nullsub_51 @@ -197,140 +197,1037 @@ gUnknown_085A765E:: @ 85A765E gUnknown_085A766E:: @ 85A766E .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 + .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 + .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 gUnknown_085A76AD:: @ 85A76AD .byte 1, 0, 5, 4, 3, 2, 0 gUnknown_085A76B4:: @ 85A76B4 - .incbin "baserom.gba", 0x5a76b4, 0xc + .2byte 0, 6, 0, 10, 0, 2 gUnknown_085A76C0:: @ 85A76C0 - .incbin "baserom.gba", 0x5a76c0, 0x12 + .byte 1, 1, 12 + .byte 1, 1, 14 + .byte 2, 2, 14 + .byte 2, 2, 14 + .byte 2, 3, 16 + .byte 3, 3, 16 gUnknown_085A76D2:: @ 85A76D2 - .incbin "baserom.gba", 0x5a76d2, 0x12 + .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 + .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 + .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E gUnknown_085A76E4:: @ 85A76E4 - .incbin "baserom.gba", 0x5a76e4, 0x1e + .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 + .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 + .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 + .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF + .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 gUnknown_085A7702:: @ 85A7702 - .incbin "baserom.gba", 0x5a7702, 0x66 + .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 + .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 + .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 + .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 + .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 + .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 gUnknown_085A7768:: @ 85A7768 - .incbin "baserom.gba", 0x5a7768, 0x66 + .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 + .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 + .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 + .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 + .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C gUnknown_085A77CE:: @ 85A77CE - .incbin "baserom.gba", 0x5a77ce, 0xa + .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 gUnknown_085A77D8:: @ 85A77D8 - .incbin "baserom.gba", 0x5a77d8, 0x14 + .byte 10, 0, 5, 0 + .byte 10, 0, 10, 0 + .byte 10, 0, 15, 0 + .byte 10, 0, 25, 0 + .byte 10, 0, 35, 0 gUnknown_085A77EC:: @ 85A77EC - .incbin "baserom.gba", 0x5a77ec, 0xa + .byte 0, 0 + .byte 5, 0 + .byte 10, 0 + .byte 15, 0 + .byte 20, 0 gUnknown_085A77F6:: @ 85A77F6 - .incbin "baserom.gba", 0x5a77f6, 0x8 + .byte 6, 4, 3, 2, 5, 0, 0, 0 gUnknown_085A77FE:: @ 85A77FE - .incbin "baserom.gba", 0x5a77fe, 0x6 + .byte 0x80, 0 + .byte 0x20, 0 + .byte 0x40, 0 gUnknown_085A7804:: @ 85A7804 - .incbin "baserom.gba", 0x5a7804, 0xa + .byte 16, 0 + .byte 8, 0 + .byte 4, 0 + .byte 2, 0 + .byte 1, 0 gUnknown_085A780E:: @ 85A780E - .incbin "baserom.gba", 0x5a780e, 0x8 + .byte 7, 8, 4, 3, 0, 5, 2, 0 gUnknown_085A7816:: @ 85A7816 - .incbin "baserom.gba", 0x5a7816, 0x12 + .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 gUnknown_085A7828:: @ 85A7828 - .incbin "baserom.gba", 0x5a7828, 0x12 + .2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C gUnknown_085A783A:: @ 85A783A - .incbin "baserom.gba", 0x5a783a, 0x8e + .2byte 0xD0, 0x38 + .2byte 0xB8, 0 + .2byte 0xC8, 8 + .2byte 0xD8, 0x10 + .2byte 0xE8, 0x18 + .2byte 0xD0, 0x48 + .2byte 0xD0, 8 + .2byte 0xD0, 0x40 + .2byte 0xD0, 0x38 + .2byte 0xC0, 0x58 + .2byte 0xE0, 0x58 + .2byte 0xC0, 0x78 + .2byte 0xE0, 0x78 + .2byte 0x90, 0x38 + .2byte 0x110, 0x58 + .2byte 0xA8, 0x70 + .2byte 0xD0, 0x54 + .2byte 0xD0, 0x70 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0x00, 0x00 + .2byte 0 + gUnknown_085A78C8:: @ 85A78C8 - .incbin "baserom.gba", 0x5a78c8, 0x13c + .4byte sub_812F078 + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F3B4 + .4byte sub_812F2CC + .4byte sub_812F078 + .4byte sub_812F078 + .4byte sub_812F080 + .4byte sub_812F104 + .4byte sub_812F11C + .4byte sub_812F134 + .4byte sub_812F150 + .4byte sub_812F1B8 + .4byte sub_812F21C + .4byte sub_812F078 + .4byte sub_812F470 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F648 + +gUnknown_085A7954:: @ 85A7954 + .byte 0x19 + .byte 0x22 + .2byte 0 + .byte 0x2 + .byte 0 + .2byte 0 + .byte 0x9 + .byte 0x10 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A7964:: @ 85A7964 + .byte 0xA + .byte 0x1 + .2byte 0 + .byte 0xB + .byte 2 + .2byte 0 + .byte 0xC + .byte 0x3 + .2byte 0 + .byte 0xD + .byte 4 + .2byte 0 + .byte 0x5 + .byte 5 + .2byte 0 + .byte 0x8 + .byte 0x6 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A7980:: @ 85A7980 + .byte 0x3 + .byte 0x7 + .2byte 0 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A798C:: @ 85A798C + .byte 0x4 + .byte 0x8 + .2byte 0 + .byte 0x6 + .byte 0x9 + .2byte 0 + .byte 0x6 + .byte 0xA + .2byte 1 + .byte 0x6 + .byte 0xB + .2byte 2 + .byte 0x6 + .byte 0xC + .2byte 3 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A79A4:: @ 85A79A4 + .byte 0 + .byte 0xD + .2byte 0 + .byte 1 + .byte 0xE + .2byte 0 + .byte 0x7 + .byte 0xF + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A79B4:: @ 85A79B4 + .byte 0x13 + .byte 0x1A + .2byte 0 + .byte 0x14 + .byte 0x1B + .2byte 1 + .byte 0x15 + .byte 0x1C + .2byte 2 + .byte 0xE + .byte 0x1D + .2byte 3 + .byte 0xF + .byte 0x1E + .2byte 4 + .byte 0x10 + .byte 0x1F + .2byte 5 + .byte 0x11 + .byte 0x20 + .2byte 6 + .byte 0x12 + .byte 0x21 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 + +gUnknown_085A79DC:: @ 85A79DC + .byte 0x16 + .byte 0x12 + .2byte 0 + .byte 0x17 + .byte 0x13 + .2byte 1 + .byte 0x18 + .byte 0x14 + .2byte 2 + .byte 0xE + .byte 0x15 + .2byte 3 + .byte 0xF + .byte 0x16 + .2byte 4 + .byte 0x10 + .byte 0x17 + .2byte 5 + .byte 0x11 + .byte 0x18 + .2byte 6 + .byte 0x12 + .byte 0x19 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7A04:: @ 85A7A04 - .incbin "baserom.gba", 0x5a7a04, 0x1c + .4byte gUnknown_085A7954 + .4byte gUnknown_085A7964 + .4byte gUnknown_085A7980 + .4byte gUnknown_085A798C + .4byte gUnknown_085A79A4 + .4byte gUnknown_085A79DC + .4byte gUnknown_085A79B4 gUnknown_085A7A20:: @ 85A7A20 - .incbin "baserom.gba", 0x5a7a20, 0x2c0 + .4byte sub_812F7C0 + .4byte sub_812F784 + .4byte sub_812F794 + .4byte nullsub_101 + .4byte nullsub_101 + .4byte sub_812F794 + .4byte sub_812F794 +gUnknown_085A7A3C:: @ 85A7A3C + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_085A7A44:: @ 85A7A44 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 + +gUnknown_085A7A4C:: @ 85A7A4C + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A54:: @ 85A7A54 + .2byte 0x8000 + .2byte 0x8000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A5C:: @ 85A7A5C + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A64:: @ 85A7A64 + .2byte 0x8000 + .2byte 0xC000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A6C:: @ 85A7A6C + .2byte 0x4000 + .2byte 0xC000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A74:: @ 85A7A74 + .2byte 0 + .2byte 0xC000 + .2byte 0 + .2byte 0 + +gUnknown_085A7A7C:: @ 85A7A7C + .4byte gSlotMachineReelTimeNumber0 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber1 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber2 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber3 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber4 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber5 + .2byte 0x80 + .2byte 0 + +gUnknown_085A7AAC:: @ 85A7AAC + .4byte gSlotMachineReelTimeShadow + .2byte 0x200 + .2byte 0 + +gUnknown_085A7AB4:: @ 85A7AB4 + .4byte gUnknown_08DD1A18 + .2byte 0x40 + .2byte 0 + +gUnknown_085A7ABC:: @ 85A7ABC + .4byte gSlotMachineReelTimeLargeBolt0 + .2byte 0x100 + .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt1 + .2byte 0x100 + .2byte 0 + +gUnknown_085A7ACC:: @ 85A7ACC + .4byte gSlotMachineReelTimePikaAura + .2byte 0x400 + .2byte 0 + +gUnknown_085A7AD4:: @ 85A7CD4 + .4byte gSlotMachineReelTimeExplosion0 + .2byte 0x200 + .2byte 0 + .4byte gSlotMachineReelTimeExplosion1 + .2byte 0x200 + .2byte 0 + +gUnknown_085A7AE4:: @ 85A7AE4 + .4byte gSlotMachineReelTimeDuck + .4byte 32 + +gUnknown_085A7AEC:: @ 85A7AEC + .4byte gSlotMachineReelTimeSmoke + .4byte 0x80 + +gUnknown_085A7AF4:: @ 85A7AF4 + .4byte gSlotMachineReelTimeBolt + .4byte 32 + +gUnknown_085A7AFC:: @ 85A7AFC + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7B04:: @ 85A7B04 + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + +gUnknown_085A7B0C:: @ 85A7B0C + obj_image_anim_frame 0, 16 + obj_image_anim_end + +gUnknown_085A7B14:: @ 85A7B14 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 + +gUnknown_085A7B20:: @ 85A7B20 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 + +gUnknown_085A7B2C:: @ 85A7B2C + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 + +gUnknown_085A7B38:: @ 85A7B38 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 + +gUnknown_085A7B44:: @ 85A7B44 + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_085A7B4C:: @ 85A7B4C + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7B54:: @ 85A7B54 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_085A7B5C:: @ 85A7B5C + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_085A7B64:: @ 85A7B64 + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_085A7B6C:: @ 85A7B6C + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_085A7B74:: @ 85A7B74 + obj_image_anim_frame 5, 1 + obj_image_anim_end + +gUnknown_085A7B7C:: @ 85A7B7C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gUnknown_085A7B88:: @ 85A7B88 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 + +gUnknown_085A7B94:: @ 85A7B94 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 + +gUnknown_085A7BA0:: @ 85A7BA0 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_085A7BA8:: @ 85A7BA8 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 + +gUnknown_085A7BB4:: @ 85A7BB4 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 80 + obj_image_anim_jump 0 + +gUnknown_085A7BC8:: @ 85A7BC8 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7BD0:: @ 85A7BD0 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_085A7BD8:: @ 85A7BD8 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_085A7BE0:: @ 85A7BE0 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_085A7BE8:: @ 85A7BE8 + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_085A7BF0:: @ 85A7BF0 + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_085A7BF8:: @ 85A7BF8 + .4byte gUnknown_085A7AFC + +gUnknown_085A7BFC:: @ 85A7BFC + .4byte gUnknown_085A7B04 + +gUnknown_085A7C00:: @ 85A7C00 + .4byte gUnknown_085A7B0C + .4byte gUnknown_085A7B14 + .4byte gUnknown_085A7B20 + .4byte gUnknown_085A7B2C + .4byte gUnknown_085A7B38 + .4byte gUnknown_085A7B44 + +gUnknown_085A7C18:: @ 85A7C18 + .4byte gUnknown_085A7B4C + .4byte gUnknown_085A7B54 + .4byte gUnknown_085A7B5C + .4byte gUnknown_085A7B64 + .4byte gUnknown_085A7B6C + .4byte gUnknown_085A7B74 + +gUnknown_085A7C30:: @ 85A7C30 + .4byte gUnknown_085A7B7C + +gUnknown_085A7C34:: @ 85A7C34 + .4byte gUnknown_085A7B88 + +gUnknown_085A7C38:: @ 85A7C38 + .4byte gUnknown_085A7B94 + .4byte gUnknown_085A7BA0 + +gUnknown_085A7C40:: @ 85A7C40 + .4byte gUnknown_085A7BA8 + +gUnknown_085A7C44:: @ 85A7C44 + .4byte gUnknown_085A7BB4 + .4byte gUnknown_085A7BC8 + +gUnknown_085A7C4C:: @ 85A7C4C + .4byte gUnknown_085A7BD0 + .4byte gUnknown_085A7BD8 + .4byte gUnknown_085A7BE0 + .4byte gUnknown_085A7BE8 + .4byte gUnknown_085A7BF0 + +gUnknown_085A7C60:: @ 85A7C60 + obj_rot_scal_anim_frame 16, 16, 0, 0 + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 1, 1, 0, 1 + obj_rot_scal_anim_loop 0xFF + obj_rot_scal_anim_end + +gUnknown_085A7C88:: @ 85A7C88 + .4byte gUnknown_085A7C60 + +gUnknown_085A7C8C:: @ 85A7C8C + obj_rot_scal_anim_frame 0, 0, 8, 32 + obj_rot_scal_anim_frame 0, 0, 6, 32 + obj_rot_scal_anim_frame 0, 0, 4, 16 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_end + +gUnknown_085A7CDC:: @ 85A7CDC + .4byte gUnknown_085A7C8C + gUnknown_085A7CE0:: @ 85A7CE0 - .incbin "baserom.gba", 0x5a7ce0, 0x18 + spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154 gUnknown_085A7CF8:: @ 85A7CF8 - .incbin "baserom.gba", 0x5a7cf8, 0x18 + spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8 gUnknown_085A7D10:: @ 85A7D10 - .incbin "baserom.gba", 0x5a7d10, 0x18 + spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D28:: @ 85A7D28 - .incbin "baserom.gba", 0x5a7d28, 0x18 + spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424 gUnknown_085A7D40:: @ 85A7D40 - .incbin "baserom.gba", 0x5a7d40, 0x18 + spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D58:: @ 85A7D58 - .incbin "baserom.gba", 0x5a7d58, 0x18 + spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D70:: @ 85A7D70 - .incbin "baserom.gba", 0x5a7d70, 0x18 + spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7D88:: @ 85A7D88 - .incbin "baserom.gba", 0x5a7d88, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4 gUnknown_085A7DA0:: @ 85A7DA0 - .incbin "baserom.gba", 0x5a7da0, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7DB8:: @ 85A7DB8 - .incbin "baserom.gba", 0x5a7db8, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7DD0:: @ 85A7DD0 - .incbin "baserom.gba", 0x5a7dd0, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8 gUnknown_085A7DE8:: @ 85A7DE8 - .incbin "baserom.gba", 0x5a7de8, 0x18 + spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48 gUnknown_085A7E00:: @ 85A7E00 - .incbin "baserom.gba", 0x5a7e00, 0x18 + spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64 gUnknown_085A7E18:: @ 85A7E18 - .incbin "baserom.gba", 0x5a7e18, 0x18 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20 gUnknown_085A7E30:: @ 85A7E30 - .incbin "baserom.gba", 0x5a7e30, 0x168 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14 + +gUnknown_085A7E48:: @ 85A7E48 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7E60:: @ 85A7E60 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7E78:: @ 85A7E78 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7E90:: @ 85A7E90 + spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7EA8:: @ 85A7EA8 + spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7EC0:: @ 85A7EC0 + spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +gUnknown_085A7ED8:: @ 85A7ED8 + spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7EF0:: @ 85A7EF0 + spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F08:: @ 85A7F08 + spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F20:: @ 85A7F20 + spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F38:: @ 85A7F38 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F50:: @ 85A7F50 + spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F68:: @ 85A7F68 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_085A7F80:: @ 85A7F80 + spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + gUnknown_085A7F98:: @ 85A7F98 - .incbin "baserom.gba", 0x5a7f98, 0x28 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54 + +gUnknown_085A7FB0:: @ 85A7FB0 + subsprite -64, -64, 3, 0, 64x64 + subsprite 0, -64, 3, 0, 64x64 + subsprite -64, 0, 3, 0, 64x64 + subsprite 0, 0, 3, 0, 64x64 gUnknown_085A7FC0:: @ 85A7FC0 - .incbin "baserom.gba", 0x5a7fc0, 0x20 + .4byte 4, gUnknown_085A7FB0 + +gUnknown_085A7FC8:: @ 85A7FC8 + subsprite -32, -12, 1, 0, 32x8 + subsprite 0, -12, 1, 4, 32x8 + subsprite -32, -4, 1, 8, 32x8 + subsprite 0, -4, 1, 12, 32x8 + subsprite -32, 4, 1, 16, 32x8 + subsprite 0, 4, 1, 20, 32x8 gUnknown_085A7FE0:: @ 85A7FE0 - .incbin "baserom.gba", 0x5a7fe0, 0x14 + .4byte 6, gUnknown_085A7FC8 +gUnknown_085A7FE8:: @ 85A7FE8 + subsprite -32, -20, 1, 0, 64x32 + subsprite -32, 12, 1, 32, 32x8 + subsprite 0, 12, 1, 36, 32x8 + gUnknown_085A7FF4:: @ 85A7FF4 - .incbin "baserom.gba", 0x5a7ff4, 0x1c + .4byte 3, gUnknown_085A7FE8 +gUnknown_085A7FFC:: @ 85A7FFC + subsprite -32, -24, 1, 0, 64x32 + subsprite -32, 8, 1, 32, 32x8 + subsprite 0, 8, 1, 36, 32x8 + subsprite -32, 16, 1, 40, 32x8 + subsprite 0, 16, 1, 44, 32x8 + gUnknown_085A8010:: @ 85A8010 - .incbin "baserom.gba", 0x5a8010, 0x18 + .4byte 5, gUnknown_085A7FFC + +gUnknown_085A8018:: @ 85A8018 + subsprite -32, -8, 1, 0, 32x8 + subsprite 0, -8, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 12, 32x8 gUnknown_085A8028:: @ 85A8028 - .incbin "baserom.gba", 0x5a8028, 0x14 + .4byte 4, gUnknown_085A8018 + +gUnknown_085A8030:: @ 85A8030 + subsprite -8, -12, 1, 0, 16x8 + subsprite -8, -4, 1, 0, 16x8 + subsprite -8, 4, 1, 0, 16x8 gUnknown_085A803C:: @ 85A803C - .incbin "baserom.gba", 0x5a803c, 0x228 + .4byte 3, gUnknown_085A8030 + +gUnknown_085A8044:: @ 85A8044 + subsprite -32, -24, 3, 0, 64x32 + subsprite -32, 8, 3, 32, 32x8 + subsprite 0, 8, 3, 36, 32x8 + subsprite -32, 16, 3, 40, 32x8 + subsprite 0, 16, 3, 44, 32x8 + +gUnknown_085A8058:: @ 85A8058 + .4byte 5, gUnknown_085A8044 + +gUnknown_085A8060:: @ 85A8060 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 + +gUnknown_085A8070:: @ 85A8070 + .4byte 4, gUnknown_085A8060 + +gUnknown_085A8078:: @ 85A8078 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 + +gUnknown_085A8088:: @ 85A8088 + .4byte 4, gUnknown_085A8078 + +gUnknown_085A8090:: @ 85A8090 + subsprite -32, -8, 3, 0, 32x8 + subsprite 0, -8, 3, 4, 32x8 + subsprite -32, 0, 3, 8, 32x8 + subsprite 0, 0, 3, 12, 32x8 + +gUnknown_085A80A0:: @ 85A80A0 + .4byte 4, gUnknown_085A8090 + +gUnknown_085A80A8:: @ 85A80A8 + subsprite -32, -12, 3, 0, 32x8 + subsprite 0, -12, 3, 4, 32x8 + subsprite -32, -4, 3, 8, 32x8 + subsprite 0, -4, 3, 12, 32x8 + subsprite -32, 4, 3, 16, 32x8 + subsprite 0, 4, 3, 20, 32x8 + +gUnknown_085A80C0:: @ 85A80C0 + .4byte 6, gUnknown_085A80A8 + +gUnknown_085A80C8:: @ 85A80C8 + subsprite -16, -16, 3, 0, 32x32 + +gUnknown_085A80CC:: @ 85A80CC + subsprite -8, -8, 3, 16, 16x16 + +gUnknown_085A80D0:: @ 85A80D0 + .4byte 1, gUnknown_085A80C8 + +gUnknown_085A80D8:: @ 85A80D8 + .4byte 1, gUnknown_085A80CC + +gUnknown_085A80E0:: @ 85A80E0 + subsprite -24, -24, 3, 0, 32x8 + subsprite 8, -24, 3, 4, 16x8 + subsprite -24, -16, 3, 6, 32x8 + subsprite 8, -16, 3, 10, 16x8 + subsprite -24, -8, 3, 12, 32x8 + subsprite 8, -8, 3, 16, 16x8 + subsprite -24, 0, 3, 18, 32x8 + subsprite 8, 0, 3, 22, 16x8 + subsprite -24, 8, 3, 24, 32x8 + subsprite 8, 8, 3, 28, 16x8 + subsprite -24, 16, 3, 30, 32x8 + subsprite 8, 16, 3, 34, 16x8 + +gUnknown_085A8110:: @ 85A8110 + .4byte 12, gUnknown_085A80E0 + +gUnknown_085A8118:: @ 85A8118 + subsprite -16, -12, 3, 0, 32x16 + subsprite -16, 4, 3, 8, 16x8 + subsprite 0, 4, 3, 10, 16x8 + +gUnknown_085A8124:: @ 85A8124 + .4byte 3, gUnknown_085A8118 + +gUnknown_085A812C:: @ 85A812C + subsprite -8, -8, 3, 0, 16x8 + subsprite -8, 0, 3, 8, 16x8 + +gUnknown_085A8134:: @ 85A8134 + .4byte 2, gUnknown_085A812C + +gUnknown_085A813C:: @ 85A813C + subsprite -8, -8, 3, 2, 16x8 + subsprite -8, 0, 3, 10, 16x8 + +gUnknown_085A8144:: @ 85A8144 + .4byte 2, gUnknown_085A813C + +gUnknown_085A814C:: @ 85A814C + subsprite -8, -8, 3, 4, 16x8 + subsprite -8, 0, 3, 12, 16x8 + +gUnknown_085A8154:: @ 85A8154 + .4byte 2, gUnknown_085A814C + +gUnknown_085A815C:: @ 85A815C + subsprite -8, -8, 3, 6, 16x8 + subsprite -8, 0, 3, 14, 16x8 + +gUnknown_085A8164:: @ 85A8164 + .4byte 2, gUnknown_085A815C + +gUnknown_085A816C:: @ 85A816C + subsprite -8, -8, 3, 0, 16x8 + subsprite -8, 0, 3, 8, 16x8 + +gUnknown_085A8174:: @ 85A8174 + .4byte 2, gUnknown_085A816C + +gUnknown_085A817C:: @ 85A817C + subsprite -4, -8, 3, 2, 8x8 + subsprite -4, 0, 3, 10, 8x8 + +gUnknown_085A8184:: @ 85A8184 + .4byte 2, gUnknown_085A817C + +gUnknown_085A818C:: @ 85A818C + subsprite -8, -8, 3, 3, 16x8 + subsprite -8, 0, 3, 11, 16x8 + +gUnknown_085A8194:: @ 85A8194 + .4byte 2, gUnknown_085A818C + +gUnknown_085A819C:: @ 85A819C + subsprite -4, -8, 3, 5, 8x8 + subsprite -4, 0, 3, 13, 8x8 + +gUnknown_085A81A4:: @ 85A81A4 + .4byte 2, gUnknown_085A819C + +gUnknown_085A81AC:: @ 85A81AC + subsprite -8, -8, 3, 6, 16x8 + subsprite -8, 0, 3, 14, 16x8 + +gUnknown_085A81B4:: @ 85A81B4 + .4byte 2, gUnknown_085A81AC + +gUnknown_085A81BC:: @ 85A81BC + subsprite -12, -12, 3, 0, 16x8 + subsprite 4, -12, 3, 2, 8x8 + subsprite -12, -4, 3, 8, 16x8 + subsprite 4, -4, 3, 10, 8x8 + subsprite -12, 4, 3, 16, 16x8 + subsprite 4, 4, 3, 18, 8x8 + +gUnknown_085A81D4:: @ 85A81D4 + .4byte 6, gUnknown_085A81BC + +gUnknown_085A81DC:: @ 85A81DC + subsprite -8, -12, 3, 3, 16x8 + subsprite -8, -4, 3, 11, 16x8 + subsprite -8, 4, 3, 19, 16x8 + +gUnknown_085A81E8:: @ 85A81E8 + .4byte 3, gUnknown_085A81DC + +gUnknown_085A81F0:: @ 85A81F0 + subsprite -12, -12, 3, 5, 16x8 + subsprite 4, -12, 3, 7, 8x8 + subsprite -12, -4, 3, 13, 16x8 + subsprite 4, -4, 3, 15, 8x8 + subsprite -12, 4, 3, 21, 16x8 + subsprite 4, 4, 3, 0x17, 8x8 + +gUnknown_085A8208:: @ 85A8208 + .4byte 6, gUnknown_085A81F0 + +gUnknown_085A8210:: @ 85A8210 + subsprite -12, -12, 3, 0, 16x8 + subsprite 4, -12, 3, 2, 8x8 + subsprite -12, -4, 3, 8, 16x8 + subsprite 4, -4, 3, 10, 8x8 + subsprite -12, 4, 3, 16, 16x8 + subsprite 4, 4, 3, 18, 8x8 + +gUnknown_085A8228:: @ 85A8228 + .4byte 6, gUnknown_085A8210 + +gUnknown_085A822C:: @ 85A822C + subsprite -8, -12, 3, 3, 16x8 + subsprite -8, -4, 3, 11, 16x8 + subsprite -8, 4, 3, 19, 16x8 + +gUnknown_085A823C:: @ 85A823C + .4byte 3, gUnknown_085A822C + +gUnknown_085A8244:: @ 85A8244 + subsprite -12, -12, 3, 5, 16x8 + subsprite 4, -12, 3, 7, 8x8 + subsprite -12, -4, 3, 13, 16x8 + subsprite 4, -4, 3, 15, 8x8 + subsprite -12, 4, 3, 21, 16x8 + subsprite 4, 4, 3, 23, 8x8 + +gUnknown_085A825C:: @ 85A825C + .4byte 6, gUnknown_085A8244 gUnknown_085A8264:: @ 85A8264 - .incbin "baserom.gba", 0x5a8264, 0x68 + .4byte gUnknown_085A7E48 + .4byte gUnknown_085A7E60 + .4byte gUnknown_085A7E78 + .4byte gUnknown_085A7EA8 + .4byte gUnknown_085A7EC0 + .4byte gUnknown_085A7F20 + .4byte gUnknown_085A7F38 + .4byte gUnknown_085A7F50 + .4byte gUnknown_085A7F68 + .4byte gUnknown_085A7F80 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gDummySpriteTemplate gUnknown_085A82CC:: @ 85A82CC - .incbin "baserom.gba", 0x5a82cc, 0x68 + .4byte gUnknown_085A8058 + .4byte gUnknown_085A8070 + .4byte gUnknown_085A8088 + .4byte gUnknown_085A80C0 + .4byte NULL + .4byte NULL + .4byte gUnknown_085A80D0 + .4byte NULL + .4byte gUnknown_085A8110 + .4byte gUnknown_085A8124 + .4byte gUnknown_085A8134 + .4byte gUnknown_085A8144 + .4byte gUnknown_085A8154 + .4byte gUnknown_085A8164 + .4byte gUnknown_085A8174 + .4byte gUnknown_085A8184 + .4byte gUnknown_085A8194 + .4byte gUnknown_085A81A4 + .4byte gUnknown_085A81B4 + .4byte gUnknown_085A81D4 + .4byte gUnknown_085A81E8 + .4byte gUnknown_085A8208 + .4byte gUnknown_085A8228 + .4byte gUnknown_085A823C + .4byte gUnknown_085A825C + .4byte NULL .align 2 gUnknown_085A8334:: @ 85A8334 @@ -353,40 +1250,91 @@ gUnknown_085A8334:: @ 85A8334 obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010 .align 2 - .incbin "baserom.gba", 0x5a83bc, 0x28 + .byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 gUnknown_085A83E4:: @ 85A83E4 - .incbin "baserom.gba", 0x5a83e4, 0x24 + .4byte gUnknown_08DD19F8 + @ might be a palette idk + .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 + +gUnknown_085A83FC:: @ 85A83FC + .byte 0x91, 0x7F + +gUnknown_085A83FE:: @ 85A83FE + .byte 0xBF, 0x43 + +gUnknown_085A8400:: @ 85A8400 + .byte 0xBF, 0x43 + +gUnknown_085A8402:: @ 85A8402 + .byte 0xBF, 0x4A + +gUnknown_085A8404:: @ 85A8404 + .byte 0xBF, 0x4A, 0, 0 gUnknown_085A8408:: @ 85A8408 - .incbin "baserom.gba", 0x5a8408, 0x14 + .4byte gUnknown_085A83FC + .4byte gUnknown_085A83FE + .4byte gUnknown_085A8400 + .4byte gUnknown_085A8402 + .4byte gUnknown_085A8404 gUnknown_085A841C:: @ 85A841C - .incbin "baserom.gba", 0x5a841c, 0x14 + .4byte gSlotMachineMenu_Pal + 0x94 + .4byte gSlotMachineMenu_Pal + 0x96 + .4byte gSlotMachineMenu_Pal + 0x98 + .4byte gSlotMachineMenu_Pal + 0x9A + .4byte gSlotMachineMenu_Pal + 0x9C gUnknown_085A8430:: @ 85A8430 - .incbin "baserom.gba", 0x5a8430, 0x5 + .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D gUnknown_085A8435:: @ 85A8435 - .incbin "baserom.gba", 0x5a8435, 0x6 + .byte 0, 0 + .byte 1, 2 + .byte 3, 4 gUnknown_085A843B:: @ 85A843B - .incbin "baserom.gba", 0x5a843b, 0x65 + .byte 1, 2, 2 + +gUnknown_085A843E:: @ 85A843E + .incbin "graphics/slot_machine/85A843E.gbapal" + +gUnknown_085A845E:: @ 85A845E + .incbin "graphics/slot_machine/85A845E.gbapal" + +gUnknown_085A847E:: @ 85A847E + .incbin "graphics/slot_machine/85A847E.gbapal" + .align 2 gUnknown_085A84A0:: @ 85A84A0 - .incbin "baserom.gba", 0x5a84a0, 0xc + .4byte gUnknown_085A843E + .4byte gUnknown_085A845E + .4byte gUnknown_085A847E gUnknown_085A84AC:: @ 85A84AC - .incbin "baserom.gba", 0x5a84ac, 0x64 + .4byte gSlotMachineMenu_Pal + 0x20 + +gUnknown_085A84B0:: @ 85A84B0 + .incbin "graphics/slot_machine/85A84B0.gbapal" + +gUnknown_085A84D0:: @ 85A84D0 + .incbin "graphics/slot_machine/85A84D0.gbapal" + +gUnknown_085A84F0:: @ 85A84F0 + .incbin "graphics/slot_machine/85A84F0.gbapal" gUnknown_085A8510:: @ 85A8510 - .incbin "baserom.gba", 0x5a8510, 0x10 + .4byte gUnknown_085A84B0 + .4byte gUnknown_085A84D0 + .4byte gUnknown_085A84F0 + .4byte gUnknown_08DCF230 gUnknown_085A8520:: @ 85A8520 - .incbin "baserom.gba", 0x5a8520, 0x4 + .4byte gUnknown_08DCF230 gUnknown_085A8524:: @ 85A8524 - .incbin "baserom.gba", 0x5a8524, 0x20 + .incbin "graphics/slot_machine/85A8524.bin" .align 2 gUnknown_085A8544:: @ 85A8544 @@ -401,10 +1349,11 @@ gUnknown_085A8544:: @ 85A8544 null_obj_pal gUnknown_085A858C:: @ 85A858C - .incbin "baserom.gba", 0x5a858c, 0x1154 + .incbin "graphics/slot_machine/reel_pikachu_and_machine.4bpp.lz" gUnknown_085A96E0:: @ 85A96E0 - .incbin "baserom.gba", 0x5a96e0, 0x1b8 + @if anyone knows what this tilemap is please do share + .incbin "graphics/slot_machine/85A96E0.bin" gUnknown_085A9898:: @ 85A9898 - .incbin "baserom.gba", 0x5a9898, 0x4 + .4byte NULL diff --git a/graphics/slot_machine/85A843E.pal b/graphics/slot_machine/85A843E.pal new file mode 100755 index 0000000000..e4d2436c7b --- /dev/null +++ b/graphics/slot_machine/85A843E.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +131 213 172 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 180 65 +255 90 0 +255 90 0 +222 41 0 +255 0 255 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/85A845E.pal b/graphics/slot_machine/85A845E.pal new file mode 100755 index 0000000000..db8703d479 --- /dev/null +++ b/graphics/slot_machine/85A845E.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +131 213 172 +255 180 65 +255 90 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 180 65 +255 90 0 +255 0 255 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/85A847E.pal b/graphics/slot_machine/85A847E.pal new file mode 100755 index 0000000000..4bb9a0b4d8 --- /dev/null +++ b/graphics/slot_machine/85A847E.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +222 222 222 +255 255 255 +131 213 172 +255 90 0 +222 41 0 +255 180 65 +255 90 0 +255 255 131 +255 180 65 +255 255 255 +255 255 131 +255 255 131 +255 180 65 +255 0 255 +156 0 0 +0 0 0 diff --git a/graphics/slot_machine/85A84B0.pal b/graphics/slot_machine/85A84B0.pal new file mode 100755 index 0000000000..3e1dbc0248 --- /dev/null +++ b/graphics/slot_machine/85A84B0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +255 189 16 +197 65 16 +197 65 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/slot_machine/85A84D0.pal b/graphics/slot_machine/85A84D0.pal new file mode 100755 index 0000000000..38b1c125da --- /dev/null +++ b/graphics/slot_machine/85A84D0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +197 65 16 +255 189 16 +197 65 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/slot_machine/85A84F0.pal b/graphics/slot_machine/85A84F0.pal new file mode 100755 index 0000000000..f4abe23f18 --- /dev/null +++ b/graphics/slot_machine/85A84F0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 90 +255 189 16 +131 0 0 +197 65 16 +197 65 16 +255 189 16 +197 65 16 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +0 0 0 diff --git a/graphics/slot_machine/85A8524.bin b/graphics/slot_machine/85A8524.bin new file mode 100644 index 0000000000000000000000000000000000000000..0325642780da7235dbab817783c8a807c6ba8c47 GIT binary patch literal 32 ScmZQz`2U}QfkTl22LJ#*?gA(P literal 0 HcmV?d00001 diff --git a/graphics/slot_machine/85A96E0.bin b/graphics/slot_machine/85A96E0.bin new file mode 100644 index 0000000000..3aa89e7b40 --- /dev/null +++ b/graphics/slot_machine/85A96E0.bin @@ -0,0 +1 @@ +񁓀񄗸񄗸񄗸񄗸񄗸񄗸񄗸񄗸񄗲񲦔򭂼򭂼򭂼򭂼򭂼򭂼򭂼򭂼򭀂񲦔򭂼򭂼򭂼򭂼򭂼򭂼򭂼򭂼򭀂򣴞򰇾򰇾򰇾򰇾򰇾򰇾򰇾򰇾򰇚񇢘򳍀򳍀򳍀򳍀򳍀򳍀򳍀򳍀򳇦񸭐񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨦񸭐񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨦񸭐񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨦񸭐񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨦񸭐񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨘񵨦򩽰򦸸򦸸򦸸򦸸򦸸򦸸򦸸򦸸򦹆 \ No newline at end of file From 442398261ee13464f4bde73142a2fd551a78dc74 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 14:48:50 -0500 Subject: [PATCH 3/5] fix tabs and add forgotten image --- data/slot_machine.s | 948 +++++++++--------- .../slot_machine/reel_pikachu_and_machine.png | Bin 0 -> 3051 bytes 2 files changed, 474 insertions(+), 474 deletions(-) create mode 100755 graphics/slot_machine/reel_pikachu_and_machine.png diff --git a/data/slot_machine.s b/data/slot_machine.s index 68adf50475..b09ee25c0f 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -6,9 +6,9 @@ gUnknown_085A7424:: @ 85A7424 .4byte 0x1F8 - .4byte 0x11C5 - .4byte 0x21D6 - .4byte 0x11E7 + .4byte 0x11C5 + .4byte 0x21D6 + .4byte 0x11E7 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 @@ -324,502 +324,502 @@ gUnknown_085A783A:: @ 85A783A gUnknown_085A78C8:: @ 85A78C8 .4byte sub_812F078 - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F3B4 - .4byte sub_812F2CC - .4byte sub_812F078 - .4byte sub_812F078 - .4byte sub_812F080 - .4byte sub_812F104 - .4byte sub_812F11C - .4byte sub_812F134 - .4byte sub_812F150 - .4byte sub_812F1B8 - .4byte sub_812F21C - .4byte sub_812F078 - .4byte sub_812F470 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F648 + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F36C + .4byte sub_812F3B4 + .4byte sub_812F2CC + .4byte sub_812F078 + .4byte sub_812F078 + .4byte sub_812F080 + .4byte sub_812F104 + .4byte sub_812F11C + .4byte sub_812F134 + .4byte sub_812F150 + .4byte sub_812F1B8 + .4byte sub_812F21C + .4byte sub_812F078 + .4byte sub_812F470 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F514 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F5E0 + .4byte sub_812F648 gUnknown_085A7954:: @ 85A7954 - .byte 0x19 - .byte 0x22 - .2byte 0 - .byte 0x2 - .byte 0 - .2byte 0 - .byte 0x9 - .byte 0x10 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x19 + .byte 0x22 + .2byte 0 + .byte 0x2 + .byte 0 + .2byte 0 + .byte 0x9 + .byte 0x10 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7964:: @ 85A7964 - .byte 0xA - .byte 0x1 - .2byte 0 - .byte 0xB - .byte 2 - .2byte 0 - .byte 0xC - .byte 0x3 - .2byte 0 - .byte 0xD - .byte 4 - .2byte 0 - .byte 0x5 - .byte 5 - .2byte 0 - .byte 0x8 - .byte 0x6 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0xA + .byte 0x1 + .2byte 0 + .byte 0xB + .byte 2 + .2byte 0 + .byte 0xC + .byte 0x3 + .2byte 0 + .byte 0xD + .byte 4 + .2byte 0 + .byte 0x5 + .byte 5 + .2byte 0 + .byte 0x8 + .byte 0x6 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7980:: @ 85A7980 - .byte 0x3 - .byte 0x7 - .2byte 0 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x3 + .byte 0x7 + .2byte 0 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A798C:: @ 85A798C - .byte 0x4 - .byte 0x8 - .2byte 0 - .byte 0x6 - .byte 0x9 - .2byte 0 - .byte 0x6 - .byte 0xA - .2byte 1 - .byte 0x6 - .byte 0xB - .2byte 2 - .byte 0x6 - .byte 0xC - .2byte 3 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x4 + .byte 0x8 + .2byte 0 + .byte 0x6 + .byte 0x9 + .2byte 0 + .byte 0x6 + .byte 0xA + .2byte 1 + .byte 0x6 + .byte 0xB + .2byte 2 + .byte 0x6 + .byte 0xC + .2byte 3 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A79A4:: @ 85A79A4 - .byte 0 - .byte 0xD - .2byte 0 - .byte 1 - .byte 0xE - .2byte 0 - .byte 0x7 - .byte 0xF - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0 + .byte 0xD + .2byte 0 + .byte 1 + .byte 0xE + .2byte 0 + .byte 0x7 + .byte 0xF + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 -gUnknown_085A79B4:: @ 85A79B4 - .byte 0x13 - .byte 0x1A - .2byte 0 - .byte 0x14 - .byte 0x1B - .2byte 1 - .byte 0x15 - .byte 0x1C - .2byte 2 - .byte 0xE - .byte 0x1D - .2byte 3 - .byte 0xF - .byte 0x1E - .2byte 4 - .byte 0x10 - .byte 0x1F - .2byte 5 - .byte 0x11 - .byte 0x20 - .2byte 6 - .byte 0x12 - .byte 0x21 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 +gUnknown_085A79B4:: @ 85A79B4 + .byte 0x13 + .byte 0x1A + .2byte 0 + .byte 0x14 + .byte 0x1B + .2byte 1 + .byte 0x15 + .byte 0x1C + .2byte 2 + .byte 0xE + .byte 0x1D + .2byte 3 + .byte 0xF + .byte 0x1E + .2byte 4 + .byte 0x10 + .byte 0x1F + .2byte 5 + .byte 0x11 + .byte 0x20 + .2byte 6 + .byte 0x12 + .byte 0x21 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A79DC:: @ 85A79DC - .byte 0x16 - .byte 0x12 - .2byte 0 - .byte 0x17 - .byte 0x13 - .2byte 1 - .byte 0x18 - .byte 0x14 - .2byte 2 - .byte 0xE - .byte 0x15 - .2byte 3 - .byte 0xF - .byte 0x16 - .2byte 4 - .byte 0x10 - .byte 0x17 - .2byte 5 - .byte 0x11 - .byte 0x18 - .2byte 6 - .byte 0x12 - .byte 0x19 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 + .byte 0x16 + .byte 0x12 + .2byte 0 + .byte 0x17 + .byte 0x13 + .2byte 1 + .byte 0x18 + .byte 0x14 + .2byte 2 + .byte 0xE + .byte 0x15 + .2byte 3 + .byte 0xF + .byte 0x16 + .2byte 4 + .byte 0x10 + .byte 0x17 + .2byte 5 + .byte 0x11 + .byte 0x18 + .2byte 6 + .byte 0x12 + .byte 0x19 + .2byte 7 + .byte 0x8 + .byte 0x11 + .2byte 0 + .byte 0xFF + .byte 0 + .2byte 0 gUnknown_085A7A04:: @ 85A7A04 .4byte gUnknown_085A7954 - .4byte gUnknown_085A7964 - .4byte gUnknown_085A7980 - .4byte gUnknown_085A798C - .4byte gUnknown_085A79A4 - .4byte gUnknown_085A79DC - .4byte gUnknown_085A79B4 + .4byte gUnknown_085A7964 + .4byte gUnknown_085A7980 + .4byte gUnknown_085A798C + .4byte gUnknown_085A79A4 + .4byte gUnknown_085A79DC + .4byte gUnknown_085A79B4 gUnknown_085A7A20:: @ 85A7A20 .4byte sub_812F7C0 - .4byte sub_812F784 - .4byte sub_812F794 - .4byte nullsub_101 - .4byte nullsub_101 - .4byte sub_812F794 - .4byte sub_812F794 + .4byte sub_812F784 + .4byte sub_812F794 + .4byte nullsub_101 + .4byte nullsub_101 + .4byte sub_812F794 + .4byte sub_812F794 gUnknown_085A7A3C:: @ 85A7A3C - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + gUnknown_085A7A44:: @ 85A7A44 - .2byte 0x8000 - .2byte 0 - .2byte 0 - .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 + .2byte 0 gUnknown_085A7A4C:: @ 85A7A4C - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - + .2byte 0 + .2byte 0x4000 + .2byte 0 + .2byte 0 + gUnknown_085A7A54:: @ 85A7A54 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0 - .2byte 0 - + .2byte 0x8000 + .2byte 0x8000 + .2byte 0 + .2byte 0 + gUnknown_085A7A5C:: @ 85A7A5C - .2byte 0 - .2byte 0x8000 - .2byte 0 - .2byte 0 + .2byte 0 + .2byte 0x8000 + .2byte 0 + .2byte 0 gUnknown_085A7A64:: @ 85A7A64 - .2byte 0x8000 - .2byte 0xC000 - .2byte 0 - .2byte 0 - + .2byte 0x8000 + .2byte 0xC000 + .2byte 0 + .2byte 0 + gUnknown_085A7A6C:: @ 85A7A6C - .2byte 0x4000 - .2byte 0xC000 - .2byte 0 - .2byte 0 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A74:: @ 85A7A74 - .2byte 0 - .2byte 0xC000 - .2byte 0 - .2byte 0 + .2byte 0 + .2byte 0xC000 + .2byte 0 + .2byte 0 gUnknown_085A7A7C:: @ 85A7A7C - .4byte gSlotMachineReelTimeNumber0 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber1 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber2 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber3 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber4 - .2byte 0x80 - .2byte 0 - .4byte gSlotMachineReelTimeNumber5 - .2byte 0x80 - .2byte 0 + .4byte gSlotMachineReelTimeNumber0 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber1 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber2 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber3 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber4 + .2byte 0x80 + .2byte 0 + .4byte gSlotMachineReelTimeNumber5 + .2byte 0x80 + .2byte 0 gUnknown_085A7AAC:: @ 85A7AAC - .4byte gSlotMachineReelTimeShadow - .2byte 0x200 - .2byte 0 + .4byte gSlotMachineReelTimeShadow + .2byte 0x200 + .2byte 0 gUnknown_085A7AB4:: @ 85A7AB4 - .4byte gUnknown_08DD1A18 - .2byte 0x40 - .2byte 0 + .4byte gUnknown_08DD1A18 + .2byte 0x40 + .2byte 0 gUnknown_085A7ABC:: @ 85A7ABC - .4byte gSlotMachineReelTimeLargeBolt0 - .2byte 0x100 - .2byte 0 - .4byte gSlotMachineReelTimeLargeBolt1 - .2byte 0x100 - .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt0 + .2byte 0x100 + .2byte 0 + .4byte gSlotMachineReelTimeLargeBolt1 + .2byte 0x100 + .2byte 0 gUnknown_085A7ACC:: @ 85A7ACC - .4byte gSlotMachineReelTimePikaAura - .2byte 0x400 - .2byte 0 - + .4byte gSlotMachineReelTimePikaAura + .2byte 0x400 + .2byte 0 + gUnknown_085A7AD4:: @ 85A7CD4 - .4byte gSlotMachineReelTimeExplosion0 - .2byte 0x200 - .2byte 0 - .4byte gSlotMachineReelTimeExplosion1 - .2byte 0x200 - .2byte 0 + .4byte gSlotMachineReelTimeExplosion0 + .2byte 0x200 + .2byte 0 + .4byte gSlotMachineReelTimeExplosion1 + .2byte 0x200 + .2byte 0 gUnknown_085A7AE4:: @ 85A7AE4 - .4byte gSlotMachineReelTimeDuck - .4byte 32 + .4byte gSlotMachineReelTimeDuck + .4byte 32 gUnknown_085A7AEC:: @ 85A7AEC - .4byte gSlotMachineReelTimeSmoke - .4byte 0x80 - + .4byte gSlotMachineReelTimeSmoke + .4byte 0x80 + gUnknown_085A7AF4:: @ 85A7AF4 - .4byte gSlotMachineReelTimeBolt - .4byte 32 + .4byte gSlotMachineReelTimeBolt + .4byte 32 gUnknown_085A7AFC:: @ 85A7AFC - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7B04:: @ 85A7B04 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + gUnknown_085A7B0C:: @ 85A7B0C - obj_image_anim_frame 0, 16 - obj_image_anim_end + obj_image_anim_frame 0, 16 + obj_image_anim_end gUnknown_085A7B14:: @ 85A7B14 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 gUnknown_085A7B20:: @ 85A7B20 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 gUnknown_085A7B2C:: @ 85A7B2C - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 gUnknown_085A7B38:: @ 85A7B38 - obj_image_anim_frame 2, 32 - obj_image_anim_frame 3, 32 - obj_image_anim_jump 0 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 gUnknown_085A7B44:: @ 85A7B44 - obj_image_anim_frame 4, 1 - obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7B4C:: @ 85A7B4C - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7B54:: @ 85A7B54 - obj_image_anim_frame 1, 1 - obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7B5C:: @ 85A7B5C - obj_image_anim_frame 2, 1 - obj_image_anim_end + obj_image_anim_frame 2, 1 + obj_image_anim_end gUnknown_085A7B64:: @ 85A7B64 - obj_image_anim_frame 3, 1 - obj_image_anim_end + obj_image_anim_frame 3, 1 + obj_image_anim_end gUnknown_085A7B6C:: @ 85A7B6C - obj_image_anim_frame 4, 1 - obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7B74:: @ 85A7B74 - obj_image_anim_frame 5, 1 - obj_image_anim_end + obj_image_anim_frame 5, 1 + obj_image_anim_end gUnknown_085A7B7C:: @ 85A7B7C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 gUnknown_085A7B88:: @ 85A7B88 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 gUnknown_085A7B94:: @ 85A7B94 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 gUnknown_085A7BA0:: @ 85A7BA0 - obj_image_anim_frame 1, 1 - obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7BA8:: @ 85A7BA8 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_jump 0 gUnknown_085A7BB4:: @ 85A7BB4 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 80 - obj_image_anim_jump 0 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 1, 80 + obj_image_anim_jump 0 gUnknown_085A7BC8:: @ 85A7BC8 - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7BD0:: @ 85A7BD0 - obj_image_anim_frame 0, 1 - obj_image_anim_end + obj_image_anim_frame 0, 1 + obj_image_anim_end gUnknown_085A7BD8:: @ 85A7BD8 - obj_image_anim_frame 1, 1 - obj_image_anim_end + obj_image_anim_frame 1, 1 + obj_image_anim_end gUnknown_085A7BE0:: @ 85A7BE0 - obj_image_anim_frame 2, 1 - obj_image_anim_end + obj_image_anim_frame 2, 1 + obj_image_anim_end gUnknown_085A7BE8:: @ 85A7BE8 - obj_image_anim_frame 3, 1 - obj_image_anim_end + obj_image_anim_frame 3, 1 + obj_image_anim_end gUnknown_085A7BF0:: @ 85A7BF0 - obj_image_anim_frame 4, 1 - obj_image_anim_end + obj_image_anim_frame 4, 1 + obj_image_anim_end gUnknown_085A7BF8:: @ 85A7BF8 - .4byte gUnknown_085A7AFC + .4byte gUnknown_085A7AFC gUnknown_085A7BFC:: @ 85A7BFC - .4byte gUnknown_085A7B04 + .4byte gUnknown_085A7B04 gUnknown_085A7C00:: @ 85A7C00 - .4byte gUnknown_085A7B0C - .4byte gUnknown_085A7B14 - .4byte gUnknown_085A7B20 - .4byte gUnknown_085A7B2C - .4byte gUnknown_085A7B38 - .4byte gUnknown_085A7B44 + .4byte gUnknown_085A7B0C + .4byte gUnknown_085A7B14 + .4byte gUnknown_085A7B20 + .4byte gUnknown_085A7B2C + .4byte gUnknown_085A7B38 + .4byte gUnknown_085A7B44 gUnknown_085A7C18:: @ 85A7C18 - .4byte gUnknown_085A7B4C - .4byte gUnknown_085A7B54 - .4byte gUnknown_085A7B5C - .4byte gUnknown_085A7B64 - .4byte gUnknown_085A7B6C - .4byte gUnknown_085A7B74 + .4byte gUnknown_085A7B4C + .4byte gUnknown_085A7B54 + .4byte gUnknown_085A7B5C + .4byte gUnknown_085A7B64 + .4byte gUnknown_085A7B6C + .4byte gUnknown_085A7B74 gUnknown_085A7C30:: @ 85A7C30 - .4byte gUnknown_085A7B7C + .4byte gUnknown_085A7B7C gUnknown_085A7C34:: @ 85A7C34 - .4byte gUnknown_085A7B88 - + .4byte gUnknown_085A7B88 + gUnknown_085A7C38:: @ 85A7C38 - .4byte gUnknown_085A7B94 - .4byte gUnknown_085A7BA0 - + .4byte gUnknown_085A7B94 + .4byte gUnknown_085A7BA0 + gUnknown_085A7C40:: @ 85A7C40 - .4byte gUnknown_085A7BA8 - + .4byte gUnknown_085A7BA8 + gUnknown_085A7C44:: @ 85A7C44 - .4byte gUnknown_085A7BB4 - .4byte gUnknown_085A7BC8 - + .4byte gUnknown_085A7BB4 + .4byte gUnknown_085A7BC8 + gUnknown_085A7C4C:: @ 85A7C4C - .4byte gUnknown_085A7BD0 - .4byte gUnknown_085A7BD8 - .4byte gUnknown_085A7BE0 - .4byte gUnknown_085A7BE8 - .4byte gUnknown_085A7BF0 + .4byte gUnknown_085A7BD0 + .4byte gUnknown_085A7BD8 + .4byte gUnknown_085A7BE0 + .4byte gUnknown_085A7BE8 + .4byte gUnknown_085A7BF0 gUnknown_085A7C60:: @ 85A7C60 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 1, 1, 0, 1 - obj_rot_scal_anim_loop 0xFF - obj_rot_scal_anim_end - + obj_rot_scal_anim_frame 16, 16, 0, 0 + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 1, 1, 0, 1 + obj_rot_scal_anim_loop 0xFF + obj_rot_scal_anim_end + gUnknown_085A7C88:: @ 85A7C88 - .4byte gUnknown_085A7C60 + .4byte gUnknown_085A7C60 gUnknown_085A7C8C:: @ 85A7C8C - obj_rot_scal_anim_frame 0, 0, 8, 32 - obj_rot_scal_anim_frame 0, 0, 6, 32 - obj_rot_scal_anim_frame 0, 0, 4, 16 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, -12, 4 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_frame 0, 0, -12, 4 - obj_rot_scal_anim_frame 0, 0, 12, 2 - obj_rot_scal_anim_end + obj_rot_scal_anim_frame 0, 0, 8, 32 + obj_rot_scal_anim_frame 0, 0, 6, 32 + obj_rot_scal_anim_frame 0, 0, 4, 16 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_frame 0, 0, -12, 4 + obj_rot_scal_anim_frame 0, 0, 12, 2 + obj_rot_scal_anim_end gUnknown_085A7CDC:: @ 85A7CDC - .4byte gUnknown_085A7C8C - + .4byte gUnknown_085A7C8C + gUnknown_085A7CE0:: @ 85A7CE0 spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154 @@ -864,106 +864,106 @@ gUnknown_085A7E18:: @ 85A7E18 gUnknown_085A7E30:: @ 85A7E30 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14 - + gUnknown_085A7E48:: @ 85A7E48 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E60:: @ 85A7E60 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E78:: @ 85A7E78 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7E90:: @ 85A7E90 spr_template 18, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EA8:: @ 85A7EA8 spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EC0:: @ 85A7EC0 spr_template 0xFFFF, 6, gUnknown_085A7A6C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_085A7ED8:: @ 85A7ED8 spr_template 19, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7EF0:: @ 85A7EF0 spr_template 20, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F08:: @ 85A7F08 spr_template 21, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F20:: @ 85A7F20 spr_template 0xFFFF, 6, gUnknown_085A7A5C, gUnknown_085A7C38, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F38:: @ 85A7F38 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F50:: @ 85A7F50 spr_template 0xFFFF, 6, gUnknown_085A7A4C, gUnknown_085A7C4C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F68:: @ 85A7F68 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F80:: @ 85A7F80 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - + gUnknown_085A7F98:: @ 85A7F98 spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54 - + gUnknown_085A7FB0:: @ 85A7FB0 - subsprite -64, -64, 3, 0, 64x64 - subsprite 0, -64, 3, 0, 64x64 - subsprite -64, 0, 3, 0, 64x64 - subsprite 0, 0, 3, 0, 64x64 + subsprite -64, -64, 3, 0, 64x64 + subsprite 0, -64, 3, 0, 64x64 + subsprite -64, 0, 3, 0, 64x64 + subsprite 0, 0, 3, 0, 64x64 gUnknown_085A7FC0:: @ 85A7FC0 .4byte 4, gUnknown_085A7FB0 - + gUnknown_085A7FC8:: @ 85A7FC8 - subsprite -32, -12, 1, 0, 32x8 - subsprite 0, -12, 1, 4, 32x8 - subsprite -32, -4, 1, 8, 32x8 - subsprite 0, -4, 1, 12, 32x8 - subsprite -32, 4, 1, 16, 32x8 - subsprite 0, 4, 1, 20, 32x8 + subsprite -32, -12, 1, 0, 32x8 + subsprite 0, -12, 1, 4, 32x8 + subsprite -32, -4, 1, 8, 32x8 + subsprite 0, -4, 1, 12, 32x8 + subsprite -32, 4, 1, 16, 32x8 + subsprite 0, 4, 1, 20, 32x8 gUnknown_085A7FE0:: @ 85A7FE0 .4byte 6, gUnknown_085A7FC8 gUnknown_085A7FE8:: @ 85A7FE8 - subsprite -32, -20, 1, 0, 64x32 - subsprite -32, 12, 1, 32, 32x8 - subsprite 0, 12, 1, 36, 32x8 - + subsprite -32, -20, 1, 0, 64x32 + subsprite -32, 12, 1, 32, 32x8 + subsprite 0, 12, 1, 36, 32x8 + gUnknown_085A7FF4:: @ 85A7FF4 .4byte 3, gUnknown_085A7FE8 gUnknown_085A7FFC:: @ 85A7FFC - subsprite -32, -24, 1, 0, 64x32 - subsprite -32, 8, 1, 32, 32x8 - subsprite 0, 8, 1, 36, 32x8 - subsprite -32, 16, 1, 40, 32x8 - subsprite 0, 16, 1, 44, 32x8 - + subsprite -32, -24, 1, 0, 64x32 + subsprite -32, 8, 1, 32, 32x8 + subsprite 0, 8, 1, 36, 32x8 + subsprite -32, 16, 1, 40, 32x8 + subsprite 0, 16, 1, 44, 32x8 + gUnknown_085A8010:: @ 85A8010 .4byte 5, gUnknown_085A7FFC - + gUnknown_085A8018:: @ 85A8018 - subsprite -32, -8, 1, 0, 32x8 - subsprite 0, -8, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 12, 32x8 + subsprite -32, -8, 1, 0, 32x8 + subsprite 0, -8, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 12, 32x8 gUnknown_085A8028:: @ 85A8028 .4byte 4, gUnknown_085A8018 - + gUnknown_085A8030:: @ 85A8030 - subsprite -8, -12, 1, 0, 16x8 - subsprite -8, -4, 1, 0, 16x8 - subsprite -8, 4, 1, 0, 16x8 + subsprite -8, -12, 1, 0, 16x8 + subsprite -8, -4, 1, 0, 16x8 + subsprite -8, 4, 1, 0, 16x8 gUnknown_085A803C:: @ 85A803C - .4byte 3, gUnknown_085A8030 + .4byte 3, gUnknown_085A8030 gUnknown_085A8044:: @ 85A8044 subsprite -32, -24, 3, 0, 64x32 @@ -1175,59 +1175,59 @@ gUnknown_085A825C:: @ 85A825C gUnknown_085A8264:: @ 85A8264 .4byte gUnknown_085A7E48 - .4byte gUnknown_085A7E60 - .4byte gUnknown_085A7E78 - .4byte gUnknown_085A7EA8 - .4byte gUnknown_085A7EC0 - .4byte gUnknown_085A7F20 - .4byte gUnknown_085A7F38 - .4byte gUnknown_085A7F50 - .4byte gUnknown_085A7F68 - .4byte gUnknown_085A7F80 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7E90 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7ED8 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7EF0 - .4byte gUnknown_085A7F08 - .4byte gUnknown_085A7F08 - .4byte gUnknown_085A7F08 - .4byte gDummySpriteTemplate + .4byte gUnknown_085A7E60 + .4byte gUnknown_085A7E78 + .4byte gUnknown_085A7EA8 + .4byte gUnknown_085A7EC0 + .4byte gUnknown_085A7F20 + .4byte gUnknown_085A7F38 + .4byte gUnknown_085A7F50 + .4byte gUnknown_085A7F68 + .4byte gUnknown_085A7F80 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7E90 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7ED8 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7EF0 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gUnknown_085A7F08 + .4byte gDummySpriteTemplate gUnknown_085A82CC:: @ 85A82CC .4byte gUnknown_085A8058 - .4byte gUnknown_085A8070 - .4byte gUnknown_085A8088 - .4byte gUnknown_085A80C0 - .4byte NULL - .4byte NULL - .4byte gUnknown_085A80D0 - .4byte NULL - .4byte gUnknown_085A8110 - .4byte gUnknown_085A8124 - .4byte gUnknown_085A8134 - .4byte gUnknown_085A8144 - .4byte gUnknown_085A8154 - .4byte gUnknown_085A8164 - .4byte gUnknown_085A8174 - .4byte gUnknown_085A8184 - .4byte gUnknown_085A8194 - .4byte gUnknown_085A81A4 - .4byte gUnknown_085A81B4 - .4byte gUnknown_085A81D4 - .4byte gUnknown_085A81E8 - .4byte gUnknown_085A8208 - .4byte gUnknown_085A8228 - .4byte gUnknown_085A823C - .4byte gUnknown_085A825C - .4byte NULL + .4byte gUnknown_085A8070 + .4byte gUnknown_085A8088 + .4byte gUnknown_085A80C0 + .4byte NULL + .4byte NULL + .4byte gUnknown_085A80D0 + .4byte NULL + .4byte gUnknown_085A8110 + .4byte gUnknown_085A8124 + .4byte gUnknown_085A8134 + .4byte gUnknown_085A8144 + .4byte gUnknown_085A8154 + .4byte gUnknown_085A8164 + .4byte gUnknown_085A8174 + .4byte gUnknown_085A8184 + .4byte gUnknown_085A8194 + .4byte gUnknown_085A81A4 + .4byte gUnknown_085A81B4 + .4byte gUnknown_085A81D4 + .4byte gUnknown_085A81E8 + .4byte gUnknown_085A8208 + .4byte gUnknown_085A8228 + .4byte gUnknown_085A823C + .4byte gUnknown_085A825C + .4byte NULL .align 2 gUnknown_085A8334:: @ 85A8334 diff --git a/graphics/slot_machine/reel_pikachu_and_machine.png b/graphics/slot_machine/reel_pikachu_and_machine.png new file mode 100755 index 0000000000000000000000000000000000000000..ddbd332eecd22fd2083ad3b8a161b365863a6453 GIT binary patch literal 3051 zcmV!N-@0000mP)t-stgOZV z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E000Yi zNklj2J*g$3*tTJeeiJV(n_X%k#>uL!_& zk-BTIO(|a)AV8=hg@FJz0s9}gCf8GBOo_!ITp1_ZNOF)i@6GJ&?#w)LWhA)-7Y)vq zkMrZ3H?yPpzM0ut?FU-yqzX8lR{<3v0N5PDo+g_^+z8m%hP|o)YJIPwjXq>Kfb@~Dn5zR;4?_R| z9gO3c03f!_0Tw$Bi`-ZT8W7uFLVe@_z+8W>1HAQ7vTQmI3l-OR z8HSFR0j#QgOf^tp5Gnz?3b3{)mtq&6S&l~m)6ZxsE$oxF|<`K6JF@Mm3b7+KV$%Skcg2Mq%OtZ&NWL5kr@m&EPxgXcm<$3 z3<G7Sb2ekU6Tj}lgU;0yH!!leubs=ste zqW>5}ShgY+-+dMe9-znfQ6O`yRj z6|)zrfAH7&2Y<8_4uo)=W&aQl+5~XxA8yO{Q*2X*RdKhc`UD(J6^~-CruP(Lcwaq9 zfqlPICWg*^%|C#mmWZL#(A|Lz%e3=h_CFSgmZz;y2rwrL(T5ckf$(9u4FH;3D9R5l zR86oKL-_>}g0Hem`4_CRz$t0q(&V0@Wa3im&Mp0r!sdd8q8#y6xNn#gjNB9l18#fH zmwpvMRm%%Jt4CyP-jJHHwXZHjmO0#k?N`~)&NAP>>l)! z1G+9+4}Ql73H}>*i29l}K4HQgJUDql>gqR>r#Olc8&6;dZ`RjF0JLJ*G*4bc>E>1)Y)CKn3sFR&T->@SIs0<15(YbUU*2mljm ziF&2GBhdCFYXYw*gbgT>}1N3;&cX2ErHJaJ!%?kK_)aMeaVnM~Zp zL909DLK&RCLWz<&WULk!mW8<|9_>hP61#VVJm5@4i1 zDoRWoL8(Bi0Ujnf+d8{4p)N`Sf;XELm_xsK zVQrhw%pNc{bi{3Ur_N7l4%9FUs2At{V6@PGSWNBl0!^p@+I(8nwUv2^CX)l`1H5>y zxfF}PDkAJLw!*wXF{IXhLjmB=La{M@adsfp*FQsnE&;>rY@rOaN&+>MXA2T&L!N*5$p^50W=+r@#>TN*_Q@=5}L))w2Ai57sEQ7+iksPAou z5-5!m57B`c6F0mt1C;4&@g|py^_hn^O)SuFS-1feS3wAD2d;L(VT%a>afaAJ*fm~| zK-&X=zkS}tL#?jib8wA?Fv%VQAp*qjpv^jVc#Z)=@H%q>aOZZoj0YhARDI3v;B``X z5XWoIY9J2_uRhk5XIQz8jAxW)AUplgT^r zuU}6lFNtyZIL*f)O{sBUt4j%ZGwNBa?oKnp`}0p{#IqQ!Quz>)**hf%u`7WHZ^XYk z5CMN`KxdW8o6BVOh5$B1sLTONJyc4XrZu(fJ5E!baIe(>j?-uqOER7Z>%d28Uf%Nk zm=2_c3rjBvpmDv*PvaYaMu20zN>E)q&^7 zUw)Yb#{_^Mvfqbd5);DMwV$YymwGz^?Dmrrf6?6F?vx;X2oZBh^O%gB7o9J z*r=~N$?RL0@*%zs0P<$Eu)hTn_;1C%Ftk@j3!q3M0+y|EzA^x>k(!mv-pXub0Ay9X$zxJB_+sV<8Fdo1SSX_8!0y4m%^9LU^tt z-UWt8NucgOzQUT1t}k-s{Zs|Qt8_X|zP(0FD2@WaT6~qxpzbGU)Y5I#15 z6xzoeFaSJxT{lw>z#j|%^=beP@b*_TTt|%nbtZue-ol<9VBZPTD;y~3$|diFIxAtm zgjcilI^ki6VSxD%K30}{LodoefZa$_71-mOL~L5<1^jKw0p=!`Vz3Y&0g!;Ct1Je**k)??Wgn3f%wz002ovPDHLkV1lN#fa3rF literal 0 HcmV?d00001 From 173c5923cbdfc23559103c43dc076322580fb435 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 19:19:47 -0500 Subject: [PATCH 4/5] clean up reel_time_gfx --- data/slot_machine.s | 2 +- .../slot_machine/reel_pikachu_and_machine.png | Bin 3051 -> 0 bytes graphics/slot_machine/reel_time_machine.png | Bin 0 -> 954 bytes graphics/slot_machine/reel_time_pikachu.png | Bin 0 -> 2210 bytes graphics_file_rules.mk | 5 +++++ 5 files changed, 6 insertions(+), 1 deletion(-) delete mode 100755 graphics/slot_machine/reel_pikachu_and_machine.png create mode 100755 graphics/slot_machine/reel_time_machine.png create mode 100755 graphics/slot_machine/reel_time_pikachu.png diff --git a/data/slot_machine.s b/data/slot_machine.s index b09ee25c0f..a3db540fac 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -1349,7 +1349,7 @@ gUnknown_085A8544:: @ 85A8544 null_obj_pal gUnknown_085A858C:: @ 85A858C - .incbin "graphics/slot_machine/reel_pikachu_and_machine.4bpp.lz" + .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" gUnknown_085A96E0:: @ 85A96E0 @if anyone knows what this tilemap is please do share diff --git a/graphics/slot_machine/reel_pikachu_and_machine.png b/graphics/slot_machine/reel_pikachu_and_machine.png deleted file mode 100755 index ddbd332eecd22fd2083ad3b8a161b365863a6453..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3051 zcmV!N-@0000mP)t-stgOZV z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E000Yi zNklj2J*g$3*tTJeeiJV(n_X%k#>uL!_& zk-BTIO(|a)AV8=hg@FJz0s9}gCf8GBOo_!ITp1_ZNOF)i@6GJ&?#w)LWhA)-7Y)vq zkMrZ3H?yPpzM0ut?FU-yqzX8lR{<3v0N5PDo+g_^+z8m%hP|o)YJIPwjXq>Kfb@~Dn5zR;4?_R| z9gO3c03f!_0Tw$Bi`-ZT8W7uFLVe@_z+8W>1HAQ7vTQmI3l-OR z8HSFR0j#QgOf^tp5Gnz?3b3{)mtq&6S&l~m)6ZxsE$oxF|<`K6JF@Mm3b7+KV$%Skcg2Mq%OtZ&NWL5kr@m&EPxgXcm<$3 z3<G7Sb2ekU6Tj}lgU;0yH!!leubs=ste zqW>5}ShgY+-+dMe9-znfQ6O`yRj z6|)zrfAH7&2Y<8_4uo)=W&aQl+5~XxA8yO{Q*2X*RdKhc`UD(J6^~-CruP(Lcwaq9 zfqlPICWg*^%|C#mmWZL#(A|Lz%e3=h_CFSgmZz;y2rwrL(T5ckf$(9u4FH;3D9R5l zR86oKL-_>}g0Hem`4_CRz$t0q(&V0@Wa3im&Mp0r!sdd8q8#y6xNn#gjNB9l18#fH zmwpvMRm%%Jt4CyP-jJHHwXZHjmO0#k?N`~)&NAP>>l)! z1G+9+4}Ql73H}>*i29l}K4HQgJUDql>gqR>r#Olc8&6;dZ`RjF0JLJ*G*4bc>E>1)Y)CKn3sFR&T->@SIs0<15(YbUU*2mljm ziF&2GBhdCFYXYw*gbgT>}1N3;&cX2ErHJaJ!%?kK_)aMeaVnM~Zp zL909DLK&RCLWz<&WULk!mW8<|9_>hP61#VVJm5@4i1 zDoRWoL8(Bi0Ujnf+d8{4p)N`Sf;XELm_xsK zVQrhw%pNc{bi{3Ur_N7l4%9FUs2At{V6@PGSWNBl0!^p@+I(8nwUv2^CX)l`1H5>y zxfF}PDkAJLw!*wXF{IXhLjmB=La{M@adsfp*FQsnE&;>rY@rOaN&+>MXA2T&L!N*5$p^50W=+r@#>TN*_Q@=5}L))w2Ai57sEQ7+iksPAou z5-5!m57B`c6F0mt1C;4&@g|py^_hn^O)SuFS-1feS3wAD2d;L(VT%a>afaAJ*fm~| zK-&X=zkS}tL#?jib8wA?Fv%VQAp*qjpv^jVc#Z)=@H%q>aOZZoj0YhARDI3v;B``X z5XWoIY9J2_uRhk5XIQz8jAxW)AUplgT^r zuU}6lFNtyZIL*f)O{sBUt4j%ZGwNBa?oKnp`}0p{#IqQ!Quz>)**hf%u`7WHZ^XYk z5CMN`KxdW8o6BVOh5$B1sLTONJyc4XrZu(fJ5E!baIe(>j?-uqOER7Z>%d28Uf%Nk zm=2_c3rjBvpmDv*PvaYaMu20zN>E)q&^7 zUw)Yb#{_^Mvfqbd5);DMwV$YymwGz^?Dmrrf6?6F?vx;X2oZBh^O%gB7o9J z*r=~N$?RL0@*%zs0P<$Eu)hTn_;1C%Ftk@j3!q3M0+y|EzA^x>k(!mv-pXub0Ay9X$zxJB_+sV<8Fdo1SSX_8!0y4m%^9LU^tt z-UWt8NucgOzQUT1t}k-s{Zs|Qt8_X|zP(0FD2@WaT6~qxpzbGU)Y5I#15 z6xzoeFaSJxT{lw>z#j|%^=beP@b*_TTt|%nbtZue-ol<9VBZPTD;y~3$|diFIxAtm zgjcilI^ki6VSxD%K30}{LodoefZa$_71-mOL~L5<1^jKw0p=!`Vz3Y&0g!;Ct1Je**k)??Wgn3f%wz002ovPDHLkV1lN#fa3rF diff --git a/graphics/slot_machine/reel_time_machine.png b/graphics/slot_machine/reel_time_machine.png new file mode 100755 index 0000000000000000000000000000000000000000..59279ccef32d1d6172c424825dba77cef8e66226 GIT binary patch literal 954 zcmV;r14aCaP)<*0000mP)t-stgOZV z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E0009; zNkl+}bP^43*lg@y5#9G4L1E z44uJ4{)YYmjw^Nc1!0KVqWJZl?YsDV7n=&&Cy`(8!}mSko!{4nfnhHQgU7>x!v*n( zB_6AX%>ekn2BSn%;^Oo?DbS%mQi09S#m|U7%UQXH_d^8o+84vq^QqFq=9g2ha5?m4 zg&gpG0r)y#`_exzfIHt0)E*A+f?%3|`WOTw%{pv@SO);zI@oc-fvrfl7x7A15L@4# zN1DC(5Ch)?8cn4hoGeh`CjYdD3hccC?8V>|L8BWDP@~Y;0}GQ#0RV;^JUd!EG(s=ykExV1YP04U{OAkhHrG!DPl0KN4z918_k1>6^DI1vErv8u3+#fJi02i_ZJkbH|?kpWk}Wf}oT1*~#tfSyL-X9KX?0PGIx0dL?*z#G|V1_N(! z(g1iT(u7fgV|fB80Lb^9(Sk}C|0aHatY2=$3cG1*B7-ySzlW z+0z5Y_y;rp7^=4D+Wq`2jwwxazIosf0TfRkl^Nx90d0}e8Kska##H9yfzwCVn=lE` z0;bcSvCLXJ5zf0W17rqaNUu|d<&Gl(IE!ZxVJ;OFG=Tjo497x%^c4WGKI?%A;LcZl z6EXn*m;mNwfegs%#}S*OihyZzV3JknRt0(%ff-vUyp$xn2>Ddvc_Fh1QkuzVmI2QL z=}Y5Y@ryFxvdaLFfi7{gJ?4Iauc{re-uNiSM+gBap~l3cp}L<`)$}4D-xS zvJ#y#V3r=@STC%}#DRstj*Y;(3NKWgrfDf9owGXMYp07*qoM6N<$f_Ig;6aWAK literal 0 HcmV?d00001 diff --git a/graphics/slot_machine/reel_time_pikachu.png b/graphics/slot_machine/reel_time_pikachu.png new file mode 100755 index 0000000000000000000000000000000000000000..29b004c84ca8ce20efbf5d4158ca76bd59548456 GIT binary patch literal 2210 zcmV;T2wnGyP)>+000Or zNkl3~ahr?54zBi3npgtV__~D&R z!UrbU#OKHm4=jL5oG^VN0*GB8SW^fDu!Bk|2Ef>%20%p-$XL0+3}c5C*2@S1h{e$b zbnCminnw{11Bi48OlM7gCII+@{Xm~#rgE+WfY;HD{?fExM4b5(yQUy{Q4~u86gTTm z5I+}G?f^1oVq>CtVG4~%<^dZUfFgj*nE9fv`iN?2vl{(GY19V8{J} zhcXt=W*oQxn5MXYUzm}Kg_i=BvM5YH7YO*nFbRs{{c{sR2(k8wy3_=X0|HDE+q5iJ zW)OJbe3zEO%!Uhq5UI2QxEuof*nXewW+-|kb5{V<4I%D#^%CoqqV8!g9?`Y*64Bf!g;j~NF>48kZ7jsd|N&ZUIiXF-&5z~QN9F;XtV z%b{)o-a))PRV}a{)F}hhb)+2z$>%V_rkogyG5`Jo0HqEAFgF&&UF&hBFSX>5B(IcO zxNAKLFA`eV6zaccLC8OV(!$1D5TmP#)NyVshO^2w!i#+m8js@mhXz0oB7wCaQ!D;q zt65Hn#$Z6%0SODF9WZnl7Kkrdkjet57H}L!ZN8efEyVlva4@xj(Bf^RnbCt98uix( zf>E4K{TCQu=hb)iVW~CTi-0}N%BC8JNv{0>^l{q@-+@#xB>Y}zq8%vTU=ShlW*kyZ zSi`L_>W@Us84OZ?>ylXifPJj3ONzNB>Pi!O9AZwp13;qbCTX*un^kNQLz{pk1yRMZ|(Ml;tPgt$ycKQ#XdP_$BKg(3i=Cd39; zR04{3{WcJozade67m#YAy(sM$ObEToR`wrUWsw`CK}%D7Cds6wHa-UKAw{SKjYL`M zRe0l>6pB1I2Lo|-)Jy*mAXRG)26jiIk`B=6fLI$TcYsAFh-)LWLtqMB$z}|Iz9!XT zQd@O(7Hb3~DSL|j)PSpt!R^m_knqoA&eTtW#}8oK!R?1ntgimG|45@K;c<^Uc)xzK zLm*MOY2JU5?1`4F8YRijk~`6wEMi3~^}X5($sLMK;ik}w_^&hntXTR;D8Q5@IlsERGG;zp))xx zmAgxd8QA9&u)2>)Zg)+~wcK(cc3t4z$SLe=`M;I12~i)e1GxFU4r~tBo8b4<{Qxsp zHQfNX;$H)3Uw9RGn4#nhKB>{;_EP}&Q2yocN3>FXpk2Ytr?}%TmqH)6wU4Sx5Z4xJ=md$o`W$P{4+zDhGTIf*v5?c>;q0s(}NWU}NxZ97hsUME$6phVE>*nJ={%pE45Uzz* zZPJtdK0d9I{($JBmtsj#-hPZvQc52{X|DhNT`$Q}E)fuer!H?le1!D(M*{LBL1lDS z`b;^$Cb)Cje#`cQK^O@?zKtG@zoF zq*Qsa8g>B&z#~?`Z{2J4M^jR)Aw%1 zh~1gH7&tYxmp1<9aWwU;2MJAmh8Cpa>gj$1ZH%=UY>4e8e`AwK#tvV(Q>=cGqX4k} zs4I#&f*JzJ2oSuUYP^=OE8%ejcp1A}83V!*hxG;TZ#;bgaJ7vf8U?tUkzS#fFRs7f zvGLw0(5ZFpN*;J=&vh;U^}$}xELcEa&lp?h-<>o-{n?nkDG!iUi_8U%jM-(1mhm~A z6)6O`<5{DsYt%lJ)VuYC5b&;Xi_E6nT*upYBW`~=GQ?JNZ&&PpohUC#xFzSJH1yM_ z;KqMu;TE8b%x!l*)u%M8VVD!vn{$6OTI4?h820!?Ce#3#o)%MQWv<9%YJhw|s*a9J z3G}NX#vW5EkS+#>G-m+)|YOaC^xLL%`1xIKm0LCe)g<|QwAVIbV z0de!Zq(iNx=W}R{#W3|f0R;if?_dadSUgjJ0=>?W0pep=RBBrwz|~K}oUW6Kl~NbZ kYA}z0u0Af=sQ;||139l>8&3HO#{d8T07*qoM6N<$f=8MSssI20 literal 0 HcmV?d00001 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 250916022f..f6724f685f 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -16,6 +16,7 @@ rayquazadir := graphics/rayquaza_scene roulettegfxdir := graphics/roulette pknvdir := graphics/pokenav/ pknvoptionsdir := graphics/pokenav/options +slotmachinedir := graphics/slot_machine types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -464,6 +465,10 @@ $(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blank $(bttransgfxdir)/frontier_squares_4.4bpp @cat $^ >$@ +$(slotmachinedir)/reel_time_gfx.4bpp: $(slotmachinedir)/reel_time_pikachu.4bpp \ + $(slotmachinedir)/reel_time_machine.4bpp + @cat $^ >$@ + $(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ $(pknvoptionsdir)/condition.4bpp \ $(pknvoptionsdir)/match_call.4bpp \ From 3c93557bcf720dcb0e3fe3cb1c4df7eb2d0369f9 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Jan 2018 23:10:26 -0500 Subject: [PATCH 5/5] tab fixing --- data/slot_machine.s | 318 ++++++++++++++++++++++---------------------- 1 file changed, 159 insertions(+), 159 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index a3db540fac..b25d496d94 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -12,7 +12,7 @@ gUnknown_085A7424:: @ 85A7424 gUnknown_085A7434:: @ 85A7434 window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - window_template_terminator + window_template_terminator gUnknown_085A7444:: @ 85A7444 window_template 0, 1, 3, 20, 13, 13, 1 @@ -22,98 +22,98 @@ gUnknown_085A744C:: @ 85A744C gUnknown_085A7450:: @ 85A7450 .4byte sub_812AB04 - .4byte sub_812AB38 - .4byte sub_812AB60 - .4byte sub_812ABA8 - .4byte sub_812ABC8 - .4byte sub_812ABF8 - .4byte sub_812ACF4 - .4byte sub_812AD34 - .4byte sub_812AD60 - .4byte sub_812AD80 - .4byte sub_812ADF4 - .4byte sub_812AE24 - .4byte sub_812AE4C - .4byte sub_812AE88 - .4byte sub_812AEC4 - .4byte sub_812AFFC - .4byte sub_812B01C - .4byte sub_812B094 - .4byte sub_812B0D8 - .4byte sub_812B108 - .4byte sub_812B130 - .4byte sub_812B158 - .4byte sub_812B1B0 - .4byte sub_812B214 - .4byte sub_812B254 - .4byte sub_812B280 - .4byte sub_812B2C0 - .4byte sub_812B2EC - .4byte sub_812B32C + .4byte sub_812AB38 + .4byte sub_812AB60 + .4byte sub_812ABA8 + .4byte sub_812ABC8 + .4byte sub_812ABF8 + .4byte sub_812ACF4 + .4byte sub_812AD34 + .4byte sub_812AD60 + .4byte sub_812AD80 + .4byte sub_812ADF4 + .4byte sub_812AE24 + .4byte sub_812AE4C + .4byte sub_812AE88 + .4byte sub_812AEC4 + .4byte sub_812AFFC + .4byte sub_812B01C + .4byte sub_812B094 + .4byte sub_812B0D8 + .4byte sub_812B108 + .4byte sub_812B130 + .4byte sub_812B158 + .4byte sub_812B1B0 + .4byte sub_812B214 + .4byte sub_812B254 + .4byte sub_812B280 + .4byte sub_812B2C0 + .4byte sub_812B2EC + .4byte sub_812B32C gUnknown_085A74C4:: @ 85A74C4 .4byte sub_812BB34 - .4byte sub_812BB68 - .4byte sub_812BC20 + .4byte sub_812BB68 + .4byte sub_812BC20 gUnknown_085A74D0:: @ 85A74D0 .4byte sub_812BF64 - .4byte sub_812BF68 - .4byte sub_812BF88 - .4byte sub_812C01C - .4byte sub_812C0E0 + .4byte sub_812BF68 + .4byte sub_812BF88 + .4byte sub_812C01C + .4byte sub_812C0E0 gUnknown_085A74E4:: @ 85A74E4 .4byte sub_812C138 - .4byte sub_812C3A0 - .4byte sub_812C4BC + .4byte sub_812C3A0 + .4byte sub_812C4BC gUnknown_085A74F0:: @ 85A74F0 .4byte sub_812C5DC - .4byte sub_812C628 - .4byte sub_812C8FC + .4byte sub_812C628 + .4byte sub_812C8FC gUnknown_085A74FC:: @ 85A74FC .2byte 2, 4, 4, 4, 8, 0 gUnknown_085A7508:: @ 85A7508 .4byte sub_812C238 - .4byte sub_812C290 - .4byte sub_812C290 + .4byte sub_812C290 + .4byte sub_812C290 gUnknown_085A7514:: @ 85A7514 .4byte sub_812C3C8 - .4byte sub_812C3C8 - .4byte sub_812C414 + .4byte sub_812C3C8 + .4byte sub_812C414 gUnknown_085A7520:: @ 85A7520 .4byte sub_812C500 - .4byte sub_812C500 - .4byte sub_812C55C + .4byte sub_812C500 + .4byte sub_812C55C gUnknown_085A752C:: @ 85A752C .4byte sub_812C64C - .4byte j5_08111E84 - .4byte sub_812C74C + .4byte j5_08111E84 + .4byte sub_812C74C gUnknown_085A7538:: @ 85A7538 .4byte sub_812C920 - .4byte sub_812CA08 - .4byte sub_812CB80 + .4byte sub_812CA08 + .4byte sub_812CB80 gUnknown_085A7544:: @ 85A7544 .4byte sub_812CDA4 - .4byte sub_812CDD8 - .4byte sub_812CDF4 + .4byte sub_812CDD8 + .4byte sub_812CDF4 gUnknown_085A7550:: @ 85A7550 .2byte 5, 10, 15, 0 gUnknown_085A7558:: @ 85A7558 .4byte nullsub_50 - .4byte sub_812D264 - .4byte sub_812D28C - .4byte sub_812D30C + .4byte sub_812D264 + .4byte sub_812D28C + .4byte sub_812D30C gUnknown_085A7568:: @ 85A7568 .2byte 0x9E @@ -123,24 +123,24 @@ gUnknown_085A756A:: @ 85A756A gUnknown_085A7574:: @ 85A7574 .4byte sub_812D51C - .4byte sub_812D594 - .4byte sub_812D60C - .4byte sub_812D63C - .4byte sub_812D6EC - .4byte sub_812D740 - .4byte sub_812D774 - .4byte sub_812D7E4 - .4byte sub_812D870 - .4byte sub_812D920 - .4byte sub_812D950 - .4byte sub_812D9A4 - .4byte sub_812DA20 - .4byte sub_812DA6C - .4byte sub_812DA90 - .4byte sub_812DB04 - .4byte sub_812DB8C - .4byte sub_812D950 - .4byte sub_812DBBC + .4byte sub_812D594 + .4byte sub_812D60C + .4byte sub_812D63C + .4byte sub_812D6EC + .4byte sub_812D740 + .4byte sub_812D774 + .4byte sub_812D7E4 + .4byte sub_812D870 + .4byte sub_812D920 + .4byte sub_812D950 + .4byte sub_812D9A4 + .4byte sub_812DA20 + .4byte sub_812DA6C + .4byte sub_812DA90 + .4byte sub_812DB04 + .4byte sub_812DB8C + .4byte sub_812D950 + .4byte sub_812DBBC gUnknown_085A75C0:: @ 85A75C0 .byte 1, 1, 2, 2 @@ -153,20 +153,20 @@ gUnknown_085A75CC:: @ 85A75CC gUnknown_085A75D4:: @ 85A75D4 .4byte sub_812DD04 - .4byte sub_812DD28 - .4byte sub_812DD48 - .4byte sub_812DD28 - .4byte sub_812DD78 - .4byte sub_812DD28 - .4byte sub_812DDC4 - .4byte sub_812DD28 - .4byte sub_812DE14 - .4byte sub_812DD28 - .4byte sub_812DE30 - .4byte sub_812DD28 - .4byte sub_812DE48 - .4byte sub_812DD28 - .4byte sub_812DE7C + .4byte sub_812DD28 + .4byte sub_812DD48 + .4byte sub_812DD28 + .4byte sub_812DD78 + .4byte sub_812DD28 + .4byte sub_812DDC4 + .4byte sub_812DD28 + .4byte sub_812DE14 + .4byte sub_812DD28 + .4byte sub_812DE30 + .4byte sub_812DD28 + .4byte sub_812DE48 + .4byte sub_812DD28 + .4byte sub_812DE7C gUnknown_085A7610:: @ 85A7610 .4byte nullsub_51 @@ -197,8 +197,8 @@ gUnknown_085A765E:: @ 85A765E gUnknown_085A766E:: @ 85A766E .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 + .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 + .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 gUnknown_085A76AD:: @ 85A76AD .byte 1, 0, 5, 4, 3, 2, 0 @@ -208,71 +208,71 @@ gUnknown_085A76B4:: @ 85A76B4 gUnknown_085A76C0:: @ 85A76C0 .byte 1, 1, 12 - .byte 1, 1, 14 - .byte 2, 2, 14 - .byte 2, 2, 14 - .byte 2, 3, 16 - .byte 3, 3, 16 + .byte 1, 1, 14 + .byte 2, 2, 14 + .byte 2, 2, 14 + .byte 2, 3, 16 + .byte 3, 3, 16 gUnknown_085A76D2:: @ 85A76D2 .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 - .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 - .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E + .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 + .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E gUnknown_085A76E4:: @ 85A76E4 .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 - .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 - .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 - .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF - .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 + .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 + .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 + .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF + .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 gUnknown_085A7702:: @ 85A7702 .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 - .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 - .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 - .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 - .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 - .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 + .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 + .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 + .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 + .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 + .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 gUnknown_085A7768:: @ 85A7768 .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 - .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 - .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 - .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 - .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C + .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 + .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 + .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 + .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C gUnknown_085A77CE:: @ 85A77CE .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 gUnknown_085A77D8:: @ 85A77D8 .byte 10, 0, 5, 0 - .byte 10, 0, 10, 0 - .byte 10, 0, 15, 0 - .byte 10, 0, 25, 0 - .byte 10, 0, 35, 0 + .byte 10, 0, 10, 0 + .byte 10, 0, 15, 0 + .byte 10, 0, 25, 0 + .byte 10, 0, 35, 0 gUnknown_085A77EC:: @ 85A77EC .byte 0, 0 - .byte 5, 0 - .byte 10, 0 - .byte 15, 0 - .byte 20, 0 + .byte 5, 0 + .byte 10, 0 + .byte 15, 0 + .byte 20, 0 gUnknown_085A77F6:: @ 85A77F6 .byte 6, 4, 3, 2, 5, 0, 0, 0 gUnknown_085A77FE:: @ 85A77FE .byte 0x80, 0 - .byte 0x20, 0 - .byte 0x40, 0 + .byte 0x20, 0 + .byte 0x40, 0 gUnknown_085A7804:: @ 85A7804 .byte 16, 0 - .byte 8, 0 - .byte 4, 0 - .byte 2, 0 - .byte 1, 0 + .byte 8, 0 + .byte 4, 0 + .byte 2, 0 + .byte 1, 0 gUnknown_085A780E:: @ 85A780E .byte 7, 8, 4, 3, 0, 5, 2, 0 @@ -285,42 +285,42 @@ gUnknown_085A7828:: @ 85A7828 gUnknown_085A783A:: @ 85A783A .2byte 0xD0, 0x38 - .2byte 0xB8, 0 - .2byte 0xC8, 8 - .2byte 0xD8, 0x10 - .2byte 0xE8, 0x18 - .2byte 0xD0, 0x48 - .2byte 0xD0, 8 - .2byte 0xD0, 0x40 - .2byte 0xD0, 0x38 - .2byte 0xC0, 0x58 - .2byte 0xE0, 0x58 - .2byte 0xC0, 0x78 - .2byte 0xE0, 0x78 - .2byte 0x90, 0x38 - .2byte 0x110, 0x58 - .2byte 0xA8, 0x70 - .2byte 0xD0, 0x54 - .2byte 0xD0, 0x70 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0x00, 0x00 - .2byte 0 - + .2byte 0xB8, 0 + .2byte 0xC8, 8 + .2byte 0xD8, 0x10 + .2byte 0xE8, 0x18 + .2byte 0xD0, 0x48 + .2byte 0xD0, 8 + .2byte 0xD0, 0x40 + .2byte 0xD0, 0x38 + .2byte 0xC0, 0x58 + .2byte 0xE0, 0x58 + .2byte 0xC0, 0x78 + .2byte 0xE0, 0x78 + .2byte 0x90, 0x38 + .2byte 0x110, 0x58 + .2byte 0xA8, 0x70 + .2byte 0xD0, 0x54 + .2byte 0xD0, 0x70 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0xBC, 0x34 + .2byte 0xD0, 0x34 + .2byte 0xE4, 0x34 + .2byte 0xB8, 0x48 + .2byte 0xC4, 0x48 + .2byte 0xD0, 0x48 + .2byte 0xDC, 0x48 + .2byte 0xE8, 0x48 + .2byte 0x00, 0x00 + .2byte 0 + gUnknown_085A78C8:: @ 85A78C8 .4byte sub_812F078