diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/crystal_intro.asm | 3 | ||||
| -rwxr-xr-x | engine/evolve.asm | 2 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 2 | ||||
| -rwxr-xr-x | engine/timeset.asm | 6 | ||||
| -rw-r--r-- | engine/title.asm | 6 | ||||
| -rwxr-xr-x | engine/trainer_card.asm | 4 |
6 files changed, 12 insertions, 11 deletions
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index e324ed476..1c0d7cd3e 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -367,7 +367,8 @@ GameFreakLogoPalettes: ; e47ac ; e47cc GameFreakLogo: ; e47cc -INCBIN "gfx/splash/logo.1bpp" +INCBIN "gfx/splash/logo1.1bpp" +INCBIN "gfx/splash/logo2.1bpp" ; e48ac CrystalIntro: ; e48ac diff --git a/engine/evolve.asm b/engine/evolve.asm index 2f7739191..3dc5d20b7 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -119,7 +119,7 @@ EvolveAfterBattle_MasterLoop .happiness ld a, [TempMonHappiness] - cp 220 + cp HAPPINESS_TO_EVOLVE jp c, .dont_evolve_2 call IsMonHoldingEverstone diff --git a/engine/pokegear.asm b/engine/pokegear.asm index c6ea8ed4f..8e5697f75 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2987,7 +2987,7 @@ INCBIN "gfx/misc/kanto.bin" PokedexNestIconGFX: ; 922d1 INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: ; 922e1 -INCBIN "gfx/pokegear/flymap_label_border.2bpp" +INCBIN "gfx/pokegear/flymap_label_border.1bpp" ; XXX xor a diff --git a/engine/timeset.asm b/engine/timeset.asm index f828b0ff8..d560ae817 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -397,11 +397,11 @@ OakText_ResponseToSetTime: ; 0x908b8 ; 0x908fb GFX_908fb: ; 908fb -INCBIN "gfx/unknown/0908fb.2bpp" +INCBIN "gfx/unknown/0908fb.1bpp" GFX_90903: ; 90903 -INCBIN "gfx/unknown/090903.2bpp" +INCBIN "gfx/unknown/090903.1bpp" GFX_9090b: ; 9090b -INCBIN "gfx/unknown/09090b.2bpp" +INCBIN "gfx/unknown/09090b.1bpp" ; 90913 Special_SetDayOfWeek: ; 90913 diff --git a/engine/title.asm b/engine/title.asm index 787872939..36e2851d3 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -387,15 +387,15 @@ AnimateTitleCrystal: ; 10ef32 ; 10ef46 TitleSuicuneGFX: ; 10ef46 -INCBIN "gfx/title/suicune.w128.2bpp.lz" +INCBIN "gfx/title/suicune.2bpp.lz" ; 10f326 TitleLogoGFX: ; 10f326 -INCBIN "gfx/title/logo.w160.t4.2bpp.lz" +INCBIN "gfx/title/logo.2bpp.lz" ; 10fcee TitleCrystalGFX: ; 10fcee -INCBIN "gfx/title/crystal.w48.interleave.2bpp.lz" +INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index a993ce4ba..23defe919 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -608,8 +608,8 @@ TrainerCard_JohtoBadgesOAM: ; 254c9 CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" -LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" -LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" +LeaderGFX: INCBIN "gfx/misc/leaders.2bpp" +LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp" BadgeGFX: INCBIN "gfx/misc/badges.2bpp" BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" |