Eduardo Quezada 749225ace1 Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c		2023-01-20 12:31:54 -03:00
..
layouts
maps	Matching merge from upstream pret	2023-01-20 12:31:54 -03:00
scripts	Fixed reusable repels/lures function forcefully using items while menu config is on	2023-01-04 00:00:13 -03:00
text
tilesets	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
battle_anim_scripts.s	Matching merge from upstream pret	2023-01-20 12:31:54 -03:00
battle_scripts_1.s	Updated the implementation	2023-01-09 15:18:22 -03:00
battle_scripts_2.s	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
contest_ai_scripts.s
event_scripts.s	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03: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	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
specials.inc	Matching merge from upstream pret	2023-01-20 12:31:54 -03:00