Merge branch 'master' into sync-ai

2020-01-23 10:24:11 -05:00
parent e7cd8c59f4 91099dbd0c
commit a01d83a434
273 changed files with 12201 additions and 25462 deletions
@@ -978,7 +978,7 @@ const u8 *BattleSetup_GetScriptAddrAfterBattle(void)
    if (sTrainerBattleEndScript != NULL)
        return sTrainerBattleEndScript;
    else
-        return EventScript_1C555B;
+        return Test_EventScript_Sign;
 }

 const u8 *BattleSetup_GetTrainerPostBattleScript(void)
@@ -986,7 +986,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
    if (sTrainerABattleScriptRetAddr != NULL)
        return sTrainerABattleScriptRetAddr;
    else
-        return EventScript_1C555B;
+        return Test_EventScript_Sign;
 }

 void ScrSpecial_ShowTrainerNonBattlingSpeech(void)