diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/trade.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
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 bd298b58e..5422a6ace 100644 --- a/src/trade.c +++ b/src/trade.c @@ -126,6 +126,8 @@ struct TradeEwramSubstruct { /*0x08fc*/ u8 filler_08fc[0x704]; }; +struct TradeEwramSubstruct2 *gUnknown_03004828; + IWRAM_DATA 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[] = { |