diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-19 15:34:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 15:34:54 -0600 |
| commit | 02b5cf028f7636ec0bd303b46e0fef180a1d12dd (patch) | |
| tree | c82c5959ec3e9147a8045ddc3b5e66713cb80999 /src/egg_hatch.c | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
| parent | 4949411f3e5c7eece80cf3e89188627b82a4c3be (diff) | |
Merge pull request #139 from DizzyEggg/decompile_battle1
Decompile and split battle_1
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 a31eb0520..7418fa72d 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -48,9 +48,9 @@ extern struct SpriteTemplate gUnknown_0202499C; extern void (*gFieldCallback)(void); extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -extern const u8 gUnknown_08C00000[]; -extern const u8 gUnknown_08C00524[]; -extern const u8 gUnknown_08C004E0[]; +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 u32 gUnknown_08331F60[]; // tilemap gameboy circle @@ -522,9 +522,9 @@ static void CB2_EggHatch_0(void) gMain.state++; break; case 2: - copy_decompressed_tile_data_to_vram_autofree(0, gUnknown_08C00000, 0, 0, 0); - CopyToBgTilemapBuffer(0, gUnknown_08C00524, 0, 0); - LoadCompressedPalette(gUnknown_08C004E0, 0, 0x20); + copy_decompressed_tile_data_to_vram_autofree(0, gBattleTextboxTiles, 0, 0, 0); + CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); + LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20); gMain.state++; break; case 3: |