Fix blank.4bpp build error from before (#12)
2
Makefile
@ -69,7 +69,7 @@ include castform.mk
|
||||
include tilesets.mk
|
||||
include fonts.mk
|
||||
include generated.mk
|
||||
include menu.mk
|
||||
include misc.mk
|
||||
|
||||
%.png: ;
|
||||
%.pal: ;
|
||||
|
23
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
|
||||
|
@ -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
|
||||
|
BIN
graphics/interface/blank.png
Executable file
After Width: | Height: | Size: 88 B |
19
graphics/intro/intro.pal
Executable file
@ -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
|
BIN
graphics/intro/intro1.png
Executable file
After Width: | Height: | Size: 462 B |
BIN
graphics/intro/intro1_bg.png
Executable file
After Width: | Height: | Size: 912 B |
19
graphics/intro/intro1_bgpal1.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal10.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal11.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal12.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal13.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal14.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal15.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal16.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal2.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal3.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal4.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal5.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal6.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal7.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal8.pal
Executable file
@ -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
|
19
graphics/intro/intro1_bgpal9.pal
Executable file
@ -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
|
19
graphics/intro/intro1_gamefreak.pal
Executable file
@ -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
|
BIN
graphics/intro/intro1_gamefreak.png
Executable file
After Width: | Height: | Size: 706 B |
BIN
graphics/intro/intro1_leaves.png
Executable file
After Width: | Height: | Size: 4.9 KiB |
BIN
graphics/intro/intro1_waterdrops.png
Executable file
After Width: | Height: | Size: 462 B |
BIN
graphics/intro/intro2.png
Executable file
After Width: | Height: | Size: 706 B |
5
menu.mk
@ -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 >$@
|
14
misc.mk
Executable file
@ -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 >$@
|