diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-18 15:04:09 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-18 15:04:09 -0500 |
commit | 751af64d727a2c46a8a56931ce97488144e13704 (patch) | |
tree | 214100fdbe37eb076826b0d76bb9eb0d2e070de5 /src/engine/trade.c | |
parent | b8b4a11a032d7fb21ae14c5372a266509d2f918b (diff) | |
parent | 58dd1c92ac6270d229c6762ca640118e4dd5e3cf (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'src/engine/trade.c')
-rw-r--r-- | src/engine/trade.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/engine/trade.c b/src/engine/trade.c index bc3daf249..4dc27ea6f 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -213,12 +213,14 @@ static #endif void sub_804DB84(void); -extern u8 gUnknown_020297D8[2]; -extern u8 *gUnknown_020296CC[13]; +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; -extern struct MailStruct gUnknown_02029700[16]; -const u32 unref_data_820ABD4[] = { +const u32 unref_data_820ABD4[] = +{ 0x00000890, 0x00003AC0, 0x0000001C, |