Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030

Browse Source 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
This commit is contained in:
Eduardo Quezada committed 2022-10-30 12:30:38 -03:00
2 parents 93dd8786ee c76beed989
commit e4a439aa46
578 files changed
+31627 -25653
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

graphics_file_rules.mk
+1 -1
View File
@@ -356,7 +356,7 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
graphics/pokenav/region_map.8bpp: %.8bpp: %.png
graphics/pokenav/region_map/map.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png