Eduardo Quezada
|
6546971313
|
Merge branch '_pret/master' into pret_europe
|
2025-07-27 11:15:48 -04:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
CI / build (push) Has been cancelled
|
2025-06-20 15:33:12 -04:00 |
|
Eduardo Quezada
|
acef8d208e
|
Merge branch '_pret/master' into pret_europe
|
2025-06-11 09:45:39 -04:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
CI / build (push) Waiting to run
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Eduardo Quezada
|
9b1935d78a
|
Merge branch '_pret/master' into pret_multilanguage
|
2025-02-15 12:20:16 -03:00 |
|
Eduardo Quezada
|
664e15ccfe
|
POKÉMON EDICIÓN ESMERALDA
|
2025-02-15 11:45:30 -03:00 |
|
Eduardo Quezada
|
ddb7844878
|
ALMOST ALMOST
|
2025-02-15 00:42:35 -03:00 |
|
Eduardo Quezada
|
cbf5d137aa
|
ALMOST THERE
|
2025-02-14 23:25:52 -03:00 |
|
GriffinR
|
cdadd7d2ed
|
Generate heal location constants automatically, move data back to a single file.
|
2025-02-03 20:25:11 -05:00 |
|
Eduardo Quezada
|
e27071dcd6
|
Almost all non-graphics data done
|
2025-01-19 13:57:35 -03:00 |
|
GriffinR
|
2f67b17571
|
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
|
2025-01-17 17:54:38 +00:00 |
|
Raymond Dodge
|
b5b0ffd511
|
Define field script opcode constants (#2005)
Replace the magic number opcodes in field script command macros with
these new constants
|
2025-01-17 17:04:00 +00:00 |
|
Eduardo Quezada
|
fabf9419ff
|
Fix compiling Spanish (still doesn't match)
|
2025-01-14 13:03:36 -03:00 |
|
Eduardo Quezada
|
0262657543
|
Spanish data/text/general.inc
|
2025-01-13 12:52:48 -03:00 |
|
Eduardo Quezada
|
a788adc3fe
|
add spanish data/text (#44)
|
2025-01-13 14:36:23 -03:00 |
|
DizzyEggg
|
7c994cc9ce
|
add spanish data/text
|
2025-01-13 16:31:13 +01:00 |
|
DizzyEggg
|
b394c79996
|
Add Spanish text to data maps
|
2025-01-13 12:10:39 -03:00 |
|
Eduardo Quezada
|
b10eecc49d
|
Fixed matching French and Italian
|
2025-01-12 21:12:05 -03:00 |
|
Eduardo Quezada
|
d8b92f98cd
|
Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage
|
2025-01-12 17:40:40 -03:00 |
|
GriffinR
|
dbff8c4360
|
Merge branch 'porymap-6' into generate-map-constants
|
2024-12-09 20:25:41 -05:00 |
|
Eduardo Quezada
|
720b2daecc
|
Improve Pyramid location documentaion
|
2024-12-05 18:25:27 -03:00 |
|
Eduardo Quezada
|
3f98c78297
|
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)
CI / build (push) Has been cancelled
|
2024-12-04 17:38:23 -05:00 |
|
GriffinR
|
382ee9e276
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2024-11-23 16:10:33 -05:00 |
|
surtr-games
|
13692076f9
|
Fixed a bug with Counter and Mirror Coat where they would be scored up depending on the wrong target mon type category.
|
2024-11-14 00:30:25 -05:00 |
|
GriffinR
|
0eb6d1d74c
|
Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants
|
2024-10-15 22:04:45 -04:00 |
|
GriffinR
|
da9c0239d9
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2024-10-15 22:02:40 -04:00 |
|
GriffinR
|
a0be2cbf7b
|
Fix Fallorbor typo
CI / build (push) Has been cancelled
|
2024-10-12 23:50:12 -04: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 |
|
GriffinR
|
cb66ea6653
|
Continue adding local IDs to map.json files
|
2024-10-12 12:24:57 -04:00 |
|
GriffinR
|
9f31b0fe90
|
Generate local IDs from map.json files
|
2024-10-12 03:04:24 -04:00 |
|
GriffinR
|
091b7269df
|
Move heal locations data to their associated map.json (#2034)
|
2024-10-11 15:15:55 -04:00 |
|
GriffinR
|
a551efea43
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2024-09-19 12:33:34 -04:00 |
|
GriffinR
|
04197b4912
|
Fix swapped cycling road entrances
|
2024-08-31 01:54:25 -04:00 |
|
Bassoonian
|
5fefd743a2
|
Fix defines in MAP_NUM and MAP_GROUP
|
2024-08-14 13:02:40 +02:00 |
|
Bassoonian
|
367f6dc8fd
|
Address concerns
|
2024-07-13 18:01:54 +02:00 |
|
Bassoonian
|
003bd54600
|
Rename battle terrain to environment
|
2024-07-13 12:02:18 +02: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 |
|
dennisw100
|
2ebe1fd8e0
|
Added Spanish Textfile AbandonedShip-BattleFrontier_BattleTowerMultiBattleRoom
Added Spanish Textfile AbandonedShip, AquaHideout, BattleFrontier_BattleArenaBattleRoom - BattleFrontier_BattleTowerMultiBattleRoom
|
2024-07-03 20:35:46 +02:00 |
|
Eduardo Quezada
|
23e0fec9ad
|
Initial Spanish (can't compile yet)
|
2024-07-01 23:07:26 -04:00 |
|
Eduardo Quezada
|
af584da7f1
|
Full name for language directories
|
2024-07-01 22:06:22 -04:00 |
|
Eduardo Quezada
|
3424047ce2
|
French: OK
|
2024-06-29 21:41:10 -04:00 |
|
Eduardo Quezada
|
82e3637e4f
|
Multiple matching fixes
|
2024-06-29 12:05:30 -04:00 |
|
dennisw100
|
3b716d22d1
|
Seperated Text from script SootopolisCity_House7-Underwater_SeafloorCavern
Seperated Text from script SootopolisCity_House7 - SootopolisCity, SSTidal, TrainerHill, Underwater_SeafloorCavern
|
2024-06-28 15:19:04 +02: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
|
eed58556f3
|
Final non-script changes (659/670)
|
2024-06-27 21:28:25 -04:00 |
|
dennisw100
|
310039bf8a
|
Seperated Text from script SlateportCity-SootopolisCity_House6
Seperated Text from script SlateportCity, SootopolisCity_Gym_1F - SootopolisCity_House6
|
2024-06-27 19:18:41 +02:00 |
|