move mon data fix conflicts

constants/battle_constants.inc

@@ -45,21 +45,21 @@
     .set OPPONENT_TELEPORTED,  0xA
     
 @ identities
-    .set IDENTITY_PLAYER_MON1,	0
-    .set IDENTITY_OPPONENT_MON1,	1
-    .set IDENTITY_PLAYER_MON2,	2
-    .set IDENTITY_OPPONENT_MON2,	3
+    .set B_POSITION_PLAYER_LEFT,	0
+    .set B_POSITION_OPPONENT_LEFT,	1
+    .set B_POSITION_PLAYER_RIGHT,	2
+    .set B_POSITION_OPPONENT_RIGHT,	3
 
 @ status 1
-	.set STATUS_SLEEP, 0x7
-	.set STATUS_POISON, 0x8
-	.set STATUS_BURN, 0x10
-	.set STATUS_FREEZE, 0x20
-	.set STATUS_PARALYSIS, 0x40
-	.set STATUS_TOXIC_POISON, 0x80
-	.set STATUS_TOXIC_COUNTER, 0xF00
+	.set STATUS1_SLEEP, 0x7
+	.set STATUS1_POISON, 0x8
+	.set STATUS1_BURN, 0x10
+	.set STATUS1_FREEZE, 0x20
+	.set STATUS1_PARALYSIS, 0x40
+	.set STATUS1_TOXIC_POISON, 0x80
+	.set STATUS1_TOXIC_COUNTER, 0xF00
 	
-	.set STATUS_ANY, STATUS_SLEEP | STATUS_POISON | STATUS_BURN | STATUS_FREEZE | STATUS_PARALYSIS | STATUS_TOXIC_POISON
+	.set STATUS1_ANY, STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON
 
 @ status 2
 	.set STATUS2_CONFUSION, 0x00000007
@@ -160,11 +160,12 @@
 	.set HITMARKER_x8000000, 0x08000000
 
 @ move flags
-	.set MOVESTATUS_MISSED, 0x1
-	.set MOVESTATUS_SUPEREFFECTIVE, 0x2
-	.set MOVESTATUS_NOTVERYEFFECTIVE, 0x4
-	.set MOVESTATUS_NOTAFFECTED, 0x8
-	.set MOVESTATUS_ONEHITKO, 0x10
-	.set MOVESTATUS_FAILED, 0x20
-	.set MOVESTATUS_ENDURED, 0x40
-	.set MOVESTATUS_HUNGON, 0x80
+	.set MOVE_RESULT_MISSED, 0x1
+	.set MOVE_RESULT_SUPER_EFFECTIVE, 0x2
+	.set MOVE_RESULT_NOT_VERY_EFFECTIVE, 0x4
+	.set MOVE_RESULT_DOESNT_AFFECT_FOE, 0x8
+	.set MOVE_RESULT_ONE_HIT_KO, 0x10
+	.set MOVE_RESULT_FAILED, 0x20
+	.set MOVE_RESULT_FOE_ENDURED, 0x40
+	.set MOVE_RESULT_FOE_HUNG_ON, 0x80
+	.set MOVE_RESULT_NO_EFFECT, (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)