From e64a8bcf685b1eb9fe9a0cbde11bd0cd9dc9ff6c Mon Sep 17 00:00:00 2001
From: Max <mad.max0@op.pl>
Date: Fri, 27 Mar 2026 09:15:04 +0000
Subject: [PATCH] Upload files to "programs/games/solitare"

the requested changes were made
---
 programs/games/solitare/solitare.asm | 65 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/programs/games/solitare/solitare.asm b/programs/games/solitare/solitare.asm
index d6c899ab6..0c0972b63 100644
--- a/programs/games/solitare/solitare.asm
+++ b/programs/games/solitare/solitare.asm
@@ -1,16 +1,16 @@
 ;   SPDX-License-Identifier: GPL-2.0-only
 ;   Program - Solitaire card game
 ;   Copyright (C) 2026 KolibriOS team
-;   Author: Max, <snapemax@wp.pl>
-;   Graphics: Designed by rawpixel.com / Freepik 
+;   Author: Max <snapemax@wp.pl>
+;   Graphics: Designed by rawpixel.com / Freepik
 ;   http://www.freepik.com
 
 format binary as 'run'
 use32
 org 0x0
 
-include 'macros.inc'
-include 'KOSfuncs.inc'
+include '../../macros.inc'
+include '../../KOSfuncs.inc'
 
 ; --- CONSTANTS ---
 CARD_W           equ 70
@@ -56,7 +56,6 @@ dd stacktop
 dd 0, 0
 
 start:
-    mov esp, stacktop
     mcall SF_STYLE_SETTINGS, SSF_GET_SKIN_HEIGHT
     mov [skin_h], eax
     call init_game_state
@@ -1463,33 +1462,7 @@ msg_congrats     db 'Congrats You Win', 0
 msg_score_lbl    db 'SCORE: ', 0
 txt_replay       db 'REPLAY', 0
 txt_exit         db 'EXIT', 0
-score_str        rb 16
-score            dd 0
-game_won         db 0
-win_timer        dd 0
-win_thread_active db 0
-should_reset     db 0
-exit_request     db 0
-mouse_lock       dd 0
-force_redraw     db 0
-temp_counter     dd 0
-temp_counter2    dd 0
-temp_val         dd 0
-mouse_off_x      dw 0
-mouse_off_y      dw 0
-temp_active      dd 0
-temp_card_buf    rd 3
-active_card_count dd 0
-active_stack     rd 13
-skin_h           dd 0
-cascade_timer    dd 0
-active_cascade_idx dd -1
-win_pos_x        dd 0
-win_pos_y        dd 0
 
-align 4
-card_vectors:    rw 52 * 2
-win_proc_info:   rb 1024
 
 ; ... Font Data ...
 font_8x12:
@@ -1559,9 +1532,37 @@ db_kh:      file 'kt.bmp':54
 db_kkaro:   file 'kd.bmp':54
 db_kt:      file 'kp.bmp':54
 
+
+i_end:
+
+score            rd 1
+game_won         rb 1
+win_timer        rd 1
+win_thread_active rb 1
+should_reset     rb 1
+exit_request     rb 1
+mouse_lock       rd 1
+force_redraw     rb 1
+temp_counter     rd 1
+temp_counter2    rd 1
+temp_val         rd 1
+mouse_off_x      rw 1
+mouse_off_y      rw 1
+temp_active      rd 1
+temp_card_buf    rd 3
+active_card_count rd 1
+active_stack     rd 13
+skin_h           rd 1
+cascade_timer    rd 1
+active_cascade_idx rd 1
+win_pos_x        rd 1
+win_pos_y        rd 1
+
 align 4
 deck_data:       rb 52 * CARD_STRUCT_SIZE
-i_end:
+card_vectors:    rw 52 * 2
+win_proc_info:   rb 1024
+score_str        rb 16
 
 align 64
 stack_bottom:    rb 16384