 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
|
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 |
|
|
dennisw100
|
fd917df12a
|
Seperated Text from script PetalburgCity_House2-RustboroCity_House3
Seperated Text from script PetalburgCity_House2 - PetalburgCity_WallysHouse, PetalburgWoods, Route120 - 128, RustboroCity_CuttersHouse - RustboroCity_House3
|
2024-06-26 15:56:08 +02:00 |
|
|
GriffinR
|
866c32a735
|
Add temp var aliases
|
2023-08-04 14:17:28 -04:00 |
|
|
GriffinR
|
36551dff2f
|
Treat warp ids as strings to allow constants
|
2022-09-03 15:43:43 -04:00 |
|
|
GriffinR
|
f899a02ac6
|
Use MON_GIVEN_TO_ constants for givemon
|
2022-01-12 18:34:26 -05:00 |
|
|
GriffinR
|
110fbc559c
|
Make item optional for givemon and setwildbattle
|
2022-01-11 02:08:14 -05:00 |
|
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
|
GriffinR
|
c4f8f4d11a
|
Add STR_VAR_# ids to string buffer macros
|
2021-11-17 22:00:44 -05:00 |
|
|
GriffinR
|
f85de6eca5
|
Start event macro comment updates
|
2021-11-15 10:54:57 -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
|
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
|
96720db083
|
Remove unnecessary removeitem arguments
|
2020-01-12 23:29:19 -05:00 |
|
|
GriffinR
|
c19289596d
|
Give/Take to Add/Remove for silent script macros
|
2020-01-12 23:24:52 -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
|
481c09fcad
|
Clean up Rustboro script doc
|
2019-11-05 16:43:57 -06:00 |
|
|
GriffinR
|
d9da932dad
|
Document Rustboro scripts
|
2019-11-05 16:43:57 -06:00 |
|
|
GriffinR
|
1d421f2f71
|
Document Devon Corp scripts
|
2019-11-05 16:43:57 -06:00 |
|
|
GriffinR
|
033c6cea3b
|
Use YES/NO constants for MSGBOX_YESNO
|
2019-11-02 16:36:43 -05:00 |
|
|
GriffinR
|
ca2c6fa9b1
|
Document pc_transfer.inc
|
2019-10-22 17:57:28 -05:00 |
|
|
GriffinR
|
a180d2af49
|
Merge branch 'master' into document-eventscripts
|
2019-09-22 12:18:48 -04:00 |
|
|
GriffinR
|
de0084ef7a
|
Document multichoice ids
|
2019-09-19 00:56:51 -04:00 |
|
|
GriffinR
|
945d3d3a27
|
Merge branch 'master' into document-eventscripts
|
2019-09-17 00:10:23 -04:00 |
|
|
GriffinR
|
06af24bce5
|
Use misc ScrCmd constants
|
2019-09-16 19:44:47 -05:00 |
|
|
GriffinR
|
ecf2097abb
|
initial event_scripts documentation
|
2019-08-14 23:38:42 -04:00 |
|
|
GriffinR
|
c2bf668fdd
|
rename town/city vars
|
2019-08-05 11:23:45 -04:00 |
|
|
Fontbane
|
d9115ada86
|
Use species constants for VAR_TEMP_1 before givemon
|
2019-05-13 10:16:28 -05: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
|
7d54c2b960
|
EventScript and Text Documentation
In event_script.s. Also renamed a couple events for consistency/detail.
|
2019-03-23 09:57:37 -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
|
4582fd1545
|
Name a ton of commonly used event scripts
|
2019-02-24 10:10:18 -06:00 |
|
|
Phlosioneer
|
cea5696f23
|
Finish moving pokeruby vars
|
2019-02-22 04:18:43 -05: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 |
|
|
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 |
|