diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:11:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:11:46 -0400 |
| commit | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (patch) | |
| tree | ec2e9ec5f3e4a6d8523e80ab58e6c9c296fbc05c /src/trade.c | |
| parent | 3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff) | |
| parent | 6edacdee36d31b2df69559f28a33b8d9e958bf5e (diff) | |
Merge pull request #732 from PikalaxALT/modern_gcc
Modernize code for compatibility with later releases of GCC
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 7 |
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(); |