diff options
| -rw-r--r-- | data/graphics.s | 8 | ||||
| -rw-r--r-- | graphics/teachy_tv/bg1_tilemap.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/teachy_tv/bg2_tilemap.bin | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | graphics/teachy_tv/palettes.pal | 67 | ||||
| -rw-r--r-- | graphics/teachy_tv/tiles.png | bin | 0 -> 1761 bytes | |||
| -rw-r--r-- | graphics_file_rules.mk | 4 |
6 files changed, 75 insertions, 4 deletions
diff --git a/data/graphics.s b/data/graphics.s index 284539152..4a40776d9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -14019,16 +14019,16 @@ gUnknown_8E861A8:: @ 8E861A8 .incbin "baserom.gba", 0xE861A8, 0x98 gUnknown_8E86240:: @ 8E86240 - .incbin "baserom.gba", 0xE86240, 0x9A8 + .incbin "graphics/teachy_tv/tiles.4bpp.lz" gUnknown_8E86BE8:: @ 8E86BE8 - .incbin "baserom.gba", 0xE86BE8, 0x184 + .incbin "graphics/teachy_tv/bg1_tilemap.bin.lz" gUnknown_8E86D6C:: @ 8E86D6C - .incbin "baserom.gba", 0xE86D6C, 0x22C + .incbin "graphics/teachy_tv/bg2_tilemap.bin.lz" gUnknown_8E86F98:: @ 8E86F98 - .incbin "baserom.gba", 0xE86F98, 0x78 + .incbin "graphics/teachy_tv/palettes.gbapal.lz" gUnknown_8E87010:: @ 8E87010 .incbin "baserom.gba", 0xE87010, 0x18 diff --git a/graphics/teachy_tv/bg1_tilemap.bin b/graphics/teachy_tv/bg1_tilemap.bin Binary files differnew file mode 100644 index 000000000..34dc439bc --- /dev/null +++ b/graphics/teachy_tv/bg1_tilemap.bin diff --git a/graphics/teachy_tv/bg2_tilemap.bin b/graphics/teachy_tv/bg2_tilemap.bin Binary files differnew file mode 100644 index 000000000..f51b3695f --- /dev/null +++ b/graphics/teachy_tv/bg2_tilemap.bin diff --git a/graphics/teachy_tv/palettes.pal b/graphics/teachy_tv/palettes.pal new file mode 100644 index 000000000..22808d3de --- /dev/null +++ b/graphics/teachy_tv/palettes.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +115 205 164 +255 255 255 +98 98 98 +255 230 90 +246 180 0 +189 115 0 +123 123 255 +74 65 74 +49 49 57 +98 106 106 +131 139 139 +255 0 255 +255 0 255 +255 255 180 +246 205 41 +213 156 16 +115 205 164 +255 255 255 +230 230 238 +205 213 222 +180 197 205 +164 180 189 +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 +115 205 164 +156 255 255 +255 255 255 +255 222 32 +246 230 164 +255 74 24 +255 148 139 +255 156 24 +131 230 222 +24 32 32 +156 189 213 +74 131 189 +90 222 164 +205 238 139 +255 0 255 +255 0 255 +115 205 164 +255 255 255 +98 98 98 +213 213 205 +230 8 8 +255 189 115 +32 156 8 +148 246 148 +49 82 205 +164 197 246 +255 0 255 +255 0 255 +74 65 74 +164 164 164 +197 197 205 +230 230 238 diff --git a/graphics/teachy_tv/tiles.png b/graphics/teachy_tv/tiles.png Binary files differnew file mode 100644 index 000000000..e867de82b --- /dev/null +++ b/graphics/teachy_tv/tiles.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 41b19433a..a1a00ad28 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -19,6 +19,7 @@ PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/event_objects MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window +TEACHYTVGFXDIR := graphics/teachy_tv types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -474,3 +475,6 @@ $(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 + +$(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 233 |
