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 | |
| parent | b8b4a11a032d7fb21ae14c5372a266509d2f918b (diff) | |
| parent | 58dd1c92ac6270d229c6762ca640118e4dd5e3cf (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'src/field')
| -rw-r--r-- | src/field/field_weather.c | 12 | ||||
| -rw-r--r-- | src/field/party_menu.c | 13 | ||||
| -rw-r--r-- | src/field/pc_screen_effect.c | 2 | ||||
| -rw-r--r-- | src/field/secret_base.c | 2 |
4 files changed, 15 insertions, 14 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, diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 31dd55dda..f55ed669d 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -101,7 +101,14 @@ static void sub_806BF24(const u8 *a, u8 monIndex, u8 c, u8 d); static void sub_806BB9C(u8 a); static void sub_806BBEC(u8 a); -const u16 TMHMMoves[] = { +EWRAM_DATA u8 gUnknown_0202E8F4 = 0; +EWRAM_DATA u8 gUnknown_0202E8F5 = 0; +EWRAM_DATA u8 gUnknown_0202E8F6 = 0; +EWRAM_DATA u16 gUnknown_0202E8F8 = 0; +EWRAM_DATA u8 gPartyMenuType = 0; + +const u16 TMHMMoves[] = +{ MOVE_FOCUS_PUNCH, MOVE_DRAGON_CLAW, MOVE_WATER_PULSE, @@ -458,10 +465,6 @@ struct Unk201FE00 extern u16 gBattleTypeFlags; extern u8 gTileBuffer[]; -extern u8 gUnknown_0202E8F4; -extern u8 gUnknown_0202E8F6; -extern u16 gUnknown_0202E8F8; -extern u8 gPartyMenuType; extern u8 gLastFieldPokeMenuOpened; extern u8 gPlayerPartyCount; extern s32 gBattleMoveDamage; diff --git a/src/field/pc_screen_effect.c b/src/field/pc_screen_effect.c index 364fca0aa..e0853e01d 100644 --- a/src/field/pc_screen_effect.c +++ b/src/field/pc_screen_effect.c @@ -30,7 +30,7 @@ extern const u16 gUnknownPal_083D18EC[16]; extern const u8 gUnknownGfx_083D190C[128]; -extern struct UnkStruct *gUnknown_020387EC; +EWRAM_DATA struct UnkStruct *gUnknown_020387EC = NULL; const struct SpriteSheet gUnknown_083D1898 = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 }; diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 311cb614a..134aebbc6 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -51,7 +51,7 @@ static void Task_SecretBasePC_Registry(u8 taskId); extern u8 gUnknown_0815F399[]; extern u8 gUnknown_0815F49A[]; -extern u8 gUnknown_020387DC; +EWRAM_DATA u8 gUnknown_020387DC = 0; const struct { |