diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/pokedex_screen.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/pokedex_screen.c')
| -rw-r--r-- | src/pokedex_screen.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index d80a2eefa..2216a94df 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -516,11 +516,11 @@ void sub_8102C28(void) FillWindowPixelBuffer(1, PIXEL_FILL(15)); sub_8104C2C(gUnknown_8415DB8); PutWindowTilemap(0); - CopyWindowToVram(0, 2); + CopyWindowToVram(0, COPYWIN_GFX); PutWindowTilemap(1); - CopyWindowToVram(1, 2); + CopyWindowToVram(1, COPYWIN_GFX); PutWindowTilemap(gUnknown_203ACF0->field_16); - CopyWindowToVram(gUnknown_203ACF0->field_16, 2); + CopyWindowToVram(gUnknown_203ACF0->field_16, COPYWIN_GFX); } void sub_8102EC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) @@ -538,7 +538,7 @@ void sub_8102EC0(s32 itemIndex, bool8 onInit, struct ListMenu *list) LoadPalette(gUnknown_84520F4[itemIndex].pal, 0x10, 0x20); } PutWindowTilemap(gUnknown_203ACF0->field_15); - CopyWindowToVram(gUnknown_203ACF0->field_15, 2); + CopyWindowToVram(gUnknown_203ACF0->field_15, COPYWIN_GFX); } void sub_8102F48(u8 windowId, s32 itemId, u8 y) @@ -631,8 +631,8 @@ void sub_810317C(void) sub_8106E78(gUnknown_8415F3D, 1); FillWindowPixelBuffer(1, PIXEL_FILL(15)); sub_8104C2C(gText_PickOKExit); - CopyWindowToVram(0, 2); - CopyWindowToVram(1, 2); + CopyWindowToVram(0, COPYWIN_GFX); + CopyWindowToVram(1, COPYWIN_GFX); } void sub_8103238(u8 taskId) @@ -717,8 +717,8 @@ void sub_810345C(void) sub_8106E78(gUnknown_8415F4A, 1); FillWindowPixelBuffer(1, PIXEL_FILL(15)); sub_8104C2C(gText_PickOKExit); - CopyWindowToVram(0, 2); - CopyWindowToVram(1, 2); + CopyWindowToVram(0, COPYWIN_GFX); + CopyWindowToVram(1, COPYWIN_GFX); } u16 sub_8103518(u8 a0) @@ -1841,7 +1841,7 @@ bool8 sub_8104C64(u16 a0, u8 a1, u8 a2) FillWindowPixelBuffer(gUnknown_203ACF0->field_20[a1], PIXEL_FILL(0)); sub_81049FC(gUnknown_203ACF0->field_20[a1], a0, a1 * 16 + 16); PutWindowTilemap(gUnknown_203ACF0->field_20[a1]); - CopyWindowToVram(gUnknown_203ACF0->field_20[a1], 2); + CopyWindowToVram(gUnknown_203ACF0->field_20[a1], COPYWIN_GFX); } else PutWindowTilemap(gUnknown_203ACF0->field_20[a1]); @@ -1861,7 +1861,7 @@ bool8 sub_8104C64(u16 a0, u8 a1, u8 a2) if (sub_8104AB0(a0, FLAG_GET_CAUGHT, TRUE)) BlitBitmapRectToWindow(gUnknown_203ACF0->field_24[a1], gUnknown_8443600, 0, 0, 8, 8, 2, 3, 8, 8); PutWindowTilemap(gUnknown_203ACF0->field_24[a1]); - CopyWindowToVram(gUnknown_203ACF0->field_24[a1], 2); + CopyWindowToVram(gUnknown_203ACF0->field_24[a1], COPYWIN_GFX); } } else @@ -1906,11 +1906,11 @@ bool8 sub_8104F0C(bool8 a0) sub_8106E78(gDexCategoryNamePtrs[gUnknown_203ACF0->field_28], 0); sub_8104EC0(0, sub_8106AF8(gUnknown_203ACF0->field_2B), sub_8106AF8(gUnknown_203ACF0->field_2A - 1), 160, 2); } - CopyWindowToVram(0, 2); + CopyWindowToVram(0, COPYWIN_GFX); FillWindowPixelBuffer(1, PIXEL_FILL(15)); if (!a0) sub_8104C2C(gUnknown_8415F6C); - CopyWindowToVram(1, 2); + CopyWindowToVram(1, COPYWIN_GFX); if (gUnknown_203ACF0->field_18[0] != 0xFFFF) sub_8104C64(gUnknown_203ACF0->field_18[0], 0, gUnknown_203ACF0->field_2C); if (gUnknown_203ACF0->field_18[1] != 0xFFFF) |