Merge branch 'master' into doc-slotmachine

2020-07-28 17:41:34 -04:00
parent 1f4813bfd2 96b904bf80
commit 5eecaf92ba
31 changed files with 119 additions and 134 deletions
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -985,7 +985,7 @@ static void PlaySlotMachine_Internal(u8 slotMachineIndex, MainCallback exitCallb
 {
    struct Task *task = &gTasks[CreateTask(SlotMachineDummyTask, 0xFF)];
    task->data[0] = slotMachineIndex;
-    StoreWordInTwoHalfwords(&task->data[1], (intptr_t)exitCallback);
+    StoreWordInTwoHalfwords((u16 *)&task->data[1], (intptr_t)exitCallback);
 }