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/field/field_weather.c | |
parent | b8b4a11a032d7fb21ae14c5372a266509d2f918b (diff) | |
parent | 58dd1c92ac6270d229c6762ca640118e4dd5e3cf (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'src/field/field_weather.c')
-rw-r--r-- | src/field/field_weather.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 48d7da7f7..b6475d8ff 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -35,10 +35,11 @@ struct WeatherCallbacks bool8 (*finish)(void); }; -extern struct Weather gWeather; -extern u8 gUnknown_0202FF38[]; -extern u16 gUnknown_0202FF58; -IWRAM_DATA const u8 *gUnknown_030006DC; +EWRAM_DATA struct Weather gWeather = {0}; +EWRAM_DATA u8 gUnknown_0202FF38[32] = {0}; +EWRAM_DATA u16 gUnknown_0202FF58 = {0}; + +static const u8 *gUnknown_030006DC; const u8 DroughtPaletteData_0[] = INCBIN_U8("graphics/weather/drought0.bin.lz"); const u8 DroughtPaletteData_1[] = INCBIN_U8("graphics/weather/drought1.bin.lz"); @@ -47,9 +48,6 @@ const u8 DroughtPaletteData_3[] = INCBIN_U8("graphics/weather/drought3.bin.lz"); const u8 DroughtPaletteData_4[] = INCBIN_U8("graphics/weather/drought4.bin.lz"); const u8 DroughtPaletteData_5[] = INCBIN_U8("graphics/weather/drought5.bin.lz"); -extern u8 (*gUnknown_0202FC48)[32]; -extern u8 gUnknown_0202F9E8[32]; - static const u8 *const sCompressedDroughtPalettes[] = { DroughtPaletteData_0, |