diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-12 21:08:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 21:08:06 -0400 |
| commit | 807e03c25d6acd9e5c2bf5337a078b2dfb90f4d9 (patch) | |
| tree | f834927206547939d8ed4ee9e62e050ff6c8f4f9 /include/battle_main.h | |
| parent | c52ba041cb793fc3154ab4244796fd5814bfbf18 (diff) | |
| parent | ff795fa8347f111163ef033a4ae132a3a3caf1eb (diff) | |
Merge pull request #107 from jiangzhengwenjz/battle
battle (2nd take)
Diffstat (limited to 'include/battle_main.h')
| -rw-r--r-- | include/battle_main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_main.h b/include/battle_main.h index 27aae9970..757ee3468 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -49,7 +49,7 @@ void CB2_QuitRecordedBattle(void); void sub_8038528(struct Sprite* sprite); void sub_8038A04(void); // unused void VBlankCB_Battle(void); -void sub_8038B74(struct Sprite *sprite); +void sub_801182C(struct Sprite *sprite); void sub_8011A1C(void); u32 sub_80391E0(u8 arrayId, u8 caseId); u32 sub_80397C4(u32 setId, u32 tableId); @@ -67,7 +67,7 @@ void EndBounceEffect(u8 bank, bool8 b); void sub_8039E44(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); void sub_8039E84(struct Sprite *sprite); -void sub_8039E9C(struct Sprite *sprite); +void sub_801236C(struct Sprite *sprite); void BeginBattleIntro(void); void SwitchInClearSetData(void); void FaintClearSetData(void); |