Eduardo Quezada 749225ace1 Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c		2023-01-20 12:31:54 -03:00
..
.gitignore
convert_png.c	Support reducing png bit depth	2023-01-11 10:11:11 -05:00
convert_png.h
font.c	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
font.h
gfx.c	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
gfx.h	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
global.h
huff.c	Copy Berry Fix MB dism from FR (#777)	2019-09-03 15:33:11 -04:00
huff.h	Copy Berry Fix MB dism from FR (#777)	2019-09-03 15:33:11 -04:00
jasc_pal.c
jasc_pal.h
LICENSE
lz.c	Copy Berry Fix MB dism from FR (#777)	2019-09-03 15:33:11 -04:00
lz.h	Copy Berry Fix MB dism from FR (#777)	2019-09-03 15:33:11 -04:00
main.c	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
Makefile	Fix finding libpng in gbagfx and rsfont	2022-03-16 14:41:12 +01:00
options.h	Ignore num_tiles if it would truncate non-transparent tiles (#1729)	2022-08-18 23:07:25 -04:00
rl.c	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
rl.h
util.c	gbagfx: Various fixes and improvements	2020-04-22 14:39:20 -07:00
util.h	gbagfx: Various fixes and improvements	2020-04-22 14:39:20 -07:00