diff options
| -rw-r--r-- | data/slot_machine.s | 44 | ||||
| -rw-r--r-- | src/field/slot_machine.c | 71 |
2 files changed, 61 insertions, 54 deletions
diff --git a/data/slot_machine.s b/data/slot_machine.s index 2811e5b5f..6caf29e42 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,50 +3,6 @@ .section .rodata - .align 1 -gUnknown_083ECCF8:: @ 83ECCF8 - .2byte 0, 6, 0, 10, 0, 2 - -gUnknown_083ECD04:: @ 83ECD04 - .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:: @ 83ECD16 - .byte 25, 25, 30, 40, 40, 50 - .byte 25, 25, 30, 30, 35, 35 - .byte 25, 25, 30, 25, 25, 30 - -gUnknown_083ECD28:: @ 83ECD28 - .byte 20, 25, 25, 20, 25, 25 - .byte 12, 15, 15, 18, 19, 22 - .byte 25, 25, 25, 30, 30, 40 - .byte 25, 25, 20, 20, 15, 15 - .byte 40, 40, 35, 35, 40, 40 - -gUnknown_083ECD46:: @ 83ECD46 - .byte -13, -13, -13, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5 - .byte 5, 5, 5,-106,-106,-106,-106,-126,-126,-126,-126,-126,-126, 100, 100, 100, 5 - .byte 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40 - .byte 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 45, 45, 45, 100 - .byte 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 5, 5, 100 - .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6 - -gUnknown_083ECDAC:: @ 83ECDAC - .byte -13, -13, -13, -56, -56, -56, -56, -96, -96, -96, -96, -96, -96, 70, 70, 70, 5 - .byte 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6 - .byte 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35 - .byte 2, 2, 2, 3, 3, 3, 3, 30, 30, 30, 30, 30, 30, 100, 100, 100, 50 - .byte 1, 1, 1, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, 40, 40, 40, 100 - .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60 - - .align 1 -gUnknown_083ECE12:: @ 83ECE12 - .2byte 128, 175, 200, 225, 256 - gUnknown_083ECE1C:: @ 83ECE1C .byte 10, 0, 5, 0, 10, 0, 10, 0, 10, 0, 15, 0, 10, 0, 25, 0, 10, 0, 35, 0 diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 594d743f1..3d68b187e 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -222,13 +222,13 @@ void sub_81064B8(void); void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); void sub_81065DC(void); -extern struct UnkStruct1 *gUnknown_083ED048[]; +extern const struct UnkStruct1 *gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; extern const u8 gSlotMachine_Gfx[]; extern const u16 gUnknown_08E95A18[]; -extern u16 gUnknown_08E95AB8[]; -extern u16 gUnknown_08E95FB8[]; -extern const u8 gUnknown_083ECD04[][3]; +extern const u16 gUnknown_08E95AB8[]; +extern const u16 gUnknown_08E95FB8[]; +const u8 gUnknown_083ECD04[][3]; extern const u8 gUnknown_083ECE3A[]; extern const u16 gUnknown_083ECE42[]; extern const u16 gUnknown_083ECE48[]; @@ -368,7 +368,7 @@ static void sub_8101B04(void) REG_BLDALPHA = 0x809; } -extern const s16 gUnknown_083ECCF8[3][2]; +const s16 gUnknown_083ECCF8[][2]; static void sub_8101BA4(void) { @@ -983,7 +983,7 @@ static bool8 sub_8102540(void) return FALSE; } -extern const u8 gUnknown_083ECD16[][6]; +const u8 gUnknown_083ECD16[][6]; static u8 sub_8102578(void) { @@ -1001,7 +1001,7 @@ static u8 sub_8102578(void) return i; } -extern const u8 gUnknown_083ECD28[][6]; +const u8 gUnknown_083ECD28[][6]; static u8 sub_81025BC(void) { @@ -1035,8 +1035,8 @@ static u8 sub_81025BC(void) return i; } -extern const u8 gUnknown_083ECDAC[][17]; -extern const u8 gUnknown_083ECD46[][17]; +const u8 gUnknown_083ECD46[][17]; +const u8 gUnknown_083ECDAC[][17]; u8 sub_810264C(u8 a0) { @@ -1069,7 +1069,7 @@ void sub_8102680(void) eSlotMachine->unk05 = i; } -extern const u16 gUnknown_083ECE12[]; +const u16 gUnknown_083ECE12[]; bool8 sub_81026DC(u16 a0) { @@ -4133,3 +4133,54 @@ const u8 gUnknown_083ECCB2[][21] = { const u8 gUnknown_083ECCF1[] = { 1, 0, 5, 4, 3, 2 }; + +const s16 gUnknown_083ECCF8[][2] = { + {0, 6}, + {0, 10}, + {0, 2} +}; + +const u8 gUnknown_083ECD04[][3] = { + {1, 1, 12}, + {1, 1, 14}, + {2, 2, 14}, + {2, 2, 14}, + {2, 3, 16}, + {3, 3, 16} +}; + +const u8 gUnknown_083ECD16[][6] = { + {25, 25, 30, 40, 40, 50}, + {25, 25, 30, 30, 35, 35}, + {25, 25, 30, 25, 25, 30} +}; + +const u8 gUnknown_083ECD28[][6] = { + {20, 25, 25, 20, 25, 25}, + {12, 15, 15, 18, 19, 22}, + {25, 25, 25, 30, 30, 40}, + {25, 25, 20, 20, 15, 15}, + {40, 40, 35, 35, 40, 40} +}; + +const u8 gUnknown_083ECD46[][17] = { + {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, + { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, + { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, + { 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 45, 45, 45, 100}, + { 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 5, 5, 100}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6} +}; + +const u8 gUnknown_083ECDAC[][17] = { + { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160, 70, 70, 70, 5}, + { 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6}, + { 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35}, + { 2, 2, 2, 3, 3, 3, 3, 30, 30, 30, 30, 30, 30, 100, 100, 100, 50}, + { 1, 1, 1, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, 40, 40, 40, 100}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60} +}; + +const u16 gUnknown_083ECE12[] = { + 0x80, 0xaf, 0xc8, 0xe1, 0x100 +}; |