Eduardo Quezada 1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c		2022-09-13 16:22:42 -03:00
..
bg.c	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
bg.h	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
blit.c
blit.h
characters.h	Fix braille slash	2021-11-02 18:34:05 -04:00
dma3_manager.c
dma3.h
gpu_regs.c
gpu_regs.h
io_reg.c
io_reg.h
malloc.c	Remove sFiller from malloc.c	2021-11-29 11:19:30 -05:00
malloc.h
sprite.c	Misc cleanup	2022-08-18 14:23:45 -04:00
sprite.h	Struct pointers star standarizing	2022-07-29 11:15:33 -04:00
string_util.c	Add missing font constants after EXT_CTRL_CODE_FONT	2022-07-18 02:36:25 -04:00
string_util.h	Use specific name limits for string limit functions	2021-11-17 22:11:03 -05:00
text.c	Cleaned trailing whitespace	2022-09-11 14:14:49 -04: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