diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-26 10:07:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-26 10:07:56 -0600 |
| commit | 7480a41cfe9b7d871e7217e4f46378fa4ccda8cd (patch) | |
| tree | 14996bf160fc925f34692bd838cd01a03e8a7bf4 /src/battle_interface.c | |
| parent | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (diff) | |
| parent | b9ad5de8a044623b9d4d76307a76c00e2fcf0da6 (diff) | |
Merge pull request #482 from DizzyEggg/bg
Fix raw SetGpuReg and SetBgAttribute args
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index 4a8422091..0eb494db4 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1753,7 +1753,7 @@ static void sub_8073E08(u8 taskId) if (--gTasks[taskId].tData15 < 0) return; - SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[15]) | ((16 - gTasks[taskId].data[15]) << 8)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[15], 16 - gTasks[taskId].data[15])); } if (gTasks[taskId].tData15 == 0) gTasks[taskId].func = sub_8073E64; @@ -1806,7 +1806,7 @@ static void sub_8073F98(u8 taskId) if (--gTasks[taskId].tData15 >= 0) { - SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8)); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[15], 16 - gTasks[taskId].data[15])); } else if (gTasks[taskId].tData15 == -1) { |