From fade8563ef1b7d3b4e82c148e64e6ec122390159 Mon Sep 17 00:00:00 2001
From: RavePossum <ravepossum@proton.me>
Date: Tue, 5 Nov 2024 17:44:48 -0500
Subject: [PATCH] Replace "none" values with -1 for clarity

---
 include/applications/pokemon_summary_screen/main.h  |  2 +-
 include/touch_screen.h                              |  2 +-
 src/applications/pokemon_summary_screen/subscreen.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/applications/pokemon_summary_screen/main.h b/include/applications/pokemon_summary_screen/main.h
index 87436e1f4d..80af958449 100644
--- a/include/applications/pokemon_summary_screen/main.h
+++ b/include/applications/pokemon_summary_screen/main.h
@@ -146,7 +146,7 @@ enum PSSPoffinFeedMsg {
     PSS_MSG_MON_WONT_EAT_MORE = 0xFF,
 };
 
-#define PSS_MOVE_NONE             0xFFFFFFFF
+#define PSS_MOVE_NONE             -1
 #define PSS_SUBSCREEN_BUTTON_NONE 0xFF
 
 #define POINTS_PER_APPEAL_HEART 10
diff --git a/include/touch_screen.h b/include/touch_screen.h
index 7587eb7a6b..b40e5db83f 100644
--- a/include/touch_screen.h
+++ b/include/touch_screen.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_TOUCH_SCREEN_H
 
 #define TOUCHSCREEN_USE_CIRCLE 0xfe
-#define TOUCHSCREEN_INPUT_NONE 0xFFFFFFFF
+#define TOUCHSCREEN_INPUT_NONE -1
 
 /**
  * These two structs represent regions that can be checked on the touch screen.
diff --git a/src/applications/pokemon_summary_screen/subscreen.c b/src/applications/pokemon_summary_screen/subscreen.c
index f150d7f68c..5758ac7e22 100644
--- a/src/applications/pokemon_summary_screen/subscreen.c
+++ b/src/applications/pokemon_summary_screen/subscreen.c
@@ -32,7 +32,7 @@ static const PSSSubscreenButton sSubscreenButtons_Normal[] = {
     { PSS_PAGE_CONTEST_MOVES, 3, 22, 15 },
     { PSS_PAGE_RIBBONS, 4, 25, 10 },
     { PSS_PAGE_EXIT, 4, 26, 4 },
-    { PSS_PAGE_NONE, 255, 255, 255 }
+    { PSS_PAGE_NONE, -1, -1, -1 }
 };
 
 static const PSSSubscreenButton sSubscreenButtons_NoContestInfo[] = {
@@ -41,13 +41,13 @@ static const PSSSubscreenButton sSubscreenButtons_NoContestInfo[] = {
     { PSS_PAGE_SKILLS, 2, 14, 18 },
     { PSS_PAGE_BATTLE_MOVES, 3, 22, 15 },
     { PSS_PAGE_EXIT, 4, 26, 9 },
-    { PSS_PAGE_NONE, 255, 255, 255 }
+    { PSS_PAGE_NONE, -1, -1, -1 }
 };
 
 static const PSSSubscreenButton sSubscreenButtons_UnusedMovesOnly[] = {
     { PSS_PAGE_BATTLE_MOVES, 3, 10, 18 },
     { PSS_PAGE_CONTEST_MOVES, 3, 17, 18 },
-    { PSS_PAGE_NONE, 255, 255, 255 }
+    { PSS_PAGE_NONE, -1, -1, -1 }
 };
 
 static const PSSSubscreenButton *sSubscreenButtonTypes[] = {
@@ -65,7 +65,7 @@ static const TouchScreenRect sSubscreenRectangles_Normal[] = {
     { 120, 159, 176, 215 },
     { 80, 119, 200, 239 },
     { 32, 71, 208, 247 },
-    { 255, 0, 0, 0 }
+    { -1, 0, 0, 0 }
 };
 
 static const TouchScreenRect sSubscreenRectangles_NoContestInfo[] = {
@@ -74,13 +74,13 @@ static const TouchScreenRect sSubscreenRectangles_NoContestInfo[] = {
     { 144, 183, 108, 147 },
     { 120, 159, 172, 211 },
     { 72, 111, 204, 243 },
-    { 255, 0, 0, 0 }
+    { -1, 0, 0, 0 }
 };
 
 static const TouchScreenRect sSubscreenRectangles_UnusedMovesOnly[] = {
     { 144, 183, 80, 119 },
     { 144, 183, 136, 175 },
-    { 255, 0, 0, 0 }
+    { -1, 0, 0, 0 }
 };
 
 static const TouchScreenRect *sSubscreenRectangles[] = {