Eduardo Quezada 70bad62f9b Merge remote-tracking branch '_pret_origin/master' into multilanguage/sync ... # Conflicts: # Makefile # data/maps/BattleFrontier_BattleTowerLobby/scripts.inc # data/maps/OldaleTown/scripts.inc # data/maps/Route110_TrickHousePuzzle7/scripts.inc # data/maps/Route110_TrickHousePuzzle8/scripts.inc # data/scripts/roulette.inc # data/tilesets/graphics.inc # data/tilesets/metatiles.inc # graphics/trainer_card/0star_fr.pal # graphics/trainer_card/four_stars_fr.pal # graphics/trainer_card/frlg/0star.pal # graphics/trainer_card/frlg/blue.pal # graphics/trainer_card/frlg/bronze.pal # graphics/trainer_card/frlg/card.png # graphics/trainer_card/frlg/four_stars.pal # graphics/trainer_card/frlg/gold.pal # graphics/trainer_card/frlg/green.pal # graphics/trainer_card/frlg/one_star.pal # graphics/trainer_card/frlg/silver.pal # graphics/trainer_card/frlg/three_stars.pal # graphics/trainer_card/frlg/two_stars.pal # graphics/trainer_card/one_star_fr.pal # graphics/trainer_card/three_stars_fr.pal # graphics/trainer_card/two_stars_fr.pal # src/battle_message.c # src/battle_tent.c # src/berry_blender.c # src/berry_tag_screen.c # src/data/bard_music/length_table.h # src/data/credits.h # src/data/items.h # src/data/pokemon/pokedex_orders.h # src/data/region_map/region_map_entries.h # src/easy_chat.c # src/field_region_map.c # src/graphics.c # src/item.c # src/item_menu.c # src/menu_specialized.c # src/pokedex.c # src/pokedex_cry_screen.c # src/pokemon_jump.c # src/pokenav_conditions_search_results.c # src/pokenav_match_call_gfx.c # src/pokenav_ribbons_list.c # src/shop.c # src/trade.c # src/trainer_card.c # src/wireless_communication_status_screen.c		2024-07-05 18:38:49 -04:00
..
map.json	Treat warp ids as strings to allow constants	2022-09-03 15:43:43 -04:00
scripts.inc	Merge remote-tracking branch '_pret_origin/master' into multilanguage/sync	2024-07-05 18:38:49 -04:00
text_es.inc	Added Spanish Textfile AbandonedShip-BattleFrontier_BattleTowerMultiBattleRoom	2024-07-03 20:35:46 +02:00
text_fr.inc	Fixed end of file newlines	2024-06-22 09:54:58 -04:00
text_it.inc	Fixed end of file newlines	2024-06-22 09:54:58 -04:00
text.inc	Fixed end of file newlines	2024-06-22 09:54:58 -04:00