Eduardo Quezada 124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # README.md # data/field_effect_scripts.s # data/maps/AncientTomb/scripts.inc # data/maps/DesertRuins/scripts.inc # data/maps/IslandCave/scripts.inc # data/scripts/follower.inc # graphics/object_events/pics/pokemon/wailord.png # graphics/object_events/pics/pokemon_old/substitute.png # include/constants/event_objects.h # include/global.h # remote_build.sh # spritesheet_rules.mk # src/bike.c # src/data/object_events/object_event_anims.h # src/data/object_events/object_event_graphics.h # src/data/object_events/object_event_graphics_info_followers.h # src/data/object_events/object_event_pic_tables.h # src/event_object_movement.c # src/field_effect_helpers.c # src/field_screen_effect.c # src/overworld.c # src/palette.c # src/pokemon_summary_screen.c # src/scrcmd.c # src/trainer_see.c		2024-02-17 23:40:08 -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	Added automatic runtime decapitalization.	2024-01-07 20:21:14 -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 branch '_pret/master' into _RHH/pr/upcoming/pret_20240210	2024-02-10 18:05:20 -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-02-17 23:40:08 -03:00
sprite.h	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers	2024-02-17 23:40:08 -03:00
string_util.c	Reformatted for code review. Moved config to include/config/decap.h.	2024-01-17 01:12:04 -05:00
string_util.h	Merge branch 'guillotine' into guillotine-expansion	2024-01-08 19:43:06 -05:00
text.c	Reformatted for code review. Moved config to include/config/decap.h.	2024-01-17 01:12:04 -05:00
text.h	Reformatted for code review. Moved config to include/config/decap.h.	2024-01-17 01:12:04 -05: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