From 13416f5109fad762adba5eaa3b2a06e27cd15d31 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 4 Oct 2019 15:57:16 -0400 Subject: [PATCH] Split pokedex area markers --- data/pokedex_area_markers/marker.pal | 19 +++++++++++++++++++ data/pokedex_area_markers/marker.png | Bin 354 -> 0 bytes data/pokedex_area_markers/marker_0.png | Bin 0 -> 157 bytes data/pokedex_area_markers/marker_1.png | Bin 0 -> 165 bytes data/pokedex_area_markers/marker_2.png | Bin 0 -> 165 bytes data/pokedex_area_markers/marker_3.png | Bin 0 -> 175 bytes data/pokedex_area_markers/marker_4.png | Bin 0 -> 177 bytes data/pokedex_area_markers/marker_5.png | Bin 0 -> 180 bytes data/pokedex_area_markers/marker_6.png | Bin 0 -> 186 bytes graphics_file_rules.mk | 14 ++++++++++++++ src/wild_pokemon_area.c | 10 +++++----- 11 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 data/pokedex_area_markers/marker.pal delete mode 100644 data/pokedex_area_markers/marker.png create mode 100644 data/pokedex_area_markers/marker_0.png create mode 100644 data/pokedex_area_markers/marker_1.png create mode 100644 data/pokedex_area_markers/marker_2.png create mode 100644 data/pokedex_area_markers/marker_3.png create mode 100644 data/pokedex_area_markers/marker_4.png create mode 100644 data/pokedex_area_markers/marker_5.png create mode 100644 data/pokedex_area_markers/marker_6.png 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 deleted file mode 100644 index d332c9f469ee3f182fdb1c25d776fe4d7f13b0d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^91IMM8Z68}*7RR%t$>t4fKP}kkp6$P_LOY$ig%Hud6HbOe>8bC?P3h$kgVt z%sReuX?fjx-(>0KEU)_-w`A^S{#^D0?5zopr0A%VMg8%>k literal 0 HcmV?d00001 diff --git a/data/pokedex_area_markers/marker_1.png b/data/pokedex_area_markers/marker_1.png new file mode 100644 index 0000000000000000000000000000000000000000..21db66b29f0b9ff557dd29ebc5ae0cec46d0434f GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!VDytB9fK>DT4r?5LY1m|7h|5Zc8A87%-`e z!3?O5u_VYZn8D%MjWi%f+0(@_gkxrMLPA1NP*4H`ld1v3XGaG{Ee4S$;|DZRaQU(D&A+A9B|Iy` zgBegAV@Z%-FoVOh8)-m}vZsq<2*=FigoL1kgoJ>gBp@Rw$U$jJ1A}?vGKn096B-Qv WRM--YwpoH4!QkoY=d#Wzp$P!5iXe#q literal 0 HcmV?d00001 diff --git a/data/pokedex_area_markers/marker_3.png b/data/pokedex_area_markers/marker_3.png new file mode 100644 index 0000000000000000000000000000000000000000..1e8fe22d23ec779ae3702434aef88b7fedb7b6ce GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%AmxltF+`h%1o(f3*02w*?YcA~7{NK|x%Dkx^*6Cnt}{gr$lMu5t_AJUM+i+Zfu! hc$^K_9xai`WMD8k$GtJ~gQGRbHcwYSmvv4FO#oLqArJrn literal 0 HcmV?d00001 diff --git a/data/pokedex_area_markers/marker_4.png b/data/pokedex_area_markers/marker_4.png new file mode 100644 index 0000000000000000000000000000000000000000..193697384439be1e0b37a153c6ef0e86a8b4fa4a GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt!9f|3{1ecUuA(#DGa% z3}!%ej3q&S!3+-1ZlnP@`kpS1Are!Q6BPIiG#wxfx6$VyLFKbLh*2~7YYP9o+2 literal 0 HcmV?d00001 diff --git a/data/pokedex_area_markers/marker_6.png b/data/pokedex_area_markers/marker_6.png new file mode 100644 index 0000000000000000000000000000000000000000..439d858e13756c7224dff235c2d6958d3776654b GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNErn9gt!9f|3{1ecUuA(#DGa% z3}!%ej3q&S!3+-1ZlnP@7M?DSAre!Q6M!Hnp@BhFmE-J^B}*Dk1q3ynN;H_^z{C27 sM^$x2)+*zUjk5iZH~tWjzopr09bh~ApigX literal 0 HcmV?d00001 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; } }