acef8d208e
Merge branch '_pret/master' into pret_europe
2025-06-11 09:45:39 -04:00
929bc8b990
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2025-05-14 11:50:11 -04:00
b394c79996
Add Spanish text to data maps
2025-01-13 12:10:39 -03:00
d8b92f98cd
Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage
2025-01-12 17:40:40 -03:00
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it ( #1947 )
2024-12-04 17:38:23 -05: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
54b254a829
Add CRY_MODE constants
2021-11-07 13:33:05 -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
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
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
290df23130
Document remaining poke marts
2019-11-04 16:42:28 -06:00
f179ab95c0
Document move tutors
2019-10-06 17:30:17 -04:00
ecf2097abb
initial event_scripts documentation
2019-08-14 23:38:42 -04: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
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
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06: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
bf2063cc1a
Update All EVENT_OBJ_GFX References
...
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14 19:09:18 -04:00
94650495c6
Use map battle scene constants in map headers
2018-07-12 22:45:41 -05:00
546819bc72
Use map type constants in map headers
2018-07-12 22:39:38 -05:00
d53e8137cd
Use weather constants in map headers
2018-07-12 22:15:35 -05:00
d5eb94330a
Use region map section constants in map headers
2018-07-12 21:47:04 -05:00
8ffd7a70fc
Use movement type constants in object_event macros
2018-07-10 18:04:51 -05:00
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
89d35e82a2
Move 'map attributes' into 'layouts'
2018-06-20 19:54:21 -05:00
96511dc214
use internal song names
2017-12-22 00:10:20 -08:00
f61810a8f9
Dump maps
2017-11-09 19:21:31 -06:00
Eduardo Quezada