From eb720cf940dbfc4ca6d0237bfbc44fb0dfab59f0 Mon Sep 17 00:00:00 2001 From: h2o-DS Date: Sat, 26 Oct 2024 00:28:33 -0400 Subject: [PATCH] Merge Resolved --- src/overlay021/pokedex_sort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index ff16804ec8..7cd5d03a00 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -11,13 +11,13 @@ #include "overlay021/struct_speciesCaughtStatus.h" #include "core_sys.h" +#include "graphics.h" #include "heap.h" #include "narc.h" #include "pokedex_data_index.h" #include "pokedex_heightweight.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_02006E3C.h" #include "unk_0202631C.h" static void Pokedex_Sort_Encountered(u16 *pokedexPreFilterArray, int *numEncountered, const PokedexData *dexData, const u16 *speciesArray, int pokedexLength); @@ -704,7 +704,7 @@ static u16 *Pokedex_Sort_SortedArray(int heapID, int pokedexSort, int *pokedexLe GF_ASSERT(47 > pokedexSort); pokedexDataNarcIndex = Pokedex_Data_NARC_Index(); - pokedexSortedArray = sub_02007068(pokedexDataNarcIndex, 11 + pokedexSort, 0, heapID, 0, &pokedexSize); + pokedexSortedArray = LoadMemberFromNARC_OutFileSize(pokedexDataNarcIndex, 11 + pokedexSort, 0, heapID, 0, &pokedexSize); *pokedexLength = pokedexSize / (sizeof(u16)); return pokedexSortedArray;