wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #22 from MeirGavish/refactors

Browse Source 
Refactor - used main_bg_se_copy_rect_1_tile_vert() for current blind raising
This commit is contained in:
Gordie
2025-07-10 21:44:36 -04:00
committed by GitHub
parent be08cb79be 3741f6f3bd
commit ebb6177d0d
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game.c
+10 -6
View File
@@ -124,6 +124,8 @@ static const Rect POP_MENU_ANIM_RECT = {9, 6, 24, 32 };
// //
// When unpopping we include another row above the menu assuming it's blank so it's copied into it // When unpopping we include another row above the menu assuming it's blank so it's copied into it
static const Rect SINGLE_BLIND_SELECT_RECT = { 9, 7, 13, 32 };
static const Rect SHOP_ICON_RECT = { 0, 0, 8, 4 }; static const Rect SHOP_ICON_RECT = { 0, 0, 8, 4 };
// Rects for TTE (in pixels) // Rects for TTE (in pixels)
@@ -439,13 +441,15 @@ void change_background(int id)
int x_from = 0; int x_from = 0;
int y_from = 27; int y_from = 27;
int x_to = 9 + (i * 5); Rect blind_rect = SINGLE_BLIND_SELECT_RECT;
int y_to = 31;
for (int y = 7; y < 40; y++) // + 1 to get to the start of the next blind, no gap between them
{ blind_rect.left += i * (SINGLE_BLIND_SELECT_RECT.right - SINGLE_BLIND_SELECT_RECT.left + 1);
memcpy16(&se_mem[MAIN_BG_SBB][x_to + 32 * (y - 1)], &se_mem[MAIN_BG_SBB][x_to + 32 * y], 5); blind_rect.right += i * (SINGLE_BLIND_SELECT_RECT.right - SINGLE_BLIND_SELECT_RECT.left + 1);
} main_bg_se_copy_rect_1_tile_vert(blind_rect, SE_UP);
int x_to = blind_rect.left;
int y_to = 31;
if (i == BIG_BLIND) if (i == BIG_BLIND)
{ {
source/graphic_utils.c
+3 -3
View File
@@ -45,8 +45,8 @@ void main_bg_se_copy_rect_1_tile_vert(Rect se_rect, int direction)
// Clip to avoid read/write overflow of the screenblock // Clip to avoid read/write overflow of the screenblock
Rect bounding_rect = FULL_SCREENBLOCK_RECT; Rect bounding_rect = FULL_SCREENBLOCK_RECT;
bounding_rect.top = 1; bounding_rect.top = 1;
bounding_rect.bottom = SE_COL_LEN - 1; bounding_rect.bottom = SE_COL_LEN - 1;
clip_se_rect_to_bounding_rect(&se_rect, &bounding_rect); clip_se_rect_to_bounding_rect(&se_rect, &bounding_rect);
int start = (direction == SE_UP) ? se_rect.top : se_rect.bottom; int start = (direction == SE_UP) ? se_rect.top : se_rect.bottom;
@@ -55,7 +55,7 @@ void main_bg_se_copy_rect_1_tile_vert(Rect se_rect, int direction)
for (int y = start; y != end - direction; y -= direction) for (int y = start; y != end - direction; y -= direction)
{ {
memcpy16(&se_mem[MAIN_BG_SBB][se_rect.left + SE_ROW_LEN * (y + direction)], memcpy16(&se_mem[MAIN_BG_SBB][se_rect.left + SE_ROW_LEN * (y + direction)],
&se_mem[MAIN_BG_SBB][se_rect.left + SE_ROW_LEN * y], &se_mem[MAIN_BG_SBB][se_rect.left + SE_ROW_LEN * y],
se_rect.right - se_rect.left + 1); se_rect.right - se_rect.left + 1);
} }
} }