diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
commit | 6cbea9af6dba53cf5b74a37d0161188f7eb3b3ac (patch) | |
tree | a2c5ca082bf9359ab056743afe4811f8c378be8a /src/tv.c | |
parent | 4a71a61e58507281252eb0406fea966d6fb7ebd4 (diff) | |
parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'src/tv.c')
-rw-r--r-- | src/tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3633,7 +3633,7 @@ void ChangePokemonNickname(void) void ChangePokemonNickname_CB(void) { SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar2); - c2_exit_to_overworld_1_continue_scripts_restart_music(); + CB2_ReturnToFieldContinueScript(); } void ChangeBoxPokemonNickname(void) @@ -3649,7 +3649,7 @@ void ChangeBoxPokemonNickname(void) void ChangeBoxPokemonNickname_CB(void) { SetBoxMonNickFromAnyBox(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos, gStringVar2); - c2_exit_to_overworld_1_continue_scripts_restart_music(); + CB2_ReturnToFieldContinueScript(); } void TV_CopyNicknameToStringVar1AndEnsureTerminated(void) |