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
..
2018-07-01 11:15:42 +02:00
2020-01-08 05:43:06 -05:00
2021-07-02 02:46:01 -04:00
2023-01-18 12:11:09 -05:00
2022-08-11 12:09:38 -04:00
2021-08-24 19:59:32 -03:00
2019-12-05 21:11:17 -06:00
2020-01-07 22:30:37 -05:00
2021-08-24 19:59:32 -03:00
2022-06-09 12:57:28 -04:00
2021-11-01 18:36:35 -03:00
2023-12-12 19:02:36 +01:00
2022-06-09 12:57:28 -04:00
2023-02-01 11:48:55 -05:00
2022-07-29 09:43:16 -04:00
2019-11-16 13:02:35 -06:00
2023-02-23 11:43:40 -03:00
2020-01-08 01:07:53 -05:00
2020-01-08 01:07:53 -05:00
2022-06-09 12:57:28 -04:00
2022-08-12 15:31:25 -04:00
2023-11-18 13:57:50 +11:00
2021-02-10 16:26:09 -05:00
2021-04-06 16:55:43 -04:00
2020-07-30 19:37:16 -04:00
2023-08-10 01:42:18 -04:00
2021-02-05 01:27:11 -05:00
2018-05-01 15:19:24 -04:00
2023-03-13 15:58:40 -04:00
2019-11-21 14:03:35 -05:00
2022-08-12 21:18:10 -04:00
2023-02-08 13:11:10 -05:00
2021-10-29 11:24:36 -04:00
2019-10-13 15:29:53 -04:00
2023-12-12 19:02:36 +01:00
2019-10-15 05:05:57 -04:00
2019-12-15 11:42:50 -05:00
2023-08-11 15:45:00 -04:00
2020-01-08 05:43:06 -05:00
2023-06-05 14:15:07 +02:00
2024-07-05 18:38:49 -04:00
2022-06-03 14:59:01 +01:00
2021-03-27 17:27:20 -05:00
2021-08-24 19:59:32 -03:00
2021-08-10 22:13:02 -04:00
2024-07-05 18:38:49 -04:00
2021-02-08 14:45:56 -05:00
2021-09-23 21:39:21 -04:00
2021-05-11 10:16:04 -05:00
2021-10-13 23:24:10 -04:00
2020-04-28 19:59:08 -05:00
2023-01-18 11:54:06 -05:00
2019-10-21 17:21:53 -05:00
2023-01-17 21:32:55 -05:00
2024-01-18 14:31:04 -05:00
2022-07-11 15:18:13 +01:00
2022-11-22 02:17:03 -05:00
2020-06-24 17:00:19 -04:00
2021-11-15 10:57:06 -05:00
2023-12-12 19:02:36 +01:00
2024-05-23 02:45:22 +03:00
2023-12-12 19:02:36 +01:00
2022-08-16 18:23:37 -04:00
2021-01-19 17:59:36 +00:00
2020-07-30 19:37:16 -04:00
2021-08-24 19:59:32 -03:00
2021-02-05 12:08:25 -05:00
2021-11-16 15:43:52 -05:00
2023-03-05 17:17:39 -03:00
2021-11-10 11:59:15 -05:00
2022-01-05 12:18:49 -05:00
2023-08-09 10:51:01 -04:00
2023-01-09 15:32:04 -05:00
2023-08-03 11:15:15 -04:00
2020-04-28 19:59:08 -05:00
2021-10-02 23:48:12 -04:00
2023-12-12 19:02:36 +01:00
2022-08-23 12:44:07 -04:00
2023-08-04 14:17:28 -04:00
2021-08-24 19:59:32 -03:00
2021-12-31 00:16:56 -05:00