Commit graph

808 commits

Author SHA1 Message Date
Jaizu
bc45dccdc7 Fix Spearow 2023-01-24 14:34:09 +01:00
Jaizu
fa13bf6b7f Fix Raticate 2023-01-24 14:34:02 +01:00
Jaizu
d3c43ab392 Fix Rattata 2023-01-24 14:33:54 +01:00
Jaizu
518d4c7fba Fix Pidgeot 2023-01-24 14:27:36 +01:00
Jaizu
cc19533975 Fix Pidgeotto 2023-01-24 14:25:30 +01:00
Jaizu
90a10d8857 Fix Beedrill 2023-01-24 14:20:34 +01:00
Jaizu
7510b413bd Fix Kakuna 2023-01-24 14:20:22 +01:00
Jaizu
2ea6620202 Fix Pidgey 2023-01-24 14:20:10 +01:00
Jaizu
492add1200 Fix Weedle 2023-01-24 14:20:01 +01:00
Jaizu
2f32c7b41e Fix Butterfree 2023-01-24 14:10:39 +01:00
Jaizu
5c7431c443 Fix Caterpie 2023-01-24 14:10:28 +01:00
Jaizu
d7af028d57 Fix Blastoise sprite 2023-01-24 14:04:55 +01:00
Jaizu
b304d60da0 Fix Wartortle sprite 2023-01-24 14:04:47 +01:00
Jaizu
a581b63cdc Fix Squirtle sprite 2023-01-24 14:04:37 +01:00
Jaizu
c6811fb692 Ability popup fixes 2023-01-21 18:12:12 +01:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
d5a4bfcd6f
Merge pull request #1843 from GriffinRichards/colorize
Colorize more grayscaled/incorrectly colored pngs
2023-01-15 12:48:42 -05:00
GriffinR
e839c8ebe5 Colorize tourney_info_card.png 2023-01-15 12:42:47 -05:00
GriffinR
0415cf73df Fix results_screen/tiles.png colors 2023-01-15 12:04:29 -05:00
GriffinR
c0e68f33f7 Colorize pokemon storage tiles 2023-01-15 00:39:51 -05:00
GriffinR
41c85b4af6 Fix slot_machine/menu colors 2023-01-14 16:34:14 -05:00
GriffinR
71d4b1687a Fix party_menu/bg colors 2023-01-14 12:32:54 -05:00
GriffinR
9be0818b78 Fix intro/scene_1 tiles 2023-01-14 00:48:58 -05:00
GriffinR
9c34bc2385 Colorize picture_frame tiles 2023-01-13 15:30:57 -05:00
GriffinR
387ea563fc Move FRLG trainer card gfx to own folder, fix tiles 2023-01-13 13:40:13 -05:00
GriffinR
1707f82992 Combine/colorize status graphics 2023-01-13 12:53:08 -05:00
GriffinR
0064db7a6d Correct colors for frontier_pass 2023-01-13 02:25:23 -05:00
GriffinR
ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
GriffinR
52e00ac603 Correct colors in summary_screen/tiles.png 2023-01-12 21:41:06 -05:00
GriffinR
3a253ece0f Fix some colors in crusher.png 2023-01-12 19:04:49 -05:00
GriffinR
89286c91e3
Merge pull request #1842 from GriffinRichards/gbagfx-pals
Automatically constrain png pixels to bit depth
2023-01-12 16:36:05 -05:00
GriffinR
a12432a0f3 Colorize crusher.png 2023-01-12 16:34:36 -05:00
GriffinR
12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
GriffinR
863779afbb Colorize rayquaza_scene/scene_1/clouds.png 2023-01-12 14:56:44 -05:00
GriffinR
0fd0eb7163 Colorize cable_car/bg.png 2023-01-12 14:47:04 -05:00
GriffinR
68f97d02f4 Colorize menu_info.png 2023-01-12 13:17:31 -05:00
GriffinR
cf14c1fd13 Colorize mirage_tower.png 2023-01-12 11:40:15 -05:00
GriffinR
3009cc7220 Colorize door animations that use multiple palettes 2023-01-11 13:31:17 -05:00
Eduardo Quezada
55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
# Conflicts:
#	include/config/pokemon.h
2023-01-04 16:19:57 -03:00
Eduardo Quezada
e0802f13a2 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103
# Conflicts:
#	include/link_rfu.h
2023-01-03 15:40:33 -03:00
Eduardo Quezada
965e2c3394 Newline fix 2023-01-01 10:31:09 -03:00
SphericalIce
09d20bd634 Rename ball_display_unused_extra 2022-12-26 11:30:12 +00:00
Eduardo Quezada
d103025527 Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2
# Conflicts:
#	include/config/pokemon.h
2022-12-22 10:30:01 -03:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
Eduardo Quezada D'Ottone
b48f057fe7
Merge pull request #1589 from cynderquil/pokemon_expansion
Fix Bastiodon's second icon frame
2022-11-20 20:47:07 -03:00
GriffinR
3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
GriffinR
b3e75138da Sync wireless improvements 2022-11-09 15:14:18 -05:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00