Eduardo Quezada b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ...

# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c

2023-02-15 14:11:03 -03: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

…

blit.h

…

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

…

gpu_regs.c

…

gpu_regs.h

…

io_reg.c

Removed trailing spaces in the most relevant files

2021-08-24 19:59:32 -03:00

io_reg.h

…

malloc.c

Remove sFiller from malloc.c

2021-11-29 11:19:30 -05:00

malloc.h

Removed free macro

2022-09-16 20:36:44 -03:00

sprite.c

Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize

2023-01-18 11:07:12 -05: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

Sync text ctrl codes with pokefirered

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

text.h

Added missing labels in headers

2022-09-12 21:14:15 -03:00

window.c

Remove unused common symbols in window.c

2023-02-01 16:14:32 -05:00

window.h

Remove unused common symbols in window.c

2023-02-01 16:14:32 -05:00