From e1021af6bd6a83cc4d53fc3879dacb5f401a0f83 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Tue, 18 Oct 2022 20:37:33 -0400 Subject: [PATCH] fix MapHasNoEncounterData --- src/wild_encounter.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 5a42027fa9..d276341070 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -965,11 +965,6 @@ u8 ChooseHiddenMonIndex(void) bool32 MapHasNoEncounterData(void) { - u16 headerId = GetCurrentMapWildMonHeaderId(); - const struct WildPokemonInfo *landMonsInfo = gWildMonHeaders[headerId].landMonsInfo; - const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].waterMonsInfo; - const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].hiddenMonsInfo; - - return (landMonsInfo == NULL && waterMonsInfo == NULL && hiddenMonsInfo == NULL); + return (GetCurrentMapWildMonHeaderId() == HEADER_NONE); }