Eduardo Quezada 341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 ...

# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c

2023-06-16 21:25:16 -04:00

..

bg.c

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103

2023-01-03 15:40:33 -03: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_manager.c

Revert void change

2021-03-04 19:32:36 -06:00

dma3.h

Move gflib srcs and headers to gflib subdir

2019-09-08 21:07:54 -04: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

Detect memory leaks in tests

2023-04-20 20:35:22 +01:00

malloc.h

Separate build directory for tests and TESTING define (#3002)

2023-05-31 09:38:37 -04:00

sprite.c

Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3

2023-06-16 21:25:16 -04:00

sprite.h

Struct pointers star standarizing

2022-07-29 11:15:33 -04:00

string_util.c

Sync text ctrl codes with pokefirered

2022-11-23 21:13:00 -05:00

string_util.h

Use specific name limits for string limit functions

2021-11-17 22:11:03 -05:00

text.c

Replace NUM_TEXT_PRINTERS with WINDOWS_MAX

2023-03-31 14:57:51 -04:00

text.h

Replace NUM_TEXT_PRINTERS with WINDOWS_MAX

2023-03-31 14:57:51 -04:00

window.c

Replace NUM_TEXT_PRINTERS with WINDOWS_MAX

2023-03-31 14:57:51 -04:00

window.h

Replace NUM_TEXT_PRINTERS with WINDOWS_MAX

2023-03-31 14:57:51 -04:00