Eduardo Quezada D'Ottone af171eb4d4 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 ... # Conflicts: # src/pokemon_summary_screen.c		2022-10-01 17:32:32 -03:00
..
data	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
agb_flash_1m.c
agb_flash_le.c
agb_flash_mx.c
agb_flash.c
AgbRfu_LinkManager.c
apprentice.c
bard_music.c
battle_ai_main.c
battle_ai_switch_items.c
battle_ai_util.c	add overwrittenAbilities field	2022-09-24 12:12:31 -04:00
battle_anim_bug.c
battle_anim_dark.c
battle_anim_dragon.c
battle_anim_effects_1.c
battle_anim_effects_2.c
battle_anim_effects_3.c
battle_anim_electric.c
battle_anim_fight.c
battle_anim_fire.c
battle_anim_flying.c
battle_anim_ghost.c
battle_anim_ground.c
battle_anim_ice.c
battle_anim_mon_movement.c
battle_anim_mons.c
battle_anim_new.c
battle_anim_normal.c
battle_anim_poison.c
battle_anim_psychic.c
battle_anim_rock.c
battle_anim_smokescreen.c
battle_anim_sound_tasks.c
battle_anim_status_effects.c
battle_anim_throw.c
battle_anim_utility_funcs.c
battle_anim_water.c
battle_anim.c
battle_arena.c
battle_bg.c
battle_controller_link_opponent.c
battle_controller_link_partner.c
battle_controller_opponent.c
battle_controller_player_partner.c
battle_controller_player.c	Cleaned up missing JOY macros	2022-09-25 13:05:18 -03:00
battle_controller_recorded_opponent.c
battle_controller_recorded_player.c
battle_controller_safari.c
battle_controller_wally.c
battle_controllers.c
battle_debug.c	Cleaned up missing JOY macros	2022-09-25 13:05:18 -03:00
battle_dome.c
battle_factory_screen.c
battle_factory.c
battle_gfx_sfx_util.c
battle_interface.c
battle_intro.c
battle_main.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
battle_message.c
battle_palace.c
battle_pike.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
battle_pyramid_bag.c
battle_pyramid.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
battle_records.c
battle_script_commands.c	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
battle_setup.c
battle_tent.c
battle_tower.c
battle_transition_frontier.c
battle_transition.c
battle_tv.c
battle_util.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
battle_util2.c
battle_z_move.c
berry_blender.c
berry_crush.c
berry_fix_graphics.c
berry_fix_program.c
berry_powder.c
berry_tag_screen.c
berry.c
bike.c
birch_pc.c
braille_puzzles.c
braille.c
cable_car.c
cable_club.c
clear_save_data_screen.c
clock.c
coins.c
confetti_util.c
contest_ai.c
contest_effect.c
contest_link_util.c
contest_link.c
contest_painting.c
contest_util.c
contest.c
coord_event_weather.c
credits.c
crt0.s
data.c
daycare.c
debug.c	Cleaned up missing JOY macros	2022-09-25 13:05:18 -03:00
decompress.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-10-01 17:32:32 -03:00
decoration_inventory.c
decoration.c
dewford_trend.c
digit_obj_util.c
diploma.c
dodrio_berry_picking.c
dynamic_placeholder_text_util.c
easy_chat.c
egg_hatch.c
ereader_helpers.c
ereader_screen.c
event_data.c
event_object_lock.c
event_object_movement.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
evolution_graphics.c
evolution_scene.c
faraway_island.c
field_camera.c
field_control_avatar.c
field_door.c
field_effect_helpers.c
field_effect.c
field_message_box.c
field_player_avatar.c
field_poison.c
field_region_map.c
field_screen_effect.c
field_special_scene.c
field_specials.c	Apply suggestions from code review	2022-09-25 08:31:24 -03:00
field_tasks.c
field_weather_effect.c
field_weather.c
fieldmap.c
fldeff_cut.c
fldeff_dig.c
fldeff_escalator.c
fldeff_flash.c
fldeff_misc.c
fldeff_rocksmash.c
fldeff_softboiled.c
fldeff_strength.c
fldeff_sweetscent.c
fldeff_teleport.c
fonts.c
frontier_pass.c
frontier_util.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
graphics.c
gym_leader_rematch.c
hall_of_fame.c
heal_location.c
hof_pc.c
image_processing_effects.c
international_string_util.c
intro_credits_graphics.c
intro.c
item_icon.c
item_menu_icons.c
item_menu.c
item_use.c
item.c
landmark.c
libgcnmultiboot.s
libisagbprn.c
librfu_intr.c
librfu_rfu.c
librfu_sio32id.c
librfu_stwi.c
lilycove_lady.c
link_rfu_2.c
link_rfu_3.c
link.c
list_menu.c
load_save.c
lottery_corner.c
m4a_1.s
m4a_tables.c
m4a.c
mail_data.c
mail.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
main_menu.c
main.c
map_name_popup.c
match_call.c
math_util.c
mauville_old_man.c
menu_helpers.c
menu_specialized.c
menu.c
metatile_behavior.c
mini_printf.c
minigame_countdown.c
mirage_tower.c
mon_markings.c
money.c
move_relearner.c
multiboot.c
mystery_event_menu.c
mystery_event_msg.c
mystery_event_script.c
mystery_gift_client.c
mystery_gift_link.c
mystery_gift_menu.c
mystery_gift_scripts.c
mystery_gift_server.c
mystery_gift_view.c
mystery_gift.c
naming_screen.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
new_game.c
option_menu.c
overworld.c
palette_util.c
palette.c
party_menu.c
play_time.c
player_pc.c
pokeball.c
pokeblock_feed.c
pokeblock.c
pokedex_area_region_map.c
pokedex_area_screen.c
pokedex_cry_screen.c
pokedex.c
pokemon_animation.c
pokemon_debug.c
pokemon_icon.c
pokemon_jump.c
pokemon_size_record.c
pokemon_storage_system.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-10-01 17:32:32 -03:00
pokemon_summary_screen.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-10-01 17:32:32 -03:00
pokemon.c
pokenav_conditions_gfx.c
pokenav_conditions_search_results.c
pokenav_conditions.c
pokenav_list.c
pokenav_main_menu.c
pokenav_match_call_data.c
pokenav_match_call_gfx.c
pokenav_match_call_list.c
pokenav_menu_handler_gfx.c
pokenav_menu_handler.c
pokenav_region_map.c
pokenav_ribbons_list.c
pokenav_ribbons_summary.c
pokenav.c
post_battle_event_funcs.c
random.c
rayquaza_scene.c
record_mixing.c
recorded_battle.c
region_map.c
reload_save.c
reset_rtc_screen.c
reshow_battle_screen.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
roamer.c
rom_header_gf.c
rom_header.s
rotating_gate.c
rotating_tile_puzzle.c
roulette.c
rtc.c
safari_zone.c
save_failed_screen.c
save_location.c
save.c
scanline_effect.c
scrcmd.c
script_menu.c
script_movement.c
script_pokemon_util.c
script.c
secret_base.c
shop.c
siirtc.c
slot_machine.c
sound.c
start_menu.c
starter_choose.c
strings.c
task.c
text_input_strings.c
text_window.c
tileset_anims.c
time_events.c
title_screen.c
trade.c
trader.c
trainer_card.c
trainer_hill.c
trainer_pokemon_sprites.c
trainer_see.c
trig.c
tv.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
union_room_battle.c
union_room_chat.c
union_room_player_avatar.c
union_room.c	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
use_pokeblock.c
util.c
walda_phrase.c
wallclock.c
wild_encounter.c
wireless_communication_status_screen.c
wonder_news.c