diff --git a/src/battle_util.c b/src/battle_util.c
index 378a56c33..b230b8b12 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -2547,7 +2547,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
     u8 target1;
 
     if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
-        return;
+        return 0;
 
     if (gBattlerAttacker >= gBattlersCount)
         gBattlerAttacker = battler;
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 2a5e2c609..cdc602f06 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -584,7 +584,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
                 // try a regular wild land encounter
                 if (TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_REPEL | WILD_CHECK_KEEN_EYE) == TRUE)
                 {
-                    if (USE_BATTLE_DEBUG && GetMonsStateToDoubles() == PLAYER_HAS_TWO_USABLE_MONS)
+                    if (USE_BATTLE_DEBUG && !GetSafariZoneFlag() && GetMonsStateToDoubles() == PLAYER_HAS_TWO_USABLE_MONS)
                     {
                         struct Pokemon mon1 = gEnemyParty[0];
                         TryGenerateWildMon(gWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, WILD_CHECK_KEEN_EYE);