acef8d208e
Merge branch '_pret/master' into pret_europe
2025-06-11 09:45:39 -04:00
b394c79996
Add Spanish text to data maps
2025-01-13 12:10:39 -03:00
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
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
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
36551dff2f
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
61aa9c3ba9
More updating event macro comments
2021-11-16 17:46:34 -05:00
f85de6eca5
Start event macro comment updates
2021-11-15 10:54:57 -05:00
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
fac6288156
Add local object event ids for referenced objects
2020-06-22 17:18:58 -04:00
e5757a3def
Use trainer type constants
2020-04-28 19:59:08 -05:00
b1d26e10a8
Sync map header property names with pokefirered
2020-04-28 19:59:08 -05:00
b93101bbeb
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
a4191040c9
Sync weather names
2019-12-06 19:05:28 -06:00
82cb741d8b
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
5c627518b3
Rename Grunts to use location-specific names
2019-11-04 16:45:00 -06:00
5f1fcdd023
Document aqua/magma area scripts
2019-11-01 17:22:45 -05:00
dd01942c4f
Document aqua/magma hideout scripts
2019-11-01 17:22:45 -05:00
1b41b8b7ca
Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms
2019-10-15 05:05:57 -04:00
9aed405851
Document a few field specials
2019-09-30 01:42:52 -04:00
713f61de7c
continue labeling metatiles for scripts
2019-06-16 10:08:07 -05:00
901a83d249
Fix some labels and include decorations.h
...
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
2019-04-22 17:23:59 -05:00
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05:00
90e32f4ec5
Document landmark setting and item balls
2019-04-04 19:34:35 -05:00
e77e7844ea
Name several vars, document some related events
2019-02-27 20:25:09 -05:00
84573f1774
Merge pull request #574 from Phlosioneer/event-vars
...
Event vars
2019-02-25 08:02:28 -06:00
8816aa527d
Update map script files
2019-02-25 08:01:22 -06:00
4e5fae0086
Merge branch 'master' into event-vars
2019-02-25 02:24:20 -05:00
0de831fd29
Name some common single-entry movements
2019-02-24 10:10:18 -06:00
cea5696f23
Finish moving pokeruby vars
2019-02-22 04:18:43 -05:00
19b76bffda
Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields
2019-02-16 16:56:41 -06:00
0b1bb9e4e9
use strings for map json coord_event var_value
2019-02-16 16:14:43 -06:00
29d6221935
Convert map data to JSON
2019-01-31 15:51:20 -06:00
5c1667b41a
Define layout constants
2019-01-29 16:55:25 -06:00
a3ebca4d81
Fix merge conflicts
2019-01-02 21:25:14 +00:00
1e3da62d24
Finish off labelling flags
2019-01-02 21:12:43 +00:00
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06:00
1e87810414
document setweather calls
2018-12-24 16:23:58 -05:00
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05: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
10725def8e
trainerbattle_normal → trainerbattle_single
...
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -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
Eduardo Quezada