diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | engine/movie/title.asm | 29 | ||||
| -rwxr-xr-x | gfx/title/logo.tilemap | bin | 0 -> 577 bytes | |||
| -rwxr-xr-x | gfx/title/logo_bottom_gold.2bpp.lz | bin | 0 -> 1142 bytes | |||
| -rwxr-xr-x | gfx/title/logo_bottom_silver.2bpp.lz | bin | 0 -> 1176 bytes | |||
| -rwxr-xr-x | gfx/title/logo_top_gold.2bpp.lz | bin | 0 -> 416 bytes | |||
| -rwxr-xr-x | gfx/title/logo_top_silver.2bpp.lz | bin | 0 -> 402 bytes | |||
| -rw-r--r-- | main.asm | 15 |
8 files changed, 28 insertions, 17 deletions
@@ -63,3 +63,4 @@ gfx/pokedex/pokedex_sgb.2bpp gfx/pokedex/question_mark.2bpp gfx/tilesets/*.2bpp gfx/battle_anims/*.2bpp +gfx/title/*.2bpp diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 0545b8f1..0ba2720a 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -7,8 +7,11 @@ TitleScreen: call ClearTilemap call DisableLCD call ClearSprites + +; Turn BG Map update off xor a ldh [hBGMapMode], a + ldh [hMapAnims], a ldh [hSCY], a ldh [hSCX], a @@ -19,21 +22,25 @@ TitleScreen: call ByteFill farcall ClearSpriteAnims +; Decompress lower part of title screen ld hl, TitleScreenGFX1 ld de, vTiles2 ld a, BANK(TitleScreenGFX1) call FarDecompress +; Decompress upper part of title screen ld hl, TitleScreenGFX2 ld de, vTiles1 ld a, BANK(TitleScreenGFX2) call FarDecompress +; Decompress Ho-Oh/Lugia sprite ld hl, TitleScreenGFX4 ld de, vTiles0 ld a, BANK(TitleScreenGFX4) call FarDecompress +; Decompress Ho-Oh/Lugia sparkle ld hl, TitleScreenGFX3 ld de, vTiles1 tile $78 ld bc, 8 tiles @@ -41,7 +48,7 @@ TitleScreen: call FarCopyBytes call FillTitleScreenPals - call Function63b6 + call LoadTitleScreenTilemap ld hl, wSpriteAnimDict xor a ld [hli], a @@ -49,12 +56,15 @@ TitleScreen: ld hl, rLCDC set rLCDC_SPRITE_SIZE, [hl] call EnableLCD + +; Reset timing variables xor a ld hl, wJumptableIndex ld [hli], a ; wJumptableIndex ld [hli], a ; wIntroSceneFrameCounter ld [hli], a ; wTitleScreenTimer ld [hl], a ; wTitleScreenTimer + 1 + depixel 12, 11 ld a, SPRITE_ANIM_INDEX_GS_INTRO_HO_OH call InitSpriteAnimStruct @@ -63,7 +73,8 @@ TitleScreen: ld bc, NUM_SPRITE_ANIM_STRUCTS call CopyBytes ld hl, wSpriteAnim1 - ld [hl], $0 + ld [hl], 0 + ld hl, wLYOverrides ld bc, wLYOverridesEnd - wLYOverrides xor a @@ -168,20 +179,20 @@ DrawTitleGraphic: jr nz, .bgrows ret -Function63b6: - ld hl, GSIntroTilemap +LoadTitleScreenTilemap: + ld hl, TitleScreenTilemap debgcoord 0, 0 -.asm_63bc - ld a, BANK(GSIntroTilemap) +.loop + ld a, BANK(TitleScreenTilemap) call GetFarByte cp -1 - jr z, .asm_63ca + jr z, .done inc hl ld [de], a inc de - jr .asm_63bc + jr .loop -.asm_63ca +.done ldh a, [hCGB] and a ret nz diff --git a/gfx/title/logo.tilemap b/gfx/title/logo.tilemap Binary files differnew file mode 100755 index 00000000..f214ff8b --- /dev/null +++ b/gfx/title/logo.tilemap diff --git a/gfx/title/logo_bottom_gold.2bpp.lz b/gfx/title/logo_bottom_gold.2bpp.lz Binary files differnew file mode 100755 index 00000000..eb9ff7f8 --- /dev/null +++ b/gfx/title/logo_bottom_gold.2bpp.lz diff --git a/gfx/title/logo_bottom_silver.2bpp.lz b/gfx/title/logo_bottom_silver.2bpp.lz Binary files differnew file mode 100755 index 00000000..09683bb6 --- /dev/null +++ b/gfx/title/logo_bottom_silver.2bpp.lz diff --git a/gfx/title/logo_top_gold.2bpp.lz b/gfx/title/logo_top_gold.2bpp.lz Binary files differnew file mode 100755 index 00000000..615d2f30 --- /dev/null +++ b/gfx/title/logo_top_gold.2bpp.lz diff --git a/gfx/title/logo_top_silver.2bpp.lz b/gfx/title/logo_top_silver.2bpp.lz Binary files differnew file mode 100755 index 00000000..9620ec0c --- /dev/null +++ b/gfx/title/logo_top_silver.2bpp.lz @@ -346,21 +346,20 @@ SECTION "bank26", ROMX IF DEF(_GOLD) TitleScreenGFX1:: - dr $98000, $98476 +INCBIN "gfx/title/logo_bottom_gold.2bpp.lz" TitleScreenGFX2:: - dr $98476, $98616 -GSIntroTilemap:: - dr $98616, $98857 +INCBIN "gfx/title/logo_top_gold.2bpp.lz" ELIF DEF(_SILVER) TitleScreenGFX1:: - dr $98000, $98498 +INCBIN "gfx/title/logo_bottom_silver.2bpp.lz" TitleScreenGFX2:: - dr $98498, $9862a -GSIntroTilemap:: - dr $9862a, $9886b +INCBIN "gfx/title/logo_top_silver.2bpp.lz" ENDC +TitleScreenTilemap:: +INCBIN "gfx/title/logo.tilemap" + SECTION "bank2E_2", ROMX |