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 | |
| parent | b8b4a11a032d7fb21ae14c5372a266509d2f918b (diff) | |
| parent | 58dd1c92ac6270d229c6762ca640118e4dd5e3cf (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/record_mixing.c | 2 | ||||
| -rw-r--r-- | src/engine/trade.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 75ca92e6a..a2660bf82 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -26,7 +26,7 @@ #include "tv.h" #include "ewram.h" -extern struct RecordMixingDayCareMail gUnknown_02038738; +EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02038738 = {0}; extern u16 gSpecialVar_0x8005; u32 gUnknown_03005D2C; 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, |