diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 13:20:03 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 13:20:03 -0800 |
| commit | 92fda2cc0d5afa76e94927cb72ceac9700f54c1b (patch) | |
| tree | 24a7840f1c49602a6ad033ea6cc1cb27b7e12be4 /src/battle/reshow_battle_screen.c | |
| parent | 955c5a8e90c9afba35114c583628f74f849a0da4 (diff) | |
| parent | 999c4d59793e761ca71ab7b27272de46d78de138 (diff) | |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'src/battle/reshow_battle_screen.c')
| -rw-r--r-- | src/battle/reshow_battle_screen.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 343c8f183..396c4435e 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -7,6 +7,7 @@ #include "text.h" #include "rom_8077ABC.h" #include "data2.h" +#include "ewram.h" extern struct SpriteTemplate gUnknown_02024E8C; extern struct Window gUnknown_03004210; @@ -55,9 +56,6 @@ static void sub_807B184(u8 bank); static void sub_807B508(u8 bank); static void sub_807B06C(void); -#define gReshowState ewram[0x1FFFF] -#define gHelperState ewram[0x1FFFE] - void nullsub_14(void) { |