diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
| commit | 3d3ec3150a7d297efe8b1dffe28a28275692f819 (patch) | |
| tree | e86983f4601dc74a8113dae471fa12315effb02f /src/trade.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/trade.c b/src/trade.c index bee58ff15..424a503bf 100644 --- a/src/trade.c +++ b/src/trade.c @@ -126,6 +126,8 @@ struct TradeEwramSubstruct { /*0x08fc*/ u8 filler_08fc[0x704]; }; +struct TradeEwramSubstruct2 *gUnknown_03004828; + static u8 gUnknown_03000508[8]; struct UnkStructF { @@ -209,7 +211,7 @@ EWRAM_DATA u8 *gUnknown_020296CC[13] = {0}; EWRAM_DATA struct MailStruct gUnknown_02029700[6] = {0}; EWRAM_DATA u8 gUnknown_020297D8[2] = {0}; -extern struct TradeEwramSubstruct *gUnknown_03004824; +struct TradeEwramSubstruct *gUnknown_03004824; const u32 unref_data_820ABD4[] = { |