diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:45:31 -0400 |
commit | 431c60c92c59ba0c2d5a658e0c490f46162bb5d2 (patch) | |
tree | 7f03009ed9475a0f8e7aac6ed6ca2ab89a527577 /include/graphics.h | |
parent | 8b462f3f6c30de55767808136861e892fc3f0356 (diff) | |
parent | 8b80b417e2172a44098a22473717da20585bd15d (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
Diffstat (limited to 'include/graphics.h')
-rw-r--r-- | include/graphics.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/graphics.h b/include/graphics.h index 186d381db..8514d49bd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4986,14 +4986,14 @@ extern const u16 gEasyChatRightWindow_Pal[]; extern const u32 gUsePokeblockCondition_Gfx[]; // Union Room Chat -extern const u16 gUnknown_08DD4BB0[]; -extern const u16 gUnknown_08DD4BD0[]; -extern const u32 gUnknown_08DD4BF0[]; -extern const u32 gUnknown_08DD4C4C[]; -extern const u32 gUnknown_08DD4CF8[]; -extern const u16 gLinkMiscMenu_Pal[]; -extern const u32 gLinkMiscMenu_Gfx[]; -extern const u32 gLinkMiscMenu_Tilemap[]; +extern const u16 gUnionRoomChat_Background_Pal[]; +extern const u32 gUnionRoomChat_Background_Gfx[]; +extern const u32 gUnionRoomChat_Background_Tilemap[]; +extern const u16 gUnionRoomChat_Window_Pal1[]; +extern const u16 gUnionRoomChat_Window_Pal2[]; +extern const u32 gUnionRoomChat_Border_Gfx[]; +extern const u32 gUnionRoomChat_Border_Tilemap[]; +extern const u32 gUnionRoomChat_RButtonLabels[]; // Use Pokeblock extern const u8 gPokenavConditionCancel_Gfx[]; |