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 /data | |
| parent | fa78910a6b08c5d812f64f28398f0a0583a8d6e4 (diff) | |
Fix blank.4bpp build error from before (#12)
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 23 | ||||
| -rw-r--r-- | data/graphics.s | 4 |
2 files changed, 23 insertions, 4 deletions
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 |