From 2c8fe78477c0fc285147c4ccb98248fb61ba1324 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 18 Jul 2023 11:34:42 -0400
Subject: [PATCH] Re-enabled pedantic flag =(

---
 common.mk                             | 2 +-
 src/battle/battle_controller_player.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 0f6628cec..4ceb85b85 100644
--- a/common.mk
+++ b/common.mk
@@ -108,7 +108,7 @@ XMAP              := $(NEF).xMAP
 
 EXCCFLAGS         := -Cpp_exceptions off
 
-MWCFLAGS           = $(DEFINES) $(OPTFLAGS) -enum int -lang c99 $(EXCCFLAGS) -gccext,on -proc $(PROC) -msgstyle gcc -gccinc -i ./include -i ./include/library -i $(WORK_DIR)/files -I$(WORK_DIR)/lib/include -ipa file -interworking -inline on,noauto -char signed -W all -W nopedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error
+MWCFLAGS           = $(DEFINES) $(OPTFLAGS) -enum int -lang c99 $(EXCCFLAGS) -gccext,on -proc $(PROC) -msgstyle gcc -gccinc -i ./include -i ./include/library -i $(WORK_DIR)/files -I$(WORK_DIR)/lib/include -ipa file -interworking -inline on,noauto -char signed -W all -W pedantic -W noimpl_signedunsigned -W noimplicitconv -W nounusedarg -W nomissingreturn -W error
 
 MWASFLAGS          = $(DEFINES) -proc $(PROC_S) -gccinc -i . -i ./include -i $(WORK_DIR)/asm/include -i $(WORK_DIR)/files -i $(WORK_DIR)/lib/asm/include -i $(WORK_DIR)/lib/NitroDWC/asm/include -i $(WORK_DIR)/lib/NitroSDK/asm/include -i $(WORK_DIR)/lib/syscall/asm/include -I$(WORK_DIR)/lib/include -DSDK_ASM
 MWLDFLAGS         := -proc $(PROC) -nopic -nopid -interworking -map closure,unused -symtab sort -m _start -msgstyle gcc
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 70b3fbc88..672e05f2c 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -130,7 +130,7 @@ typedef enum BattleSelectState {
     BS_STATE_15,
     BS_STATE_16,
     BS_STATE_END
-} SelectionScreenInputState;
+} BattleSelectState;
 
 //static
 void BattleControllerPlayer_SelectionScreenInput(BattleSystem *bsys, BATTLECONTEXT *ctx) {