fix merge conflicts, evo scene

1 files changed, 4 insertions, 0 deletions

diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h
index 9684425fe..a466abc04 100644
--- a/include/battle_script_commands.h
+++ b/include/battle_script_commands.h
@@ -25,6 +25,7 @@
 #define VARIOUS_GET_MOVE_TARGET                 3
 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
+#define VARIOUS_EMIT_YESNOBOX                   13
 #define VARIOUS_WAIT_CRY                        18
 #define VARIOUS_RETURN_OPPONENT_MON1            19
 #define VARIOUS_RETURN_OPPONENT_MON2            20
@@ -41,6 +42,9 @@
 #define STAT_CHANGE_WORKED      0
 #define STAT_CHANGE_DIDNT_WORK  1
 
+#define WINDOW_CLEAR            0x1
+#define WINDOW_x80              0x80
+
 void AI_CalcDmg(u8 bankAtk, u8 bankDef);
 u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
 u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);