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

Fix applying boss blind color twice (#49

Browse Source 
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
This commit is contained in:
Geralt
2026-05-20 18:59:17 -07:00
committed by GitHub
co-authored by MathisMartin31
parent 69403f059f
commit e3f680d6d0
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/blind.h
-2
View File
@@ -103,8 +103,6 @@ typedef struct
void blind_init(); void blind_init();
void blind_set_boss_graphics(const unsigned int* tiles, const u16* palette);
u32 blind_get_requirement(enum BlindType type, int ante); u32 blind_get_requirement(enum BlindType type, int ante);
int blind_get_reward(enum BlindType type); int blind_get_reward(enum BlindType type);
u16 blind_get_color(enum BlindType type, enum BlindColorIndex index); u16 blind_get_color(enum BlindType type, enum BlindColorIndex index);
source/game.c
+1 -4
View File
@@ -1213,12 +1213,9 @@ void change_background_legacy(enum BackgroundId id)
{ {
main_bg_se_copy_rect(BIG_BLIND_TITLE_SRC_RECT, TOP_LEFT_BLIND_TITLE_POINT); main_bg_se_copy_rect(BIG_BLIND_TITLE_SRC_RECT, TOP_LEFT_BLIND_TITLE_POINT);
} }
else if (g_game_vars.current_blind > BLIND_TYPE_BIG) else if (g_game_vars.current_blind >= BLIND_TYPE_BOSS)
{ {
main_bg_se_copy_rect(BOSS_BLIND_TITLE_SRC_RECT, TOP_LEFT_BLIND_TITLE_POINT); main_bg_se_copy_rect(BOSS_BLIND_TITLE_SRC_RECT, TOP_LEFT_BLIND_TITLE_POINT);
affine_background_set_color(
blind_get_color(g_game_vars.current_blind, BLIND_SHADOW_COLOR_INDEX)
);
} }
bg_copy_current_item_to_top_left_panel(); bg_copy_current_item_to_top_left_panel();
source/game/blind_select.c
+8
View File
@@ -1,5 +1,6 @@
#include "blind_select.h" #include "blind_select.h"
#include "affine_background.h"
#include "audio_utils.h" #include "audio_utils.h"
#include "background_blind_select_gfx.h" #include "background_blind_select_gfx.h"
#include "blind.h" #include "blind.h"
@@ -279,6 +280,13 @@ static void game_blind_select_display_blind_panel()
main_bg_se_copy_expand_3w_row(TOP_LEFT_PANEL_ANIM_RECT, TOP_LEFT_PANEL_EMPTY_3W_ROW_POS); main_bg_se_copy_expand_3w_row(TOP_LEFT_PANEL_ANIM_RECT, TOP_LEFT_PANEL_EMPTY_3W_ROW_POS);
reset_top_left_panel_bottom_row(); reset_top_left_panel_bottom_row();
if (g_game_vars.current_blind >= BLIND_TYPE_BOSS)
{
affine_background_set_color(
blind_get_color(g_game_vars.current_blind, BLIND_SHADOW_COLOR_INDEX)
);
}
} }
// Shift the blind panel down onto screen // Shift the blind panel down onto screen