Merge remote-tracking branch 'Egg/slotmachine'

This commit is contained in:
Diegoisawesome 2018-09-15 20:42:58 -05:00
commit 3303c416d4
8 changed files with 3640 additions and 9529 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2,526 +2,8 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_085A7424:: @ 85A7424
.4byte 0x1F8
.4byte 0x11C5
.4byte 0x21D6
.4byte 0x11E7
gUnknown_085A7434:: @ 85A7434
window_template 0, 2, 15, 0x1B, 4, 15, 0x194
null_window_template
gUnknown_085A7444:: @ 85A7444
window_template 0, 1, 3, 20, 13, 13, 1
gUnknown_085A744C:: @ 85A744C
.byte 3, 1, 2, 0
gUnknown_083ECAAC:: @ 85A7450
.4byte sub_8101D5C
.4byte sub_8101D8C
.4byte sub_8101DB0
.4byte sub_8101DF4
.4byte sub_8101E10
.4byte sub_8101E3C
.4byte sub_8101F44
.4byte sub_8101F60
.4byte sub_8101F88
.4byte sub_8101FA4
.4byte sub_8102008
.4byte sub_8102034
.4byte sub_8102058
.4byte sub_8102090
.4byte sub_81020C8
.4byte sub_81021E0
.4byte sub_81021FC
.4byte sub_8102264
.4byte sub_81022A0
.4byte sub_81022CC
.4byte sub_81022F0
.4byte sub_8102318
.4byte sub_8102344
.4byte sub_810239C
.4byte sub_81023B8
.4byte sub_81023E0_
.4byte sub_81023FC
.4byte sub_8102424
.4byte sub_8102460
gUnknown_085A74C4:: @ 85A74C4
.4byte sub_812BB34
.4byte sub_812BB68
.4byte sub_812BC20
gUnknown_085A74D0:: @ 85A74D0
.4byte sub_812BF64
.4byte sub_812BF68
.4byte sub_812BF88
.4byte sub_812C01C
.4byte sub_812C0E0
gUnknown_085A74E4:: @ 85A74E4
.4byte sub_812C138
.4byte sub_812C3A0
.4byte sub_812C4BC
gUnknown_085A74F0:: @ 85A74F0
.4byte sub_812C5DC
.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
gUnknown_085A7514:: @ 85A7514
.4byte sub_812C3C8
.4byte sub_812C3C8
.4byte sub_812C414
gUnknown_085A7520:: @ 85A7520
.4byte sub_812C500
.4byte sub_812C500
.4byte sub_812C55C
gUnknown_085A752C:: @ 85A752C
.4byte sub_812C64C
.4byte j5_08111E84
.4byte sub_812C74C
gUnknown_085A7538:: @ 85A7538
.4byte sub_812C920
.4byte sub_812CA08
.4byte sub_812CB80
gUnknown_085A7544:: @ 85A7544
.4byte sub_812CDA4
.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
gUnknown_085A7568:: @ 85A7568
.2byte 0x9E
gUnknown_085A756A:: @ 85A756A
.2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F
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
gUnknown_085A75C0:: @ 85A75C0
.byte 1, 1, 2, 2
gUnknown_085A75C4:: @ 85A75C4
.2byte 0x40, 0x30, 0x18, 8
gUnknown_085A75CC:: @ 85A75CC
.2byte 10, 8, 6, 4
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
gUnknown_085A7610:: @ 85A7610
.4byte nullsub_51
gUnknown_085A7614:: @ 85A7614
.2byte 16
gUnknown_085A7616:: @ 85A7616
.2byte 0, 0x40, 0x80, 0xC0
gUnknown_085A761E:: @ 85A761E
.2byte 4, -4, 4, -4
gUnknown_085A7626:: @ 85A7626
.2byte 4, 4, -4, -4
gUnknown_085A762E:: @ 85A762E
.2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0
gUnknown_085A763E:: @ 85A763E
.2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0
gUnknown_085A764E:: @ 85A764E
.2byte 16, 12, 16, 0, 0, 4, 8, 8
gUnknown_085A765E:: @ 85A765E
.2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18
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
gUnknown_085A76AD:: @ 85A76AD
.byte 1, 0, 5, 4, 3, 2, 0
gUnknown_083ECCF8:: @ 85A76B4
.2byte 0, 6, 0, 10, 0, 2
gUnknown_083ECD04:: @ 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
gUnknown_083ECD16:: @ 85A76D2
.byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32
.byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23
.byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E
gUnknown_083ECD28:: @ 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
gUnknown_083ECD46:: @ 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
gUnknown_083ECDAC:: @ 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
gUnknown_083ECE12:: @ 85A77CE
.2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100
gUnknown_083ECE1C:: @ 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
gUnknown_083ECE30:: @ 85A77EC
.byte 0, 0
.byte 5, 0
.byte 10, 0
.byte 15, 0
.byte 20, 0
gUnknown_083ECE3A:: @ 85A77F6
.byte 6, 4, 3, 2, 5, 0, 0, 0
gUnknown_083ECE42:: @ 85A77FE
.byte 0x80, 0
.byte 0x20, 0
.byte 0x40, 0
gUnknown_083ECE48:: @ 85A7804
.byte 16, 0
.byte 8, 0
.byte 4, 0
.byte 2, 0
.byte 1, 0
sSym2Match:: @ 85A780E
.byte 7, 8, 4, 3, 0, 5, 2, 0
sSlotMatchFlags:: @ 85A7816
.2byte 1, 2, 4, 8, 16, 32, 64, 128, 256
sSlotPayouts:: @ 85A7828
.2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C
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
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
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
.4byte gUnknown_085A7954
.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
.align 2
gUnknown_085A7A3C:: @ 85A7A3C
.2byte 0
@ -820,50 +302,50 @@ gUnknown_085A7C8C:: @ 85A7C8C
gUnknown_085A7CDC:: @ 85A7CDC
.4byte gUnknown_085A7C8C
gUnknown_085A7CE0:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154
gSpriteTemplate_83ED414:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18
gUnknown_085A7CF8:: @ 85A7CF8
spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8
gSpriteTemplate_83ED42C:: @ 85A7CF8
spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C
gUnknown_085A7D10:: @ 85A7D10
gSpriteTemplate_83ED444:: @ 85A7D10
spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D28:: @ 85A7D28
spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424
gSpriteTemplate_83ED45C:: @ 85A7D28
spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170
gUnknown_085A7D40:: @ 85A7D40
gSpriteTemplate_83ED474:: @ 85A7D40
spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D58:: @ 85A7D58
gSpriteTemplate_83ED48C:: @ 85A7D58
spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D70:: @ 85A7D70
gSpriteTemplate_83ED4A4:: @ 85A7D70
spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D88:: @ 85A7D88
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4
gSpriteTemplate_83ED4BC:: @ 85A7D88
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C
gUnknown_085A7DA0:: @ 85A7DA0
gSpriteTemplate_83ED4D4:: @ 85A7DA0
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7DB8:: @ 85A7DB8
gSpriteTemplate_83ED4EC:: @ 85A7DB8
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7DD0:: @ 85A7DD0
spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8
gSpriteTemplate_83ED504:: @ 85A7DD0
spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C
gUnknown_085A7DE8:: @ 85A7DE8
spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48
gSpriteTemplate_83ED51C:: @ 85A7DE8
spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784
gUnknown_085A7E00:: @ 85A7E00
spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64
gSpriteTemplate_83ED534:: @ 85A7E00
spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894
gUnknown_085A7E18:: @ 85A7E18
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20
gSpriteTemplate_83ED54C:: @ 85A7E18
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C
gUnknown_085A7E30:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14
gSpriteTemplate_83ED564:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38
gUnknown_085A7E48:: @ 85A7E48
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@ -907,8 +389,8 @@ gUnknown_085A7F68:: @ 85A7F68
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
gSpriteTemplate_83ED6CC:: @ 85A7F98
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70
gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, -64, 3, 0, 64x64
@ -916,7 +398,7 @@ gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, 0, 3, 0, 64x64
subsprite 0, 0, 3, 0, 64x64
gUnknown_085A7FC0:: @ 85A7FC0
gSubspriteTables_83ED704:: @ 85A7FC0
.4byte 4, gUnknown_085A7FB0
gUnknown_085A7FC8:: @ 85A7FC8
@ -927,7 +409,7 @@ gUnknown_085A7FC8:: @ 85A7FC8
subsprite -32, 4, 1, 16, 32x8
subsprite 0, 4, 1, 20, 32x8
gUnknown_085A7FE0:: @ 85A7FE0
gSubspriteTables_83ED73C:: @ 85A7FE0
.4byte 6, gUnknown_085A7FC8
gUnknown_085A7FE8:: @ 85A7FE8
@ -935,7 +417,7 @@ gUnknown_085A7FE8:: @ 85A7FE8
subsprite -32, 12, 1, 32, 32x8
subsprite 0, 12, 1, 36, 32x8
gUnknown_085A7FF4:: @ 85A7FF4
gSubspriteTables_83ED75C:: @ 85A7FF4
.4byte 3, gUnknown_085A7FE8
gUnknown_085A7FFC:: @ 85A7FFC
@ -945,7 +427,7 @@ gUnknown_085A7FFC:: @ 85A7FFC
subsprite -32, 16, 1, 40, 32x8
subsprite 0, 16, 1, 44, 32x8
gUnknown_085A8010:: @ 85A8010
gSubspriteTables_83ED78C:: @ 85A8010
.4byte 5, gUnknown_085A7FFC
gUnknown_085A8018:: @ 85A8018
@ -954,7 +436,7 @@ gUnknown_085A8018:: @ 85A8018
subsprite -32, 0, 1, 8, 32x8
subsprite 0, 0, 1, 12, 32x8
gUnknown_085A8028:: @ 85A8028
gSubspriteTables_83ED7B4:: @ 85A8028
.4byte 4, gUnknown_085A8018
gUnknown_085A8030:: @ 85A8030
@ -962,7 +444,7 @@ gUnknown_085A8030:: @ 85A8030
subsprite -8, -4, 1, 0, 16x8
subsprite -8, 4, 1, 0, 16x8
gUnknown_085A803C:: @ 85A803C
gSubspriteTables_83ED7D4:: @ 85A803C
.4byte 3, gUnknown_085A8030
gUnknown_085A8044:: @ 85A8044
@ -1173,7 +655,7 @@ gUnknown_085A8244:: @ 85A8244
gUnknown_085A825C:: @ 85A825C
.4byte 6, gUnknown_085A8244
gUnknown_085A8264:: @ 85A8264
gUnknown_083EDB5C:: @ 85A8264
.4byte gUnknown_085A7E48
.4byte gUnknown_085A7E60
.4byte gUnknown_085A7E78
@ -1201,7 +683,7 @@ gUnknown_085A8264:: @ 85A8264
.4byte gUnknown_085A7F08
.4byte gDummySpriteTemplate
gUnknown_085A82CC:: @ 85A82CC
gUnknown_083EDBC4:: @ 85A82CC
.4byte gUnknown_085A8058
.4byte gUnknown_085A8070
.4byte gUnknown_085A8088
@ -1230,7 +712,7 @@ gUnknown_085A82CC:: @ 85A82CC
.4byte NULL
.align 2
gUnknown_085A8334:: @ 85A8334
sSlotMachineSpriteSheets:: @ 85A8334
obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
@ -1252,7 +734,7 @@ gUnknown_085A8334:: @ 85A8334
.align 2
.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
gUnknown_083EDCDC:: @ 85A83E4
.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
@ -1272,29 +754,29 @@ gUnknown_085A8402:: @ 85A8402
gUnknown_085A8404:: @ 85A8404
.byte 0xBF, 0x4A, 0, 0
gUnknown_085A8408:: @ 85A8408
gUnknown_083EDD08:: @ 85A8408
.4byte gUnknown_085A83FC
.4byte gUnknown_085A83FE
.4byte gUnknown_085A8400
.4byte gUnknown_085A8402
.4byte gUnknown_085A8404
gUnknown_085A841C:: @ 85A841C
gUnknown_083EDD1C:: @ 85A841C
.4byte gSlotMachineMenu_Pal + 0x94
.4byte gSlotMachineMenu_Pal + 0x96
.4byte gSlotMachineMenu_Pal + 0x98
.4byte gSlotMachineMenu_Pal + 0x9A
.4byte gSlotMachineMenu_Pal + 0x9C
gUnknown_085A8430:: @ 85A8430
gUnknown_083EDD30:: @ 85A8430
.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D
gUnknown_085A8435:: @ 85A8435
gUnknown_083EDD35:: @ 85A8435
.byte 0, 0
.byte 1, 2
.byte 3, 4
gUnknown_085A843B:: @ 85A843B
gUnknown_083EDD3B:: @ 85A843B
.byte 1, 2, 2
gUnknown_085A843E:: @ 85A843E
@ -1307,12 +789,12 @@ gUnknown_085A847E:: @ 85A847E
.incbin "graphics/slot_machine/85A847E.gbapal"
.align 2
gUnknown_085A84A0:: @ 85A84A0
gUnknown_083EDDA0:: @ 85A84A0
.4byte gUnknown_085A843E
.4byte gUnknown_085A845E
.4byte gUnknown_085A847E
gUnknown_085A84AC:: @ 85A84AC
gUnknown_083EDDAC:: @ 85A84AC
.4byte gSlotMachineMenu_Pal + 0x20
gUnknown_085A84B0:: @ 85A84B0
@ -1324,20 +806,20 @@ gUnknown_085A84D0:: @ 85A84D0
gUnknown_085A84F0:: @ 85A84F0
.incbin "graphics/slot_machine/85A84F0.gbapal"
gUnknown_085A8510:: @ 85A8510
gUnknown_083EDE10:: @ 85A8510
.4byte gUnknown_085A84B0
.4byte gUnknown_085A84D0
.4byte gUnknown_085A84F0
.4byte gUnknown_08DCF230
gUnknown_085A8520:: @ 85A8520
gUnknown_083EDE20:: @ 85A8520
.4byte gUnknown_08DCF230
gUnknown_085A8524:: @ 85A8524
gPalette_83EDE24:: @ 85A8524
.incbin "graphics/slot_machine/85A8524.bin"
.align 2
gUnknown_085A8544:: @ 85A8544
gSlotMachineSpritePalettes:: @ 85A8544
obj_pal gUnknown_08DCF170, 0
obj_pal gUnknown_08DCF190, 1
obj_pal gUnknown_08DCF1B0, 2
@ -1348,10 +830,10 @@ gUnknown_085A8544:: @ 85A8544
obj_pal gUnknown_08DCF1F0, 7
null_obj_pal
gUnknown_085A858C:: @ 85A858C
sReelTimeGfx:: @ 85A858C
.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
gUnknown_085A96E0:: @ 85A96E0
sReelTimeWindowTilemap:: @ 85A96E0
@if anyone knows what this tilemap is please do share
.incbin "graphics/slot_machine/85A96E0.bin"

