Commit Graph

18 Commits

Author SHA1 Message Date
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
Eduardo Quezada 23e0fec9ad Initial Spanish (can't compile yet) 2024-07-01 23:07:26 -04:00
AnonymousRandomPerson a8d0a0d709 Replaced decomp list with pret.github.io link 2023-08-30 00:08:19 -04:00
AnonymousRandomPerson 63f39133ab Added newer decomp projects to readme 2023-08-18 23:38:14 -04:00
Eduardo Quezada 11cc2179a4 (205/665) Italian up to date with French 2022-08-12 15:31:25 -04:00
Eduardo Quezada 62b81fea84 Setting up french makefile 2022-08-01 16:16:52 -04:00
IIMarckus 6012cf43cb Kill Freenode. 2021-10-08 04:57:05 -06:00
SatoMew 7061e66212 Undo secondary changes 2021-05-13 19:49:15 +01:00
SatoMew ff866d0735 Remove Travis badge 2021-03-23 22:31:01 +00:00
PikalaxALT 6efa51f8ad Bump discord invite
New invite link points to landing channel
2019-11-25 18:38:13 -06:00
SatoMew 89da828794 Another update for README.md 2019-06-16 22:26:10 +01:00
SatoMew f9ca074bc4 Update README.md 2019-04-24 21:11:49 +01:00
luckytyphlosion 2778e9ad3d Update Discord link. 2018-10-22 22:20:48 -04:00
yenatch 745985612e travis badge 2018-01-21 12:57:41 -05:00
luckytyphlosion f82badd515 Add pokegold and pokefirered. 2017-12-31 13:30:22 -05:00
luckytyphlosion 675bdb5250 Add Discord and other disassemblies. 2017-09-04 19:41:47 -04:00
YamaArashi 5af8ba570c add INSTALL file 2016-09-03 14:25:34 -07:00
YamaArashi 33b799c967 Initial commit 2015-10-05 03:09:22 -07:00