diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
| commit | 04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch) | |
| tree | 5722c829dbad65bbbeb573084291ba0621b89df5 /src/battle_controller_wally.c | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'src/battle_controller_wally.c')
| -rw-r--r-- | src/battle_controller_wally.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index eb1486738..50ede7c7d 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -2,6 +2,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_anim_special.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" @@ -10,7 +11,6 @@ #include "menu_cursor.h" #include "palette.h" #include "pokemon.h" -#include "rom3.h" #include "constants/songs.h" #include "sound.h" #include "sprite.h" @@ -58,7 +58,6 @@ extern u8 gUnknown_0300434C[]; extern const u8 BattleText_WallyMenu[]; extern const u8 BattleText_MenuOptions[]; -// TODO: include rom3.h when my other PR gets merged extern void BtlController_EmitTwoReturnValues(u8, u8, u16); extern void BtlController_EmitOneReturnValue(u8, u16); |