Commit Graph

587 Commits

Author SHA1 Message Date
DizzyEggg b394c79996 Add Spanish text to data maps 2025-01-13 12:10:39 -03:00
Eduardo Quezada b10eecc49d Fixed matching French and Italian 2025-01-12 21:12:05 -03:00
Eduardo Quezada d8b92f98cd Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage 2025-01-12 17:40:40 -03:00
Eduardo Quezada 3f98c78297 Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
GriffinR a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
GriffinR 04197b4912 Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
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 e26a0629ae English as proper default 2024-07-05 07:31:42 -04:00
dennisw100 2ebe1fd8e0 Added Spanish Textfile AbandonedShip-BattleFrontier_BattleTowerMultiBattleRoom
Added Spanish Textfile AbandonedShip, AquaHideout, BattleFrontier_BattleArenaBattleRoom - BattleFrontier_BattleTowerMultiBattleRoom
2024-07-03 20:35:46 +02:00
Eduardo Quezada 3424047ce2 French: OK 2024-06-29 21:41:10 -04:00
dennisw100 3b716d22d1 Seperated Text from script SootopolisCity_House7-Underwater_SeafloorCavern
Seperated Text from script SootopolisCity_House7 - SootopolisCity, SSTidal, TrainerHill, Underwater_SeafloorCavern
2024-06-28 15:19:04 +02:00
Eduardo Quezada 68fca4ae37 Duplicated english script text files to use as a base for spanish integration 2024-06-28 08:45:03 -04:00
dennisw100 310039bf8a Seperated Text from script SlateportCity-SootopolisCity_House6
Seperated Text from script SlateportCity, SootopolisCity_Gym_1F - SootopolisCity_House6
2024-06-27 19:18:41 +02:00
dennisw100 9c549be8de Seperated Text from script RustboroCity-SkyPillar
Seperated Text from script RustboroCity_Mart - RustboroCity, SeafloorCavern, ShoalCave, SkyPillar
2024-06-27 19:16:30 +02:00
dennisw100 fd917df12a Seperated Text from script PetalburgCity_House2-RustboroCity_House3
Seperated Text from script PetalburgCity_House2 - PetalburgCity_WallysHouse, PetalburgWoods, Route120 - 128, RustboroCity_CuttersHouse - RustboroCity_House3
2024-06-26 15:56:08 +02:00
dennisw100 1aad902a77 Seperated Text from script MtPyre-PetalburgCity_House1
Seperated Text from script MtPyre, NewMauville, OldaleTown, PacifidlogTown, PetalburgCity - PetalburgCity_House1
2024-06-26 15:53:19 +02:00
dennisw100 e9c3998d38 Seperated Text from script MauvilleCity_PokemonCenter_2F-MtChimney
Seperated Text from script MauvilleCity_PokemonCenter_2F, MeteorFalls, MirageTower, MossdeepCity, MtChimney
2024-06-25 17:52:56 +02:00
dennisw100 bba64752e0 Seperated Text from script LilycoveCity-MauvilleCity_PokemonCenter_1F
Seperated Text from script LilycoveCity, MagmaHideout, MauvilleCity - MauvilleCity_PokemonCenter_1F
2024-06-25 17:50:16 +02:00
dennisw100 7bb00ffe5b Seperated Text from script LavaridgeTown-LilycoveCity_House1
Seperated Text from script LavaridgeTown, LilycoveCity_ContestHall - LilycoveCity_House1
2024-06-24 17:06:01 +02:00
dennisw100 8e65d6615a Seperated Text from script FallarborTown-JaggedPass
Seperated Text from script FallarborTown, FarawayIsland, FortreeCity, GraniteCave, InsideOfTruck & JaggedPass
2024-06-24 17:02:13 +02:00
Eduardo Quezada 00f9aa4af9 Seperated Text from script CaveOfOrigin_B1F - FallarborTown_BattleTentCorridor (#28) 2024-06-22 11:02:27 -04:00
Eduardo Quezada 988328a6e3 Verdanturf, Rusturf, Victory Road (437/665) 2024-06-22 10:59:03 -04:00
dennisw100 e191c1d0a1 Seperated Text from script CaveOfOrigin_B1F - FallarborTown_BattleTentCorridor
effected locations
CaveOfOrigin_B1F
DewfordTown
EverGrandeCity
FallarborTown - FallarborTown_BattleTentCorridor
2024-06-22 16:51:32 +02:00
Eduardo Quezada 7b3bbd2246 Fixed end of file newlines 2024-06-22 09:54:58 -04:00
dennisw100 23ad0c125d Seperated Text from script Battle Frontier 2/2 2024-06-22 11:21:47 +02:00
dennisw100 c529d4f09f Seperated Text from script Battle Frontier 1/2
Hoffentlich jetzt in den richtigen ordner
2024-06-22 11:18:09 +02:00
Jaizu 189d542520 Fix Steven partner battle post-battle script (#2001) 2024-06-17 15:44:52 -04:00
GriffinR a5c2ac5e49 Use BUGFIX in assembly files 2023-10-20 09:10:49 -04:00
GriffinR b248791f47 Merge pull request #1904 from GriffinRichards/temp-alias
Add temp flag and var aliases
2023-08-11 15:45:00 -04:00
Martin Griffin 912a80e27a Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR 866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
GriffinR 6d4dadd7b5 Add temp flag aliases 2023-08-03 15:55:06 -04:00
PSF b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
Eduardo Quezada da17309441 385/665 2023-05-30 08:12:59 -04:00
Zunawe 492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
GriffinR bb078e0618 Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments
Document music usage to make it easier to search for a specific track
2023-03-05 15:29:38 -05:00
Eduardo Quezada a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
GriffinR ce6875817f Merge pull request #1860 from GriffinRichards/metatile-labels
Format metatile_labels
2023-03-04 23:36:04 -05:00
Zunawe f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Zunawe 60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
Zunawe 8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00
GriffinR b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR 9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
Eduardo Quezada c264fdf45e 382/665 2023-01-09 00:49:12 -03:00
Eduardo Quezada 56496b15e5 333/665 2022-12-30 11:46:16 -03:00
Eduardo Quezada 1ddbd318be 328/665 2022-12-30 10:32:17 -03:00
Eduardo Quezada c7295fa8e2 315/665 2022-12-30 09:50:31 -03:00
Eduardo Quezada 9022504af5 306/665 2022-12-30 08:39:45 -03:00
GriffinR e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00