pokeemerald/gflib
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
..
bg.c Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 2023-01-03 15:40:33 -03:00
bg.h Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
blit.c Change toOrrX and toOrrY to u8 2020-10-02 11:17:11 -04:00
blit.h Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
characters.h Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
dma3_manager.c Revert void change 2021-03-04 19:32:36 -06:00
dma3.h Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
gpu_regs.c Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
gpu_regs.h Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
io_reg.c Removed trailing spaces in the most relevant files 2021-08-24 19:59:32 -03:00
io_reg.h Document some overworld and field effects 2020-06-23 15:48:53 -04:00
malloc.c Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
malloc.h Removed free macro 2022-09-16 20:36:44 -03:00
sprite.c Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
sprite.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
string_util.c Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
string_util.h Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
text.c Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
text.h Added missing labels in headers 2022-09-12 21:14:15 -03:00
window.c Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
window.h void pointer standarized 2022-07-29 10:52:35 -04:00