Jaizu
|
0f7e1a2388
|
Fix Paras
|
2023-01-30 17:17:56 +01:00 |
|
Jaizu
|
0134efd983
|
Fix Ninetales
|
2023-01-24 15:34:12 +01:00 |
|
Jaizu
|
de5d8407ad
|
Fix Vulpix
|
2023-01-24 15:34:03 +01:00 |
|
Jaizu
|
24d81ccf96
|
Fix Jigglypuff
|
2023-01-24 15:33:56 +01:00 |
|
Jaizu
|
dd9c63d6f2
|
Fix Golbat
|
2023-01-24 15:33:47 +01:00 |
|
Jaizu
|
94c9e3a943
|
Fix Gloom
|
2023-01-24 15:33:38 +01:00 |
|
Jaizu
|
43a45d18d8
|
Fix Vileplume
|
2023-01-24 15:33:29 +01:00 |
|
Jaizu
|
4573f1b48d
|
Fix Oddish
|
2023-01-24 15:33:19 +01:00 |
|
Jaizu
|
6d9e26270d
|
Fix Wigglytuff
|
2023-01-24 15:33:07 +01:00 |
|
Jaizu
|
1817d85a2b
|
Fix Zubat
|
2023-01-24 15:32:51 +01:00 |
|
Jaizu
|
fca339f5e0
|
Fix Clefable
|
2023-01-24 15:13:30 +01:00 |
|
Jaizu
|
c8e0d3fce1
|
Fix Clefairy
|
2023-01-24 15:13:19 +01:00 |
|
Jaizu
|
a6e462b20c
|
Fix Nidoking
|
2023-01-24 15:13:11 +01:00 |
|
Jaizu
|
d71f5fd81d
|
Fix Nidoqueen
|
2023-01-24 15:12:58 +01:00 |
|
Jaizu
|
a1a3e1d68a
|
Fix Nidoran f
|
2023-01-24 15:12:51 +01:00 |
|
Jaizu
|
bbaa397c78
|
Fix Nidoran m
|
2023-01-24 15:12:42 +01:00 |
|
Jaizu
|
d1432e4517
|
Fix Nidorina
|
2023-01-24 15:12:31 +01:00 |
|
Jaizu
|
9dd0560bfa
|
Fix Nidorino
|
2023-01-24 15:12:21 +01:00 |
|
Jaizu
|
9c6ba83269
|
Fix Sandslash
|
2023-01-24 14:53:52 +01:00 |
|
Jaizu
|
7cecb0e0ee
|
Fix Snadshrew
|
2023-01-24 14:53:46 +01:00 |
|
Jaizu
|
4718cf91a5
|
Fix Raichu
|
2023-01-24 14:49:40 +01:00 |
|
Jaizu
|
4c84431a76
|
Fix Pikachu
|
2023-01-24 14:49:35 +01:00 |
|
Jaizu
|
2fb719541a
|
Fix Arbok
|
2023-01-24 14:49:28 +01:00 |
|
Jaizu
|
a926d6741a
|
Fix Ekans
|
2023-01-24 14:49:19 +01:00 |
|
Jaizu
|
bf4c126663
|
Fix Fearow palettes
|
2023-01-24 14:43:34 +01:00 |
|
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 |
|
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 |
|
GriffinR
|
c8afeea182
|
Generate trainer pic palettes from image
|
2022-09-05 16:09:45 -04:00 |
|
Blackforest92
|
7e9d243677
|
Tidying graphics/battle_anims
|
2022-09-04 23:24:37 +07:00 |
|
Eduardo Quezada
|
5403cd036e
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
|
2022-09-02 23:24:08 -04:00 |
|
Blackforest92
|
61c33f56a0
|
Updated to latest master branch + add PLA's data to teachable_learnsets.h
|
2022-08-29 21:01:31 +07:00 |
|
phxGAMMA
|
4577f635c9
|
Update fairy.png
|
2022-08-27 22:42:05 -04:00 |
|
Blackforest92
|
07a07ddc8d
|
Update to latest master branch + allow Reveal Glass to work with Enamorus
|
2022-08-24 15:00:48 +07:00 |
|
Eduardo Quezada D'Ottone
|
21fe205f0f
|
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes
Fix multiple pokemon icons & tidying pokemon graphic folders
|
2022-08-24 00:52:49 -04:00 |
|
Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
GriffinR
|
261b0ff118
|
Standardize judgement vs judgment spelling
|
2022-08-20 22:58:46 -04:00 |
|
Blackforest92
|
a9d09bcd17
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
|
2022-08-19 17:53:01 +07:00 |
|
Blackforest92
|
00a827b3fb
|
Add PLA pokemon to Form Species Table, add Kleavor's graphics
|
2022-08-19 17:47:34 +07:00 |
|