Eduardo Quezada 0b02527e5c Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # test/test_runner.c		2024-07-21 13:36:07 -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	Change toOrrX and toOrrY to u8	2020-10-02 11:17:11 -04:00
blit.h
characters.h	Revert "Guillotine: Decapitalize everything (#3949)" (#4525)	2024-05-13 19:19:37 +02:00
dma3.h	Use u32 in gflib functions and remove unused (#4250)	2024-03-06 22:22:05 +01:00
dma3_manager.c	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	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
malloc.c	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-21 13:36:07 -04: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	Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge11july	2024-07-11 09:57:03 +02:00
sprite.h	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-05-18 10:12:17 -04: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	Allow users to increase MAX_MONEY (#4943)	2024-07-13 11:16:34 +02: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