diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 03:07:50 -0500 |
| commit | 9140594b233b08d05d0832b62d3e64d50528a460 (patch) | |
| tree | 1175aa70b24f9c07b8089e23b2e8e7fdcba1b524 /include/graphics.h | |
| parent | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (diff) | |
| parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) | |
Merge branch 'master' into doc-littleroot
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/graphics.h b/include/graphics.h index 37dd77e89..831b202f8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3208,7 +3208,7 @@ extern const u32 gBattleTextboxTiles[]; extern const u32 gBattleTextboxTilemap[]; extern const u32 gBattleTextboxPalette[]; extern const u32 gUnknown_08D778F0[]; -extern const u32 gUnknown_08D77B0C[]; +extern const u32 gVsLettersGfx[]; extern const u32 gUnknown_08D77AE4[]; extern const u32 gUnknown_08D779D8[]; extern const u32 gUnknown_08D857A8[]; @@ -4122,7 +4122,7 @@ extern const u32 gUnknown_08D84970[]; extern const u32 gUnknown_08D84F00[]; extern const u32 gUnknown_08D85444[]; extern const u32 gUnknown_08D85358[]; -extern const u32 gUnknown_08D85600[]; +extern const u32 gBattleWindowTextPalette[]; extern const u32 gUnknown_08D854C8[]; extern const u32 gUnknown_08D82F10[]; extern const u32 gUnknown_08D834FC[]; |