diff options
| -rw-r--r-- | data/pokedex_area_markers/marker.pal | 19 | ||||
| -rw-r--r-- | data/pokedex_area_markers/marker.png | bin | 354 -> 0 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_0.png | bin | 0 -> 157 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_1.png | bin | 0 -> 165 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_2.png | bin | 0 -> 165 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_3.png | bin | 0 -> 175 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_4.png | bin | 0 -> 177 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_5.png | bin | 0 -> 180 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_6.png | bin | 0 -> 186 bytes | |||
| -rw-r--r-- | graphics_file_rules.mk | 14 | ||||
| -rw-r--r-- | src/wild_pokemon_area.c | 10 |
11 files changed, 38 insertions, 5 deletions
diff --git a/data/pokedex_area_markers/marker.pal b/data/pokedex_area_markers/marker.pal new file mode 100644 index 000000000..5a7190a3a --- /dev/null +++ b/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 diff --git a/data/pokedex_area_markers/marker.png b/data/pokedex_area_markers/marker.png Binary files differdeleted file mode 100644 index d332c9f46..000000000 --- a/data/pokedex_area_markers/marker.png +++ /dev/null diff --git a/data/pokedex_area_markers/marker_0.png b/data/pokedex_area_markers/marker_0.png Binary files differnew file mode 100644 index 000000000..10ef6d24b --- /dev/null +++ b/data/pokedex_area_markers/marker_0.png diff --git a/data/pokedex_area_markers/marker_1.png b/data/pokedex_area_markers/marker_1.png Binary files differnew file mode 100644 index 000000000..21db66b29 --- /dev/null +++ b/data/pokedex_area_markers/marker_1.png diff --git a/data/pokedex_area_markers/marker_2.png b/data/pokedex_area_markers/marker_2.png Binary files differnew file mode 100644 index 000000000..e25be6f5c --- /dev/null +++ b/data/pokedex_area_markers/marker_2.png diff --git a/data/pokedex_area_markers/marker_3.png b/data/pokedex_area_markers/marker_3.png Binary files differnew file mode 100644 index 000000000..1e8fe22d2 --- /dev/null +++ b/data/pokedex_area_markers/marker_3.png diff --git a/data/pokedex_area_markers/marker_4.png b/data/pokedex_area_markers/marker_4.png Binary files differnew file mode 100644 index 000000000..193697384 --- /dev/null +++ b/data/pokedex_area_markers/marker_4.png diff --git a/data/pokedex_area_markers/marker_5.png b/data/pokedex_area_markers/marker_5.png Binary files differnew file mode 100644 index 000000000..0919682f4 --- /dev/null +++ b/data/pokedex_area_markers/marker_5.png diff --git a/data/pokedex_area_markers/marker_6.png b/data/pokedex_area_markers/marker_6.png Binary files differnew file mode 100644 index 000000000..439d858e1 --- /dev/null +++ b/data/pokedex_area_markers/marker_6.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index c5571394e..60bf4c73b 100644 --- a/graphics_file_rules.mk +++ b/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 $^ > $@ diff --git a/src/wild_pokemon_area.c b/src/wild_pokemon_area.c index 66637abfa..5ea9d1610 100644 --- a/src/wild_pokemon_area.c +++ b/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; } } |
