diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-11 07:08:19 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-11 07:08:19 -0400 |
| commit | 9b58695341f0bb4291fcd4decd2292a1ebd0bcd7 (patch) | |
| tree | deef7672dd5902b0b6cf0db21c631d9d299789e0 /data | |
| parent | 611cd549db36619e7404110e792145fa9c39d24e (diff) | |
| parent | 8ffa9b4b65c22c89da8ef552c75fc1e198f03369 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 8 |
1 files changed, 4 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 |