Eduardo Quezada
acef8d208e
Merge branch '_pret/master' into pret_europe
2025-06-11 09:45:39 -04:00
DizzyEggg
b394c79996
Add Spanish text to data maps
2025-01-13 12:10:39 -03:00
GriffinR
f61c0099b9
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
GriffinR
bf17d54b52
Finish adding local IDs to map.json files
2024-10-12 23:32:28 -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
23ad0c125d
Seperated Text from script Battle Frontier 2/2
2024-06-22 11:21:47 +02:00
GriffinR
36551dff2f
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
cbt6
32aaf6912f
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08: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
e5757a3def
Use trainer type constants
2020-04-28 19:59:08 -05:00
GriffinR
b1d26e10a8
Sync map header property names with pokefirered
2020-04-28 19:59:08 -05:00
GriffinR
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
GriffinR
0513e05c38
Document Frontier Reception Gate
2019-11-16 12:00:35 -06:00
GriffinR
248b85c3cb
Document Frontier Exchange Corner scripts
2019-11-16 12:00:35 -06:00
GriffinR
d914c1d659
Document common movements
2019-10-06 13:55: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
aac9658a8e
Document some field_specials data
2019-09-17 16:50:17 -05:00
Fontbane
9e74409bb2
Fix labels, label more scripts
2019-04-04 19:34:35 -05:00
Fontbane
90e32f4ec5
Document landmark setting and item balls
2019-04-04 19:34:35 -05:00
Phlosioneer
e77e7844ea
Name several vars, document some related events
2019-02-27 20:25:09 -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
Marcus Huderle
19b76bffda
Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields
2019-02-16 16:56:41 -06:00
Marcus Huderle
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
Marcus Huderle
5c1667b41a
Define layout constants
2019-01-29 16:55:25 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06: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
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
garak
624a7552b6
use event flags in event scripts
2018-10-17 09:05:22 -04:00
Marcus Huderle
94650495c6
Use map battle scene constants in map headers
2018-07-12 22:45:41 -05:00
Marcus Huderle
546819bc72
Use map type constants in map headers
2018-07-12 22:39:38 -05:00
Marcus Huderle
d53e8137cd
Use weather constants in map headers
2018-07-12 22:15:35 -05:00
Marcus Huderle
d5eb94330a
Use region map section constants in map headers
2018-07-12 21:47:04 -05:00
Marcus Huderle
8ffd7a70fc
Use movement type constants in object_event macros
2018-07-10 18:04:51 -05:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Marcus Huderle
89d35e82a2
Move 'map attributes' into 'layouts'
2018-06-20 19:54:21 -05:00
sceptillion
96511dc214
use internal song names
2017-12-22 00:10:20 -08:00
Diegoisawesome
f61810a8f9
Dump maps
2017-11-09 19:21:31 -06:00
