From cce7209221f3da1d4a17d99587bcfa29dff53116 Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 1 Aug 2024 19:08:47 +0200
Subject: [PATCH 01/10] Starting to add the inventory.

---
 assets-fx/1b/inventory.png | Bin 0 -> 608 bytes
 src/config.h               |   2 ++
 src/events.c               |   2 +-
 src/game.h                 |  20 +++++++++++++++++++-
 src/inventory.c            |   1 +
 src/inventory.h            |   9 +++++++++
 src/main.c                 |  11 +++++++++++
 7 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 assets-fx/1b/inventory.png
 create mode 100644 src/inventory.c
 create mode 100644 src/inventory.h

diff --git a/assets-fx/1b/inventory.png b/assets-fx/1b/inventory.png
new file mode 100644
index 0000000000000000000000000000000000000000..53d66aa231613a89d9ed36523940b082a6e53836
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq004jh002M;1ONa4c;C150006fNkl<Zc%1E8
z%d*2D2-Q3N|6isHW2;86Q9!uKS#&zu0wVI#2oP?KKWPSW<G+8wOPm9W@8WhEp|}NL
zh{$(s3@kuOv>3{Lk0GK~ur2{@U!(=_EWb|$j+t5&di*m81#s_vNe?~?Pl^Eam)x9B
zb66Opc4nSAbZ4mLbIE|wL3{w$@^Qq<2gvdQ!po2rAR$Vo-tKy-4oS`}&?o?hAkYYV
zb+_>4WJ)x}tK3>y^C~b9VGurEx?aTf9r|UVHQ)S?>)d*>QhdoU$a^w-uCDyl;oD-6
z337<iqXE?@Abg~_ml)Opt3r@5creewe}s+2kc~PV4TE>VwrbD{9tG?cU^m<-K&mt0
zMgda3+KmEkZvj%+m<VC$H$<><d44>>oC3;LOwa7wf_HX2gIxi$XBCQX@$^luYb0O+
zGlJH)1i59ZabIBW2!xP#Tj#n&KmlA=8BQ&Lr;Y8}0yr>gqi~ELvtIfEQc>W^1i1;W
z=K;Dfm<Q;>pc5Qjj+(Cp)?Wp=t_9Z5a=#Xkg2^L5SpYW-hQX8t%D+%ZFsOh8t*~e?
z4~PMdD{_~`5Jw)+zclavc78m;oD&?W51YR_o?$Kz(1yW0Ko@4CfELX8fPYX6tf78C
zdiE#gYXPo)K>I#X3MTV_;5!joMSef-wky0Ucus|NU@#BppMEKSVDJcxo=-ma0<5@w
uCg?^1&m$=zx^5J3dkc`lqk!E4?8Y1Fd5+CPx%%G#0000<MNUMnLSTZF)C}PO

literal 0
HcmV?d00001

diff --git a/src/config.h b/src/config.h
index 2f7a890..33e1b0f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -12,6 +12,8 @@
 #define GRAYMODEOK 1
 #endif
 
+#define SLOT_NUM 9
+
 #if GINT_RENDER_RGB
 /* The tile size */
 #define T_HEIGHT 16
diff --git a/src/events.c b/src/events.c
index 31ffdcc..79d8eb0 100644
--- a/src/events.c
+++ b/src/events.c
@@ -48,7 +48,7 @@ int (*_operations[OP_AMOUNT])(int, int) = {_op_null, _op_set, _op_add, _op_sub,
 
 #define MIN(a, b) a < b ? a : b
 
-char _message_buffer[MESSAGE_BUFFER_SZ];
+char *_message_buffer;
 char *events_parse_string(EventHandler *handler, char *message) {
     size_t message_pos = 0;
     char in_token = 0;
diff --git a/src/game.h b/src/game.h
index b9b45da..0728ac5 100644
--- a/src/game.h
+++ b/src/game.h
@@ -12,10 +12,28 @@ typedef enum { D_UP, D_DOWN, D_LEFT, D_RIGHT } Direction;
 
 typedef enum { P_LEFTUP = -1, P_CENTER = 0, P_RIGHTDOWN = 1 } Checkpos;
 
+typedef enum {
+    I_NONE,
+    I_ARMOR,
+    I_GLOVE,
+    I_BEER,
+    I_MILK,
+    I_TALISMAN,
+    I_AMOUNT
+} Item;
+
+typedef struct {
+    Item i;
+    unsigned char durability;
+} Slot;
+
+typedef struct {
+    Slot slots[SLOT_NUM];
+} Inventory;
+
 typedef struct {
     uint32_t x1, y1;
     uint32_t x2, y2;
-
 } Collider;
 
 /* Struct that define player parameters */
diff --git a/src/inventory.c b/src/inventory.c
new file mode 100644
index 0000000..91f36e5
--- /dev/null
+++ b/src/inventory.c
@@ -0,0 +1 @@
+#include "inventory.h"
diff --git a/src/inventory.h b/src/inventory.h
new file mode 100644
index 0000000..44c8613
--- /dev/null
+++ b/src/inventory.h
@@ -0,0 +1,9 @@
+#ifndef INVENTORY_H
+#define INVENTORY_H
+
+/* The structs related to the inventory are defined in game.h */
+#include "game.h"
+
+
+
+#endif
diff --git a/src/main.c b/src/main.c
index b07643d..9f25dbc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -117,6 +117,16 @@ int main(void) {
     }
     timer_start(timer);
 
+    extern char *_message_buffer;
+    _message_buffer = NULL;
+    _message_buffer = malloc(MESSAGE_BUFFER_SZ);
+    if(!_message_buffer){
+        dtext(64, 64, C_BLACK, "Failed to allocate the message buffer: not "
+                               "enough RAM available. Press any key to quit.");
+        dupdate();
+        getkey();
+        return 0;
+    }
     game_init(&game);
 
 #if USB_FEATURE
@@ -213,5 +223,6 @@ int main(void) {
 #endif
 
     timer_stop(timer);
+    free(_message_buffer);
     return 1;
 }

From 771d844bc45b7f742df8ecd0f105f574fa58dba3 Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 1 Aug 2024 19:11:11 +0200
Subject: [PATCH 02/10] Ran clang-format.

---
 src/game.c      | 2 +-
 src/inventory.h | 2 --
 src/main.c      | 7 ++++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/game.c b/src/game.c
index 36e86b3..25b94eb 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2,8 +2,8 @@
 
 #include "config.h"
 #include "map.h"
-#include "npc.h"
 #include "mapdata.h"
+#include "npc.h"
 
 #include <gint/cpu.h>
 #include <gint/display.h>
diff --git a/src/inventory.h b/src/inventory.h
index 44c8613..2c41b82 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -4,6 +4,4 @@
 /* The structs related to the inventory are defined in game.h */
 #include "game.h"
 
-
-
 #endif
diff --git a/src/main.c b/src/main.c
index 9f25dbc..986e4ea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -120,9 +120,10 @@ int main(void) {
     extern char *_message_buffer;
     _message_buffer = NULL;
     _message_buffer = malloc(MESSAGE_BUFFER_SZ);
-    if(!_message_buffer){
-        dtext(64, 64, C_BLACK, "Failed to allocate the message buffer: not "
-                               "enough RAM available. Press any key to quit.");
+    if(!_message_buffer) {
+        dtext(64, 64, C_BLACK,
+              "Failed to allocate the message buffer: not "
+              "enough RAM available. Press any key to quit.");
         dupdate();
         getkey();
         return 0;

From 04d4c9e31eb4392b1e9cae91581661345c5ab7b3 Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 1 Aug 2024 19:14:29 +0200
Subject: [PATCH 03/10] Cleaner enums with clang-format.

---
 .clang-format |  1 +
 src/events.h  |  6 +++++-
 src/game.h    | 13 +++++++++++--
 src/npc.h     |  1 -
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.clang-format b/.clang-format
index 196c51c..e35924c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -10,3 +10,4 @@ IndentCaseBlocks: true
 IncludeBlocks: Regroup
 AllowShortBlocksOnASingleLine: Empty
 ColumnLimit: 80
+AllowShortEnumsOnASingleLine: false
diff --git a/src/events.h b/src/events.h
index f4a19bf..a095283 100644
--- a/src/events.h
+++ b/src/events.h
@@ -15,7 +15,11 @@ typedef struct {
     unsigned int vars;
 } EventHandler;
 
-typedef enum { T_NULL, T_VAR_EDIT, T_AMOUNT } Token;
+typedef enum {
+    T_NULL,
+    T_VAR_EDIT,
+    T_AMOUNT
+} Token;
 
 typedef enum {
     OP_NULL,
diff --git a/src/game.h b/src/game.h
index 0728ac5..f82c51b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -8,9 +8,18 @@
 #include <stdint.h>
 
 /* The direction where the player is going to. */
-typedef enum { D_UP, D_DOWN, D_LEFT, D_RIGHT } Direction;
+typedef enum {
+    D_UP,
+    D_DOWN,
+    D_LEFT,
+    D_RIGHT
+} Direction;
 
-typedef enum { P_LEFTUP = -1, P_CENTER = 0, P_RIGHTDOWN = 1 } Checkpos;
+typedef enum {
+    P_LEFTUP = -1,
+    P_CENTER = 0,
+    P_RIGHTDOWN = 1
+} Checkpos;
 
 typedef enum {
     I_NONE,
diff --git a/src/npc.h b/src/npc.h
index 8c7f83e..2726e20 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -13,7 +13,6 @@ enum {
     NPC_FRIENDLY = 1, // The player's team
     NPC_HOSTILE = 2,  // to the player
     NPC_ALL = 3
-
 };
 
 /* /!\ Warning /!\

From 4d2eb2e8de82cc702a47509d85fe918a698d14a9 Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 1 Aug 2024 20:05:28 +0200
Subject: [PATCH 04/10] Graphics for the inventory.

---
 assets-cg/inventory.ase          | Bin 0 -> 5780 bytes
 assets-cg/inventory.png          | Bin 0 -> 2892 bytes
 assets-cg/player_female_inv.png  | Bin 0 -> 536 bytes
 assets-cg/player_male_inv.png    | Bin 0 -> 421 bytes
 assets-fx/1b/fxconv-metadata.txt |   4 ++++
 assets-fx/2b/fxconv-metadata.txt |   4 ++++
 assets-fx/2b/inventory.png       | Bin 0 -> 608 bytes
 7 files changed, 8 insertions(+)
 create mode 100644 assets-cg/inventory.ase
 create mode 100644 assets-cg/inventory.png
 create mode 100644 assets-cg/player_female_inv.png
 create mode 100644 assets-cg/player_male_inv.png
 create mode 100644 assets-fx/2b/inventory.png

diff --git a/assets-cg/inventory.ase b/assets-cg/inventory.ase
new file mode 100644
index 0000000000000000000000000000000000000000..4e9487ad183f942e4368f539400c19bd77b0bdd8
GIT binary patch
literal 5780
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
Ds}KBH

literal 0
HcmV?d00001

diff --git a/assets-cg/inventory.png b/assets-cg/inventory.png
new file mode 100644
index 0000000000000000000000000000000000000000..a56f56a249552a9311a9c3fe2189e59bded68eaf
GIT binary patch
literal 2892
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
GaOIzA1zywu

literal 0
HcmV?d00001

diff --git a/assets-cg/player_female_inv.png b/assets-cg/player_female_inv.png
new file mode 100644
index 0000000000000000000000000000000000000000..49e2bae8e726890aba65a0a65df0f3e5bf0d86e7
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0005sNkl<ZScT12
zF-`+95S&Fc6ciK*qJ}D|;1zt}{0QDd#S`qmAZkdLNGPF0>6hYshwWQC>&t;MQsk4p
z>z$h$J4*<_wjId;$vi`X^J62fMj!(!)jF4wx*#A!U<87fA!+@rlsgp(&AvGze?=m@
ze@T&lg+xTJhPCZ)9HKho6=|&eJQC@tDXUQ`n65b^#|`U|M5La;p&T6{#it2K5E)Q<
z+hx$lDqrHHPtEjDs8S{}!D-M!XI2kpJ+Yct;DkJqDnh8aS&bXcSw&9}*8^}!5#=3l
z5Q=@IW@V_zF{aIvAmFz#k`xgemq{^O3~EecRwsC+f&`G7b>WS6an;Ip`vPXm&NrnE
zDhhTS8}4(74Dr_2m@j>V5r_onNK{uYfY~yUA^#k$#YC1ZTOyMs;gXiU>CEUHTw-cT
z!H`UdDvzWj0QALE61n&sCNZl-q82J5hUlmxt;vr)vR;cpuix)j)gPEBA9#x=lUnLe
zbNBc$N)>HhtjJ~~NA36RSoMGA@#%9flli39iM9bD%i!96Fb<Y^)aACixo1N}oVEvv
zBKe!uxc=LYB@yP+fs>OZ!nVO~Hv<4%6A>30rtm;XHX?ww&rbk=`TR@VL-a^0V~K<Y
an*1NmZJ~5c+)K9r0000<MNUMnLSTX%>gxXh

literal 0
HcmV?d00001

diff --git a/assets-cg/player_male_inv.png b/assets-cg/player_male_inv.png
new file mode 100644
index 0000000000000000000000000000000000000000..0361d95fc8f02f129e25e2e15220780b5b26c7aa
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0004ONkl<ZScUCY
zJ5Izf5PgHvaDfzCQgVZ>X!Z*B5w@V?1YCk<uV7zcB{mIP(V=wPuEYr_P2mI_|KgxH
zalw-!#qq@NdB&a@pb(H^#z49Tib2grCPBu!VId~}T;vguIjB|;U~>@w+$=~Og&DIY
zy)hIaLB)8)J|ja2F+U^c6NKatV6SZns=P)45b2+l8W%chYY8gmjQk488IBk_-eNow
zzcm(8&c<JCfs#C;-k$W^`Apbu)3U3lN;~iuQx~U`TWg3o`K|My=TonbppWPKpNZSe
z1^{rk-)F5mM4T>%9RT3#dez@-A@9fIBE^qO(B-gmg|uzEO7-Pk*G57gs?}P6UQ999
zm&A$<k%?kF@-M_jwCM4aR6Y?RkopVq$V|Itj6uqT#R4W33;7Dj5}OcTF`*fQN_`k(
zskUC|exP#~8KIb*aV3(QAud6mFAo5Kx~>5Ll`>-1Pc}`HHSKqs95i9y&L4jM_vDQd
P00000NkvXXu0mjf4JozV

literal 0
HcmV?d00001

diff --git a/assets-fx/1b/fxconv-metadata.txt b/assets-fx/1b/fxconv-metadata.txt
index 9f0baf7..400e93b 100644
--- a/assets-fx/1b/fxconv-metadata.txt
+++ b/assets-fx/1b/fxconv-metadata.txt
@@ -1,3 +1,7 @@
 INFO_Icon.png:
   type: bopti-image
   name: INFO_Icon_img
+
+inventory.png:
+  type: bopti-image
+  name: inventory_img
diff --git a/assets-fx/2b/fxconv-metadata.txt b/assets-fx/2b/fxconv-metadata.txt
index 9f0baf7..400e93b 100644
--- a/assets-fx/2b/fxconv-metadata.txt
+++ b/assets-fx/2b/fxconv-metadata.txt
@@ -1,3 +1,7 @@
 INFO_Icon.png:
   type: bopti-image
   name: INFO_Icon_img
+
+inventory.png:
+  type: bopti-image
+  name: inventory_img
diff --git a/assets-fx/2b/inventory.png b/assets-fx/2b/inventory.png
new file mode 100644
index 0000000000000000000000000000000000000000..53d66aa231613a89d9ed36523940b082a6e53836
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq004jh002M;1ONa4c;C150006fNkl<Zc%1E8
z%d*2D2-Q3N|6isHW2;86Q9!uKS#&zu0wVI#2oP?KKWPSW<G+8wOPm9W@8WhEp|}NL
zh{$(s3@kuOv>3{Lk0GK~ur2{@U!(=_EWb|$j+t5&di*m81#s_vNe?~?Pl^Eam)x9B
zb66Opc4nSAbZ4mLbIE|wL3{w$@^Qq<2gvdQ!po2rAR$Vo-tKy-4oS`}&?o?hAkYYV
zb+_>4WJ)x}tK3>y^C~b9VGurEx?aTf9r|UVHQ)S?>)d*>QhdoU$a^w-uCDyl;oD-6
z337<iqXE?@Abg~_ml)Opt3r@5creewe}s+2kc~PV4TE>VwrbD{9tG?cU^m<-K&mt0
zMgda3+KmEkZvj%+m<VC$H$<><d44>>oC3;LOwa7wf_HX2gIxi$XBCQX@$^luYb0O+
zGlJH)1i59ZabIBW2!xP#Tj#n&KmlA=8BQ&Lr;Y8}0yr>gqi~ELvtIfEQc>W^1i1;W
z=K;Dfm<Q;>pc5Qjj+(Cp)?Wp=t_9Z5a=#Xkg2^L5SpYW-hQX8t%D+%ZFsOh8t*~e?
z4~PMdD{_~`5Jw)+zclavc78m;oD&?W51YR_o?$Kz(1yW0Ko@4CfELX8fPYX6tf78C
zdiE#gYXPo)K>I#X3MTV_;5!joMSef-wky0Ucus|NU@#BppMEKSVDJcxo=-ma0<5@w
uCg?^1&m$=zx^5J3dkc`lqk!E4?8Y1Fd5+CPx%%G#0000<MNUMnLSTZF)C}PO

literal 0
HcmV?d00001


From d555c5be6f2f398c7d5cdb27ff0fb366f3dc26ce Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 1 Aug 2024 23:09:04 +0200
Subject: [PATCH 05/10] Started inventory rendering.

---
 CMakeLists.txt                   |  11 ++-
 assets-cg/base_slot.png          | Bin 0 -> 223 bytes
 assets-cg/inventory.png          | Bin 2892 -> 2878 bytes
 assets-cg/items.png              | Bin 0 -> 666 bytes
 assets-cg/selected.png           | Bin 0 -> 206 bytes
 assets-cg/selection.png          | Bin 0 -> 211 bytes
 assets-fx/1b/fxconv-metadata.txt |   4 +
 assets-fx/1b/items.png           | Bin 0 -> 181 bytes
 assets-fx/2b/fxconv-metadata.txt |   4 +
 assets-fx/2b/items.png           | Bin 0 -> 181 bytes
 assets-fx/selected.png           | Bin 0 -> 93 bytes
 assets-fx/selection.png          | Bin 0 -> 90 bytes
 src/config.h                     |   1 +
 src/game.c                       | 141 +++++++++++++++++--------------
 src/game.h                       |   6 ++
 src/inventory.c                  |  50 +++++++++++
 src/inventory.h                  |   2 +
 src/main.c                       |  51 +++++------
 18 files changed, 182 insertions(+), 88 deletions(-)
 create mode 100644 assets-cg/base_slot.png
 create mode 100644 assets-cg/items.png
 create mode 100644 assets-cg/selected.png
 create mode 100644 assets-cg/selection.png
 create mode 100644 assets-fx/1b/items.png
 create mode 100644 assets-fx/2b/items.png
 create mode 100644 assets-fx/selected.png
 create mode 100644 assets-fx/selection.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e646b91..ae1e57a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,7 @@ set(SOURCES
   src/npc.c
   src/events.c
   src/animation.c
+  src/inventory.c
   # ...
 )
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
@@ -56,6 +57,8 @@ set(ASSETS
 set(ASSETS_cg
   assets-cg/player_male.png
   assets-cg/player_female.png
+  assets-cg/player_male_inv.png
+  assets-cg/player_female_inv.png
   assets-cg/npc/char/npc_male.png
   assets-cg/npc/char/npc_female.png
   assets-cg/npc/char/npc_milkman.png
@@ -69,6 +72,8 @@ set(ASSETS_cg
   assets-cg/INFO_Icon.png
   assets-cg/player_face.png
   assets-cg/font.png
+  assets-cg/inventory.png
+  assets-cg/items.png
 )
 
 set(ASSETS_cg_EGA64
@@ -98,6 +103,8 @@ set(ASSETS_fx_1b
   assets-fx/1b/npc/face/npc_milkman.png
   assets-fx/1b/npc/face/npc_police.png
   assets-fx/1b/INFO_Icon.png
+  assets-fx/1b/inventory.png
+  assets-fx/1b/items.png
   # ...
 )
 
@@ -112,7 +119,9 @@ set(ASSETS_fx_2b
   assets-fx/2b/npc/face/npc_female.png
   assets-fx/2b/npc/face/npc_milkman.png
   assets-fx/2b/npc/face/npc_police.png
-  assets-fx/1b/INFO_Icon.png
+  assets-fx/2b/INFO_Icon.png
+  assets-fx/2b/inventory.png
+  assets-fx/2b/items.png
   # ...
 )
 
diff --git a/assets-cg/base_slot.png b/assets-cg/base_slot.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a45491edb2abd227ce4927331af6a2b276d6a71
GIT binary patch
literal 223
zcmV<503iQ~P)<h;3K|Lk000e1NJLTq000~S000{Z1^@s6ZwT)!0001{Nkl<ZNQv#%
zK@NZ*3<N;nkM)u8NW2-1?RJ40FYHNybb?V!PGqX2j^>Y+GE)aG@{k$aoS4NtR2^K!
z5c(QGSZn&Y2#-E)G|WP*X!sqyE+Q}n&C!^L7H#n=hH8|kH<C$})L%P{*d3~+KGH9<
z!40m1=tn#ntyW<>bwtcxTf{D{8vk^QNR;k}2=(ykj?bVYq0Tf>=+LQc6`eYlj^gb1
Zd;+A>Nhl%vb^HJT002ovPDHLkV1nX4T<HJ+

literal 0
HcmV?d00001

diff --git a/assets-cg/inventory.png b/assets-cg/inventory.png
index a56f56a249552a9311a9c3fe2189e59bded68eaf..c7030a0cfb6a9f408ab28cd7fd510ad236e1514c 100644
GIT binary patch
delta 2438
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

delta 2473
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
DqlDG3

diff --git a/assets-cg/items.png b/assets-cg/items.png
new file mode 100644
index 0000000000000000000000000000000000000000..3730ee2e93787d7efb8035e967a2d93d8c297061
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq006`Q000{Z1^@s6BhDa^0007ENkl<Zc%1E=
zVU7YJ427AER~!#1htywe5KC!G!K&{iCc7i>Q5a}paE>I@?M!#>`)f{zv@Gzzi^^jY
zjUcmd@W6}4>waN{Nuc0?7nMg|oP~{`;DHyF_i}-Q<xF2cPaPCI@S^gb{-Iz!NKX{J
zXC!#wMdSVd;Q^CE!TWw5H!DlhzRSMD8zzCyHl{R>lxNWj9#v+^H_PM7me%DL`tOfQ
zJPXs7VQI`Zt(Dg+m-~403Ujs$ZQ9zNRlJ;^KbA7Mw44pK+H^hM#cRbbk(OmyBx!h>
z!Pn-a>Sk?As-q-z)9`Y(+iT$!%`i2*UY}^{a68leXrUh7K~ouuXK}d}-b~%3H?G7R
zadne~J|kY6r>(m-bQ<w?=i_GnkymJWWXSYusvAn;-n}#$4Bm{L@(Pc%tlC~nNPY3C
zlAk0-lr)^1jHr4>mJ9|@+dM)hjX2hdeyi>4c|?iA4Tz%A470j(SC+qfFzl9ek-Ni2
zEhB8m)Z0Cf?kcR5wIkbnI|swN+ibPG!q2cCqLyW=b5^Tv*4DLi;gg4Uhe|D*(#rZ2
zrq%AS9%853h1k1d?NtMQ*CxR?=w(3c-r<PKYahg=q~8Li(#$*v`{efg6yD{U)627n
zRpK7S7qxrjGuvn*p2nqn@Tl@;cFZ)qTGpG&%CpMCqry-Pk6c4|>;PzwU_|11&DIo;
zT3CC}j8WRtdJM<H>utMg*D*Nl3Z6Spd(yzuKI>q3I_;{3a*`Ma9(YlC_{AJ};8ntJ
zs=))V65hH29(a}TUMBFst0b<-r@n~|Jn%HU2c%N7FFW}h>i_@%07*qoM6N<$f?8@$
A*Z=?k

literal 0
HcmV?d00001

diff --git a/assets-cg/selected.png b/assets-cg/selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae7cb57a1f3b92699b80d75535de7b83ee0338e3
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZN!3HGrIo|64si~eWjv*eMZ>L@4YB1n%-JAUX
z|LL!j61eB~WwOj&-m%r#HP^+jkNbUfuia!9z9Z)u7Oc&-P7w@A6w7+iqaJ#%WS{qz
zTVa_xr^W8JOv<TT-{EH^C-`pNCc_1v?Ed_;lUTiCkJskkn?n7{89ef9O81{)j63zs
ze&5!<3?uL3y<4&uZFTq9(N)?ZvT$n9XC)o`IZMyo_EQfO&;C+<q-+DwfefCmelF{r
G5}E*a3RGkO

literal 0
HcmV?d00001

diff --git a/assets-cg/selection.png b/assets-cg/selection.png
new file mode 100644
index 0000000000000000000000000000000000000000..5348c4c63be1794456311ab4aba3afb8a73e0003
GIT binary patch
literal 211
zcmV;^04)EBP)<h;3K|Lk000e1NJLTq000~S000{Z1^@s6ZwT)!0001*Nkl<ZNQv#1
zOA>%E2t%d!zjItW@(DDKo3d*QdE(H5U8Dg(c5Y_I=%h{+WC9Nlrmza?ZtlV|=xZZ`
zMPJ>Cc`Up@wis9qV;xmcQ^P9g@|<^JnZ{C8Bx3;Z%21JArse+9FYN#ia383=m!8&A
z-n+`er%jP%r14L;P(tZ`m<3euamQx_I!4VjDrjqJ+l7wi(k`4Wt{dH+a45oD6XgH^
N002ovPDHLkV1j0WRf7Nk

literal 0
HcmV?d00001

diff --git a/assets-fx/1b/fxconv-metadata.txt b/assets-fx/1b/fxconv-metadata.txt
index 400e93b..881385f 100644
--- a/assets-fx/1b/fxconv-metadata.txt
+++ b/assets-fx/1b/fxconv-metadata.txt
@@ -5,3 +5,7 @@ INFO_Icon.png:
 inventory.png:
   type: bopti-image
   name: inventory_img
+
+items.png:
+  type: bopti-image
+  name: items_img
diff --git a/assets-fx/1b/items.png b/assets-fx/1b/items.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb6dbf22372575ae4cc6412e4c4b252ca0f4736
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^7C_9w!2%@NzJ395YCK&WLo_Dt4RYjbFyP4U{r|tn
zwujTgV3tJWrVG5c`gnd=a(FNbO~~-zwToUmzmvZ)Kf&@rSmgxWX*X6UEfcoBv_<mO
zx6linn~z)-$$uYyOfjCr?|n`@%jDI$Prd9Vs|_z*O`P^2t^VNW40o?1fk*ZS^iT4A
e*OQ-9E5R;(*P6GjvnL1W4hBzGKbLh*2~7Y!FhoiK

literal 0
HcmV?d00001

diff --git a/assets-fx/2b/fxconv-metadata.txt b/assets-fx/2b/fxconv-metadata.txt
index 400e93b..881385f 100644
--- a/assets-fx/2b/fxconv-metadata.txt
+++ b/assets-fx/2b/fxconv-metadata.txt
@@ -5,3 +5,7 @@ INFO_Icon.png:
 inventory.png:
   type: bopti-image
   name: inventory_img
+
+items.png:
+  type: bopti-image
+  name: items_img
diff --git a/assets-fx/2b/items.png b/assets-fx/2b/items.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb6dbf22372575ae4cc6412e4c4b252ca0f4736
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^7C_9w!2%@NzJ395YCK&WLo_Dt4RYjbFyP4U{r|tn
zwujTgV3tJWrVG5c`gnd=a(FNbO~~-zwToUmzmvZ)Kf&@rSmgxWX*X6UEfcoBv_<mO
zx6linn~z)-$$uYyOfjCr?|n`@%jDI$Prd9Vs|_z*O`P^2t^VNW40o?1fk*ZS^iT4A
e*OQ-9E5R;(*P6GjvnL1W4hBzGKbLh*2~7Y!FhoiK

literal 0
HcmV?d00001

diff --git a/assets-fx/selected.png b/assets-fx/selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd155be672a86000ca511a39736803162da029c1
GIT binary patch
literal 93
zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;il>WX2*=FiKmX@9Hck|DT-5lV
o$0uXa|Ct6N6IVX{4+M!S3=Ka-fBcqs^Z=y6)78&qol`;+09pGU`2YX_

literal 0
HcmV?d00001

diff --git a/assets-fx/selection.png b/assets-fx/selection.png
new file mode 100644
index 0000000000000000000000000000000000000000..70920377b65f2f2bd75a2fb4a4cc6bb6e6fcaf8b
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;qNj^v2*=Fi1PA6G9v+_m7k_v#
m{g;%Oabc@~SVH5=qnr%hJ}jKyYWA)JsrGdBb6Mw<&;$TErxy+Y

literal 0
HcmV?d00001

diff --git a/src/config.h b/src/config.h
index 87598ae..67e0b3a 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,6 +13,7 @@
 #endif
 
 #define SLOT_NUM 9
+#define SLOT_COLUMNS 3
 
 #if GINT_RENDER_RGB
 /* The tile size */
diff --git a/src/game.c b/src/game.c
index 25b94eb..0b5306e 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,6 +1,7 @@
 #include "game.h"
 
 #include "config.h"
+#include "inventory.h"
 #include "map.h"
 #include "mapdata.h"
 #include "npc.h"
@@ -135,6 +136,7 @@ void game_draw(Game *game) {
     dprint(8, 8, C_BLACK, "npc_count: %d", npc_count);
     dprint(8, 16, C_BLACK, "Mana: %d", game->mana);
     dprint(8, 24, C_BLACK, "X: %d Y: %d", game->player.x, game->player.y);
+    inventory_draw(game, &game->inventory);
 }
 
 /* Key management */
@@ -149,86 +151,99 @@ void game_get_inputs(Game *game) {
     if(keydown(KEY_EXIT))
         game->exittoOS = true;
 
-    /* Player actions - Prototypes in player.h and implementation in player.c */
-    if(keydown(KEY_LEFT))
-        player_move(game, D_LEFT);
-    if(keydown(KEY_RIGHT))
-        player_move(game, D_RIGHT);
-    if(keydown(KEY_UP))
-        player_move(game, D_UP);
-    if(keydown(KEY_DOWN))
-        player_move(game, D_DOWN);
-    if(keydown(KEY_SHIFT))
-        player_action(game);
-    if(keydown(KEY_OPTN)) {
-        game->player.is_male = !game->player.is_male;
+    /* Inventory */
+    if(keydown(KEY_ALPHA)) {
+        game->inventory.open = !game->inventory.open;
         /* TODO: Make something cleaner */
-        while(keydown(KEY_OPTN)) {
+        while(keydown(KEY_ALPHA)) {
             clearevents();
             sleep();
         }
-    }
-    Player *player = &game->player;
-    if(keydown(KEY_SHIFT)) {
-        uint32_t i;
-        for(i = 0; i < game->map_level->nbPortal; i++) {
-            Portal *portal = &game->map_level->portals[i];
-            if(player->x >= (int)portal->collider.x1 * PXSIZE &&
-               player->x < (int)portal->collider.x2 * PXSIZE &&
-               player->y >= (int)portal->collider.y1 * PXSIZE &&
-               player->y < (int)portal->collider.y2 * PXSIZE) {
-                Portal *dest_portal = (Portal *)portal->portal;
-                Collider dest_collider = dest_portal->collider;
-                Map *dest_map = (Map *)portal->map;
-                player->x = (dest_collider.x1 + dest_collider.x2) / 2 * PXSIZE;
-                player->y = (dest_collider.y1 + dest_collider.y2) / 2 * PXSIZE;
-                game->map_level = dest_map;
-                /* TODO: Make something cleaner */
-                while(keydown(KEY_SHIFT)) {
-                    clearevents();
-                    sleep();
+    } else {
+        /* Player actions - Prototypes in player.h and implementation in
+         * player.c */
+        if(keydown(KEY_LEFT))
+            player_move(game, D_LEFT);
+        if(keydown(KEY_RIGHT))
+            player_move(game, D_RIGHT);
+        if(keydown(KEY_UP))
+            player_move(game, D_UP);
+        if(keydown(KEY_DOWN))
+            player_move(game, D_DOWN);
+        if(keydown(KEY_SHIFT))
+            player_action(game);
+        if(keydown(KEY_OPTN)) {
+            game->player.is_male = !game->player.is_male;
+            /* TODO: Make something cleaner */
+            while(keydown(KEY_OPTN)) {
+                clearevents();
+                sleep();
+            }
+        }
+        Player *player = &game->player;
+        if(keydown(KEY_SHIFT)) {
+            uint32_t i;
+            for(i = 0; i < game->map_level->nbPortal; i++) {
+                Portal *portal = &game->map_level->portals[i];
+                if(player->x >= (int)portal->collider.x1 * PXSIZE &&
+                   player->x < (int)portal->collider.x2 * PXSIZE &&
+                   player->y >= (int)portal->collider.y1 * PXSIZE &&
+                   player->y < (int)portal->collider.y2 * PXSIZE) {
+                    Portal *dest_portal = (Portal *)portal->portal;
+                    Collider dest_collider = dest_portal->collider;
+                    Map *dest_map = (Map *)portal->map;
+                    player->x =
+                        (dest_collider.x1 + dest_collider.x2) / 2 * PXSIZE;
+                    player->y =
+                        (dest_collider.y1 + dest_collider.y2) / 2 * PXSIZE;
+                    game->map_level = dest_map;
+                    /* TODO: Make something cleaner */
+                    while(keydown(KEY_SHIFT)) {
+                        clearevents();
+                        sleep();
+                    }
                 }
             }
         }
-    }
 
-    /*Temp debug*/
-    if(keydown(KEY_F1)) {
-        NPC *mynpc = npc_create();
-        if(mynpc) {
-            mynpc->curx = (player->x << PRECISION) / PXSIZE;
-            mynpc->cury = (player->y << PRECISION) / PXSIZE;
-            mynpc->x = player->x;
-            mynpc->y = player->x;
-            mynpc->hasPath = 0;
-            mynpc->face = 0;
-            mynpc->paused = 0;
-            mynpc->has_dialog = 0;
+        /*Temp debug*/
+        if(keydown(KEY_F1)) {
+            NPC *mynpc = npc_create();
+            if(mynpc) {
+                mynpc->curx = (player->x << PRECISION) / PXSIZE;
+                mynpc->cury = (player->y << PRECISION) / PXSIZE;
+                mynpc->x = player->x;
+                mynpc->y = player->x;
+                mynpc->hasPath = 0;
+                mynpc->face = 0;
+                mynpc->paused = 0;
+                mynpc->has_dialog = 0;
+            }
         }
-    }
 
-    /* Display Debug Information on screen */
+        /* Display Debug Information on screen */
 #if DEBUGMODE
-    if(keydown(KEY_F1)) {
-        game->debug_map = !game->debug_map;
-    }
-    if(keydown(KEY_F2)) {
-        game->debug_player = !game->debug_player;
-    }
-    if(keydown(KEY_F3)) {
-        game->debug_extra = !game->debug_extra;
-    }
+        if(keydown(KEY_F1)) {
+            game->debug_map = !game->debug_map;
+        }
+        if(keydown(KEY_F2)) {
+            game->debug_player = !game->debug_player;
+        }
+        if(keydown(KEY_F3)) {
+            game->debug_extra = !game->debug_extra;
+        }
 #endif
 
-    /* if USB is enabled - keybinding for screencapture */
+        /* if USB is enabled - keybinding for screencapture */
 #if USB_FEATURE
 
-    if(keydown(KEY_7))
-        game->screenshot = true;
-    if(keydown(KEY_8))
-        game->record = !game->record;
+        if(keydown(KEY_7))
+            game->screenshot = true;
+        if(keydown(KEY_8))
+            game->record = !game->record;
 
 #endif // USB_FEATURE
+    }
 }
 
 void game_update_animations(Game *game, unsigned char ms) {
diff --git a/src/game.h b/src/game.h
index f82c51b..a58a438 100644
--- a/src/game.h
+++ b/src/game.h
@@ -25,6 +25,7 @@ typedef enum {
     I_NONE,
     I_ARMOR,
     I_GLOVE,
+    I_SWORD,
     I_BEER,
     I_MILK,
     I_TALISMAN,
@@ -38,6 +39,10 @@ typedef struct {
 
 typedef struct {
     Slot slots[SLOT_NUM];
+    Slot talisman;
+    Slot armor;
+    Slot weapon;
+    char open : 1;
 } Inventory;
 
 typedef struct {
@@ -204,6 +209,7 @@ typedef struct {
     bool debug_extra;
 
     Animation npc_animation;
+    Inventory inventory;
 
     int mana; /* Only for testing events TODO: Remove this! */
 } Game;
diff --git a/src/inventory.c b/src/inventory.c
index 91f36e5..511bf51 100644
--- a/src/inventory.c
+++ b/src/inventory.c
@@ -1 +1,51 @@
 #include "inventory.h"
+
+#include <gint/display.h>
+
+extern bopti_image_t inventory_img;
+extern bopti_image_t items_img;
+extern bopti_image_t player_male_inv_img;
+extern bopti_image_t player_female_inv_img;
+
+void inventory_draw(Game *game, Inventory *inventory) {
+    size_t i;
+    /* TODO: Cleanup! */
+    inventory->slots[5].i = I_GLOVE;
+    inventory->armor.i = I_ARMOR;
+    inventory->talisman.i = I_TALISMAN;
+    inventory->weapon.i = I_SWORD;
+    if(inventory->open) {
+        dimage(0, 0, &inventory_img);
+        for(i=0;i<SLOT_NUM;i++){
+#if GINT_RENDER_RGB
+            dsubimage(272+(i%SLOT_COLUMNS)*32, 87+(i/SLOT_COLUMNS)*32,
+                      &items_img, inventory->slots[i].i*28, 0, 28, 27,
+                      DIMAGE_NONE);
+#else
+            dsubimage(88+(i%SLOT_COLUMNS)*12, 24+(i/SLOT_COLUMNS)*12,
+                      &items_img, inventory->slots[i].i*8, 0, 8, 8,
+                      DIMAGE_NONE);
+#endif
+        }
+#if GINT_RENDER_RGB
+        dsubimage(222, 87, &items_img, inventory->talisman.i*28, 0, 28, 27,
+                  DIMAGE_NONE);
+        dsubimage(222, 87+32, &items_img, inventory->armor.i*28, 0, 28, 27,
+                  DIMAGE_NONE);
+        dsubimage(222, 87+64, &items_img, inventory->weapon.i*28, 0, 28, 27,
+                  DIMAGE_NONE);
+#else
+        dsubimage(72, 24, &items_img, inventory->talisman.i*8, 0, 8, 8,
+                  DIMAGE_NONE);
+        dsubimage(72, 24+12, &items_img, inventory->armor.i*8, 0, 8, 8,
+                  DIMAGE_NONE);
+        dsubimage(72, 24+24, &items_img, inventory->weapon.i*8, 0, 8, 8,
+                  DIMAGE_NONE);
+#endif
+#if GINT_RENDER_RGB
+        dimage(183, 20,
+               game->player.is_male ? &player_male_inv_img
+                                    : &player_female_inv_img);
+#endif
+    }
+}
diff --git a/src/inventory.h b/src/inventory.h
index 2c41b82..b8a0368 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -4,4 +4,6 @@
 /* The structs related to the inventory are defined in game.h */
 #include "game.h"
 
+void inventory_draw(Game *game, Inventory *inventory);
+
 #endif
diff --git a/src/main.c b/src/main.c
index 986e4ea..e9762af 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,31 +32,34 @@
 extern Map *worldRPG[];
 
 /* Game data (defined in "game.h")*/
-Game game = {NULL,
-             {12 * PXSIZE,
-              36 * PXSIZE,
-              0,
-              0,
-              100,
-              SPEED,
-              false,
-              0,
-              false,
-              false,
-              true,
-              {}},
-             {{}, {}, 0},
-             false,
-             false,
-             false,
-             0,
+Game game = {
+    NULL,
+    {12 * PXSIZE,
+     36 * PXSIZE,
+     0,
+     0,
+     100,
+     SPEED,
+     false,
+     0,
+     false,
+     false,
+     true,
+     {}},
+    {{}, {}, 0},
+    false,
+    false,
+    false,
+    0,
 
-             /* debug variables*/
-             false,
-             false,
-             false,
-             {},
-             100};
+    /* debug variables*/
+    false,
+    false,
+    false,
+    {},
+    {},
+    100,
+};
 
 /* screen capture management code. TODO: Clean this up! */
 

From 311b7f27df05bdecf56ec07dec6abba93907205a Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 1 Aug 2024 23:09:43 +0200
Subject: [PATCH 06/10] Ran clang-format

---
 src/inventory.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/inventory.c b/src/inventory.c
index 511bf51..1e135d7 100644
--- a/src/inventory.c
+++ b/src/inventory.c
@@ -16,30 +16,30 @@ void inventory_draw(Game *game, Inventory *inventory) {
     inventory->weapon.i = I_SWORD;
     if(inventory->open) {
         dimage(0, 0, &inventory_img);
-        for(i=0;i<SLOT_NUM;i++){
+        for(i = 0; i < SLOT_NUM; i++) {
 #if GINT_RENDER_RGB
-            dsubimage(272+(i%SLOT_COLUMNS)*32, 87+(i/SLOT_COLUMNS)*32,
-                      &items_img, inventory->slots[i].i*28, 0, 28, 27,
-                      DIMAGE_NONE);
+            dsubimage(272 + (i % SLOT_COLUMNS) * 32,
+                      87 + (i / SLOT_COLUMNS) * 32, &items_img,
+                      inventory->slots[i].i * 28, 0, 28, 27, DIMAGE_NONE);
 #else
-            dsubimage(88+(i%SLOT_COLUMNS)*12, 24+(i/SLOT_COLUMNS)*12,
-                      &items_img, inventory->slots[i].i*8, 0, 8, 8,
-                      DIMAGE_NONE);
+            dsubimage(88 + (i % SLOT_COLUMNS) * 12,
+                      24 + (i / SLOT_COLUMNS) * 12, &items_img,
+                      inventory->slots[i].i * 8, 0, 8, 8, DIMAGE_NONE);
 #endif
         }
 #if GINT_RENDER_RGB
-        dsubimage(222, 87, &items_img, inventory->talisman.i*28, 0, 28, 27,
+        dsubimage(222, 87, &items_img, inventory->talisman.i * 28, 0, 28, 27,
                   DIMAGE_NONE);
-        dsubimage(222, 87+32, &items_img, inventory->armor.i*28, 0, 28, 27,
+        dsubimage(222, 87 + 32, &items_img, inventory->armor.i * 28, 0, 28, 27,
                   DIMAGE_NONE);
-        dsubimage(222, 87+64, &items_img, inventory->weapon.i*28, 0, 28, 27,
+        dsubimage(222, 87 + 64, &items_img, inventory->weapon.i * 28, 0, 28, 27,
                   DIMAGE_NONE);
 #else
-        dsubimage(72, 24, &items_img, inventory->talisman.i*8, 0, 8, 8,
+        dsubimage(72, 24, &items_img, inventory->talisman.i * 8, 0, 8, 8,
                   DIMAGE_NONE);
-        dsubimage(72, 24+12, &items_img, inventory->armor.i*8, 0, 8, 8,
+        dsubimage(72, 24 + 12, &items_img, inventory->armor.i * 8, 0, 8, 8,
                   DIMAGE_NONE);
-        dsubimage(72, 24+24, &items_img, inventory->weapon.i*8, 0, 8, 8,
+        dsubimage(72, 24 + 24, &items_img, inventory->weapon.i * 8, 0, 8, 8,
                   DIMAGE_NONE);
 #endif
 #if GINT_RENDER_RGB

From 5dab7f9f1800b4cf7d612e6b539440158bbd81a3 Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Fri, 2 Aug 2024 12:59:10 +0200
Subject: [PATCH 07/10] Cleaner inventory rendering

---
 assets-cg/items.png  | Bin 666 -> 684 bytes
 assets/converters.py |   2 +-
 src/config.h         |  20 ++++++++++++++++----
 src/game.h           |  10 ++++++----
 src/inventory.c      |  39 ++++++++++-----------------------------
 5 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/assets-cg/items.png b/assets-cg/items.png
index 3730ee2e93787d7efb8035e967a2d93d8c297061..08ed2c27f0c219cff45abd95e639038b900c65fc 100644
GIT binary patch
delta 660
zcmV;F0&D%61*`>-B!6>BL_t(|ob8-jj>8}fMd@g^m@aa%$j%oMLdN)oF{$ro3mj}>
zFqGz1g6i)oAME@0U0%sco;A<3Q(Dc88cFKh<R!0Hn1GNPSH*Q|@{$LA9wH#L##K?B
zn!MzVc-sR4Gw#0O&#!CT-pr}VOCHAC8W50iBcn!wj2$^Od4I{9@wNqog>h9BrzX#r
zht0~Avb*ft5)fKvQtMPBEuFcN2en!2X?a-N)V@%8Cy(E+u2~yNoLS4(y7w&`h*7(<
z`j$K@(~{RRq4HKdN?>Yum<<qj_Pn?U1m}c6vPt5wIKkJ~gZd^t{b>7vtq2+(=Yg}}
zRcV+U-e^oXeSi47%Evur>Wzeq(9BHQ+?Cos^}*$=MwFRP)91bnWp<U?=UH#$!`XKb
z?+3?!hgwI~bV!?{QZx$&Ylf#dX_O_awRaW_kV5PsT2YLsWw2#3qS_gm5)78MS)@!H
zVXPJ7*4j5(5h)565LL4oX7%8%Y~MQ=yhZVy*JQ?Jgnvz$t_ybT=yOj=2ePl{84SC9
zwpv!{XV?{@74>M%QmY=;erd<jCkuI}N<ACW%Kk`>;ai1WAw1P@#CGM{s{-EZkl+d0
z9uVFqDpXz#4C;{{m52Q>#cfMkhN^Gmxu;C;ySykj7NHXZ?re(v^pCZ{z2-pWLG5Wy
z%s9MO(tn3a%9BdMgVInAFT@_g;>1CE<pYw{Yz^_CjkWd67{#C5HZ;7^u`72Uleb-y
zXU^l^G_bT!8Vp-+yH-8%K7I1e=H)-;l9#+j+XJGMXZ<HPd1v!N1Vky%d22)R&gO*)
uh*F;MUZ3Qh%?lL}txkROTk_84{R0OYYd40eLJesE0000<MNUMnLSTa9=S=?q

delta 641
zcmV-{0)G9h1)2qrB!6K^L_t(|ob8-pjshVJg_(_491kgn)L(26OKD5Ns_!KxyCd*X
z7-(T|jwICWOn2`4Yfgu>EbzdK%3~9aAhU4rz>CJ~eqn`4px}WQl}BEjg^i%#fftqc
za)E>8OkY1w9TYt9qVk^pp<q2oPZYdoBzWLO<Ng2P0h2<(`+t5OH!DlhzRSMD8zzCy
zHl{R>lxNWj9#v+^H_PM7me%DL`tOfQJPXs7VQI`Zt(Dg+m-~403Ujs$ZQ9zNRlJ;^
zKbA7Mw44pK+H^hM#cRbbk(OmyBx!h>!Pn-a>Sk?As-q-z)9`Y(+iT$!%`i2*UY}^{
za68leXrUh7L4Q*jif3`T7T!$Vq&Kd_8*z1$ggzr)o2RY2Hgp>CcIV?}{*hN`d1T1+
zYpNSc;@-V98Vufyo$?Bgw5-}*OGth3sgj>0MwB$1n~bP>MwSc)Pun~~CXG1Oihir@
z>v=?p!VQR`(G0V?b61wXdob*lbdkHmMlB<3$kf|CkbmwftdzAQ+k86*!@JvTwY<X5
zupXk8Wvg>mt8UiTwR7Q<hjxcbEt}HH`V^+s?yw$Wr`m<syJGEC1Af;g!8hn-K<wV(
zh{|gp#HFO)0;ST-JP7;b_WTsy<(kvWvxrsV9>o{6d*n0QXd|A+rF-zG@@96-G`w2Y
zo65?w%6h`1!cYy5Ttj&50BDb3MB;hP))bFgSbNWmQQFgb49CLjZM$mMF*xlCo;y!_
z(!kR`>tJ{~?W%=xk{Aabcu{%y#T<CxRl;wo!2_=n-ns!Ec$M&8Ch)+kB(BJ(zKIPy
b@HD&!q*AjlJNX>z00000NkvXXu0mjf*3C`i

diff --git a/assets/converters.py b/assets/converters.py
index 2d267f9..c3ddc50 100644
--- a/assets/converters.py
+++ b/assets/converters.py
@@ -142,7 +142,7 @@ def convert_map(input: str, output: str, params: dict, target):
         indoor = int(input_map.get_property("indoor"))
     except Exception as e:
         # Show a warning
-        print(f"WARNING: Indoor property not found.\n")
+        print(f"WARNING: Indoor property not found.")
 
     if indoor:
         # Get the indoor tileset
diff --git a/src/config.h b/src/config.h
index 67e0b3a..2176fa1 100644
--- a/src/config.h
+++ b/src/config.h
@@ -25,9 +25,15 @@
 /* The size of the player */
 #define P_WIDTH 16
 #define P_HEIGHT 16
-/*Max number of dynamic NPCs.*/
+/* Max number of dynamic NPCs. */
 #define NPC_STACK_SIZE 256
-
+/* The position of the slots in the inventory */
+#define SLOT_Y 87
+#define SLOT_X_EQUIPPED 222
+#define SLOT_X 272
+#define SLOT_W 28
+#define SLOT_H 27
+#define SLOT_SPACING 32
 #else
 /* The tile size */
 #define T_HEIGHT 8
@@ -38,9 +44,15 @@
 /* The player size */
 #define P_WIDTH 8
 #define P_HEIGHT 8
-/*Max number of "dynamic" NPCs. We are starved for static ram on fx !*/
+/* Max number of "dynamic" NPCs. We are starved for static ram on fx ! */
 #define NPC_STACK_SIZE 32
-
+/* The position of the slots in the inventory */
+#define SLOT_Y 24
+#define SLOT_X_EQUIPPED 72
+#define SLOT_X 88
+#define SLOT_W 8
+#define SLOT_H 8
+#define SLOT_SPACING 12
 #endif
 
 /* SPEED should NOT be 8 or bigger: it may cause bugs when handling
diff --git a/src/game.h b/src/game.h
index a58a438..be88cd4 100644
--- a/src/game.h
+++ b/src/game.h
@@ -33,15 +33,17 @@ typedef enum {
 } Item;
 
 typedef struct {
-    Item i;
+    Item i : 4;
     unsigned char durability;
 } Slot;
 
 typedef struct {
+    /* Backpack slots. */
     Slot slots[SLOT_NUM];
-    Slot talisman;
-    Slot armor;
-    Slot weapon;
+    /* Equipped items: first slot: talisman, second slot: armor, last slot:
+    weapon. */
+    Slot equipped[3];
+    /* 1 if the inventory is open. */
     char open : 1;
 } Inventory;
 
diff --git a/src/inventory.c b/src/inventory.c
index 1e135d7..b2a1145 100644
--- a/src/inventory.c
+++ b/src/inventory.c
@@ -9,40 +9,21 @@ extern bopti_image_t player_female_inv_img;
 
 void inventory_draw(Game *game, Inventory *inventory) {
     size_t i;
-    /* TODO: Cleanup! */
-    inventory->slots[5].i = I_GLOVE;
-    inventory->armor.i = I_ARMOR;
-    inventory->talisman.i = I_TALISMAN;
-    inventory->weapon.i = I_SWORD;
     if(inventory->open) {
         dimage(0, 0, &inventory_img);
         for(i = 0; i < SLOT_NUM; i++) {
-#if GINT_RENDER_RGB
-            dsubimage(272 + (i % SLOT_COLUMNS) * 32,
-                      87 + (i / SLOT_COLUMNS) * 32, &items_img,
-                      inventory->slots[i].i * 28, 0, 28, 27, DIMAGE_NONE);
-#else
-            dsubimage(88 + (i % SLOT_COLUMNS) * 12,
-                      24 + (i / SLOT_COLUMNS) * 12, &items_img,
-                      inventory->slots[i].i * 8, 0, 8, 8, DIMAGE_NONE);
-#endif
+            dsubimage(SLOT_X + (i % SLOT_COLUMNS) * SLOT_SPACING,
+                      SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING, &items_img,
+                      inventory->slots[i].i * SLOT_W, 0, SLOT_W, SLOT_H,
+                      DIMAGE_NONE);
+        }
+        for(i = 0; i < 3; i++) {
+            dsubimage(SLOT_X_EQUIPPED, SLOT_Y + i * SLOT_SPACING, &items_img,
+                      inventory->equipped[i].i * SLOT_W, 0, SLOT_W, SLOT_H,
+                      DIMAGE_NONE);
         }
 #if GINT_RENDER_RGB
-        dsubimage(222, 87, &items_img, inventory->talisman.i * 28, 0, 28, 27,
-                  DIMAGE_NONE);
-        dsubimage(222, 87 + 32, &items_img, inventory->armor.i * 28, 0, 28, 27,
-                  DIMAGE_NONE);
-        dsubimage(222, 87 + 64, &items_img, inventory->weapon.i * 28, 0, 28, 27,
-                  DIMAGE_NONE);
-#else
-        dsubimage(72, 24, &items_img, inventory->talisman.i * 8, 0, 8, 8,
-                  DIMAGE_NONE);
-        dsubimage(72, 24 + 12, &items_img, inventory->armor.i * 8, 0, 8, 8,
-                  DIMAGE_NONE);
-        dsubimage(72, 24 + 24, &items_img, inventory->weapon.i * 8, 0, 8, 8,
-                  DIMAGE_NONE);
-#endif
-#if GINT_RENDER_RGB
+        /* Render the player between the two swords if we are on cg. */
         dimage(183, 20,
                game->player.is_male ? &player_male_inv_img
                                     : &player_female_inv_img);

From b26cf53e91460b69095ae7ae39400acc47d5fd5c Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Fri, 2 Aug 2024 16:14:04 +0200
Subject: [PATCH 08/10] Inventory item selection.

---
 CMakeLists.txt                |  4 +++
 assets-fx/fxconv-metadata.txt |  8 +++++
 src/game.c                    | 46 ++++++++++++++++++++++--
 src/game.h                    |  3 ++
 src/inventory.c               | 66 +++++++++++++++++++++++++++++++++--
 src/inventory.h               |  5 ++-
 6 files changed, 126 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae1e57a..6d258ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,8 @@ set(ASSETS_cg
   assets-cg/font.png
   assets-cg/inventory.png
   assets-cg/items.png
+  assets-cg/selection.png
+  assets-cg/selected.png
 )
 
 set(ASSETS_cg_EGA64
@@ -88,6 +90,8 @@ set(ASSETS_fx
   assets-fx/SGN_Icon.png
   assets-fx/player_face.png
   assets-fx/font.png
+  assets-fx/selection.png
+  assets-fx/selected.png
   # ...
 )
 
diff --git a/assets-fx/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt
index 1d7d0f9..b3556bf 100644
--- a/assets-fx/fxconv-metadata.txt
+++ b/assets-fx/fxconv-metadata.txt
@@ -17,6 +17,14 @@ SGN_Icon.png:
   type: bopti-image
   name: SGN_Icon_img
 
+selection.png:
+  type: bopti-image
+  name: selection_img
+
+selected.png:
+  type: bopti-image
+  name: selected_img
+
 font.png:
   name: fontRPG
   type: font
diff --git a/src/game.c b/src/game.c
index 0b5306e..61f8987 100644
--- a/src/game.c
+++ b/src/game.c
@@ -36,6 +36,7 @@ void game_init(Game *game) {
     events_init_handler(&game->handler);
     events_bind_variable(&game->handler, (int *)&game->player.life, "life");
     events_bind_variable(&game->handler, &game->mana, "mana");
+    inventory_init(&game->inventory);
 
     // reload_npc(&game);
 }
@@ -122,8 +123,10 @@ void game_render_indicator(Game *game) {
 
 /* Draw everything. */
 void game_draw(Game *game) {
-    /*Only clear if we are inside, the screen is guaranteed to be filled
+    /* Only clear if we are inside, the screen is guaranteed to be filled
      * otherwise */
+    /* (Mibi88) if we do so, we should only use opaque tiles in the background
+    layer (it's currently not the case), to artefacts when rendering dialogs. */
     if(game->map_level->indoor)
         dclear(C_WHITE);
     map_render_by_layer(game, BACKGROUND);
@@ -136,7 +139,7 @@ void game_draw(Game *game) {
     dprint(8, 8, C_BLACK, "npc_count: %d", npc_count);
     dprint(8, 16, C_BLACK, "Mana: %d", game->mana);
     dprint(8, 24, C_BLACK, "X: %d Y: %d", game->player.x, game->player.y);
-    inventory_draw(game, &game->inventory);
+    inventory_draw(&game->inventory, &game->player);
 }
 
 /* Key management */
@@ -159,6 +162,45 @@ void game_get_inputs(Game *game) {
             clearevents();
             sleep();
         }
+    } else if(game->inventory.open) {
+        if(keydown(KEY_LEFT))
+            inventory_move_selection(&game->inventory, D_LEFT);
+            /* TODO: Make something cleaner */
+            while(keydown(KEY_LEFT)) {
+                clearevents();
+                sleep();
+            }
+        if(keydown(KEY_RIGHT))
+            inventory_move_selection(&game->inventory, D_RIGHT);
+            /* TODO: Make something cleaner */
+            while(keydown(KEY_RIGHT)) {
+                clearevents();
+                sleep();
+            }
+        if(keydown(KEY_UP))
+            inventory_move_selection(&game->inventory, D_UP);
+            /* TODO: Make something cleaner */
+            while(keydown(KEY_UP)) {
+                clearevents();
+                sleep();
+            }
+        if(keydown(KEY_DOWN))
+            inventory_move_selection(&game->inventory, D_DOWN);
+            /* TODO: Make something cleaner */
+            while(keydown(KEY_DOWN)) {
+                clearevents();
+                sleep();
+            }
+        if(keydown(KEY_SHIFT))
+            game->inventory.selected = game->inventory.selection;
+        if(keydown(KEY_OPTN)) {
+            game->player.is_male = !game->player.is_male;
+            /* TODO: Make something cleaner */
+            while(keydown(KEY_OPTN)) {
+                clearevents();
+                sleep();
+            }
+        }
     } else {
         /* Player actions - Prototypes in player.h and implementation in
          * player.c */
diff --git a/src/game.h b/src/game.h
index be88cd4..9670a4c 100644
--- a/src/game.h
+++ b/src/game.h
@@ -45,6 +45,8 @@ typedef struct {
     Slot equipped[3];
     /* 1 if the inventory is open. */
     char open : 1;
+    char selected;
+    char selection;
 } Inventory;
 
 typedef struct {
@@ -142,6 +144,7 @@ typedef struct {
     uint8_t current_group;
     uint8_t hostile_to_group;
 
+    /* uint16_t to keep the struct aligned */
     uint16_t __padding;
 } NPC;
 
diff --git a/src/inventory.c b/src/inventory.c
index b2a1145..5289fc1 100644
--- a/src/inventory.c
+++ b/src/inventory.c
@@ -1,13 +1,24 @@
 #include "inventory.h"
 
 #include <gint/display.h>
+#include <string.h>
 
 extern bopti_image_t inventory_img;
 extern bopti_image_t items_img;
+extern bopti_image_t selection_img;
+extern bopti_image_t selected_img;
 extern bopti_image_t player_male_inv_img;
 extern bopti_image_t player_female_inv_img;
 
-void inventory_draw(Game *game, Inventory *inventory) {
+void inventory_init(Inventory *inventory) {
+    inventory->open = 0;
+    memset(inventory->slots, 0, sizeof(Slot)*SLOT_NUM);
+    memset(inventory->equipped, 0, sizeof(Slot)*3);
+    inventory->selected = -1;
+    inventory->selection = 0;
+}
+
+void inventory_draw(Inventory *inventory, Player *player) {
     size_t i;
     if(inventory->open) {
         dimage(0, 0, &inventory_img);
@@ -16,6 +27,16 @@ void inventory_draw(Game *game, Inventory *inventory) {
                       SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING, &items_img,
                       inventory->slots[i].i * SLOT_W, 0, SLOT_W, SLOT_H,
                       DIMAGE_NONE);
+            if(i == inventory->selection){
+                dimage(SLOT_X + (i % SLOT_COLUMNS) * SLOT_SPACING,
+                       SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING,
+                       &selection_img);
+            }
+            if(i == inventory->selected){
+                dimage(SLOT_X + (i % SLOT_COLUMNS) * SLOT_SPACING,
+                       SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING,
+                       &selected_img);
+            }
         }
         for(i = 0; i < 3; i++) {
             dsubimage(SLOT_X_EQUIPPED, SLOT_Y + i * SLOT_SPACING, &items_img,
@@ -25,8 +46,47 @@ void inventory_draw(Game *game, Inventory *inventory) {
 #if GINT_RENDER_RGB
         /* Render the player between the two swords if we are on cg. */
         dimage(183, 20,
-               game->player.is_male ? &player_male_inv_img
-                                    : &player_female_inv_img);
+               player->is_male ? &player_male_inv_img : &player_female_inv_img);
 #endif
     }
 }
+
+char inventory_add(Inventory *inventory, Item item) {
+    size_t i;
+    for(i = 0; i < SLOT_NUM; i++) {
+        if(!inventory->slots[i].i) {
+            inventory->slots[i].i = item;
+            inventory->slots[i].durability = 255;
+            return 0;
+        }
+    }
+    return 1;
+}
+
+void inventory_move_selection(Inventory *inventory, Direction direction) {
+    switch(direction) {
+    case D_UP:
+        inventory->selection -= SLOT_COLUMNS;
+        if(inventory->selection < 0)
+            inventory->selection = 0;
+        break;
+    case D_DOWN:
+        inventory->selection += SLOT_COLUMNS;
+        if(inventory->selection >= SLOT_NUM) {
+            inventory->selection = SLOT_NUM - 1;
+        }
+        break;
+    case D_LEFT:
+        if(inventory->selection > 0) {
+            inventory->selection--;
+        }
+        break;
+    case D_RIGHT:
+        if(inventory->selection < SLOT_NUM - 1) {
+            inventory->selection++;
+        }
+        break;
+    default:
+        break;
+    }
+}
diff --git a/src/inventory.h b/src/inventory.h
index b8a0368..4e547f6 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -4,6 +4,9 @@
 /* The structs related to the inventory are defined in game.h */
 #include "game.h"
 
-void inventory_draw(Game *game, Inventory *inventory);
+void inventory_init(Inventory *inventory);
+void inventory_draw(Inventory *inventory, Player *player);
+char inventory_add(Inventory *inventory, Item item);
+void inventory_move_selection(Inventory *inventory, Direction direction);
 
 #endif

From fe824d73405983bc048fe7a0cc9654f05ef1c3f5 Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Fri, 2 Aug 2024 18:29:27 +0200
Subject: [PATCH 09/10] Inventory management.

---
 src/game.c      | 23 ++++++++++++++----
 src/game.h      |  9 +++++++
 src/inventory.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/inventory.h |  3 +++
 4 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/src/game.c b/src/game.c
index 61f8987..8aae513 100644
--- a/src/game.c
+++ b/src/game.c
@@ -37,6 +37,10 @@ void game_init(Game *game) {
     events_bind_variable(&game->handler, (int *)&game->player.life, "life");
     events_bind_variable(&game->handler, &game->mana, "mana");
     inventory_init(&game->inventory);
+    /* For debugging */
+    game->inventory.slots[5].i = I_GLOVE;
+    game->inventory.slots[1].i = I_ARMOR;
+    game->inventory.slots[8].i = I_TALISMAN;
 
     // reload_npc(&game);
 }
@@ -191,16 +195,27 @@ void game_get_inputs(Game *game) {
                 clearevents();
                 sleep();
             }
-        if(keydown(KEY_SHIFT))
-            game->inventory.selected = game->inventory.selection;
-        if(keydown(KEY_OPTN)) {
-            game->player.is_male = !game->player.is_male;
+        if(keydown(KEY_OPTN))
+            inventory_move_from_selected(&game->inventory);
             /* TODO: Make something cleaner */
             while(keydown(KEY_OPTN)) {
                 clearevents();
                 sleep();
             }
+        if(keydown(KEY_SQUARE)) {
+            inventory_use(&game->inventory, &game->player);
         }
+        if(keydown(KEY_F1)) {
+            inventory_unequip(&game->inventory, IT_TALISMAN);
+        }
+        if(keydown(KEY_F2)) {
+            inventory_unequip(&game->inventory, IT_ARMOR);
+        }
+        if(keydown(KEY_F3)) {
+            inventory_unequip(&game->inventory, IT_WEAPON);
+        }
+        if(keydown(KEY_SHIFT))
+            game->inventory.selected = game->inventory.selection;
     } else {
         /* Player actions - Prototypes in player.h and implementation in
          * player.c */
diff --git a/src/game.h b/src/game.h
index 9670a4c..f42269a 100644
--- a/src/game.h
+++ b/src/game.h
@@ -32,6 +32,15 @@ typedef enum {
     I_AMOUNT
 } Item;
 
+typedef enum {
+    IT_NONE,
+    IT_TALISMAN,
+    IT_ARMOR,
+    IT_WEAPON,
+    IT_FOOD,
+    IT_AMOUNT
+} ItemType;
+
 typedef struct {
     Item i : 4;
     unsigned char durability;
diff --git a/src/inventory.c b/src/inventory.c
index 5289fc1..ec1836a 100644
--- a/src/inventory.c
+++ b/src/inventory.c
@@ -10,6 +10,16 @@ extern bopti_image_t selected_img;
 extern bopti_image_t player_male_inv_img;
 extern bopti_image_t player_female_inv_img;
 
+char item_types[I_AMOUNT] = {
+    IT_NONE,
+    IT_ARMOR,
+    IT_WEAPON,
+    IT_WEAPON,
+    IT_FOOD,
+    IT_FOOD,
+    IT_TALISMAN
+};
+
 void inventory_init(Inventory *inventory) {
     inventory->open = 0;
     memset(inventory->slots, 0, sizeof(Slot)*SLOT_NUM);
@@ -49,6 +59,7 @@ void inventory_draw(Inventory *inventory, Player *player) {
                player->is_male ? &player_male_inv_img : &player_female_inv_img);
 #endif
     }
+    /* TODO: Stats. */
 }
 
 char inventory_add(Inventory *inventory, Item item) {
@@ -63,6 +74,59 @@ char inventory_add(Inventory *inventory, Item item) {
     return 1;
 }
 
+void inventory_move_from_selected(Inventory *inventory) {
+    if(inventory->selected < 0) return;
+    Slot current = inventory->slots[inventory->selection];
+    Slot new = inventory->slots[inventory->selected];
+    inventory->slots[inventory->selection] = new;
+    inventory->slots[inventory->selected] = current;
+}
+
+void inventory_use(Inventory *inventory, Player *player) {
+    Item item = inventory->slots[inventory->selection].i;
+    switch(item_types[item]){
+        case IT_TALISMAN:
+            inventory->equipped[0] = inventory->slots[inventory->selection];
+            break;
+        case IT_ARMOR:
+            inventory->equipped[1] = inventory->slots[inventory->selection];
+            break;
+        case IT_WEAPON:
+            inventory->equipped[2] = inventory->slots[inventory->selection];
+            break;
+        case IT_FOOD:
+            /* TODO */
+            break;
+        default:
+            break;
+    }
+    inventory->slots[inventory->selection].i = I_NONE;
+    inventory->slots[inventory->selection].durability = 255;
+}
+
+void inventory_unequip(Inventory *inventory, ItemType type) {
+    if(inventory->slots[inventory->selection].i) return;
+    switch(type){
+        case IT_TALISMAN:
+            inventory->slots[inventory->selection] = inventory->equipped[0];
+            inventory->equipped[0].i = I_NONE;
+            inventory->equipped[0].durability = 255;
+            break;
+        case IT_ARMOR:
+            inventory->slots[inventory->selection] = inventory->equipped[1];
+            inventory->equipped[1].i = I_NONE;
+            inventory->equipped[1].durability = 255;
+            break;
+        case IT_WEAPON:
+            inventory->slots[inventory->selection] = inventory->equipped[2];
+            inventory->equipped[2].i = I_NONE;
+            inventory->equipped[2].durability = 255;
+            break;
+        default:
+            break;
+    }
+}
+
 void inventory_move_selection(Inventory *inventory, Direction direction) {
     switch(direction) {
     case D_UP:
diff --git a/src/inventory.h b/src/inventory.h
index 4e547f6..5bc3116 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -7,6 +7,9 @@
 void inventory_init(Inventory *inventory);
 void inventory_draw(Inventory *inventory, Player *player);
 char inventory_add(Inventory *inventory, Item item);
+void inventory_move_from_selected(Inventory *inventory);
+void inventory_use(Inventory *inventory, Player *player);
+void inventory_unequip(Inventory *inventory, ItemType type);
 void inventory_move_selection(Inventory *inventory, Direction direction);
 
 #endif

From a27ad9a14f0294afd88415f893c10f09c6e7612e Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Fri, 2 Aug 2024 18:29:56 +0200
Subject: [PATCH 10/10] Ran clang-format

---
 src/game.c      | 50 +++++++++++++--------------
 src/inventory.c | 91 +++++++++++++++++++++++--------------------------
 2 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/src/game.c b/src/game.c
index 8aae513..935994c 100644
--- a/src/game.c
+++ b/src/game.c
@@ -169,39 +169,39 @@ void game_get_inputs(Game *game) {
     } else if(game->inventory.open) {
         if(keydown(KEY_LEFT))
             inventory_move_selection(&game->inventory, D_LEFT);
-            /* TODO: Make something cleaner */
-            while(keydown(KEY_LEFT)) {
-                clearevents();
-                sleep();
-            }
+        /* TODO: Make something cleaner */
+        while(keydown(KEY_LEFT)) {
+            clearevents();
+            sleep();
+        }
         if(keydown(KEY_RIGHT))
             inventory_move_selection(&game->inventory, D_RIGHT);
-            /* TODO: Make something cleaner */
-            while(keydown(KEY_RIGHT)) {
-                clearevents();
-                sleep();
-            }
+        /* TODO: Make something cleaner */
+        while(keydown(KEY_RIGHT)) {
+            clearevents();
+            sleep();
+        }
         if(keydown(KEY_UP))
             inventory_move_selection(&game->inventory, D_UP);
-            /* TODO: Make something cleaner */
-            while(keydown(KEY_UP)) {
-                clearevents();
-                sleep();
-            }
+        /* TODO: Make something cleaner */
+        while(keydown(KEY_UP)) {
+            clearevents();
+            sleep();
+        }
         if(keydown(KEY_DOWN))
             inventory_move_selection(&game->inventory, D_DOWN);
-            /* TODO: Make something cleaner */
-            while(keydown(KEY_DOWN)) {
-                clearevents();
-                sleep();
-            }
+        /* TODO: Make something cleaner */
+        while(keydown(KEY_DOWN)) {
+            clearevents();
+            sleep();
+        }
         if(keydown(KEY_OPTN))
             inventory_move_from_selected(&game->inventory);
-            /* TODO: Make something cleaner */
-            while(keydown(KEY_OPTN)) {
-                clearevents();
-                sleep();
-            }
+        /* TODO: Make something cleaner */
+        while(keydown(KEY_OPTN)) {
+            clearevents();
+            sleep();
+        }
         if(keydown(KEY_SQUARE)) {
             inventory_use(&game->inventory, &game->player);
         }
diff --git a/src/inventory.c b/src/inventory.c
index ec1836a..3533c5c 100644
--- a/src/inventory.c
+++ b/src/inventory.c
@@ -10,20 +10,13 @@ extern bopti_image_t selected_img;
 extern bopti_image_t player_male_inv_img;
 extern bopti_image_t player_female_inv_img;
 
-char item_types[I_AMOUNT] = {
-    IT_NONE,
-    IT_ARMOR,
-    IT_WEAPON,
-    IT_WEAPON,
-    IT_FOOD,
-    IT_FOOD,
-    IT_TALISMAN
-};
+char item_types[I_AMOUNT] = {IT_NONE, IT_ARMOR, IT_WEAPON,  IT_WEAPON,
+                             IT_FOOD, IT_FOOD,  IT_TALISMAN};
 
 void inventory_init(Inventory *inventory) {
     inventory->open = 0;
-    memset(inventory->slots, 0, sizeof(Slot)*SLOT_NUM);
-    memset(inventory->equipped, 0, sizeof(Slot)*3);
+    memset(inventory->slots, 0, sizeof(Slot) * SLOT_NUM);
+    memset(inventory->equipped, 0, sizeof(Slot) * 3);
     inventory->selected = -1;
     inventory->selection = 0;
 }
@@ -37,12 +30,12 @@ void inventory_draw(Inventory *inventory, Player *player) {
                       SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING, &items_img,
                       inventory->slots[i].i * SLOT_W, 0, SLOT_W, SLOT_H,
                       DIMAGE_NONE);
-            if(i == inventory->selection){
+            if(i == inventory->selection) {
                 dimage(SLOT_X + (i % SLOT_COLUMNS) * SLOT_SPACING,
                        SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING,
                        &selection_img);
             }
-            if(i == inventory->selected){
+            if(i == inventory->selected) {
                 dimage(SLOT_X + (i % SLOT_COLUMNS) * SLOT_SPACING,
                        SLOT_Y + (i / SLOT_COLUMNS) * SLOT_SPACING,
                        &selected_img);
@@ -75,7 +68,8 @@ char inventory_add(Inventory *inventory, Item item) {
 }
 
 void inventory_move_from_selected(Inventory *inventory) {
-    if(inventory->selected < 0) return;
+    if(inventory->selected < 0)
+        return;
     Slot current = inventory->slots[inventory->selection];
     Slot new = inventory->slots[inventory->selected];
     inventory->slots[inventory->selection] = new;
@@ -84,46 +78,47 @@ void inventory_move_from_selected(Inventory *inventory) {
 
 void inventory_use(Inventory *inventory, Player *player) {
     Item item = inventory->slots[inventory->selection].i;
-    switch(item_types[item]){
-        case IT_TALISMAN:
-            inventory->equipped[0] = inventory->slots[inventory->selection];
-            break;
-        case IT_ARMOR:
-            inventory->equipped[1] = inventory->slots[inventory->selection];
-            break;
-        case IT_WEAPON:
-            inventory->equipped[2] = inventory->slots[inventory->selection];
-            break;
-        case IT_FOOD:
-            /* TODO */
-            break;
-        default:
-            break;
+    switch(item_types[item]) {
+    case IT_TALISMAN:
+        inventory->equipped[0] = inventory->slots[inventory->selection];
+        break;
+    case IT_ARMOR:
+        inventory->equipped[1] = inventory->slots[inventory->selection];
+        break;
+    case IT_WEAPON:
+        inventory->equipped[2] = inventory->slots[inventory->selection];
+        break;
+    case IT_FOOD:
+        /* TODO */
+        break;
+    default:
+        break;
     }
     inventory->slots[inventory->selection].i = I_NONE;
     inventory->slots[inventory->selection].durability = 255;
 }
 
 void inventory_unequip(Inventory *inventory, ItemType type) {
-    if(inventory->slots[inventory->selection].i) return;
-    switch(type){
-        case IT_TALISMAN:
-            inventory->slots[inventory->selection] = inventory->equipped[0];
-            inventory->equipped[0].i = I_NONE;
-            inventory->equipped[0].durability = 255;
-            break;
-        case IT_ARMOR:
-            inventory->slots[inventory->selection] = inventory->equipped[1];
-            inventory->equipped[1].i = I_NONE;
-            inventory->equipped[1].durability = 255;
-            break;
-        case IT_WEAPON:
-            inventory->slots[inventory->selection] = inventory->equipped[2];
-            inventory->equipped[2].i = I_NONE;
-            inventory->equipped[2].durability = 255;
-            break;
-        default:
-            break;
+    if(inventory->slots[inventory->selection].i)
+        return;
+    switch(type) {
+    case IT_TALISMAN:
+        inventory->slots[inventory->selection] = inventory->equipped[0];
+        inventory->equipped[0].i = I_NONE;
+        inventory->equipped[0].durability = 255;
+        break;
+    case IT_ARMOR:
+        inventory->slots[inventory->selection] = inventory->equipped[1];
+        inventory->equipped[1].i = I_NONE;
+        inventory->equipped[1].durability = 255;
+        break;
+    case IT_WEAPON:
+        inventory->slots[inventory->selection] = inventory->equipped[2];
+        inventory->equipped[2].i = I_NONE;
+        inventory->equipped[2].durability = 255;
+        break;
+    default:
+        break;
     }
 }