pret/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-04 07:11:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,923 Commits 3 Branches 0 Tags
29bbd327de18d4f06b0eceae5330dea5c95f3abe
Commit Graph

495 Commits

Author SHA1 Message Date
Eduardo Quezada 29bbd327de Final non-graphic changes 2025-01-19 16:54:24 -03:00
Eduardo Quezada e27071dcd6 Almost all non-graphics data done 2025-01-19 13:57:35 -03:00
Eduardo Quezada 4d026edc08 Battle Frontier Data 2025-01-17 16:44:13 -03:00
DizzyEggg cd9426a82b Merge branch 'pret_multilanguage' of https://github.com/AsparagusEduardo/pokeemerald into easychat 2025-01-15 11:51:52 +01:00
DizzyEggg 4938e7b58b easy chat files 2025-01-15 11:51:14 +01:00
Eduardo Quezada f9b90a79c5 moooooore 2025-01-14 23:37:12 -03:00
Eduardo Quezada fabf9419ff Fix compiling Spanish (still doesn't match) 2025-01-14 13:03:36 -03:00
Eduardo Quezada d8b92f98cd Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage 2025-01-12 17:40:40 -03:00
Frank 544b76fbbf Added value for bard sound length 2024-10-21 09:04:42 -04:00
Bassoonian c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
Eduardo Quezada b9645f048a Map section names default to english when they aren't present in the JSON 2024-07-05 19:09:09 -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 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 e183cc0b0d Started to standarize graphics folders (#34) 2024-06-29 22:36:21 -04:00
Eduardo Quezada 3424047ce2 French: OK 2024-06-29 21:41:10 -04:00
Eduardo Quezada f2f072cc0a More french-matching fixes 2024-06-29 19:46:20 -04:00
Eduardo Quezada e275345080 Item names (616/670) 2024-06-26 22:52:15 -04:00
Eduardo Quezada 72b8c2f60b Decorations + general language string macro 2024-06-24 09:48:12 -04:00
Eduardo Quezada 8d2643cc6c Trainer names (462/665) 2024-06-22 13:44:54 -04:00
Kurausukun 7567b0a57a safeguard SQUARE and CUBE macro arguments in parentheses 2023-12-27 17:29:35 -05:00
Bassoonian bc2a745171 Fix accidental symbol replacements 2023-12-12 23:18:35 +01:00
Bassoonian e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
Bassoonian cd9ef3a566 Formatting fix 2023-10-28 16:34:11 +02:00
Bassoonian f472d768dd Rename Undiscovered to No Eggs Discovered 2023-10-28 16:32:55 +02:00
Eduardo Quezada af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Eduardo Quezada b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
GriffinR 10a10e914b Merge pull request #1910 from GriffinRichards/misc-constants 
Use miscellaneous missing constants
 2023-08-15 17:53:41 -04:00
GriffinR 18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
GriffinR 6eaaa50ad5 Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Martin Griffin 912a80e27a Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Eduardo Quezada 0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
GriffinR 8d88a38561 Merge pull request #1854 from GriffinRichards/constants-num-frames 
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
 2023-02-27 13:16:49 -05:00
GriffinR a322379feb Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
GriffinR c32fbf594a Merge pull request #1851 from GriffinRichards/doc-fldspc 
Document remaining field_specials task data
 2023-02-08 22:34:57 -05:00
GriffinR 5496f0e6b0 Merge pull request #1850 from GriffinRichards/sync-trade 
Sync trade
 2023-02-03 19:05:00 -05:00
Jaizu 717ba22ea1 Make contest opponents an enum 
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
 2023-02-03 15:49:22 +01:00
GriffinR 3b15fd34cc Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames 2023-02-01 16:09:01 -05:00
GriffinR 4328ed8b19 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-02-01 14:59:45 -05:00
GriffinR 9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
GriffinR 7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
GriffinR 18384894e0 Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups 
Made Types and Egg Groups into arrays
 2023-01-15 00:27:20 -05:00
Eduardo Quezada 70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
GriffinR b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
GriffinR c91b13a12b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-01-07 13:30:11 -05:00
Eduardo Quezada 9022504af5 306/665 2022-12-30 08:39:45 -03:00
Eduardo Quezada a7b9a4e862 264/665 2022-12-29 20:43:39 -03:00
GriffinR 347a02ace1 Sync trade 2022-12-15 15:40:59 -05:00
Eduardo Quezada 2f96344cd9 Removed ANIM_CMD macro from unused_anims.h 2022-12-10 11:46:41 -03:00