diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-13 16:08:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 16:08:57 -0500 |
| commit | 5dc85a079d9b18d95e655ebf5709530be41797f9 (patch) | |
| tree | 2a6c50b6fbb20d074cc6d526cb904b251166de7b /src/battle_controller_link_partner.c | |
| parent | d067f0e6717908f4cb6d0c0ac9ba4fea8eb2cebe (diff) | |
| parent | aeebfee838222b9054da0632f2a65d2f934f7e23 (diff) | |
Merge pull request #742 from PikalaxALT/modern_gcc
Modern gcc
Diffstat (limited to 'src/battle_controller_link_partner.c')
| -rw-r--r-- | src/battle_controller_link_partner.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 3ea5bd624..acc35e2d2 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -58,17 +58,14 @@ extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern u8 move_anim_start_t3(); -extern u8 IsBankSpritePresent(); extern void sub_8044CA0(u8); extern void sub_8030E38(struct Sprite *); extern void StartBattleIntroAnim(); extern void sub_8047858(); extern void move_anim_start_t2_for_situation(); -extern void sub_8043D84(); extern void BufferStringBattle(); extern void sub_8031F24(void); extern void sub_80326EC(); -extern void DoMoveAnim(); extern void sub_80324BC(); extern u8 IsMoveWithoutAnimation(); extern u8 mplay_80342A4(); @@ -83,21 +80,10 @@ extern u8 StartSendOutMonAnimation(); extern void sub_80312F0(struct Sprite *); extern u8 CreateInvisibleSpriteWithCallback(); extern void BattleLoadPlayerMonSprite(); -extern u8 GetBattlerSpriteCoord(); extern u8 sub_8077F68(); -extern u8 GetBattlerSubpriority(); extern void nullsub_10(); -extern void sub_8045A5C(); -extern void sub_804777C(); -extern void sub_8043DFC(); -//extern s16 sub_8045C78(); -extern void sub_80440EC(); -extern void HandleLowHpMusicChange(); extern void nullsub_9(u16); -extern void sub_8043DB0(); -extern void move_anim_start_t4(); extern void c3_0802FDF4(u8); -extern void sub_8031F88(); extern void c2_8011A1C(void); // this file's functions @@ -327,7 +313,7 @@ void sub_811DCA0(void) sub_8045A5C(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], 0); sub_804777C(gActiveBattler); sub_8043DFC(gHealthboxSpriteIds[gActiveBattler]); - (s8)ewram17810[4].unk9 &= ~1; + ewram17810[4].unk9 = (s8)ewram17810[4].unk9 & ~1; gBattlerControllerFuncs[gActiveBattler] = sub_811DBC0; } } |