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
e26a0629ae
English as proper default
2024-07-05 07:31:42 -04:00
68fca4ae37
Duplicated english script text files to use as a base for spanish integration
2024-06-28 08:45:03 -04:00
7b3bbd2246
Fixed end of file newlines
2024-06-22 09:54:58 -04:00
23ad0c125d
Seperated Text from script Battle Frontier 2/2
2024-06-22 11:21:47 +02:00
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
c4f8f4d11a
Add STR_VAR_# ids to string buffer macros
2021-11-17 22:00:44 -05:00
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
57a66bb22d
Document Battle Frontier lounges
2019-11-16 11:37:34 -06:00
033c6cea3b
Use YES/NO constants for MSGBOX_YESNO
2019-11-02 16:36:43 -05:00
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
f179ab95c0
Document move tutors
2019-10-06 17:30:17 -04:00
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
6ab49da811
Clean up field_specials documentation
2019-09-17 16:50:17 -05:00
3dbd375779
Some frontier field_specials documentation
2019-09-17 16:50:17 -05:00
aac9658a8e
Document some field_specials data
2019-09-17 16:50:17 -05:00
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Eduardo Quezada