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 /src/graphics.c | |
| parent | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (diff) | |
| parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) | |
Merge branch 'master' into doc-littleroot
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics.c b/src/graphics.c index 06bfeed17..17d9a03cb 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -960,7 +960,7 @@ const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz"); const u32 gUnknown_08D77AE4[] = INCBIN_U32("graphics/battle_transitions/vs_frame.gbapal.lz"); -const u32 gUnknown_08D77B0C[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); +const u32 gVsLettersGfx[] = INCBIN_U32("graphics/battle_transitions/vs.4bpp.lz"); #include "data/graphics/battle_terrain.h" @@ -987,7 +987,7 @@ const u32 gUnknown_08D854C8[] = INCBIN_U32("graphics/battle_frontier/options_pal const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.4bpp.lz"); const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); -const u32 gUnknown_08D85600[] = INCBIN_U32("graphics/battle_frontier/text.gbapal.lz"); +const u32 gBattleWindowTextPalette[] = INCBIN_U32("graphics/battle_interface/text.gbapal.lz"); const u16 gUnknown_08D85620[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); const u16 gTilesetAnims_BattleDomePals0_0[] = INCBIN_U16("graphics/battle_frontier/dome_anim1.gbapal"); |