Eduardo Quezada b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ...

# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c

2023-02-15 14:11:03 -03:00

..

agb_flash.txt

…

AgbRfu_LinkManager.txt

…

apprentice.txt

…

battle_anim_throw.txt

…

battle_factory_screen.txt

…

battle_main.txt

…

battle_tower.txt

…

berry_blender.txt

…

bg.txt

…

contest_painting.txt

…

contest.txt

…

ereader_screen.txt

…

evolution_scene.txt

…

faraway_island.txt

…

field_camera.txt

…

field_control_avatar.txt

…

field_specials.txt

…

fieldmap.txt

…

image_processing_effects.txt

…

intro.txt

…

librfu_rfu.txt

…

librfu_sio32id.txt

…

librfu_stwi.txt

…

link_rfu_2.txt

…

link.txt

…

list_menu.txt

…

load_save.txt

…

m4a.txt

…

main.txt

…

mauville_old_man.txt

…

overworld.txt

…

party_menu.txt

…

pokedex_cry_screen.txt

…

pokedex.txt

…

random.txt

…

rtc.txt

…

save.txt

…

sound.txt

…

sprite.txt

…

start_menu.txt

…

task.txt

…

text.txt

…

trainer_see.txt

…

tv.txt

…

window.txt

…