diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 20:10:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 20:10:46 -0700 |
| commit | 62388f3bfd5b1abd9fa369628b805e683e64c302 (patch) | |
| tree | 7b57d749b99b491905f1590d7791780a7ff69596 /src/battle/reshow_battle_screen.c | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
| parent | 09411d29f66c427367a2db3de155fed8c98138f5 (diff) | |
Merge pull request #561 from yenatch/battle-1
almost all of battle_1
Diffstat (limited to 'src/battle/reshow_battle_screen.c')
| -rw-r--r-- | src/battle/reshow_battle_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 0da29441e..85aa78ca0 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -29,7 +29,7 @@ extern u8 gBankSpriteIds[4]; extern u8 gBattleMonForms[4]; extern u8 gHealthboxIDs[4]; -bool8 sub_800E414(u8 a0); +bool8 LoadChosenBattleElement(u8 a0); bool8 sub_8031C30(u8 a0); void sub_8031EE8(void); void sub_80327CC(void); @@ -97,7 +97,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) } break; case 2: - if (!sub_800E414(gHelperState)) + if (!LoadChosenBattleElement(gHelperState)) { gHelperState++; gReshowState--; |