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/battle_controller_safari.c | |
| parent | 955c5a8e90c9afba35114c583628f74f849a0da4 (diff) | |
| parent | 999c4d59793e761ca71ab7b27272de46d78de138 (diff) | |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'src/battle/battle_controller_safari.c')
| -rw-r--r-- | src/battle/battle_controller_safari.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index e05578c31..5b89cf9ba 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -12,6 +12,7 @@ #include "sound.h" #include "text.h" #include "util.h" +#include "ewram.h" extern struct Window gUnknown_03004210; extern u8 gDisplayedStringBattle[]; @@ -483,7 +484,7 @@ void SafariHandlecmd18(void) nullsub_8(i); sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); - StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CBB); + StrCpyDecodeToDisplayedStringBattle(gUnknown_08400CBB); InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35); sub_8002F44(&gUnknown_03004210); |