Split pokedex area markers

data/pokedex_area_markers/marker.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 197 115
+255 139 57
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics_file_rules.mk

@@ -501,3 +501,17 @@ $(TITLESCREENGFXDIR)/unk_8ead608.4bpp: %.4bpp: %.png
 
 $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 77
+
+POKEDEXAREAMARKERSDATADIR := data/pokedex_area_markers
+
+POKEDEXAREAMARKERFILES := \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_0.4bpp \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_1.4bpp \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_2.4bpp \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_3.4bpp \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_4.4bpp \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_5.4bpp \
+	$(POKEDEXAREAMARKERSDATADIR)/marker_6.4bpp
+
+$(POKEDEXAREAMARKERSDATADIR)/marker.4bpp: $(POKEDEXAREAMARKERFILES)
+	cat $^ > $@

src/wild_pokemon_area.c

@@ -26,7 +26,7 @@ static s32 CountRoamerNests(u16 species, struct Subsprite * subsprites);
 static bool32 PokemonInAnyEncounterTableInMap(const struct WildPokemonHeader * data, s32 species);
 static bool32 PokemonInEncounterTable(const struct WildPokemonInfo * pokemon, s32 species, s32 count);
 static u16 GetMapSecIdFromWildMonHeader(const struct WildPokemonHeader * header);
-static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lut_i_p, u16 * table_idx_p);
+static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lutIdx_p, u16 * tableIdx_p);
 
 static const u16 sDexAreas_Kanto[][2] = {
     { MAPSEC_PALLET_TOWN,         1 },
@@ -292,15 +292,15 @@ static u16 GetMapSecIdFromWildMonHeader(const struct WildPokemonHeader * header)
     return get_mapheader_by_bank_and_number(header->mapGroup, header->mapNum)->regionMapSectionId;
 }
 
-static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lut_i_p, u16 * table_idx_p)
+static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lutIdx_p, u16 * tableIdx_p)
 {
     s32 i;
-    for (i = *lut_i_p; i < count; i++)
+    for (i = *lutIdx_p; i < count; i++)
     {
         if (lut[i][0] == mapSecId)
         {
-            *table_idx_p = lut[i][1];
-            *lut_i_p = i + 1;
+            *tableIdx_p = lut[i][1];
+            *lutIdx_p = i + 1;
             return TRUE;
         }
     }