Skip to content

Commit e4ae540

Browse files
committed
Fixed a bug with border on/off after adding smooth zoom.
1 parent 8bef8c1 commit e4ae540

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

source/Gfx.s

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ winLayouts: // Horizontal, Vertical
105105
.short (((SCREEN_HEIGHT-GAME_WIDTH)/2)<<8)+(SCREEN_HEIGHT+GAME_WIDTH)/2
106106
.short (0<<8)+SCREEN_WIDTH
107107
.short (((SCREEN_HEIGHT-((GAME_HEIGHT<<8)/ZOOM_VAL))/2)<<8) + ((SCREEN_HEIGHT+((GAME_HEIGHT<<8)/ZOOM_VAL))/2)
108+
.short (0<<8)+SCREEN_WIDTH
109+
.short (((SCREEN_HEIGHT-((GAME_HEIGHT<<8)/ZOOM_VAL))/2)<<8) + ((SCREEN_HEIGHT+((GAME_HEIGHT<<8)/ZOOM_VAL))/2)
108110
;@----------------------------------------------------------------------------
109111
gfxWinInit:
110112
.type gfxWinInit STT_FUNC
@@ -120,7 +122,7 @@ gfxWinInit:
120122
mov r1,r1,lsr#16
121123
strh r1,[r0,#REG_WIN0V]
122124

123-
ldr r1,=0x00282c2c ;@ WinIN0/1, BG2, BG3 & COL inside Win0
125+
ldr r1,=0x00202c2c ;@ WinIN0/1, BG2, BG3 & COL inside Win0
124126
str r1,[r0,#REG_WININ] ;@ WinOUT, Only BG2, BG3 & COL enabled outside Windows.
125127
bx lr
126128
;@----------------------------------------------------------------------------

source/Gui.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ const char *getScreenModeText() {
264264
void borderSet() {
265265
gBorderEnable ^= 0x01;
266266
if (gBorderEnable & 1) {
267-
GFX_DISPCNT = MODE_5_2D | DISPLAY_BG2_ACTIVE;
267+
GFX_DISPCNT = MODE_5_2D | DISPLAY_BG2_ACTIVE | DISPLAY_BG3_ACTIVE;
268268
}
269269
else {
270-
GFX_DISPCNT = MODE_5_2D | DISPLAY_BG2_ACTIVE | DISPLAY_WIN0_ON;
270+
GFX_DISPCNT = MODE_5_2D | DISPLAY_BG2_ACTIVE | DISPLAY_BG3_ACTIVE | DISPLAY_WIN0_ON;
271271
}
272272
videoSetMode(GFX_DISPCNT);
273273

0 commit comments

Comments
 (0)