 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
|
cb66ea6653
|
Continue adding local IDs to map.json files
|
2024-10-12 12:24:57 -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
|
c264fdf45e
|
382/665
|
2023-01-09 00:49:12 -03:00 |
|
|
GriffinR
|
cc182bf05e
|
Use Porymap's new order for connection fields
|
2022-10-24 10:05:59 -04:00 |
|
|
GriffinR
|
36551dff2f
|
Treat warp ids as strings to allow constants
|
2022-09-03 15:43:43 -04:00 |
|
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
|
GriffinR
|
f85de6eca5
|
Start event macro comment updates
|
2021-11-15 10:54:57 -05: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
|
0851c34bac
|
Add berry tree id constants
|
2021-02-05 15:25:12 -05: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
|
e92cc7752b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
|
2020-01-13 20:41:57 -05:00 |
|
|
GriffinR
|
f2e7b1507e
|
Port some macro/script fixes from pokefirered
|
2020-01-11 14:12:31 -05:00 |
|
|
GriffinR
|
b93101bbeb
|
Merge master into ObjEvent rename
|
2019-12-06 21:37:33 -05:00 |
|
|
GriffinR
|
a4191040c9
|
Sync weather names
|
2019-12-06 19:05:28 -06: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
|
525ec2025d
|
Document Routes 111-118
|
2019-11-14 17:41:01 -06:00 |
|
|
GriffinR
|
dd01942c4f
|
Document aqua/magma hideout scripts
|
2019-11-01 17:22:45 -05:00 |
|
|
GriffinR
|
928cdf2531
|
Merge branch 'master' into doc-inc2
|
2019-10-14 19:25:10 -04:00 |
|
|
GriffinR
|
30ef494163
|
Merge branch 'master' into doc-inc2
|
2019-10-13 15:44:07 -04:00 |
|
|
GriffinR
|
d8f5e73bb7
|
Merge branch 'master' into doc-inc
|
2019-10-07 17:37:04 -04:00 |
|
|
GriffinR
|
7ba11b7a1b
|
Use VAR_FACING constants
|
2019-10-07 16:36:02 -05:00 |
|
|
GriffinR
|
628301d6d5
|
Document unusual_weather.inc
|
2019-10-07 11:29:14 -04:00 |
|
|
GriffinR
|
d914c1d659
|
Document common movements
|
2019-10-06 13:55:30 -04:00 |
|
|
GriffinR
|
9aed405851
|
Document a few field specials
|
2019-09-30 01:42:52 -04:00 |
|
|
Fontbane
|
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 |
|
|
Fontbane
|
2c076f1f3e
|
Doc most OnTransitions
|
2019-04-22 17:23:59 -05:00 |
|
|
Fontbane
|
4a09a5da33
|
Doc field move scripts completely, use fldeff constants for dofieldeffect
Fix labels
Fix labels again
Delete extra boulder scripts
Now it should build fine
|
2019-04-06 12:48:50 -05:00 |
|
|
Fontbane
|
90e32f4ec5
|
Document landmark setting and item balls
|
2019-04-04 19:34:35 -05:00 |
|
|
Phlosioneer
|
4137dd7b0b
|
Identify unused, never read, and never written vars
|
2019-02-27 14:42:32 -05:00 |
|
|
Phlosioneer
|
c1348d22f3
|
Name most event scripts related to unusual weather
|
2019-02-27 04:27:54 -05:00 |
|
|
Phlosioneer
|
fe55580fe1
|
Reverse engineer unusual weather events
|
2019-02-27 03:42:04 -05:00 |
|
|
huderlem
|
84573f1774
|
Merge pull request #574 from Phlosioneer/event-vars
Event vars
|
2019-02-25 08:02:28 -06:00 |
|
|
Phlosioneer
|
8816aa527d
|
Update map script files
|
2019-02-25 08:01:22 -06:00 |
|
|
Phlosioneer
|
4e5fae0086
|
Merge branch 'master' into event-vars
|
2019-02-25 02:24:20 -05:00 |
|
|
Phlosioneer
|
0de831fd29
|
Name some common single-entry movements
|
2019-02-24 10:10:18 -06:00 |
|
|
Phlosioneer
|
e12a7790cf
|
Start porting pokeruby vars to pokeemerald
|
2019-02-22 04:01:38 -05: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 |
|
|
garak
|
0b1bb9e4e9
|
use strings for map json coord_event var_value
|
2019-02-16 16:14:43 -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 |
|