diff options
| -rw-r--r-- | data/graphics.s | 8 | ||||
| -rw-r--r-- | include/graphics.h | 8 | ||||
| -rw-r--r-- | src/berry_pouch.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/data/graphics.s b/data/graphics.s index e03266f85..9c5d1c3f9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13991,19 +13991,19 @@ gItemPcTilemap:: @ 8E85458 gBerryPouchSpriteTiles:: @ 8E8560C .incbin "graphics/berry_pouch/unk_8E8560C.4bpp.lz" -gUnknown_8E859D0:: @ 8E859D0 +gBerryPouchBgGfx:: @ 8E859D0 .incbin "graphics/berry_pouch/unk_8E859D0.4bpp.lz" -gUnknown_8E85BA4:: @ 8E85BA4 +gBerryPouchBgPals:: @ 8E85BA4 .incbin "graphics/berry_pouch/unk_8E85BA4.gbapal.lz" -gUnknown_8E85BF4:: @ 8E85BF4 +gBerryPouchBgPal0FemaleOverride:: @ 8E85BF4 .incbin "graphics/berry_pouch/unk_8E85BF4.gbapal.lz" gBerryPouchSpritePalette:: @ 8E85C1C .incbin "graphics/berry_pouch/unk_8E85C1C.gbapal.lz" -gUnknown_8E85C44:: @ 8E85C44 +gBerryPouchBg1Tilemap:: @ 8E85C44 .incbin "graphics/berry_pouch/unk_8E85C44.bin.lz" gUnknown_8E85DC8:: @ 8E85DC8 diff --git a/include/graphics.h b/include/graphics.h index 5c6f201db..a76607f40 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1000,10 +1000,10 @@ extern const u8 gCreditsAllRightsReservedGfxMap[]; // berry_pouch extern const u32 gBerryPouchSpriteTiles[]; -extern const u8 gUnknown_8E859D0[]; -extern const u8 gUnknown_8E85BA4[]; -extern const u8 gUnknown_8E85BF4[]; +extern const u8 gBerryPouchBgGfx[]; +extern const u8 gBerryPouchBgPals[]; +extern const u8 gBerryPouchBgPal0FemaleOverride[]; extern const u32 gBerryPouchSpritePalette[]; -extern const u8 gUnknown_8E85C44[]; +extern const u8 gBerryPouchBg1Tilemap[]; #endif //GUARD_GRAPHICS_H diff --git a/src/berry_pouch.c b/src/berry_pouch.c index abf2484f6..9be2537b9 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -607,20 +607,20 @@ static bool8 BerryPouchLoadGfx(void) { case 0: ResetTempTileDataBuffers(); - DecompressAndCopyTileDataToVram(1, gUnknown_8E859D0, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gBerryPouchBgGfx, 0, 0, 0); sResources->data[0]++; break; case 1: if (FreeTempTileDataBuffersIfPossible() != TRUE) { - LZDecompressWram(gUnknown_8E85C44, sResources->bg1TilemapBuffer); + LZDecompressWram(gBerryPouchBg1Tilemap, sResources->bg1TilemapBuffer); sResources->data[0]++; } break; case 2: - LoadCompressedPalette(gUnknown_8E85BA4, 0, 0x60); + LoadCompressedPalette(gBerryPouchBgPals, 0, 0x60); if (gSaveBlock2Ptr->playerGender != MALE) - LoadCompressedPalette(gUnknown_8E85BF4, 0, 0x20); + LoadCompressedPalette(gBerryPouchBgPal0FemaleOverride, 0, 0x20); sResources->data[0]++; break; case 3: |