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/unk_pokedex_area_screen_helper.c | |
| parent | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (diff) | |
| parent | b9ad5de8a044623b9d4d76307a76c00e2fcf0da6 (diff) | |
Merge pull request #482 from DizzyEggg/bg
Fix raw SetGpuReg and SetBgAttribute args
Diffstat (limited to 'src/unk_pokedex_area_screen_helper.c')
| -rw-r--r-- | src/unk_pokedex_area_screen_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unk_pokedex_area_screen_helper.c b/src/unk_pokedex_area_screen_helper.c index 67fd52cb5..0041d628c 100644 --- a/src/unk_pokedex_area_screen_helper.c +++ b/src/unk_pokedex_area_screen_helper.c @@ -22,21 +22,21 @@ void sub_81C4D70(const struct UnkStruct_1C4D70 *template) if (unk == 0) { - SetBgAttribute(template->bg, BG_CTRL_ATTR_WRAPAROUND, 0); + SetBgAttribute(template->bg, BG_ATTR_METRIC, 0); decompress_and_copy_tile_data_to_vram(template->bg, gUnknown_0861D1A0, 0, template->unk2, unk); sub_8199D3C(decompress_and_copy_tile_data_to_vram(template->bg, gUnknown_0861DEF4, 0, 0, 1), template->unk2, 32, 32, unk); } else { - SetBgAttribute(template->bg, BG_CTRL_ATTR_WRAPAROUND, 2); - SetBgAttribute(template->bg, 9, 1); + SetBgAttribute(template->bg, BG_ATTR_METRIC, 2); + SetBgAttribute(template->bg, BG_ATTR_TYPE, 1); decompress_and_copy_tile_data_to_vram(template->bg, gUnknown_0861E208, 0, template->unk2, 0); sub_8199D3C(decompress_and_copy_tile_data_to_vram(template->bg, gUnknown_0861EF64, 0, 0, 1), template->unk2, 64, 64, 1); } ChangeBgX(template->bg, 0, 0); ChangeBgY(template->bg, 0, 0); - SetBgAttribute(template->bg, BG_CTRL_ATTR_SCREENSIZE, 1); + SetBgAttribute(template->bg, BG_ATTR_PALETTEMODE, 1); CpuCopy32(gUnknown_0861D140, &gPlttBufferUnfaded[0x70], 0x60); *gUnknown_0203CF28 = template->bg; } |