Eduardo Quezada
2de4b6f546
Fix spanish compile again
2025-01-14 21:18:20 -03:00
Eduardo Quezada
1a6be8f822
Moreee
2025-01-14 21:17:39 -03:00
Eduardo Quezada
fabf9419ff
Fix compiling Spanish (still doesn't match)
2025-01-14 13:03:36 -03:00
Eduardo Quezada
c2ada5c8a1
Some updates
2025-01-13 15:44:07 -03: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
Bassoonian
6365431122
Add PokéNav too
2023-12-12 23:20:22 +01:00
Bassoonian
e5ac2fe0b1
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
Eduardo Quezada
9144779634
Removed repeated extern consts in strings.h
2022-09-09 08:49:16 -04:00
Eduardo Quezada
fe0367be3e
Merge remote-tracking branch 'pret/master' into pret_multilanguage
...
# Conflicts:
# graphics_file_rules.mk
# src/naming_screen.c
2022-08-23 08:11:38 -04:00
Eduardo Quezada
11cc2179a4
(205/665) Italian up to date with French
2022-08-12 15:31:25 -04:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
Eduardo Quezada
27f2b85efe
Incorporated Italian changes, enough to compile (still needs to sync a couple of them)
2022-08-12 00:28:16 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
Eduardo Quezada
860df0bd97
Merge remote-tracking branch 'pret/master' into pret_french
...
# Conflicts:
# ld_script.txt
# src/battle_controller_player.c
# src/battle_main.c
# src/battle_script_commands.c
# src/evolution_scene.c
# src/field_specials.c
# src/pokedex.c
# src/union_room.c
2022-08-08 11:22:44 -04:00
Eduardo Quezada
18cdd708b5
(56/654) Berry fix gba file + finalizing format for inc files
2022-08-02 11:05:56 -04:00
Eduardo Quezada
b2160d50bb
37/654
2022-08-01 23:35:34 -04:00
GriffinR
06dc93fc2f
Clean up field_poison.c
2022-07-06 21:04:54 -04:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
f5152094a9
Finish pokenav conditions doc
2021-11-12 11:01:22 -05:00
GriffinR
684f599a44
Label remaining battle_interface symbols
2021-11-08 16:03:44 -05:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
GriffinR
8c820878bf
Document Battle Pyramid Bag
2021-04-23 15:07:36 -04:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
GriffinR
22c1bf965a
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
...
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
b40cee540e
Continue documenting roulette
2020-08-02 14:52:05 -04:00
GriffinR
36a4764a78
Document some slot machine data
2020-07-26 02:15:59 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose
...
Document starter_choose.c
2020-07-17 16:02:10 -04:00
GriffinR
431c60c92c
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
2020-07-08 15:45:31 -04:00
GriffinR
43c48d95c2
Document starter_choose.c
2020-07-06 17:26:25 -04:00
GriffinR
24569583e4
Document contest results
2020-06-18 17:50:13 -04:00
GriffinR
3f97763181
Document cable_club.c
2020-06-06 16:10:03 -04:00
GriffinR
7632404ba5
Document union_room_chat.c
2020-06-02 18:35:00 -04:00
GriffinR
3456578c0f
Move berry crush data to src
2020-02-17 13:10:23 -06:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
GriffinR
8a96aa9e97
Name pokenav files
2020-02-04 08:02:28 -06:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
GriffinR
23f952b34e
Merge master into doc-tower
2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
jiangzhengwenjz
5bec27aa34
nonmatch sub_8024604
2019-12-18 03:36:51 +08:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall
...
Document some pokenav match call
2019-12-15 09:42:13 -06:00
GriffinR
75b0c9d7a9
Document Battle Pyramid scripts
2019-12-14 08:38:26 -06:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall
2019-12-10 20:43:27 -05:00
GriffinR
b7ab9cbf4c
Update JP translation and fix typo
2019-12-10 19:29:23 -06:00
