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
GriffinR
f602a9dcbf
Use bool for multichoice ignoreBPress
2021-03-31 00:35:56 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
fac6288156
Add local object event ids for referenced objects
2020-06-22 17:18:58 -04:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
GriffinR
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
GriffinR
82f55f2381
Merge master into ObjEvent rename
2019-12-15 02:00:00 -05:00
GriffinR
75b0c9d7a9
Document Battle Pyramid scripts
2019-12-14 08:38:26 -06:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
GriffinR
fdae25eab2
Set up Battle Pyramid macros
2019-12-05 21:11:17 -06:00
GriffinR
cb90f22c5e
Merge master into ObjEvent rename
2019-11-27 12:51:10 -05:00
GriffinR
8d870d94c9
Document Battle Arena scripts
2019-11-26 18:47:48 -06:00
GriffinR
f559fa3fe2
Merge master into ObjEvent rename
2019-11-25 20:00:04 -05:00
GriffinR
63ee15fc28
Document Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2
Begin documenting Battle Pike and Frontier Util
2019-11-25 18:37:48 -06:00
GriffinR
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
GriffinR
6ac7efb54f
Document Scotts House and begin frontier macros
2019-11-17 08:16:28 -06:00
GriffinR
a3ee92a4e7
Document some frontier util funcs
2019-11-10 16:37:14 -06:00
GriffinR
033c6cea3b
Use YES/NO constants for MSGBOX_YESNO
2019-11-02 16:36:43 -05:00
GriffinR
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
GriffinR
c4deb4db96
Document field_poison
2019-10-06 20:04:30 -04:00
GriffinR
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a
Document multichoice ids
2019-09-19 00:56:51 -04:00
GriffinR
6ab49da811
Clean up field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
06af24bce5
Use misc ScrCmd constants
2019-09-16 19:44:47 -05:00
Phlosioneer
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
Phlosioneer
0de831fd29
Name some common single-entry movements
2019-02-24 10:10:18 -06:00
Phlosioneer
4582fd1545
Name a ton of commonly used event scripts
2019-02-24 10:10:18 -06:00
Melody
38293d4293
use player constant in obj script commands
2018-12-24 16:31:24 -05:00
Melody
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
Melody
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
Melody
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
DizzyEggg
4e37723288
Document Battle Pyramid
2018-11-18 17:52:22 +01:00
DizzyEggg
0bb51037d7
Finish frontier util
2018-11-01 21:31:10 +01:00
DizzyEggg
edcf04b665
Document battle dome.
2018-08-25 19:59:47 +02:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
