From 57e025e6aa02442a75a453a39ed6e3689dadd074 Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Tue, 27 Feb 2024 15:35:51 -0800
Subject: [PATCH] Fix flipping sprites, start work on player

---
 game/art/game_player.aseprite | Bin 0 -> 582 bytes
 game/art/game_player.png      | Bin 0 -> 380 bytes
 game/game.c                   |   2 +-
 sys/sys_graphics.c            |  23 ++++++++++++++++++-----
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 game/art/game_player.aseprite
 create mode 100644 game/art/game_player.png

diff --git a/game/art/game_player.aseprite b/game/art/game_player.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..d61f8ef8dbb5edf9b26e349e61b71e84bd71a288
GIT binary patch
literal 582
zcmZ=`Vqkc%l#!u<L4kpTfsuiMAq9vLK!AY}B*-8DgtP$1fTsWY$O^WV6=;DN5VI?Q
ztwge}3dojJfVqGlNe0aP&%hw79SkJvR6!&|dmxZp9b^V1<HP-d<e|gIf#m;>FF+)N
zFNj<WWH9`HqYfk)o`6(puKf=ro6F{a#LHKJ$TO?{TLGn6K;Z(i9B2v92B7gkvw;SK
zOa&R~3o`7DI?x!P86X3Iy3eeV2kBH`29huUG?Iax!6&gYwMfD6ERe&h0Fn9+j06a9
z0NPVAr*~2y-w_247f~VBcl8fK1H3c0pK^a(Two;;d`U^kV_jK|{*^_^b#nSgP2X5N
zb6m4?8=FPS{NvM1pJz#1_f;D3@10Y4rui{DYwP)&PZKZ73feuIZgb{RNSyeelZO4g
zNA?!n{UE;E=J5PoIX>z(pM2`Gc6FR{-<x>+BL6hLUn~9@m<QDTV0=;Y*Ynk$_db)C
o|NnCNxX-VRueAcAA0ORy#rN@p^uK=lefGppSoV*Z`66E|03-gWg#Z8m

literal 0
HcmV?d00001

diff --git a/game/art/game_player.png b/game/art/game_player.png
new file mode 100644
index 0000000000000000000000000000000000000000..34293985ca0f3352925825122358b1c841346a9c
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3-qd{%H^gQjEnx?oJHr&dIz4ats1|LR^8g
ztafmnYA{24;OZc=_;CM2hmZgN_~Ji<@BhUN|KF%HJTcQ;`@gwt&j0ci|Ie&?x7ex%
zs7IhA$S;`TKPos7(CrMAyXWcR7!uL?cFIA%!wNjkiXIc5{I{<V&`5o2b>UE6<#MU5
z8((`^ggd$vFdOfksqkRazvlX$=EFX_@AkG#s5!;AVa0Z{pmf#u!E-Gxznz_}+{Lg@
z@<^J+MbiUI1w$LYbsHKS+*FtE!oIO5WtmmMB74(CeGYSu2gkn(ugy*2Z{%8-|8=&U
z)Xh-FX+KL9*1foPLLlJfeBK$U$0KCYeu;T-moQIw{njy9Y*BvW7fy$=n7r_cYZWh)
z9|&eJe^S4({yT@J_1q}ArvhyUY$wRgw3V3Cp1k1X@3uq<Alm<l>GN5>*xi0-<^g@m
N;OXk;vd$@?2>{YBr``Yn

literal 0
HcmV?d00001

diff --git a/game/game.c b/game/game.c
index c3b2417..91c8b7c 100644
--- a/game/game.c
+++ b/game/game.c
@@ -126,7 +126,7 @@ void game_draw() {
         0,
         x1, y1-64,
         16, 8,
-        false, false
+        true, true
     );
 
     sys_map_draw(game_map, game_tiles, 0, 0, map_x, 0, 32, 18);
diff --git a/sys/sys_graphics.c b/sys/sys_graphics.c
index c6580ee..9d6e6ba 100644
--- a/sys/sys_graphics.c
+++ b/sys/sys_graphics.c
@@ -12,7 +12,7 @@ void sys_scanline_internal_set(
     sys_i32 x0, sys_i32 x1, sys_i32 y, sys_color c, bool fill
 );
 void sys_glyph_internal_draw(sys_i32 x, sys_i32 y, sys_glyph g, sys_color c);
-void sys_sprite_internal_draw(sys_i32 x, sys_i32 y, sys_sprite s);
+void sys_sprite_internal_draw(sys_i32 x, sys_i32 y, sys_sprite s, bool flip_x, bool flip_y);
 
 // == public ==
 void sys_clip_set(sys_i32 x0, sys_i32 y0, sys_i32 x1, sys_i32 y1) {
@@ -258,11 +258,20 @@ void sys_sprite_draw_ext(
     // (this is necessary for w and h)
     for (int sy = 0; sy < h; sy++) {
         for (int sx = 0; sx < w; sx++) {
-            sys_i32 tile = n + sx + sy * spritesheet.width;
+            sys_i32 sx_adj = flip_x ? w - 1 - sx : sx;
+            sys_i32 sy_adj = flip_y ? h - 1 - sy : sy;
+            sys_i32 tile = 
+                n + sx_adj + sy_adj * spritesheet.width;
             if (tile < 0 || tile >= spritesheet.width * spritesheet.height) {
                 continue;
             }
-            sys_sprite_internal_draw(x + sx * 8, y + sy * 8, spritesheet.sprites[tile]);
+            sys_sprite_internal_draw(
+                x + sx * 8, 
+                y + sy * 8, 
+                spritesheet.sprites[tile],
+                flip_x,
+                flip_y
+            );
         }
     }
 }
@@ -332,10 +341,14 @@ void sys_glyph_internal_draw(sys_i32 x, sys_i32 y, sys_glyph g, sys_color c) {
     }
 }
 
-void sys_sprite_internal_draw(sys_i32 x, sys_i32 y, sys_sprite s) {
+void sys_sprite_internal_draw(
+    sys_i32 x, sys_i32 y, sys_sprite s, bool flip_x, bool flip_y
+) {
     for (int py = 0; py < 8; py++) {
         for (int px = 0; px < 8; px++) {
-            sys_pixel_internal_set(x + px, y + py, s.pixels[py][px]);
+            sys_i32 px_adj = flip_x ? 7 - px : px;
+            sys_i32 py_adj = flip_y ? 7 - py : py;
+            sys_pixel_internal_set(x + px, y + py, s.pixels[py_adj][px_adj]);
         }
     }
 }
\ No newline at end of file