From d2053c12c231765b023f5736b3b65c813d1898da Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 26 Aug 2018 13:08:01 -0400 Subject: [PATCH] wCreditsFaux2bpp -> wCreditsBlankFrame2bpp, with the right buffer size Remove some unused WRAM labels --- engine/movie/credits.asm | 6 +++--- wram.asm | 20 ++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index f3939004c..8420725f3 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -20,8 +20,8 @@ Credits:: call ClearTileMap call ClearSprites - ld hl, wCreditsFaux2bpp - ld c, wCreditsFaux2bppEnd - wCreditsFaux2bpp + ld hl, wCreditsBlankFrame2bpp + ld c, (wCreditsBlankFrame2bppEnd - wCreditsBlankFrame2bpp) / 2 ld de, `22222222 ; eight pixels, each with color #2 .load_loop @@ -561,7 +561,7 @@ Credits_LoadBorderGFX: ret .init - ld hl, wCreditsFaux2bpp + ld hl, wCreditsBlankFrame2bpp ret .Frames: diff --git a/wram.asm b/wram.asm index 1c0bdd547..481b201b9 100644 --- a/wram.asm +++ b/wram.asm @@ -1069,26 +1069,22 @@ wc9f9:: ds 7 UNION ; ca00 ; blank credits tile buffer -wCreditsFaux2bpp:: ds 8 * LEN_2BPP_TILE -wCreditsFaux2bppEnd:: +wCreditsBlankFrame2bpp:: ds 16 tiles +wCreditsBlankFrame2bppEnd:: NEXTU ; ca00 ; mystery gift data wca00:: db wca01:: db wca02:: db - ds 160 -ENDU ; caa3 -wcaa3:: ds 2 -wcaa5:: ds 16 -wcab5:: ds 10 -wcabf:: ds 10 -wcac9:: ds 63 -wcb08:: ds 6 +NEXTU ; ca00 +; link data + ds 191 +wcabf:: ds 79 wcb0e:: ds 5 -wcb13:: ds 9 -wcb1c:: ds 14 +wcb13:: ds 23 +ENDU ; cb2a wBillsPC_ScrollPosition:: db wBillsPC_CursorPosition:: db