diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /include/graphics.h | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/graphics.h b/include/graphics.h index 6ec5c44b2..f51d7fa47 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3282,18 +3282,18 @@ extern const u32 gBattleTerrainPalette_StadiumWallace[]; extern const u32 gPokedexMenu2_Gfx[]; extern const u16 gPokedexText_Pal[]; extern const u32 gPokedexMenu_Gfx[]; -extern const u8 gUnknown_08DC2C5C[]; -extern const u8 gUnknown_08DC2DAC[]; -extern const u8 gUnknown_08DC2A08[]; -extern const u8 gUnknown_08DC2B1C[]; +extern const u8 gPokedexTilemap_Main[]; +extern const u8 gPokedexTilemap_MainUnderlay[]; +extern const u8 gPokedexTilemap_StartMenu1[]; +extern const u8 gPokedexTilemap_StartMenu2[]; extern const u16 gPokedexHoennBg_Pal[]; extern const u16 gPokedexText_Pal[]; extern const u16 gPokedexNationalBg_Pal[]; -extern const u8 gUnknown_08DC3080[]; -extern const u8 gUnknown_08DC3198[]; -extern const u8 gUnknown_08DC2E6C[]; -extern const u8 gUnknown_08DC2F5C[]; -extern const u8 gUnknown_08DC2FEC[]; +extern const u8 gPokedexTilemap_DescriptionScreen[]; +extern const u8 gPokedexTilemap_CryScreen[]; +extern const u8 gPokedexTilemap_SizeScreen[]; +extern const u8 gPokedexTilemap_ScreenSelectBar1[]; +extern const u8 gPokedexTilemap_ScreenSelectBar2[]; extern const u16 gPokedexCaughtScreenFade_Pal[]; extern const u32 gPokedexSearchMenu_Gfx[]; extern const u32 gPokedexSearch2_Tilemap[]; |