diff options
| author | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 00:13:42 -0500 |
|---|---|---|
| committer | camthesaxman <camthesaxman@users.noreply.github.com> | 2019-07-31 00:13:42 -0500 |
| commit | b74a0c3122113b5ebef469739745e2b8fd420c50 (patch) | |
| tree | e6bd06cc852ca638f9dc9a0d7c8a12b7ee394a5a /src/battle_controller_wally.c | |
| parent | d7a754386ce491791fe8216fdcb0f4fb72240774 (diff) | |
resolve more battle system differences
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 a16fe26cc..ac71aabaf 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); |