summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2022-02-20 08:19:19 -0800
committerSeth Barberee <seth.barberee@gmail.com>2022-02-20 08:22:26 -0800
commit4a0a498c4d9244e304b550263ddb2f97c8e346c4 (patch)
treedb09bb0d9ea19dd37594dcd3a84ecc71691e7dba /src
parentab11f056c91813a31fce26fdbb6b4b7e601750d1 (diff)
Revert "delete src/data/menus"
This reverts commit b9a6e74268449d2283b5cb4532b4f4452dce9e9d.
Diffstat (limited to 'src')
-rw-r--r--src/data/menus/main_menu.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/data/menus/main_menu.h b/src/data/menus/main_menu.h
index c6b81ce..b947f02 100644
--- a/src/data/menus/main_menu.h
+++ b/src/data/menus/main_menu.h
@@ -273,7 +273,11 @@ const struct MenuItem gUnknown_80E5DF0[] = {
{0, 0xFFDD}
};
+<<<<<<< HEAD
static const u8 sUnknown_80E5E08[] = _("#C2Beware#R! This will delete it forever!");
+=======
+static const u8 sUnknown_80E5E08[] = _("{COLOR_1 RED}Beware{END_COLOR_TEXT_1}! This will delete it forever!");
+>>>>>>> ec2f746 (Revert "delete src/data/menus")
static const u8 sUnknown_80E5E34[] = "This will delete your saved game data.";
const struct MenuItem gUnknown_80E5E5C[] = {