Apply suggestions from review

pret · Jan 28, 2024 · e4edaa7 · e4edaa7
1 parent 2a325ba
commit e4edaa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/include/core_sys.h b/include/core_sys.h
@@ -5,12 +5,12 @@
 #include "struct_decls/struct_0201CD88_decl.h"
 #include "overlay023/funcptr_ov23_022537D4.h"
 
-typedef enum ButtonMode {
+enum ButtonMode {
     BUTTON_MODE_NORMAL = 0,
     BUTTON_MODE_START_IS_X = 1,
     BUTTON_MODE_SWAP_XY = 2,
     BUTTON_MODE_L_IS_A = 3,
-} ButtonMode;
+};
 
 typedef struct CoreSys {
     UnkFuncPtr_02017798 unk_00;
@@ -26,7 +26,7 @@ typedef struct CoreSys {
     u32 * unk_28;
     u32 unk_2C;
     u32 unk_30;
-    ButtonMode buttonMode;
+    enum ButtonMode buttonMode;
     u32 heldKeysRaw;
     u32 pressedKeysRaw;
     u32 pressedKeysRepeatableRaw;

diff --git a/src/main.c b/src/main.c
@@ -38,6 +38,8 @@
 #include "unk_02039A64.h"
 #include "unk_0209A74C.h"
 
+#define RESET_COMBO (PAD_BUTTON_START | PAD_BUTTON_SELECT | PAD_BUTTON_L | PAD_BUTTON_R)
+
 FS_EXTERN_OVERLAY(overlay57);
 FS_EXTERN_OVERLAY(overlay77);
 
@@ -122,7 +124,7 @@ void NitroMain (void)
         sub_0200106C();
         ReadKeypadAndTouchpad();
 
-        if ((gCoreSys.heldKeysRaw & (PAD_BUTTON_START | PAD_BUTTON_SELECT | PAD_BUTTON_L | PAD_BUTTON_R)) == (PAD_BUTTON_START | PAD_BUTTON_SELECT | PAD_BUTTON_L | PAD_BUTTON_R)) {
+        if ((gCoreSys.heldKeysRaw & RESET_COMBO) == RESET_COMBO) {
             if (gCoreSys.unk_68 == 0) {
                 sub_02000F60(0);
             }