diff options
42 files changed, 433 insertions, 159 deletions
diff --git a/.gitignore b/.gitignore index e3cb43d69..c85c20759 100644 --- a/.gitignore +++ b/.gitignore @@ -39,8 +39,10 @@ types_*.taghl Thumbs.db build/ .idea/ +cmake-build-* *.DS_Store *.pl *.bak src/data/items.h -tools/br_ips/{br_ips,ips_patch}{,.exe} +tools/br_ips/br_ips +tools/br_ips/ips_patch diff --git a/baserom.ips b/baserom.ips Binary files differindex 11c3b7f62..ffe2db87b 100644 --- a/baserom.ips +++ b/baserom.ips diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index d10a7d403..bbd53eca8 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -165,164 +165,8 @@ gUnknown_8402250:: @ 8402250 gUnknown_8402258:: @ 8402258 .incbin "baserom.gba", 0x402258, 0x8 -gUnknown_8402260:: @ 8402260 - .incbin "baserom.gba", 0x402260, 0x20 -gUnknown_8402280:: @ 8402280 - .incbin "baserom.gba", 0x402280, 0x264 - -gUnknown_84024E4:: @ 84024E4 - .incbin "baserom.gba", 0x4024E4, 0x14C - -gUnknown_8402630:: @ 8402630 - .incbin "baserom.gba", 0x402630, 0x20 - -gUnknown_8402650:: @ 8402650 - .incbin "baserom.gba", 0x402650, 0x18 - -gUnknown_8402668:: @ 8402668 - .incbin "baserom.gba", 0x402668, 0xA4 - -gUnknown_840270C:: @ 840270C - .incbin "baserom.gba", 0x40270C, 0x20 - -gUnknown_840272C:: @ 840272C - .incbin "baserom.gba", 0x40272C, 0x1CC - -gUnknown_84028F8:: @ 84028F8 - .incbin "baserom.gba", 0x4028F8, 0x43C - -gUnknown_8402D34:: @ 8402D34 - .incbin "baserom.gba", 0x402D34, 0x20 - -gUnknown_8402D54:: @ 8402D54 - .incbin "baserom.gba", 0x402D54, 0x1294 - -gUnknown_8403FE8:: @ 8403FE8 - .incbin "baserom.gba", 0x403FE8, 0x8E4 - -gUnknown_84048CC:: @ 84048CC - .incbin "baserom.gba", 0x4048CC, 0x20 - -gUnknown_84048EC:: @ 84048EC - .incbin "baserom.gba", 0x4048EC, 0x690 - -gUnknown_8404F7C:: @ 8404F7C - .incbin "baserom.gba", 0x404F7C, 0x438 - -gUnknown_84053B4:: @ 84053B4 - .incbin "baserom.gba", 0x4053B4, 0x60 - -gUnknown_8405414:: @ 8405414 - .incbin "baserom.gba", 0x405414, 0x47C - -gUnknown_8405890:: @ 8405890 - .incbin "baserom.gba", 0x405890, 0x298 - -gUnknown_8405B28:: @ 8405B28 - .incbin "baserom.gba", 0x405B28, 0x1B4 - -gUnknown_8405CDC:: @ 8405CDC - .incbin "baserom.gba", 0x405CDC, 0xC8 - -gUnknown_8405DA4:: @ 8405DA4 - .incbin "baserom.gba", 0x405DA4, 0x20 - -gUnknown_8405DC4:: @ 8405DC4 - .incbin "baserom.gba", 0x405DC4, 0x688 - -gUnknown_840644C:: @ 840644C - .incbin "baserom.gba", 0x40644C, 0x1E8 - -gUnknown_8406634:: @ 8406634 - .incbin "baserom.gba", 0x406634, 0x20 - -gUnknown_8406654:: @ 8406654 - .incbin "baserom.gba", 0x406654, 0xB7C - -gUnknown_84071D0:: @ 84071D0 - .incbin "baserom.gba", 0x4071D0, 0x260 - -gUnknown_8407430:: @ 8407430 - .incbin "baserom.gba", 0x407430, 0x40 - -gUnknown_8407470:: @ 8407470 - .incbin "baserom.gba", 0x407470, 0x5E0 - -gUnknown_8407A50:: @ 8407A50 - .incbin "baserom.gba", 0x407A50, 0x14C - -gUnknown_8407B9C:: @ 8407B9C - .incbin "baserom.gba", 0x407B9C, 0x11FC - -gUnknown_8408D98:: @ 8408D98 - .incbin "baserom.gba", 0x408D98, 0x2DE8 - -gUnknown_840BB80:: @ 840BB80 - .incbin "baserom.gba", 0x40BB80, 0x8 - -gUnknown_840BB88:: @ 840BB88 - .incbin "baserom.gba", 0x40BB88, 0x8 - -gUnknown_840BB90:: @ 840BB90 - .incbin "baserom.gba", 0x40BB90, 0x10 - -gUnknown_840BBA0:: @ 840BBA0 - .incbin "baserom.gba", 0x40BBA0, 0x8 - -gUnknown_840BBA8:: @ 840BBA8 - .incbin "baserom.gba", 0x40BBA8, 0x10 - -gUnknown_840BBB8:: @ 840BBB8 - .incbin "baserom.gba", 0x40BBB8, 0x8 - -gUnknown_840BBC0:: @ 840BBC0 - .incbin "baserom.gba", 0x40BBC0, 0x28 - -gUnknown_840BBE8:: @ 840BBE8 - .incbin "baserom.gba", 0x40BBE8, 0x20 - -gUnknown_840BC08:: @ 840BC08 - .incbin "baserom.gba", 0x40BC08, 0x64 - -gUnknown_840BC6C:: @ 840BC6C - .incbin "baserom.gba", 0x40BC6C, 0x18 - -gUnknown_840BC84:: @ 840BC84 - .incbin "baserom.gba", 0x40BC84, 0x38 - -gUnknown_840BCBC:: @ 840BCBC - .incbin "baserom.gba", 0x40BCBC, 0x20 - -gUnknown_840BCDC:: @ 840BCDC - .incbin "baserom.gba", 0x40BCDC, 0xAC - -gUnknown_840BD88:: @ 840BD88 - .incbin "baserom.gba", 0x40BD88, 0x20 - -gUnknown_840BDA8:: @ 840BDA8 - .incbin "baserom.gba", 0x40BDA8, 0x18 - -gUnknown_840BDC0:: @ 840BDC0 - .incbin "baserom.gba", 0x40BDC0, 0x3C - -gUnknown_840BDFC:: @ 840BDFC - .incbin "baserom.gba", 0x40BDFC, 0x50 - -gUnknown_840BE4C:: @ 840BE4C - .incbin "baserom.gba", 0x40BE4C, 0x40 - -gUnknown_840BE8C:: @ 840BE8C - .incbin "baserom.gba", 0x40BE8C, 0x38 - -gUnknown_840BEC4:: @ 840BEC4 - .incbin "baserom.gba", 0x40BEC4, 0x18 - -gUnknown_840BEDC:: @ 840BEDC - .incbin "baserom.gba", 0x40BEDC, 0x38 - -gUnknown_840BF14:: @ 840BF14 - .incbin "baserom.gba", 0x40BF14, 0x28 + .section .rodata.battle_anim_special gUnknown_840BF3C:: @ 840BF3C .incbin "baserom.gba", 0x40BF3C, 0xC diff --git a/data/intro.s b/data/intro.s new file mode 100644 index 000000000..d28eb8d41 --- /dev/null +++ b/data/intro.s @@ -0,0 +1,187 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata + + .align 2 +gUnknown_8402260:: @ gbapal + .incbin "graphics/intro/unk_8402260.gbapal" + +gUnknown_8402280:: @ 4bpp.lz + .incbin "graphics/intro/unk_8402280.4bpp.lz" + +gUnknown_84024E4:: @ bin.lz + .incbin "graphics/intro/unk_84024E4.bin.lz" + +gUnknown_8402630:: @ gbapal + .incbin "graphics/intro/unk_8402630.gbapal" + +gUnknown_8402650:: @ 4bpp.lz + .incbin "graphics/intro/unk_8402650.4bpp.lz" + +gUnknown_8402668:: @ bin.lz + .incbin "graphics/intro/unk_8402668.bin.lz" + +gUnknown_840270C:: @ gbapal + .incbin "graphics/intro/unk_840270C.gbapal" + +gUnknown_840272C:: @ 4bpp.lz + .incbin "graphics/intro/unk_840272C.4bpp.lz" + +gUnknown_84028F8:: @ bin.lz + .incbin "graphics/intro/unk_84028F8.bin.lz" + +gUnknown_8402A44:: @ gbapal + .incbin "graphics/intro/unk_8402A64.gbapal" + +gUnknown_8402A64:: @ 4bpp.lz + .incbin "graphics/intro/unk_8402A64.4bpp.lz" + +gUnknown_8402ABC:: @ gbapal + .incbin "graphics/intro/unk_8402ADC.gbapal" + +gUnknown_8402ADC:: @ 4bpp.lz + .incbin "graphics/intro/unk_8402ADC.4bpp.lz" + +gUnknown_8402B2C:: @ 4bpp.lz + .incbin "graphics/intro/unk_8402B2C.4bpp.lz" + +gUnknown_8402CD4:: @ 8402BD4 + .incbin "graphics/intro/unk_8402CD4.4bpp.lz" + +gUnknown_8402D34:: @ gbapal + .incbin "graphics/intro/unk_8402D34.gbapal" + +gUnknown_8402D54:: @ 4bpp.lz + .incbin "graphics/intro/unk_8402D54.4bpp.lz" + +gUnknown_8403FE8:: @ bin.lz + .incbin "graphics/intro/unk_8403FE8.bin.lz" + +gUnknown_84048CC:: @ gbapal + .incbin "graphics/intro/unk_84048CC.gbapal" + +gUnknown_84048EC:: @ 4bpp.lz + .incbin "graphics/intro/unk_84048EC.4bpp.lz" + +gUnknown_8404F7C:: @ bin.lz + .incbin "graphics/intro/unk_8404F7C.bin.lz" + +gUnknown_84053B4:: @ gbapal + .incbin "graphics/intro/unk_84053B4.gbapal" + +gUnknown_8405414:: @ 4bpp.lz + .incbin "graphics/intro/unk_8405414.4bpp.lz" + +gUnknown_8405890:: @ bin.lz + .incbin "graphics/intro/unk_8405890.bin.lz" + +gUnknown_8405B08:: @ 8405B08 + .incbin "graphics/intro/unk_8405B08.gbapal" + +gUnknown_8405B28:: @ 4bpp.lz + .incbin "graphics/intro/unk_8405B28.4bpp.lz" + +gUnknown_8405CDC:: @ bin.lz + .incbin "graphics/intro/unk_8405CDC.bin.lz" + +gUnknown_8405DA4:: @ gbapal + .incbin "graphics/intro/unk_8405DA4.gbapal" + +gUnknown_8405DC4:: @ 4bpp.lz + .incbin "graphics/intro/unk_8405DC4.4bpp.lz" + +gUnknown_840644C:: @ bin.lz + .incbin "graphics/intro/unk_840644C.bin.lz" + +gUnknown_8406634:: @ gbapal + .incbin "graphics/intro/unk_8406634.gbapal" + +gUnknown_8406654:: @ 4bpp.lz + .incbin "graphics/intro/unk_8406654.4bpp.lz" + +gUnknown_84071D0:: @ bin.lz + .incbin "graphics/intro/unk_84071D0.bin.lz" + +gUnknown_8407430:: @ gbapal + .incbin "graphics/intro/unk_8407430.gbapal" + +gUnknown_8407470:: @ 4bpp.lz + .incbin "graphics/intro/unk_8407470.4bpp.lz" + +gUnknown_8407A50:: @ bin.lz + .incbin "graphics/intro/unk_8407A50.bin.lz" + +gUnknown_8407B9C:: @ 4bpp.lz + .incbin "graphics/intro/unk_8407B9C.4bpp.lz" + +gUnknown_8408D98:: @ bin.lz + .incbin "graphics/intro/unk_8408D98.bin.lz" + +gUnknown_840926C:: @ 840926C + .incbin "baserom.gba", 0x40926C, 0x2914 + +gUnknown_840BB80:: @ 840BB80 + .incbin "baserom.gba", 0x40BB80, 0x8 + +gUnknown_840BB88:: @ 840BB88 + .incbin "baserom.gba", 0x40BB88, 0x8 + +gUnknown_840BB90:: @ 840BB90 + .incbin "baserom.gba", 0x40BB90, 0x10 + +gUnknown_840BBA0:: @ 840BBA0 + .incbin "baserom.gba", 0x40BBA0, 0x8 + +gUnknown_840BBA8:: @ 840BBA8 + .incbin "baserom.gba", 0x40BBA8, 0x10 + +gUnknown_840BBB8:: @ 840BBB8 + .incbin "baserom.gba", 0x40BBB8, 0x8 + +gUnknown_840BBC0:: @ 840BBC0 + .incbin "baserom.gba", 0x40BBC0, 0x28 + +gUnknown_840BBE8:: @ 840BBE8 + .incbin "baserom.gba", 0x40BBE8, 0x20 + +gUnknown_840BC08:: @ 840BC08 + .incbin "baserom.gba", 0x40BC08, 0x64 + +gUnknown_840BC6C:: @ 840BC6C + .incbin "baserom.gba", 0x40BC6C, 0x18 + +gUnknown_840BC84:: @ 840BC84 + .incbin "baserom.gba", 0x40BC84, 0x38 + +gUnknown_840BCBC:: @ 840BCBC + .incbin "baserom.gba", 0x40BCBC, 0x20 + +gUnknown_840BCDC:: @ 840BCDC + .incbin "baserom.gba", 0x40BCDC, 0xAC + +gUnknown_840BD88:: @ 840BD88 + .incbin "baserom.gba", 0x40BD88, 0x20 + +gUnknown_840BDA8:: @ 840BDA8 + .incbin "baserom.gba", 0x40BDA8, 0x18 + +gUnknown_840BDC0:: @ 840BDC0 + .incbin "baserom.gba", 0x40BDC0, 0x3C + +gUnknown_840BDFC:: @ 840BDFC + .incbin "baserom.gba", 0x40BDFC, 0x50 + +gUnknown_840BE4C:: @ 840BE4C + .incbin "baserom.gba", 0x40BE4C, 0x40 + +gUnknown_840BE8C:: @ 840BE8C + .incbin "baserom.gba", 0x40BE8C, 0x38 + +gUnknown_840BEC4:: @ 840BEC4 + .incbin "baserom.gba", 0x40BEC4, 0x18 + +gUnknown_840BEDC:: @ 840BEDC + .incbin "baserom.gba", 0x40BEDC, 0x38 + +gUnknown_840BF14:: @ 840BF14 + .incbin "baserom.gba", 0x40BF14, 0x28 diff --git a/graphics/intro/unk_8402260.pal b/graphics/intro/unk_8402260.pal new file mode 100644 index 000000000..4219d4394 --- /dev/null +++ b/graphics/intro/unk_8402260.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 32 32 +24 57 57 +49 82 82 +82 106 106 +106 131 131 +139 156 156 +164 180 180 +197 205 205 +222 230 230 +255 255 255 diff --git a/graphics/intro/unk_8402280.png b/graphics/intro/unk_8402280.png Binary files differnew file mode 100644 index 000000000..dccf33afa --- /dev/null +++ b/graphics/intro/unk_8402280.png diff --git a/graphics/intro/unk_84024E4.bin b/graphics/intro/unk_84024E4.bin Binary files differnew file mode 100644 index 000000000..2e48c59b4 --- /dev/null +++ b/graphics/intro/unk_84024E4.bin diff --git a/graphics/intro/unk_8402630.pal b/graphics/intro/unk_8402630.pal new file mode 100644 index 000000000..6ca1f007c --- /dev/null +++ b/graphics/intro/unk_8402630.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 41 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +82 82 82 +180 180 180 +255 255 255 diff --git a/graphics/intro/unk_8402650.png b/graphics/intro/unk_8402650.png Binary files differnew file mode 100644 index 000000000..1ed1b6dc5 --- /dev/null +++ b/graphics/intro/unk_8402650.png diff --git a/graphics/intro/unk_8402668.bin b/graphics/intro/unk_8402668.bin Binary files differnew file mode 100644 index 000000000..2fbac69de --- /dev/null +++ b/graphics/intro/unk_8402668.bin diff --git a/graphics/intro/unk_840270C.pal b/graphics/intro/unk_840270C.pal new file mode 100644 index 000000000..619aee6a0 --- /dev/null +++ b/graphics/intro/unk_840270C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +24 41 74 +0 0 0 +139 123 16 +189 172 16 +131 164 65 +148 230 49 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +222 222 222 +24 41 74 +82 82 82 +180 180 180 +255 255 255 diff --git a/graphics/intro/unk_840272C.png b/graphics/intro/unk_840272C.png Binary files differnew file mode 100644 index 000000000..d84885c6a --- /dev/null +++ b/graphics/intro/unk_840272C.png diff --git a/graphics/intro/unk_84028F8.bin b/graphics/intro/unk_84028F8.bin Binary files differnew file mode 100644 index 000000000..70782b718 --- /dev/null +++ b/graphics/intro/unk_84028F8.bin diff --git a/graphics/intro/unk_8402A64.png b/graphics/intro/unk_8402A64.png Binary files differnew file mode 100644 index 000000000..79784c7c5 --- /dev/null +++ b/graphics/intro/unk_8402A64.png diff --git a/graphics/intro/unk_8402ADC.png b/graphics/intro/unk_8402ADC.png Binary files differnew file mode 100644 index 000000000..b57006c7b --- /dev/null +++ b/graphics/intro/unk_8402ADC.png diff --git a/graphics/intro/unk_8402B2C.png b/graphics/intro/unk_8402B2C.png Binary files differnew file mode 100644 index 000000000..791cb0e47 --- /dev/null +++ b/graphics/intro/unk_8402B2C.png diff --git a/graphics/intro/unk_8402CD4.png b/graphics/intro/unk_8402CD4.png Binary files differnew file mode 100644 index 000000000..9e19b576c --- /dev/null +++ b/graphics/intro/unk_8402CD4.png diff --git a/graphics/intro/unk_8402D34.pal b/graphics/intro/unk_8402D34.pal new file mode 100644 index 000000000..4be93ec3e --- /dev/null +++ b/graphics/intro/unk_8402D34.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +115 197 106 +41 164 8 +82 180 65 +139 222 131 +98 197 82 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +16 139 98 +16 115 98 +24 90 90 +32 74 90 +32 65 82 diff --git a/graphics/intro/unk_8402D54.png b/graphics/intro/unk_8402D54.png Binary files differnew file mode 100644 index 000000000..0f487f0bd --- /dev/null +++ b/graphics/intro/unk_8402D54.png diff --git a/graphics/intro/unk_8403FE8.bin b/graphics/intro/unk_8403FE8.bin Binary files differnew file mode 100644 index 000000000..c81ca17d1 --- /dev/null +++ b/graphics/intro/unk_8403FE8.bin diff --git a/graphics/intro/unk_84048CC.pal b/graphics/intro/unk_84048CC.pal new file mode 100644 index 000000000..ef08ae2fe --- /dev/null +++ b/graphics/intro/unk_84048CC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 255 +255 255 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +238 246 246 +222 230 230 +180 189 197 +148 156 172 +106 123 139 +74 90 115 +41 57 90 +0 0 0 diff --git a/graphics/intro/unk_84048EC.png b/graphics/intro/unk_84048EC.png Binary files differnew file mode 100644 index 000000000..577f1926d --- /dev/null +++ b/graphics/intro/unk_84048EC.png diff --git a/graphics/intro/unk_8404F7C.bin b/graphics/intro/unk_8404F7C.bin Binary files differnew file mode 100644 index 000000000..fd7aef605 --- /dev/null +++ b/graphics/intro/unk_8404F7C.bin diff --git a/graphics/intro/unk_84053B4.pal b/graphics/intro/unk_84053B4.pal new file mode 100644 index 000000000..3567f4cff --- /dev/null +++ b/graphics/intro/unk_84053B4.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +0 0 0 +131 238 115 +82 189 74 +57 164 57 +115 213 98 +16 123 16 +164 255 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 148 0 +164 222 98 +0 0 0 +82 98 115 +98 189 123 +139 156 172 +65 139 98 +238 246 246 +106 172 57 +189 189 213 +148 213 82 +106 180 41 +164 131 41 +115 98 49 +82 74 57 +222 222 230 +32 65 90 +24 115 65 +0 0 0 +156 230 156 +131 205 148 +106 180 131 +65 139 98 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/intro/unk_8405414.png b/graphics/intro/unk_8405414.png Binary files differnew file mode 100644 index 000000000..254ec3b06 --- /dev/null +++ b/graphics/intro/unk_8405414.png diff --git a/graphics/intro/unk_8405890.bin b/graphics/intro/unk_8405890.bin Binary files differnew file mode 100644 index 000000000..aea2053b3 --- /dev/null +++ b/graphics/intro/unk_8405890.bin diff --git a/graphics/intro/unk_8405B08.pal b/graphics/intro/unk_8405B08.pal new file mode 100644 index 000000000..43cc9d949 --- /dev/null +++ b/graphics/intro/unk_8405B08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +131 238 115 +82 189 74 +57 164 57 +115 213 98 +16 123 16 +164 255 131 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 148 0 +164 222 98 diff --git a/graphics/intro/unk_8405B28.png b/graphics/intro/unk_8405B28.png Binary files differnew file mode 100644 index 000000000..45400d46d --- /dev/null +++ b/graphics/intro/unk_8405B28.png diff --git a/graphics/intro/unk_8405CDC.bin b/graphics/intro/unk_8405CDC.bin Binary files differnew file mode 100644 index 000000000..32cd439b8 --- /dev/null +++ b/graphics/intro/unk_8405CDC.bin diff --git a/graphics/intro/unk_8405DA4.pal b/graphics/intro/unk_8405DA4.pal new file mode 100644 index 000000000..79d568984 --- /dev/null +++ b/graphics/intro/unk_8405DA4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +197 222 205 +255 255 255 +222 222 222 +123 123 123 +255 0 255 +255 0 255 +255 0 255 +65 41 74 +255 180 123 +238 98 74 +205 57 32 +197 131 180 +164 98 148 +131 65 123 +90 57 90 +16 16 16 diff --git a/graphics/intro/unk_8405DC4.png b/graphics/intro/unk_8405DC4.png Binary files differnew file mode 100644 index 000000000..8ae6ba691 --- /dev/null +++ b/graphics/intro/unk_8405DC4.png diff --git a/graphics/intro/unk_840644C.bin b/graphics/intro/unk_840644C.bin Binary files differnew file mode 100644 index 000000000..3a6ca9351 --- /dev/null +++ b/graphics/intro/unk_840644C.bin diff --git a/graphics/intro/unk_8406634.pal b/graphics/intro/unk_8406634.pal new file mode 100644 index 000000000..8e13fe902 --- /dev/null +++ b/graphics/intro/unk_8406634.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 123 41 +65 148 90 +49 115 74 +106 57 98 +49 115 98 +82 205 156 +49 164 115 +255 255 255 +106 189 115 +90 41 82 +222 180 205 +189 131 189 +139 90 148 +205 205 222 +131 131 131 +16 16 16 diff --git a/graphics/intro/unk_8406654.png b/graphics/intro/unk_8406654.png Binary files differnew file mode 100644 index 000000000..4c6c06681 --- /dev/null +++ b/graphics/intro/unk_8406654.png diff --git a/graphics/intro/unk_84071D0.bin b/graphics/intro/unk_84071D0.bin Binary files differnew file mode 100644 index 000000000..37b2b07d8 --- /dev/null +++ b/graphics/intro/unk_84071D0.bin diff --git a/graphics/intro/unk_8407430.pal b/graphics/intro/unk_8407430.pal new file mode 100644 index 000000000..5c34c44c8 --- /dev/null +++ b/graphics/intro/unk_8407430.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +82 98 115 +98 189 123 +139 156 172 +65 139 98 +238 246 246 +106 172 57 +189 189 213 +148 213 82 +106 180 41 +164 131 41 +115 98 49 +82 74 57 +222 222 230 +32 65 90 +24 115 65 +0 0 0 +164 238 139 +57 148 57 +131 213 115 +156 230 156 +131 205 148 +106 180 131 +65 139 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 0 0 diff --git a/graphics/intro/unk_8407470.png b/graphics/intro/unk_8407470.png Binary files differnew file mode 100644 index 000000000..809c259bf --- /dev/null +++ b/graphics/intro/unk_8407470.png diff --git a/graphics/intro/unk_8407A50.bin b/graphics/intro/unk_8407A50.bin Binary files differnew file mode 100644 index 000000000..6a70c1dc0 --- /dev/null +++ b/graphics/intro/unk_8407A50.bin diff --git a/graphics/intro/unk_8407B9C.png b/graphics/intro/unk_8407B9C.png Binary files differnew file mode 100644 index 000000000..75528b3b6 --- /dev/null +++ b/graphics/intro/unk_8407B9C.png diff --git a/graphics/intro/unk_8408D98.bin b/graphics/intro/unk_8408D98.bin Binary files differnew file mode 100644 index 000000000..6e02db72d --- /dev/null +++ b/graphics/intro/unk_8408D98.bin diff --git a/ld_script.txt b/ld_script.txt index f2f738c84..762ec2710 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -419,6 +419,9 @@ SECTIONS { data/data_83F5738.o(.rodata); src/save.o(.rodata); data/data_83FECCC.o(.rodata); + src/intro.o(.rodata); + data/intro.o(.rodata); + data/data_83FECCC.o(.rodata.battle_anim_special); data/strings.o(.rodata); data/data_83FECCC.o(.rodata.841EE44); src/new_menu_helpers.o(.rodata); diff --git a/src/intro.c b/src/intro.c index b57b538f0..a7ad6c56a 100644 --- a/src/intro.c +++ b/src/intro.c @@ -82,7 +82,7 @@ void sub_80EEBE4(void); extern const u32 gMultiBootProgram_PokemonColosseum_Start[]; -extern const u8 gUnknown_8402260[]; +extern const u16 gUnknown_8402260[]; extern const u8 gUnknown_8402280[]; extern const u8 gUnknown_84024E4[]; extern const u16 gUnknown_8402630[]; |
