Eduardo Quezada 1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c		2022-09-13 16:22:42 -03:00
..
layouts
maps	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-13 16:22:42 -03:00
scripts	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-13 16:22:42 -03:00
text	Fixed instances of .string being used with spaces instead of tabs	2022-08-15 14:32:01 -04:00
tilesets
battle_anim_scripts.s	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
battle_scripts_1.s	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
battle_scripts_2.s
contest_ai_scripts.s	Incorporate commented bug fixes in contest AI scripts	2022-08-19 19:45:15 -04:00
event_scripts.s	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
field_effect_scripts.s
map_events.s
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc
sound_data.s	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
specials.inc	Fixed battle frontier tutors (for real this time)	2022-08-27 22:45:10 -04:00
tilesets.s