Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim

2022-08-23 10:47:07 -04:00
parent b3590324b8 feb3d9cbab
commit a5853a71bd
33 changed files with 777 additions and 433 deletions
@@ -439,7 +439,7 @@ static void SafariHandleChooseAction(void)

    gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3;
    BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG);
-    BattlePutTextOnWindow(gUnknown_83FE747, B_WIN_ACTION_MENU);
+    BattlePutTextOnWindow(gText_SafariZoneMenu, B_WIN_ACTION_MENU);
    for (i = 0; i < 4; ++i)
        ActionSelectionDestroyCursorAt(i);
    ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0);