Commit Graph

42 Commits

Author SHA1 Message Date
Eduardo Quezada e27071dcd6 Almost all non-graphics data done 2025-01-19 13:57:35 -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
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 f2f072cc0a More french-matching fixes 2024-06-29 19:46:20 -04:00
Eduardo Quezada b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
GriffinR 6eaaa50ad5 Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Eduardo Quezada 9022504af5 306/665 2022-12-30 08:39:45 -03:00
GriffinR c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
Eduardo Quezada fbcb80c575 (260/665) 2022-08-18 11:13:02 -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
Eduardo Quezada bb671d90a8 (197/654) 2022-08-10 09:07:13 -04:00
GriffinR 694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR 41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04: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 dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
Ashley Coleman 0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
GriffinR 38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR 52b1251b48 Document second rayquaza scene 2020-08-27 15:43:27 -04:00
GriffinR ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
GriffinR 95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR 0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
GriffinR b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
GriffinR 36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR 96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
GriffinR 172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR 689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
GriffinR c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
GriffinR 6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
Papa Cancer e53ba4773d Documenting bags, berries and graphics
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
garak d0115db565 move pokemon graphics to mon-specific directories 2019-03-16 12:21:47 -05:00
garak 14211fb495 fix incbin paths 2019-03-16 12:21:47 -05:00
garak e292d0ca83 Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
garak e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
nullableVoidPtr 4fc3fa9e44 Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines 2018-12-07 20:18:24 +08:00
nullableVoidPtr f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
Melody b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Diegoisawesome 8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Slawter666 0cd250a83e Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666 5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00