View File

@ -236,4 +236,6 @@ void sub_80B9CDC(s16*, u8);
void sub_80B7CAC(struct Sprite*);
void sub_80B7A58(struct Sprite*);
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
#endif //GUARD_FIELD_EFFECTS_H

View File

@ -160,6 +160,8 @@ struct SubspriteTable
struct Sprite;
typedef void (*SpriteCallback)(struct Sprite *);
struct SpriteTemplate
{
u16 tileTag;
@ -168,7 +170,7 @@ struct SpriteTemplate
const union AnimCmd *const *anims;
const struct SpriteFrameImage *images;
const union AffineAnimCmd *const *affineAnims;
void (*callback)(struct Sprite *);
SpriteCallback callback;
};
struct Sprite
@ -179,7 +181,7 @@ struct Sprite
/*0x10*/ const union AffineAnimCmd *const *affineAnims;
/*0x14*/ const struct SpriteTemplate *template;
/*0x18*/ const struct SubspriteTable *subspriteTables;
/*0x1C*/ void (*callback)(struct Sprite *);
/*0x1C*/ SpriteCallback callback;
/*0x20*/ struct Coords16 pos1;
/*0x24*/ struct Coords16 pos2;

View File

@ -171,7 +171,6 @@ SECTIONS {
asm/cute_sketch.o(.text);
src/decoration.o(.text);
src/slot_machine.o(.text);
asm/slot_machine.o(.text);
asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text);
src/trader.o(.text);

