Eduardo Quezada 5d372b5f8a Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # README.md # gflib/sprite.c # graphics/object_events/pics/pokemon/togetic.png # src/data/object_events/object_event_graphics.h # src/data/object_events/object_event_graphics_info.h # src/data/object_events/object_event_graphics_info_followers.h # src/event_object_movement.c # src/field_effect_helpers.c		2024-01-18 08:12:09 -03:00
..
defines.h	Merge branch '_RHH/master' into _RHH/upcoming	2024-01-09 09:19:12 -03:00
flash_internal.h
gba.h
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	Fix weird stat drop anim (#3870)	2023-12-30 22:53:46 +01:00