From 0e5edf03ff4ba5ad0c6740eefd0e28ae5eca10c4 Mon Sep 17 00:00:00 2001 From: entrpntr Date: Sun, 14 Jun 2020 17:19:40 -0400 Subject: Braindead matching for now (incbin .lz.bin for non-matching lz's). --- engine/movie/gold_silver_intro.asm | 14 +++++++------- engine/pokemon/bills_pc.asm | 2 +- gfx/font.asm | 2 +- gfx/pics_silver.asm | 4 ++-- main.asm | 12 ++++++------ 5 files changed, 17 insertions(+), 17 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 .@" diff --git a/gfx/font.asm b/gfx/font.asm index 8808f250..6d21bd49 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -31,7 +31,7 @@ ExpBarGFX: INCBIN "gfx/battle/expbar.2bpp" TownMapGFX: -INCBIN "gfx/pokegear/town_map.2bpp.lz" +INCBIN "gfx/pokegear/town_map.2bpp.lz.bin" PokegearPhoneIconGFX: INCBIN "gfx/font/phone_icon.2bpp" diff --git a/gfx/pics_silver.asm b/gfx/pics_silver.asm index 8635699b..b3bed876 100644 --- a/gfx/pics_silver.asm +++ b/gfx/pics_silver.asm @@ -60,7 +60,7 @@ LaprasFrontpic: INCBIN "gfx/pokemon/lapras/front_silver.2bpp.lz" KimonoGirlPic: INCBIN "gfx/trainers/kimono_girl.2bpp.lz" MagnetonFrontpic: INCBIN "gfx/pokemon/magneton/front_silver.2bpp.lz" KadabraFrontpic: INCBIN "gfx/pokemon/kadabra/front_silver.2bpp.lz" -AlakazamBackpic: INCBIN "gfx/pokemon/alakazam/back_silver.2bpp.lz" +AlakazamBackpic: INCBIN "gfx/pokemon/alakazam/back_silver.2bpp.lz.bin" HitmontopBackpic: INCBIN "gfx/pokemon/hitmontop/back_silver.2bpp.lz" CloysterBackpic: INCBIN "gfx/pokemon/cloyster/back.2bpp.lz" GolbatFrontpic: INCBIN "gfx/pokemon/golbat/front_silver.2bpp.lz" @@ -691,4 +691,4 @@ UnownPBackpic: INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" UnownIBackpic: INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" UnownIFrontpic: INCBIN "gfx/pokemon/unown_i/front.2bpp.lz" UnownRBackpic: INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" -UnownRFrontpic: INCBIN "gfx/pokemon/unown_r/front.2bpp.lz" \ No newline at end of file +UnownRFrontpic: INCBIN "gfx/pokemon/unown_r/front.2bpp.lz" diff --git a/main.asm b/main.asm index c8777586..1b420fd1 100644 --- a/main.asm +++ b/main.asm @@ -255,15 +255,15 @@ SECTION "bank26", ROMX IF DEF(_GOLD) TitleScreenGFX1: -INCBIN "gfx/title/logo_bottom_gold.2bpp.lz" +INCBIN "gfx/title/logo_bottom_gold.2bpp.lz.bin" TitleScreenGFX2: -INCBIN "gfx/title/logo_top_gold.2bpp.lz" +INCBIN "gfx/title/logo_top_gold.2bpp.lz.bin" ELIF DEF(_SILVER) TitleScreenGFX1: -INCBIN "gfx/title/logo_bottom_silver.2bpp.lz" +INCBIN "gfx/title/logo_bottom_silver.2bpp.lz.bin" TitleScreenGFX2: -INCBIN "gfx/title/logo_top_silver.2bpp.lz" +INCBIN "gfx/title/logo_top_silver.2bpp.lz.bin" ENDC TitleScreenTilemap: @@ -333,13 +333,13 @@ IF DEF(_GOLD) TitleScreenGFX3: INCBIN "gfx/title/title_trail_gold.2bpp" TitleScreenGFX4: -INCBIN "gfx/title/hooh_gold.2bpp.lz" +INCBIN "gfx/title/hooh_gold.2bpp.lz.bin" ELIF DEF(_SILVER) TitleScreenGFX3: INCBIN "gfx/title/title_trail_silver.2bpp" TitleScreenGFX4: -INCBIN "gfx/title/lugia_silver.2bpp.lz" +INCBIN "gfx/title/lugia_silver.2bpp.lz.bin" ENDC INCLUDE "engine/menus/options_menu.asm" -- cgit v1.2.3