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 |
|
GriffinR
|
a10ec0487e
|
Color rotating gate pngs
|
2022-10-12 19:19:42 -04:00 |
|
Eduardo Quezada
|
44754f8ca7
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-10-07 15:27:16 -03:00 |
|
Jaizu
|
34c0a5bd8a
|
Spiky Eared Pichu second frame
|
2022-09-30 17:54:11 -03:00 |
|
Jaizu
|
40e4cb81ef
|
finish normal palette swapping
|
2022-09-30 17:54:04 -03:00 |
|
Jaizu
|
6278f710a0
|
Finish plenty of sprites.
This also includes some fixes to Swanna, Spiky Eared Pichu and some broken details across other species that I already forgot.
|
2022-09-30 17:53:58 -03:00 |
|
Eduardo Quezada
|
ecad6ff0db
|
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
|
2022-09-27 10:46:49 -03:00 |
|
GriffinR
|
7223dbd62f
|
Merge branch 'master' into rme-update
|
2022-09-25 11:56:57 -04:00 |
|
Eduardo Quezada
|
f969effd36
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
|
2022-09-25 12:51:39 -03:00 |
|
GriffinR
|
9bcc36fe08
|
Merge pull request #1767 from GriffinRichards/trainer-pals
Generate trainer pic palettes from image
|
2022-09-22 11:34:03 -04:00 |
|
Eduardo Quezada
|
41d11b0708
|
Restored filename format for gendered species
|
2022-09-14 11:13:42 -03:00 |
|
Eduardo Quezada
|
0caf79f702
|
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-09-13 20:44:49 -03:00 |
|
Blackforest92
|
431cb6fa7c
|
Tidying graphics - Trio Weather
|
2022-09-09 21:57:40 +07:00 |
|
Blackforest92
|
3acb32acb8
|
Tyding graphics - Acupressure
|
2022-09-09 00:25:43 +07:00 |
|
Eduardo Quezada D'Ottone
|
f79e9f02de
|
Merge pull request #2289 from Blackforest92/RHH-PR-Branch
Tidying Graphics/Battle_Anims
|
2022-09-06 17:02:25 -04:00 |
|