diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 11:38:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 11:38:44 -0500 |
| commit | fbf0c4616c397bf7d9d5a8d2dfda5c647fa18af7 (patch) | |
| tree | 2b6aa4f2f870d0262f29dc5ff275b124eb70412e /src/battle_setup.c | |
| parent | 84c198ac76902385170fd0df90117411b930abe1 (diff) | |
| parent | c75296640d9c42897eecf229bc7fc294f60a65eb (diff) | |
Merge branch 'master' into doc-cinnabar
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index a46191509..06f65dae2 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -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) |