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
..
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
tilesets
battle_anim_scripts.s
battle_scripts_1.s	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate	2022-08-22 20:30:45 -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
specials.inc
tilesets.s