Eduardo Quezada 39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	include/data.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_3_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h

2024-03-17 23:41:23 -03: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

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_manager.c

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01:00

dma3.h

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01: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

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 'master' of https://github.com/pret/pokeemerald into upcoming

2024-03-07 20:57:07 +01: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 '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-03-17 23:41:23 -03:00

sprite.h

Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-03-17 23:41:23 -03:00

string_util.c

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01:00

string_util.h

Merge branch 'guillotine' into guillotine-expansion

2024-01-08 19:43:06 -05:00

text.c

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01:00

text.h

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01:00

window.c

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01:00

window.h

Use u32 in gflib functions and remove unused (#4250)

2024-03-06 22:22:05 +01:00