diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-27 20:43:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 20:43:47 -0400 |
| commit | 922411abebd56d0f5d6072bad4924c909c8e2c27 (patch) | |
| tree | 40f400e663ea3ef1139a9577277911b680cb1870 /src | |
| parent | b1d7bd24aa9e89bd9340146bea8d4c6da7b14c97 (diff) | |
| parent | b0a6be811fdd39813358daa7f45fe09d37a26f0e (diff) | |
Merge pull request #136 from PikalaxALT/pokeball_trade_dump
Pokeball and Trade data dump
Diffstat (limited to 'src')
| -rw-r--r-- | src/daycare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daycare.c b/src/daycare.c index ca9eb14f7..c016bbc38 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -76,7 +76,7 @@ extern const u8 gDaycareText_DontLikeOther[]; extern const u8 gDaycareText_PlayOther[]; extern const u8 gExpandedPlaceholder_Empty[]; -extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle +extern const u32 gUnknown_826601C[]; // tilemap gameboy circle extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; @@ -1880,7 +1880,7 @@ static void CB2_EggHatch_0(void) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); LoadPalette(gTradeGba2_Pal, 0x10, 0xA0); LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0); - CopyToBgTilemapBuffer(1, gUnknown_08331F60, 0x1000, 0); + CopyToBgTilemapBuffer(1, gUnknown_826601C, 0x1000, 0); CopyBgTilemapBufferToVram(1); gMain.state++; break; |