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_bg.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_bg.c')
| -rw-r--r-- | src/battle_bg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c index a6919be1d..a072a2cda 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -1092,7 +1092,7 @@ void DrawBattleEntryBackground(void) LZDecompressVram(gUnknown_08D778F0, (void*)(VRAM + 0x4000)); LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000)); LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); - SetBgAttribute(1, BG_CTRL_ATTR_MAPBASEINDEX, 1); + SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); CopyToBgTilemapBuffer(1, gUnknown_08D779D8, 0, 0); CopyToBgTilemapBuffer(2, gUnknown_08D779D8, 0, 0); @@ -1113,8 +1113,8 @@ void DrawBattleEntryBackground(void) } else { - SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 2); - SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 2); + SetBgAttribute(1, BG_ATTR_CHARBASEINDEX, 2); + SetBgAttribute(2, BG_ATTR_CHARBASEINDEX, 2); CopyToBgTilemapBuffer(1, gUnknown_08D857A8, 0, 0); CopyToBgTilemapBuffer(2, gUnknown_08D85A1C, 0, 0); CopyBgTilemapBufferToVram(1); |