From 2f0b152e5a52d39bfe938f8f19cdd49d3dcd4671 Mon Sep 17 00:00:00 2001
From: 2Tie <foxman95@ymail.com>
Date: Mon, 18 Jun 2018 22:53:06 -0600
Subject: this is how you fix conflicts, right?

---
 constants/wram_constants.asm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'constants')

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 4b63ba7..18b7e4a 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -7,6 +7,22 @@
 	const RIGHT    ; 3
 NUM_DIRECTIONS EQU const_value
 
+; wMonType:: ; cb5a
+	const_def
+	const PARTYMON   ; 0
+	const OTPARTYMON ; 1
+	const BOXMON     ; 2
+	const TEMPMON    ; 3
+	const WILDMON    ; 4
+	
+; wPlayerState:: ; d95d
+PLAYER_NORMAL    EQU 0
+PLAYER_BIKE      EQU 1
+PLAYER_SKATE     EQU 2
+PLAYER_SURF      EQU 4
+PLAYER_SURF_PIKA EQU 8
+
+; wDebugFlags:: ; ce63
 	const_def
 	const DEBUG_BATTLE_F
 	const DEBUG_FIELD_F
-- 
cgit v1.2.3