 Eduardo Quezada
|
6546971313
|
Merge branch '_pret/master' into pret_europe
|
2025-07-27 11:15:48 -04:00 |
|
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
|
2025-06-20 15:33:12 -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 |
|
|
Eduardo Quezada
|
68fca4ae37
|
Duplicated english script text files to use as a base for spanish integration
|
2024-06-28 08:45:03 -04:00 |
|
|
Eduardo Quezada
|
7b3bbd2246
|
Fixed end of file newlines
|
2024-06-22 09:54:58 -04: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 |
|
|
GriffinR
|
866c32a735
|
Add temp var aliases
|
2023-08-04 14:17:28 -04:00 |
|
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
|
ExpoSeed
|
6a977bdbfc
|
Document second parameter of playbgm
|
2021-05-21 15:08:00 -05:00 |
|
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
|
GriffinR
|
75b0c9d7a9
|
Document Battle Pyramid scripts
|
2019-12-14 08:38:26 -06:00 |
|