diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 10:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:48:56 -0500 |
| commit | 6280a3786ba77956fae95bb11b425e7301d0a6fa (patch) | |
| tree | b140b92b4bd9113d0dea6c6ed8197ace1f93f8fe /include/graphics.h | |
| parent | 47f6e9f97396d1486fe515b8a994bbc285060419 (diff) | |
| parent | 5198a05272716990bcd98b9b216d3431adb25a3e (diff) | |
Merge branch 'master' into doc-sixisland
Diffstat (limited to 'include/graphics.h')
| -rw-r--r-- | include/graphics.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/graphics.h b/include/graphics.h index dcc4c44a7..1405cdcf1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4845,10 +4845,10 @@ extern const u32 gBuyMenuFrame_Pal[]; extern const u16 gUnknown_8D2FBB4[]; // trainer card -extern const u16 gFireRedTrainerCard_Pal[]; -extern const u32 gFireRedTrainerCard_Gfx[]; -extern const u16 gEmeraldTrainerCard_Pal[]; -extern const u32 gEmeraldTrainerCard_Gfx[]; +extern const u16 gKantoTrainerCard_Pal[]; +extern const u32 gKantoTrainerCard_Gfx[]; +extern const u16 gHoennTrainerCard_Pal[]; +extern const u32 gHoennTrainerCard_Gfx[]; // battle_interface extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; |