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
..
abnormal_weather.inc
apprentice.inc
battle_pike.inc
berry_blender.inc
berry_tree.inc
cable_club.inc
cave_hole.inc
cave_of_origin.inc
check_furniture.inc
contest_hall.inc
day_care.inc
elite_four.inc
field_move_scripts.inc
field_poison.inc
flash.inc
gabby_and_ty.inc
gift_altering_cave.inc	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
gift_aurora_ticket.inc
gift_battle_card.inc
gift_mystic_ticket.inc
gift_old_sea_map.inc
gift_pichu.inc
gift_stamp_card.inc
gift_trainer.inc
hall_of_fame.inc
interview.inc
item_ball_scripts.inc
kecleon.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
lilycove_lady.inc
mauville_man.inc	Fixed instances of .string being used with spaces instead of tabs	2022-08-15 14:32:01 -04:00
move_tutors.inc
movement.inc
new_game.inc
obtain_item.inc
pc_transfer.inc
pc.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
pkmn_center_nurse.inc
players_house.inc
prof_birch.inc
profile_man.inc
questionnaire.inc
record_mix.inc
repel.inc
rival_graphics.inc
roulette.inc
safari_zone.inc
secret_base.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
secret_power_tm.inc
set_gym_trainers.inc
shared_secret_base.inc
std_msgbox.inc
surf.inc
test_signpost.inc
trainer_battle.inc
trainer_hill.inc
trainer_script.inc
tv.inc