summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-08-12 11:50:26 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-08-12 11:50:26 +0200
commit1229bead2ea61019955ededd5f06e64d7e776155 (patch)
tree82ed66e13d11d653aa01a23d7ebf9fbc52c68b6e /src
parent0e0d1030443ee5c1ffd281eaa89e0b4dccad6ae7 (diff)
slot machine review changes
Diffstat (limited to 'src')
-rw-r--r--src/slot_machine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/slot_machine.c b/src/slot_machine.c
index fd4726879..5422103c3 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -319,7 +319,7 @@ void Task_FadeToSlotMachine(u8 taskId)
switch (gTasks[taskId].tState)
{
case 0:
- BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].tState++;
break;
case 1:
@@ -487,10 +487,10 @@ void SlotMachineSetup_2_1(void)
SetGpuReg(REG_OFFSET_BG2VOFS, 0);
SetGpuReg(REG_OFFSET_BG3HOFS, 0);
SetGpuReg(REG_OFFSET_BG3VOFS, 0);
- SetGpuReg(REG_OFFSET_WININ, 0x3f);
- SetGpuReg(REG_OFFSET_WINOUT, 0x3f);
+ SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR);
+ SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_OBJ);
- SetGpuReg(REG_OFFSET_BLDALPHA, 0x809);
+ SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(9, 8));
}
extern const s16 gUnknown_083ECCF8[][2];