Eduardo Quezada ab682ce900 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/data/items.h # src/pokemon_summary_screen.c		2024-05-15 09:58:21 -04:00
..
bg.c	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
bg.h	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
blit.c
blit.h
characters.h	Revert "Guillotine: Decapitalize everything (#3949)" (#4525)	2024-05-13 19:19:37 +02:00
dma3_manager.c	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
dma3.h	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
gpu_regs.c
gpu_regs.h
io_reg.c	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
io_reg.h
malloc.c	Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming	2024-03-07 20:57:07 +01:00
malloc.h	Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210	2023-12-10 13:27:09 -03:00
sprite.c	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
sprite.h	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
string_util.c	Revert "Guillotine: Decapitalize everything (#3949)" (#4525)	2024-05-13 19:19:37 +02:00
string_util.h	Revert "Guillotine: Decapitalize everything (#3949)" (#4525)	2024-05-13 19:19:37 +02:00
text.c	Merge branch '_RHH/master' into _RHH/upcoming	2024-05-15 09:58:21 -04:00
text.h	Merge branch '_RHH/master' into _RHH/upcoming	2024-05-15 09:58:21 -04:00
window.c	Narrower fonts	2024-04-25 18:40:37 +01:00
window.h	Narrower fonts	2024-04-25 18:40:37 +01:00