Commit Graph

116 Commits

Author SHA1 Message Date
Eduardo Quezada acef8d208e Merge branch '_pret/master' into pret_europe 2025-06-11 09:45:39 -04:00
GriffinR f11bddf854 Fixes for Mirage Tower graphics (#2120)
* Add documentation for CreateCeilingCrumbleSprites

* Combine mirage tower graphics

* Add comment about mirage tower / player palette
2025-04-14 08:12:45 +02: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
Eduardo Quezada 16c46da158 Pokenav options gfx 2025-02-14 17:03:51 -03:00
Eduardo Quezada e27071dcd6 Almost all non-graphics data done 2025-01-19 13:57:35 -03:00
Eduardo Quezada fb870fe0d4 Move types 2025-01-13 14:50:56 -03:00
Eduardo Quezada dcf9ab7d73 Restored English Matching 2025-01-12 17:57:33 -03:00
Eduardo Quezada d8b92f98cd Merge remote-tracking branch '_pret_origin/master' into pret_multilanguage 2025-01-12 17:40:40 -03:00
GriffinR 1b8e6fbe3f Lay out emerald version png horizontally 2024-11-04 15:40:10 -05: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 af584da7f1 Full name for language directories 2024-07-01 22:06:22 -04:00
Eduardo Quezada 60804a7909 Italian: OK 2024-07-01 13:34:27 -04:00
Eduardo Quezada 420b36ca36 Final french gfx matching diffs 2024-06-29 20:53:51 -04:00
Eduardo Quezada f2f072cc0a More french-matching fixes 2024-06-29 19:46:20 -04:00
Eduardo Quezada bc1dd80876 Fonts (461/665) 2024-06-22 11:55:22 -04:00
Icedude907 81f397360e Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin 2023-11-12 14:28:11 +13:00
GriffinR f4111d8082 Sync castform folder organization 2023-07-09 14:57:51 -04:00
GriffinR 6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
GriffinR 52e00ac603 Correct colors in summary_screen/tiles.png 2023-01-12 21:41:06 -05:00
GriffinR 12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
Eduardo Quezada bdf90de7b3 366/665 2022-12-30 17:39:56 -03:00
tustin2121 cf6f343726 Use multi-include incbins for stormy_water
- Removes a special case rule from the make files.
2022-11-26 23:38:39 -05:00
GriffinR 3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
GriffinR 7223dbd62f Merge branch 'master' into rme-update 2022-09-25 11:56:57 -04:00
Eduardo Quezada 65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -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
GriffinR cce9918908 Add Wnum_tiles to additional num_tiles rules 2022-08-18 23:13:27 -04:00
Martin Griffin 5e593a62fb Ignore num_tiles if it would truncate non-transparent tiles (#1729) 2022-08-18 23:07:25 -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 fdf99fefb8 Abilities and Ribbon descriptions + fix in strings.c 2022-08-08 12:07:40 -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 fa3abf90c4 (148/654) 2022-08-03 11:25:11 -04:00
GriffinR 8b43cffe09 Move remaining region map graphics to region map folder 2022-02-22 18:43:23 -05:00
GriffinR 4dec9b83a3 Move more graphics out of misc 2022-01-14 12:29:30 -05:00
GriffinR 01af8e877f Move starter choose out of interface/misc 2022-01-11 17:49:08 -05:00
GriffinR 694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR 565dd24309 Move party menu graphics out of interface 2022-01-11 11:37:13 -05:00
GriffinR 23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
GriffinR baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00
GriffinR e14210ce1f Merge pull request #1536 from GriffinRichards/clean-braille
Add font id constants, better braille support
2021-11-03 13:17:29 -04:00
GriffinR 36039e1b86 Convert fonts.s to C 2021-10-31 01:44:18 -04:00
GriffinR fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR a470e2c761 Tabs to spaces for graphics_file_rules alignment 2021-10-27 14:07:56 -04:00
GriffinR 41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
GriffinR 18f85b5cf0 Merge pull request #1415 from GriffinRichards/doc-contestutil
Some Contest clean up
2021-04-27 02:29:41 -04:00
GriffinR dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR 838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR cbc7a72814 Merge pull request #1346 from GriffinRichards/doc-pokejump
Document pokemon jump
2021-02-28 11:19:02 -05:00