diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-06-19 00:14:16 -0400 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-18 21:14:16 -0700 |
| commit | 42f11811599b01d0233b360758f5bd9b3c5bcdfb (patch) | |
| tree | 8b0e48de9b6123aa7358f7c886f9992b6f97b0c4 | |
| parent | fa78910a6b08c5d812f64f28398f0a0583a8d6e4 (diff) | |
Fix blank.4bpp build error from before (#12)
30 files changed, 380 insertions, 10 deletions
@@ -69,7 +69,7 @@ include castform.mk include tilesets.mk include fonts.mk include generated.mk -include menu.mk +include misc.mk %.png: ; %.pal: ; diff --git a/data/data2.s b/data/data2.s index d83c82127..7d8a78d47 100644 --- a/data/data2.s +++ b/data/data2.s @@ -13186,11 +13186,27 @@ gUnknown_08406334: @ 8406334 .global gUnknown_0840633A gUnknown_0840633A: @ 840633A - .incbin "baserom.gba", 0x0040633a, 0x63a + .incbin "baserom.gba", 0x0040633a, 0x46 + .incbin "graphics/intro/intro.4bpp.lz" .global gUnknown_08406974 gUnknown_08406974: @ 8406974 - .incbin "baserom.gba", 0x00406974, 0x200 + .incbin "graphics/intro/intro1_bgpal1.gbapal" + .incbin "graphics/intro/intro1_bgpal2.gbapal" + .incbin "graphics/intro/intro1_bgpal3.gbapal" + .incbin "graphics/intro/intro1_bgpal4.gbapal" + .incbin "graphics/intro/intro1_bgpal5.gbapal" + .incbin "graphics/intro/intro1_bgpal6.gbapal" + .incbin "graphics/intro/intro1_bgpal7.gbapal" + .incbin "graphics/intro/intro1_bgpal8.gbapal" + .incbin "graphics/intro/intro1_bgpal9.gbapal" + .incbin "graphics/intro/intro1_bgpal10.gbapal" + .incbin "graphics/intro/intro1_bgpal11.gbapal" + .incbin "graphics/intro/intro1_bgpal12.gbapal" + .incbin "graphics/intro/intro1_bgpal13.gbapal" + .incbin "graphics/intro/intro1_bgpal14.gbapal" + .incbin "graphics/intro/intro1_bgpal15.gbapal" + .incbin "graphics/intro/intro1_bgpal16.gbapal" .global gUnknown_08406B74 gUnknown_08406B74: @ 8406B74 @@ -13210,7 +13226,8 @@ gUnknown_0840754C: @ 840754C .global gUnknown_08407764 gUnknown_08407764: @ 8407764 - .incbin "baserom.gba", 0x00407764, 0x2170 +@ replacing .incbin "baserom.gba", 0x00407764, 0x2170 + .incbin "graphics/intro/introgfx.4bpp.lz" .global gUnknown_084098D4 gUnknown_084098D4: @ 84098D4 diff --git a/data/graphics.s b/data/graphics.s index 717007b9b..a8f2cdf68 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -122,7 +122,9 @@ gInterfacePal_PremierBall: .global gUnknown_08D030D0 gUnknown_08D030D0: @ 8D030D0 - .incbin "baserom.gba", 0xD030D0, 0x6B78 + .incbin "graphics/interface/ball_open.4bpp.lz" + .incbin "graphics/interface/blank.4bpp.lz" + .incbin "baserom.gba", 0x00d03248, 0x6A00 .global gUnknown_08D09C48 gUnknown_08D09C48: @ 8D09C48 diff --git a/graphics/interface/blank.png b/graphics/interface/blank.png Binary files differnew file mode 100755 index 000000000..3a4ba289c --- /dev/null +++ b/graphics/interface/blank.png diff --git a/graphics/intro/intro.pal b/graphics/intro/intro.pal new file mode 100755 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/intro.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/intro1.png b/graphics/intro/intro1.png Binary files differnew file mode 100755 index 000000000..13dd3e216 --- /dev/null +++ b/graphics/intro/intro1.png diff --git a/graphics/intro/intro1_bg.png b/graphics/intro/intro1_bg.png Binary files differnew file mode 100755 index 000000000..14b3cb5ec --- /dev/null +++ b/graphics/intro/intro1_bg.png diff --git a/graphics/intro/intro1_bgpal1.pal b/graphics/intro/intro1_bgpal1.pal new file mode 100755 index 000000000..3617c25a8 --- /dev/null +++ b/graphics/intro/intro1_bgpal1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal10.pal b/graphics/intro/intro1_bgpal10.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal10.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 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 diff --git a/graphics/intro/intro1_bgpal11.pal b/graphics/intro/intro1_bgpal11.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal11.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 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 diff --git a/graphics/intro/intro1_bgpal12.pal b/graphics/intro/intro1_bgpal12.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal12.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 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 diff --git a/graphics/intro/intro1_bgpal13.pal b/graphics/intro/intro1_bgpal13.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal13.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 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 diff --git a/graphics/intro/intro1_bgpal14.pal b/graphics/intro/intro1_bgpal14.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal14.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 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 diff --git a/graphics/intro/intro1_bgpal15.pal b/graphics/intro/intro1_bgpal15.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal15.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 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 diff --git a/graphics/intro/intro1_bgpal16.pal b/graphics/intro/intro1_bgpal16.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal16.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 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 diff --git a/graphics/intro/intro1_bgpal2.pal b/graphics/intro/intro1_bgpal2.pal new file mode 100755 index 000000000..3617c25a8 --- /dev/null +++ b/graphics/intro/intro1_bgpal2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal3.pal b/graphics/intro/intro1_bgpal3.pal new file mode 100755 index 000000000..8a1fb05a5 --- /dev/null +++ b/graphics/intro/intro1_bgpal3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 82 0 +32 90 0 +41 98 0 +49 115 0 +57 123 0 +65 139 0 +74 148 0 +82 156 0 +90 172 0 +0 16 0 +8 41 0 +16 57 0 +123 197 16 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal4.pal b/graphics/intro/intro1_bgpal4.pal new file mode 100755 index 000000000..9761c8fac --- /dev/null +++ b/graphics/intro/intro1_bgpal4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 82 0 +32 90 0 +41 98 0 +49 115 0 +57 123 0 +65 139 0 +74 148 0 +82 156 0 +90 172 0 +8 24 8 +8 41 0 +16 57 0 +148 205 98 +98 172 74 +238 255 238 diff --git a/graphics/intro/intro1_bgpal5.pal b/graphics/intro/intro1_bgpal5.pal new file mode 100755 index 000000000..3617c25a8 --- /dev/null +++ b/graphics/intro/intro1_bgpal5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +24 90 0 +49 115 0 +65 139 0 +90 172 0 +164 172 255 +164 197 255 +139 213 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 205 98 +180 255 131 +164 238 98 diff --git a/graphics/intro/intro1_bgpal6.pal b/graphics/intro/intro1_bgpal6.pal new file mode 100755 index 000000000..c242494ac --- /dev/null +++ b/graphics/intro/intro1_bgpal6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +246 246 238 +238 246 230 +230 246 222 +205 238 222 +180 230 230 +172 213 238 +131 205 238 +180 180 156 +213 213 230 +205 197 213 +189 230 115 +156 213 98 +222 230 222 +115 172 98 diff --git a/graphics/intro/intro1_bgpal7.pal b/graphics/intro/intro1_bgpal7.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal7.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 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 diff --git a/graphics/intro/intro1_bgpal8.pal b/graphics/intro/intro1_bgpal8.pal new file mode 100755 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/intro1_bgpal8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/intro1_bgpal9.pal b/graphics/intro/intro1_bgpal9.pal new file mode 100755 index 000000000..4b0812f09 --- /dev/null +++ b/graphics/intro/intro1_bgpal9.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 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 diff --git a/graphics/intro/intro1_gamefreak.pal b/graphics/intro/intro1_gamefreak.pal new file mode 100755 index 000000000..aef9152e4 --- /dev/null +++ b/graphics/intro/intro1_gamefreak.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +156 246 0 +65 90 156 +49 115 255 +82 82 82 +98 98 98 +115 115 115 +131 131 131 +148 148 148 +164 164 164 +180 180 180 +197 197 197 +213 213 213 +230 230 230 +255 255 255 +255 255 255 diff --git a/graphics/intro/intro1_gamefreak.png b/graphics/intro/intro1_gamefreak.png Binary files differnew file mode 100755 index 000000000..fe734a591 --- /dev/null +++ b/graphics/intro/intro1_gamefreak.png diff --git a/graphics/intro/intro1_leaves.png b/graphics/intro/intro1_leaves.png Binary files differnew file mode 100755 index 000000000..38c442b24 --- /dev/null +++ b/graphics/intro/intro1_leaves.png diff --git a/graphics/intro/intro1_waterdrops.png b/graphics/intro/intro1_waterdrops.png Binary files differnew file mode 100755 index 000000000..13dd3e216 --- /dev/null +++ b/graphics/intro/intro1_waterdrops.png diff --git a/graphics/intro/intro2.png b/graphics/intro/intro2.png Binary files differnew file mode 100755 index 000000000..fe734a591 --- /dev/null +++ b/graphics/intro/intro2.png diff --git a/menu.mk b/menu.mk deleted file mode 100755 index b4135ad72..000000000 --- a/menu.mk +++ /dev/null @@ -1,5 +0,0 @@ -MENUGFXDIR := graphics/interface - -$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal - - @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
\ No newline at end of file diff --git a/misc.mk b/misc.mk new file mode 100755 index 000000000..b0c3c7a66 --- /dev/null +++ b/misc.mk @@ -0,0 +1,14 @@ +MENUGFXDIR := graphics/interface +INTROGFXDIR := graphics/intro + +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal + + @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ + +$(INTROGFXDIR)/intro.4bpp: $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp + + @cat $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp >$@ + +$(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp + + @cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@ |
