diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-07 18:47:05 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-07 18:47:05 -0600 |
| commit | 75f9c1650420a5d6a0e8130f471481ab19e27a77 (patch) | |
| tree | 77a75a4277cd12d19c7f72977e105fcefe271a23 /src/egg_hatch.c | |
| parent | a11c65ff1ac380cd213b26d0bb7a2787936b33f9 (diff) | |
| parent | 75c359e3001badee4eaaf496255d3a51bdcb124e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'src/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 721ba4a4f..1aff894b9 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -51,8 +51,8 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const u8 gBattleTextboxTiles[]; extern const u8 gBattleTextboxTilemap[]; extern const u8 gBattleTextboxPalette[]; -extern const u16 gUnknown_08DD7300[]; // palette, gameboy advance -extern const u32 gUnknown_08DD7360[]; // tileset gameboy advance +extern const u16 gTradeGba2_Pal[]; // palette, gameboy advance +extern const u32 gTradeGba_Gfx[]; // tileset gameboy advance extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; @@ -548,8 +548,8 @@ static void CB2_EggHatch_0(void) break; case 7: SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - LoadPalette(gUnknown_08DD7300, 0x10, 0xA0); - LoadBgTiles(1, gUnknown_08DD7360, 0x1420, 0); + LoadPalette(gTradeGba2_Pal, 0x10, 0xA0); + LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0); CopyToBgTilemapBuffer(1, gUnknown_08331F60, 0x1000, 0); CopyBgTilemapBufferToVram(1); gMain.state++; |