Merge branch 'master' into navdata

1 files changed, 5 insertions, 2 deletions

diff --git a/src/trade.c b/src/trade.c
index f7650ff03..94accc43c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -158,6 +158,9 @@ static EWRAM_DATA struct {
     /*0xFE*/ u8 unk_FE;
 } *gUnknown_020322A0 = {NULL};
 
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
 static bool32 sub_8077260(void);
 static void sub_80773D0(void);
 static void sub_807811C(void);
@@ -2779,7 +2782,7 @@ static void sub_8079398(void)
     }
 }
 
-static void DisplayMessageAndContinueTask(void)
+static void Wait2SecondsAndCreateYesNoMenu(void)
 {
     gUnknown_0203229C->unk_A8++;
 
@@ -2918,7 +2921,7 @@ static void sub_80795AC(void)
             sub_80781C8();
             break;
         case 14:
-            DisplayMessageAndContinueTask();
+            Wait2SecondsAndCreateYesNoMenu();
             break;
         case 15:
             sub_8079034();