Clean up files and add entries to charmap

2018-07-24 21:18:23 -07:00
parent 731d6d59bc
commit 156fb472e1
57 changed files with 343 additions and 276 deletions
@@ -3454,7 +3454,7 @@ void ChangePokemonNickname(void)
 void ChangePokemonNickname_CB(void)
 {
    SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar2);
-    CB2_ReturnToFieldContinueScript();
+    CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }

 void ChangeBoxPokemonNickname(void)
@@ -3470,7 +3470,7 @@ void ChangeBoxPokemonNickname(void)
 void ChangeBoxPokemonNickname_CB(void)
 {
    SetBoxMonNickFromAnyBox(gSpecialVar_MonBoxId, gSpecialVar_MonBoxPos, gStringVar2);
-    CB2_ReturnToFieldContinueScript();
+    CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }

 void TV_CopyNicknameToStringVar1AndEnsureTerminated(void)