diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-15 00:08:48 -0600 |
| commit | e3c366df6489c92a6ac5778b458b815cc8eab75d (patch) | |
| tree | 89c80f554da617d89641af8a707ccf9c96d5707c /src/pokemon_summary_screen.c | |
| parent | 8e9428c482d33ac59b5c29d89db0bd5a2e6fdef3 (diff) | |
| parent | c9f196cdfea08eefffd39ebc77a150f197e1250e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rwxr-xr-x | src/pokemon_summary_screen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index e9cd3e215..b00979945 100755 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3,17 +3,17 @@ #include "bg.h" #include "decompress.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "link.h" #include "m4a.h" #include "main.h" #include "malloc.h" -#include "moves.h" +#include "constants/moves.h" #include "palette.h" #include "pokemon.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "unk_text_util.h" #include "string_util.h" @@ -937,7 +937,7 @@ void sub_81C0704(u8 taskId) gUnknown_0203CF1C->unk40D3 = sub_81C45F4(&gUnknown_0203CF1C->currentMon, &data[1]); if (gUnknown_0203CF1C->unk40D3 == 0xFF) return; - gSprites[gUnknown_0203CF1C->unk40D3].data2 = 1; + gSprites[gUnknown_0203CF1C->unk40D3].data[2] = 1; sub_81C0E24(); data[1] = 0; break; @@ -952,7 +952,7 @@ void sub_81C0704(u8 taskId) sub_81C2524(); break; case 12: - gSprites[gUnknown_0203CF1C->unk40D3].data2 = 0; + gSprites[gUnknown_0203CF1C->unk40D3].data[2] = 0; break; default: if (sub_81221EC() == 0 && FuncIsActiveTask(sub_81C20F0) == 0) |