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/pokemon_summary_screen.c | |
| parent | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (diff) | |
| parent | b9ad5de8a044623b9d4d76307a76c00e2fcf0da6 (diff) | |
Merge pull request #482 from DizzyEggg/bg
Fix raw SetGpuReg and SetBgAttribute args
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index eedb9417b..7feeb79e7 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1688,15 +1688,15 @@ static void sub_81C0B8C(u8 taskId) if (pssData->unk40C9 == 0) { data[1] = 1; - SetBgAttribute(1, 7, 1); - SetBgAttribute(2, 7, 2); + SetBgAttribute(1, BG_ATTR_PRIORITY, 1); + SetBgAttribute(2, BG_ATTR_PRIORITY, 2); schedule_bg_copy_tilemap_to_vram(1); } else { data[1] = 2; - SetBgAttribute(2, 7, 1); - SetBgAttribute(1, 7, 2); + SetBgAttribute(2, BG_ATTR_PRIORITY, 1); + SetBgAttribute(1, BG_ATTR_PRIORITY, 2); schedule_bg_copy_tilemap_to_vram(2); } ChangeBgX(data[1], 0, 0); @@ -1745,14 +1745,14 @@ static void sub_81C0D44(u8 taskId) s16 *data = gTasks[taskId].data; if (pssData->unk40C9 == 0) { - SetBgAttribute(1, 7, 1); - SetBgAttribute(2, 7, 2); + SetBgAttribute(1, BG_ATTR_PRIORITY, 1); + SetBgAttribute(2, BG_ATTR_PRIORITY, 2); schedule_bg_copy_tilemap_to_vram(2); } else { - SetBgAttribute(2, 7, 1); - SetBgAttribute(1, 7, 2); + SetBgAttribute(2, BG_ATTR_PRIORITY, 1); + SetBgAttribute(1, BG_ATTR_PRIORITY, 2); schedule_bg_copy_tilemap_to_vram(1); } if (pssData->currPageIndex > 1) |