Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-15 00:30:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered

Browse Source
This commit is contained in:
PikalaxALT 2019-06-11 07:08:19 -04:00
commit 9b58695341
6 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/graphics.s
View File

@ -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

BIN
graphics/teachy_tv/bg1_tilemap.bin Normal file
View File

Binary file not shown.

BIN
graphics/teachy_tv/bg2_tilemap.bin Normal file
View File

Binary file not shown.

67
graphics/teachy_tv/palettes.pal Normal file
View File

@ -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

BIN
graphics/teachy_tv/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

4
graphics_file_rules.mk
View File

@ -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