Eduardo Quezada 1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 ... # Conflicts: # Makefile # data/battle_scripts_1.s # gflib/malloc.c # gflib/malloc.h # include/battle.h # ld_script.ld # ld_script_modern.ld # src/battle_ai_script_commands.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/species_info.h # src/pokemon.c		2023-12-10 13:27:09 -03:00
..
braille.png	Add font id constants	2021-10-30 19:54:15 -04:00
down_arrow.png	move fonts from data/graphics/ to graphics/	2020-03-12 13:40:00 -04:00
down_arrow_alt.png	Misc text clean-up	2021-11-14 22:21:17 -05:00
japanese_bold.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
japanese_frlg_female.png	Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin	2023-11-12 14:28:11 +13:00
japanese_frlg_male.png	Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin	2023-11-12 14:28:11 +13:00
japanese_normal.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
japanese_short.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
japanese_small.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
keypad_icons.png	move fonts from data/graphics/ to graphics/	2020-03-12 13:40:00 -04:00
latin_narrow.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
latin_normal.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
latin_short.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
latin_small.png	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2021-11-18 16:48:49 +01:00
latin_small_narrow.png	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
unused_frlg_blanked_down_arrow.png	move fonts from data/graphics/ to graphics/	2020-03-12 13:40:00 -04:00
unused_frlg_down_arrow.png	move fonts from data/graphics/ to graphics/	2020-03-12 13:40:00 -04:00