pokeemerald/gflib
Eduardo Quezada afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
2022-08-22 20:30:45 -04:00
..
bg.c Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 2022-08-22 20:30:45 -04: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 Fix braille slash 2021-11-02 18:34:05 -04: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 Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
malloc.h Document frontier pass 2021-07-31 13:28:08 -04:00
sprite.c OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
sprite.h Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
string_util.c Add missing font constants after EXT_CTRL_CODE_FONT 2022-07-18 02:36:25 -04:00
string_util.h Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
text.c Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
text.h Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
window.c Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
window.h void pointer standarized 2022-07-29 10:52:35 -04:00