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