diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-22 19:20:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 19:20:53 -0500 |
| commit | 9aaafa84871e7bcc553d3eda680415545a337eee (patch) | |
| tree | 78a208976e44452f8818305fe73e53e8b9de865e /src/trade_scene.c | |
| parent | e194cf83d257796591e6a7a2cb88e208ac7de968 (diff) | |
| parent | 8c02668a19f45e2969c206657ec08799d4dddd3e (diff) | |
Merge pull request #263 from GriffinRichards/move-graphics
Move graphics.s to src
Diffstat (limited to 'src/trade_scene.c')
| -rw-r--r-- | src/trade_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trade_scene.c b/src/trade_scene.c index bb441f523..9f0b83ec9 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -946,13 +946,13 @@ static void TradeAnimInit_LoadGfx(void) DeactivateAllTextPrinters(); // Doing the graphics load... DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); - LZDecompressWram(gFile_graphics_interface_menu_map_tilemap, gDecompressionBuffer); + LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer); CopyToBgTilemapBuffer(0, gDecompressionBuffer, BG_SCREEN_SIZE, 0); LoadCompressedPalette(gBattleTextboxPalette, 0x000, 0x20); InitWindows(gUnknown_826D1BC); // ... and doing the same load again DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0); - LZDecompressWram(gFile_graphics_interface_menu_map_tilemap, gDecompressionBuffer); + LZDecompressWram(gBattleTextboxTilemap, gDecompressionBuffer); CopyToBgTilemapBuffer(0, gDecompressionBuffer, BG_SCREEN_SIZE, 0); LoadCompressedPalette(gBattleTextboxPalette, 0x000, 0x20); } |