diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
| commit | 8712757d2454a8ee15680a658ea7df8621954bef (patch) | |
| tree | 5f0ebfdccc0e22c0e52f8d223ec4889c7597569f /src/intro.c | |
| parent | f8838491f6c46df771c5414f8b6da781294300b7 (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/intro.c b/src/intro.c index 5a0e13869..94692e6ec 100644 --- a/src/intro.c +++ b/src/intro.c @@ -5,7 +5,7 @@ #include "task.h" #include "title_screen.h" #include "libgcnmultiboot.h" -#include "malloc.h" +#include "alloc.h" #include "gpu_regs.h" #include "link.h" #include "multiboot_pokemon_colosseum.h" @@ -62,10 +62,10 @@ static const u32 gIntro3MiscTiles[] = INCBIN_U32("graphics/intro/intro3_misc.4bp static const u16 gIntro1FlygonPalette[] = INCBIN_U16("graphics/intro/intro1_flygon.gbapal"); static const u32 gIntro1EonTiles_Unused[] = INCBIN_U32("graphics/intro/intro1_eon.4bpp.lz"); static const u8 sUnknownBytes[] = { - 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, + 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x02, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x02, 0x0D, 0x0E, 0x0F, 0x10, - 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 + 0x11, 0x12, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x00 }; static const struct CompressedSpriteSheet gUnknown_085E4A74[] = { |