fix pokeblock conflicts

2017-12-18 16:58:14 +01:00
parent c3abe2863f 6a674e1e83
commit cb229f56e8
174 changed files with 5529 additions and 7226 deletions
@@ -105,7 +105,7 @@ void SafariZoneRetirePrompt(void)
    ScriptContext1_SetupScript(EventScript_2A4B6F);
 }

-void sub_80FC190(void)
+void CB2_EndSafariBattle(void)
 {
    sSafariZoneFleedMons += gBattleResults.field_1F;
    if (gBattleOutcome == BATTLE_CAUGHT)