Eduardo Quezada 69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs ... # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c		2022-08-27 02:42:22 -04:00
..
layouts
maps	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04:00
scripts	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -04: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	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs	2022-08-27 02:42:22 -04:00
battle_scripts_1.s	Merge pull request #2173 from LOuroboros/yourAffection	2022-08-26 14:54:32 -04:00
battle_scripts_2.s
contest_ai_scripts.s
event_scripts.s
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
tilesets.s