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