File diff suppressed because it is too large Load Diff

View File

@ -31,9 +31,7 @@
.include "src/mauville_old_man.o"
.include "src/menu_helpers.o"
.include "src/region_map.o"
gUnknown_03001188: @ 3001188
.space 0x68
.include "src/slot_machine.o"
gUnknown_030011F0: @ 30011F0
.space 0x2

View File

@ -448,94 +448,7 @@ gUnknown_0203A120: @ 203A120
.include "src/menu_helpers.o"
.include "src/region_map.o"
.include "src/decoration.o"
.align 2
@ slot_machine
gUnknown_0203AAC8: @ 203AAC8
.space 0x4
gUnknown_0203AACC: @ 203AACC
.space 0x4
gUnknown_0203AAD0: @ 203AAD0
.space 0x4
gUnknown_0203AAD4: @ 203AAD4
.space 0x4
gUnknown_0203AAD8: @ 203AAD8
.space 0x4
gUnknown_0203AADC: @ 203AADC
.space 0x4
gUnknown_0203AAE0: @ 203AAE0
.space 0x4
gUnknown_0203AAE4: @ 203AAE4
.space 0x4
gUnknown_0203AAE8: @ 203AAE8
.space 0x4
gUnknown_0203AAEC: @ 203AAEC
.space 0x4
gUnknown_0203AAF0: @ 203AAF0
.space 0x4
gUnknown_0203AAF4: @ 203AAF4
.space 0x4
gUnknown_0203AAF8: @ 203AAF8
.space 0x4
gUnknown_0203AAFC: @ 203AAFC
.space 0x4
gUnknown_0203AB00: @ 203AB00
.space 0x4
gUnknown_0203AB04: @ 203AB04
.space 0x4
gUnknown_0203AB08: @ 203AB08
.space 0x4
gUnknown_0203AB0C: @ 203AB0C
.space 0x4
gUnknown_0203AB10: @ 203AB10
.space 0x4
gUnknown_0203AB14: @ 203AB14
.space 0x4
gUnknown_0203AB18: @ 203AB18
.space 0x4
gUnknown_0203AB1C: @ 203AB1C
.space 0x4
gUnknown_0203AB20: @ 203AB20
.space 0x4
gUnknown_0203AB24: @ 203AB24
.space 0x4
gUnknown_0203AB28: @ 203AB28
.space 0x4
gUnknown_0203AB2C: @ 203AB2C
.space 0x4
gUnknown_0203AB30: @ 203AB30
.space 0x4
sSlotMachine: @ 203AB34
.space 0x4
.include "src/slot_machine.o"
.include "src/battle_ai_script_commands.o"
.align 2