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/pokemon/pokemon_summary_screen.c | |
| parent | b8b4a11a032d7fb21ae14c5372a266509d2f918b (diff) | |
| parent | 58dd1c92ac6270d229c6762ca640118e4dd5e3cf (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into fixes
Diffstat (limited to 'src/pokemon/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon/pokemon_summary_screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index eab6fb4ee..96f9c44f9 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -121,7 +121,6 @@ extern u8 ball_number_to_ball_processing_index(u16); extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8); extern struct MusicPlayerInfo gMPlay_BGM; -extern u8 gUnknown_020384F0; extern u8 gUnknown_08208238[]; extern u16 gBattle_BG3_Y; extern u16 gBattle_BG2_Y; @@ -130,7 +129,6 @@ extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; extern u16 gBattle_BG3_X; extern TaskFunc gUnknown_03005CF0; -extern struct Sprite *gUnknown_020384F4; extern struct SpriteTemplate gUnknown_02024E8C; extern const u8 gStatusPal_Icons[]; @@ -157,6 +155,9 @@ extern const u16 gUnknown_08E94550[]; extern const u16 gUnknown_08E94590[]; extern const u8 gUnknown_08E73E88[]; +EWRAM_DATA u8 gUnknown_020384F0 = 0; +EWRAM_DATA struct Sprite *gUnknown_020384F4 = NULL; + #if ENGLISH #include "../data/text/move_descriptions_en.h" #include "../data/text/nature_names_en.h" |