From 0caea0f8202bf4cedb967a844a96cee04386b8df Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Tue, 2 Jan 2018 16:46:40 -0500 Subject: Use BANK for all hardcoded banks with BANK in comments. --- engine/title.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index 2380cfedf..2b43c811a 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -162,7 +162,7 @@ _TitleScreen: ; 10ed67 ld a, [rSVBK] push af - ld a, 5 ; BANK(LYOverrides) + ld a, BANK(LYOverrides) ld [rSVBK], a ; Make alternating lines come in from opposite sides -- cgit v1.2.3 From 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 19:12:45 -0500 Subject: Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). --- engine/title.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index 2b43c811a..1b7ae66e0 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -139,7 +139,7 @@ _TitleScreen: ; 10ed67 ld a, [rSVBK] push af ; WRAM bank 5 - ld a, 5 + ld a, BANK(wBGPals1) ld [rSVBK], a ; Update palette colors -- cgit v1.2.3 From a8cf8979d9acf66d1bdf4ea115ab6a0faa8f9d34 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 17:20:47 -0500 Subject: Do a little cleanup towards issue #465 --- engine/title.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index 2380cfedf..3e4afafa2 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -237,11 +237,11 @@ SuicuneFrameIterator: ; 10eea7 inc [hl] ; Only do this once every eight frames - and (1 << 3) - 1 + and %111 ret nz ld a, c - and 3 << 3 + and %11000 sla a swap a ld e, a -- cgit v1.2.3 From f22485b08d5378015f3248b7a758ea0d25eb0c7d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 22:44:06 -0500 Subject: Binary tilemaps --- engine/title.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index 3e4afafa2..9d8ce1d3f 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -167,8 +167,8 @@ _TitleScreen: ; 10ed67 ; Make alternating lines come in from opposite sides -; ( This part is actually totally pointless, you can't -; see anything until these values are overwritten! ) +; (This part is actually totally pointless, you can't +; see anything until these values are overwritten!) ld b, 80 / 2 ; alternate for 80 lines ld hl, LYOverrides -- cgit v1.2.3 From 5c5f8b325fe5900a3800a976a1a31e99934f6815 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 23:21:32 -0500 Subject: Move data/palettes/ .pal files into gfx/ --- engine/title.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index 9d8ce1d3f..5f9ca82f7 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -399,4 +399,4 @@ INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: -INCLUDE "data/palettes/title.pal" +INCLUDE "gfx/title/title.pal" -- cgit v1.2.3 From 417937cffc2a7c3cfac49f3b00caf1a856d0a925 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 13:47:57 -0500 Subject: Resolve #461 --- engine/title.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index 5f9ca82f7..d3cb7f4c8 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -323,7 +323,7 @@ DrawTitleGraphic: ; 10eeef ; 10ef06 InitializeBackground: ; 10ef06 - ld hl, Sprites + ld hl, Sprite01 ld d, -$22 ld e, $0 ld c, 5 @@ -344,17 +344,17 @@ InitializeBackground: ; 10ef06 ld b, $40 .loop2 ld a, d - ld [hli], a + ld [hli], a ; y ld a, b - ld [hli], a + ld [hli], a ; x add $8 ld b, a ld a, e - ld [hli], a + ld [hli], a ; tile id inc e inc e - ld a, $80 - ld [hli], a + ld a, 0 | BEHIND_BG + ld [hli], a ; attributes dec c jr nz, .loop2 ret @@ -366,9 +366,9 @@ AnimateTitleCrystal: ; 10ef32 ; Stop at y=6 ; y is really from the bottom of the sprite, which is two tiles high - ld hl, Sprites + ld hl, Sprite01YCoord ld a, [hl] - cp 6 + $10 + cp 6 + 2 * TILE_WIDTH ret z ; Move all 30 parts of the crystal down by 2 @@ -376,10 +376,10 @@ AnimateTitleCrystal: ; 10ef32 .loop ld a, [hl] add 2 - ld [hli], a - inc hl - inc hl + ld [hli], a ; y +rept SPRITEOAMSTRUCT_LENGTH +- 1 inc hl +endr dec c jr nz, .loop -- cgit v1.2.3 From af4001132e3ead7da12faaf6e2a09b548fb98490 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 23:50:44 -0500 Subject: Break up engine/events_3.asm --- engine/title.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/title.asm') diff --git a/engine/title.asm b/engine/title.asm index d3cb7f4c8..bf6ea79bf 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -353,7 +353,7 @@ InitializeBackground: ; 10ef06 ld [hli], a ; tile id inc e inc e - ld a, 0 | BEHIND_BG + ld a, 0 | PRIORITY ld [hli], a ; attributes dec c jr nz, .loop2 -- cgit v1.2.3