Eduardo Quezada 3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # include/event_object_movement.h # src/data.c # src/data/graphics/pokemon.h # src/data/pokemon/species_info/gen_4_families.h		2024-04-20 13:23:14 -04:00
..
defines.h	Merge branch '_RHH/master' into _RHH/upcoming	2024-01-09 09:19:12 -03:00
flash_internal.h	decompile save_failed_screen.c	2017-10-06 18:33:35 -04:00
gba.h	use firered isagbprint header.	2018-01-06 21:38:34 -05:00
io_reg.h	Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829	2023-08-31 14:28:01 -04:00
isagbprint.h	[debug, printf] add DebugPrintfLevel macro	2022-12-07 00:03:25 +01:00
m4a_internal.h	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
macro.h	Added support for compressed OW graphics.	2023-12-31 00:35:27 -05:00
multiboot.h	Documenting padding in structs used by Saveblocks	2022-12-17 22:55:43 -03:00
syscall.h	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
types.h	Include gba/defines.h in gba/types.h (#4364)	2024-04-07 13:08:35 +02:00