diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-14 17:49:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 17:49:36 -0400 |
| commit | 7f6bc3d3826fe7727bdc8714aa0295a712a548c3 (patch) | |
| tree | aca0979818b88f0e27f18b95d87a006767cf89fb /engine | |
| parent | dd97bedd52f97122c0d4a06eb30c0b571ddda343 (diff) | |
| parent | 0e5edf03ff4ba5ad0c6740eefd0e28ae5eca10c4 (diff) | |
Merge pull request #50 from entrpntr/pics2
Switch to building binary pic files from pngs
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/movie/gold_silver_intro.asm | 14 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/movie/gold_silver_intro.asm b/engine/movie/gold_silver_intro.asm index 7195e7dc..7f4be3bb 100644 --- a/engine/movie/gold_silver_intro.asm +++ b/engine/movie/gold_silver_intro.asm @@ -1571,7 +1571,7 @@ Intro_ResetLYOverrides: ret Intro_WaterGFX1: -INCBIN "gfx/intro/water1.2bpp.lz" +INCBIN "gfx/intro/water1.2bpp.lz.bin" Intro_WaterTilemap: INCBIN "gfx/intro/water.tilemap" @@ -1580,10 +1580,10 @@ Intro_WaterMeta: INCBIN "gfx/intro/water.bin" Intro_WaterGFX2: -INCBIN "gfx/intro/water2.2bpp.lz" +INCBIN "gfx/intro/water2.2bpp.lz.bin" Intro_GrassGFX1: -INCBIN "gfx/intro/grass1.2bpp.lz" +INCBIN "gfx/intro/grass1.2bpp.lz.bin" Intro_GrassTilemap: INCBIN "gfx/intro/grass.tilemap" @@ -1592,13 +1592,13 @@ Intro_GrassMeta: INCBIN "gfx/intro/grass.bin" Intro_GrassGFX2: -INCBIN "gfx/intro/grass2.2bpp.lz" +INCBIN "gfx/intro/grass2.2bpp.lz.bin" Intro_FireGFX1: -INCBIN "gfx/intro/charizard1.2bpp.lz" +INCBIN "gfx/intro/charizard1.2bpp.lz.bin" Intro_FireGFX2: -INCBIN "gfx/intro/charizard2.2bpp.lz" +INCBIN "gfx/intro/charizard2.2bpp.lz.bin" Intro_FireGFX3: -INCBIN "gfx/intro/charizard3.2bpp.lz" +INCBIN "gfx/intro/charizard3.2bpp.lz.bin" diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index fa610df1..733c30b9 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2185,7 +2185,7 @@ BillsPC_InitGFX: call EnableLCD ret -PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz" +PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz.bin" PCMailGFX: INCBIN "gfx/pc/pc_mail.2bpp" PCString_ChooseaPKMN: db "Choose a <PK><MN>.@" |