diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:22:33 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:22:33 -0400 |
| commit | d172b9ed71485e45f4896beb637ab536e10cc138 (patch) | |
| tree | 05b1a4fd706d30cf065aa76017975ac7dba133bf /src/shop.c | |
| parent | 0117d43fa758bfc12a8bf5c3dd09a625556a644c (diff) | |
Merge structs at 02019348
Diffstat (limited to 'src/shop.c')
| -rw-r--r-- | src/shop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shop.c b/src/shop.c index 032297f71..34086958e 100644 --- a/src/shop.c +++ b/src/shop.c @@ -267,7 +267,7 @@ static void BuyMenuDrawGraphics(void) Dma3FillLarge32_(0, (void*)OAM, OAM_SIZE); LZDecompressVram(gBuyMenuFrame_Gfx, (void*)(VRAM + 0x7C00)); - LZDecompressWram(gBuyMenuFrame_Tilemap, ewram18000_2); + LZDecompressWram(gBuyMenuFrame_Tilemap, ewram18000); LoadCompressedPalette(gMenuMoneyPal, 0xC0, sizeof(gMenuMoneyPal)); FreeAllSpritePalettes(); ResetPaletteFade(); @@ -498,7 +498,7 @@ static void BuyMenuDrawTextboxBG_Restore(void) for (i = 0; i < 8; i++) for (j = 0; j < 14; j++) - gBGTilemapBuffers[1][32 * (i + 12) + j] = ewram18300[32 * i + j] + 0xC3E0; + gBGTilemapBuffers[1][32 * (i + 12) + j] = ewram18000[0x180 + 32 * i + j] + 0xC3E0; } static void Shop_PrintItemDesc(void) |