Remove (incorrect) address comments

Conflicts:
	text.asm

1 files changed, 12 insertions, 0 deletions

diff --git a/text.asm b/text.asm
index 9d7789d2..db66070d 100644
--- a/text.asm
+++ b/text.asm
@@ -2089,7 +2089,11 @@ _ColosseumVersionText::
 	prompt
 
 _Char00Text::
+<<<<<<< HEAD
 	TX_NUM hSpriteIndexOrTextID,1,2
+=======
+	TX_NUM $FF8C,1,2
+>>>>>>> 6bdf0c5... Remove (incorrect) address comments
 	text " error."
 	done
 
@@ -2489,11 +2493,19 @@ _DreamWasEatenText::
 	line "dream was eaten!"
 	prompt
 
+<<<<<<< HEAD
 _TradeCenterText1::
 	text "!"
 	done
 
 _ColosseumText1::
+=======
+_BattleCenterMText1::
+	text "!"
+	done
+
+_TradeCenterMText1::
+>>>>>>> 6bdf0c5... Remove (incorrect) address comments
 	text "!"
 	done