diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 19:46:54 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 19:46:54 -0700 |
| commit | 12fb25f4e38942a64b1ab4803516228f0b900bc9 (patch) | |
| tree | 295de7d68a1ca8a8bdbfd7ebbe0c579ffdda6d8d /src/egg_hatch.c | |
| parent | 20f41da2d2538c81d53ece27d17ead845a40ccd5 (diff) | |
| parent | b1d091e233b81262e0905ce06607cfa7c4d4c9dd (diff) | |
Merge remote-tracking branch 'upstream/master' into contest_effect
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 282ad31fb..5bba69f86 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -40,9 +40,9 @@ struct EggHatchData struct EggHatchData* gEggHatchData; -extern const u32 gUnknown_08D00000[]; -extern const u32 gUnknown_08D00524[]; -extern const u16 gUnknown_08D004E0[]; //palette +extern const u32 gBattleTextboxTiles[]; +extern const u32 gBattleTextboxTilemap[]; +extern const u16 gBattleTextboxPalette[]; //palette extern const struct SpriteSheet sUnknown_0820A3B0; extern const struct SpriteSheet sUnknown_0820A3B8; extern const struct SpritePalette sUnknown_0820A3C0; @@ -478,10 +478,10 @@ static void CB2_EggHatch_0(void) gMain.state++; break; case 2: - LZDecompressVram(&gUnknown_08D00000, (void*)(VRAM)); - CpuSet(&gUnknown_08D00524, ewram0_7, 0x800); + LZDecompressVram(&gBattleTextboxTiles, (void*)(VRAM)); + CpuSet(&gBattleTextboxTilemap, ewram0_7, 0x800); DmaCopy16(3, ewram0_7, (void*)(VRAM + 0x2800), 0x500); - LoadCompressedPalette(&gUnknown_08D004E0, 0, 0x20); + LoadCompressedPalette(&gBattleTextboxPalette, 0, 0x20); gMain.state++; break; case 3: |