diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-19 16:58:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 16:58:51 -0500 |
| commit | 407c49820e1e64ff6deb4480b6ff9aceb0a3b085 (patch) | |
| tree | 3d98eec0219fa3332fcb9fe808c5fbd91b3ca64f /src/battle_main.c | |
| parent | 055e5d2bbff31a98bcdffec0d7392e7ce77bcd46 (diff) | |
| parent | c365f58833d60606b2a759b190b1f35f09f7ee66 (diff) | |
Merge pull request #233 from PikalaxALT/item_menu
item_menu
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 9f3477659..15c264369 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -86,7 +86,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum); static void CB2_HandleStartBattle(void); static void TryCorrectShedinjaLanguage(struct Pokemon *mon); static void BattleMainCB1(void); -static void CB2_QuitPokeDudeBattle(void); +static void CB2_QuitPokedudeBattle(void); static void sub_80111FC(struct Sprite *sprite); static void sub_8011B94(void); static void sub_8011BB0(void); @@ -1438,7 +1438,7 @@ void BattleMainCB2(void) gSpecialVar_Result = gBattleOutcome = B_OUTCOME_DREW; ResetPaletteFadeControl(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - SetMainCallback2(CB2_QuitPokeDudeBattle); + SetMainCallback2(CB2_QuitPokedudeBattle); } } @@ -1454,7 +1454,7 @@ void FreeRestoreBattleData(void) FreeBattleResources(); } -static void CB2_QuitPokeDudeBattle(void) +static void CB2_QuitPokedudeBattle(void) { UpdatePaletteFade(); if (!gPaletteFade.active) |