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
..
bg.c	fix -Warray-parameter, -Waddress, -Warray-bounds warnings	2023-10-16 09:36:36 +01:00
bg.h	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
blit.c	Change toOrrX and toOrrY to u8	2020-10-02 11:17:11 -04:00
blit.h	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
characters.h	Sync text ctrl codes with pokefirered	2022-11-23 21:13:00 -05:00
dma3.h	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
dma3_manager.c	Revert void change	2021-03-04 19:32:36 -06:00
gpu_regs.c	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
gpu_regs.h	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
io_reg.c	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
io_reg.h	Document some overworld and field effects	2020-06-23 15:48:53 -04:00
malloc.c	Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210	2023-12-10 13:27:09 -03: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 remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-01-18 08:12:09 -03:00
sprite.h	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-01-18 08:12:09 -03:00
string_util.c	Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002	2023-10-02 17:17:41 -03:00
string_util.h	Easy Chat always shows words in uppercase	2023-06-06 10:55:42 -04:00
text.c	Solved a bunch of -Wall errors on modern	2023-09-20 19:01:08 -03:00
text.h	Replace NUM_TEXT_PRINTERS with WINDOWS_MAX	2023-03-31 14:57:51 -04:00
window.c	Solved a bunch of -Wall errors on modern	2023-09-20 19:01:08 -03:00
window.h	Replace NUM_TEXT_PRINTERS with WINDOWS_MAX	2023-03-31 14:57:51 -04:00