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 |
|
Martin Griffin
|
5e593a62fb
|
Ignore num_tiles if it would truncate non-transparent tiles (#1729)
|
2022-08-18 23:07:25 -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
|
231727d02b
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
|
2022-07-22 23:33:04 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
Blackforest92
|
56f4c319a4
|
Fix multiple pokemon graphics, tidying pokemon graphic folders
|
2022-07-22 22:17:29 +07:00 |
|
Eduardo Quezada D'Ottone
|
fe63dafcc1
|
Merge branch 'battle_engine' into BE_pretmerge
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
|
2022-07-20 08:50:30 -04:00 |
|
ghoulslash
|
f2ee9f3ba0
|
tweak z indicator position relative to healthbox
|
2022-07-18 09:44:04 -04:00 |
|
ghoulslash
|
18affe8c1a
|
new z move indicator, credits to blackforest
|
2022-07-18 09:21:59 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04:00 |
|
Eduardo Quezada D'Ottone
|
e791cf90ad
|
Merge tag 'pretmaster' into BE_pretmerge2
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
|
2022-07-15 12:58:46 -04:00 |
|
Eduardo Quezada D'Ottone
|
c69275f373
|
Merge remote-tracking branch 'pret/master' into PE_pretmerge
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
|
2022-07-12 17:20:49 -04:00 |
|
Blackforest92
|
ff861ff963
|
Add some of Legends Arceus battle sprites
|
2022-07-04 12:28:40 +07:00 |
|
Blackforest92
|
8c88e8a9b7
|
Legends Arceus Pokemon 95% Finished
|
2022-07-03 17:15:37 +07:00 |
|
ghoulslash
|
fc2cfd8c9d
|
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
|
2022-07-01 09:22:55 -04:00 |
|
ghoulslash
|
a349462b78
|
Merge pull request #2134 from LOuroboros/bePretMerge
Pret merge for the battle_engine
|
2022-07-01 09:21:51 -04:00 |
|
GriffinR
|
277750b088
|
Merge branch 'master' into rme-update
|
2022-06-22 10:02:17 -04:00 |
|
hamish
|
307d5d93c4
|
add potlergeist animation
|
2022-05-23 08:53:08 -04:00 |
|
sneed
|
ef496ddb9d
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim
|
2022-05-19 00:54:16 +03:00 |
|
sneed
|
09bace2b26
|
fix cherrim sprite
|
2022-05-19 00:40:54 +03:00 |
|
sneed
|
8c15c5b6d7
|
fix castform sprite
|
2022-05-18 20:47:14 +03:00 |
|
GriffinR
|
c2dc4a5dea
|
Some field door comments
|
2022-05-18 13:03:02 -04:00 |
|
GriffinR
|
5c8e1e81ea
|
Color single-palette door anim graphics
|
2022-05-18 12:41:20 -04:00 |
|
LOuroboros
|
52d6c96e69
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
|
2022-05-13 03:20:42 -03:00 |
|
LOuroboros
|
2263caef7a
|
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
|
2022-05-13 03:17:31 -03:00 |
|
ghoulslash
|
574be40f26
|
Merge pull request #2099 from Greenphx9/calyrex_rider_icons
Calyrex Rider Icons
|
2022-04-27 08:43:53 -04:00 |
|
Greenphx9
|
b3294c60a2
|
Calyrex Rider Icons
|
2022-04-22 16:31:17 +10:00 |
|
GriffinR
|
fc5747f0f7
|
Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
|
2022-04-20 00:20:44 -04:00 |
|
TheXaman
|
2fa812df26
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge
|
2022-04-13 20:51:35 +02:00 |
|
LOuroboros
|
446bcd3181
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePret
|
2022-04-11 01:23:18 -03:00 |
|
LOuroboros
|
b6e2945072
|
Merge branch 'master' of https://github.com/pret/pokeemerald into bePret
|
2022-04-11 01:22:10 -03:00 |
|
LOuroboros
|
f82c946ff3
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
|
2022-04-03 13:26:27 -03:00 |
|
LOuroboros
|
af2f70e000
|
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
|
2022-04-03 13:21:40 -03:00 |
|
LOuroboros
|
fa39dc76dc
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
|
2022-04-02 18:45:18 -03:00 |
|
GriffinR
|
328b925a08
|
Move trainer hill map data to bin files
|
2022-03-31 14:08:31 -04:00 |
|
ExpoSeed
|
f50a406b18
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2022-03-22 12:56:23 -05:00 |
|
GriffinR
|
33c05cefe2
|
Merge pull request #1644 from GriffinRichards/name-jump-long-grass
Name unknown_16.png
|
2022-03-14 16:32:08 -04:00 |
|
GriffinR
|
0a0157b62c
|
Name unknown_16.png
|
2022-03-14 15:54:47 -04:00 |
|
GriffinR
|
8bf7e7b6f5
|
Improve egg hatch documentation
|
2022-03-03 01:33:49 -05:00 |
|
ultima-soul
|
2d3ba500c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2022-03-01 15:10:19 -08:00 |
|
ultima-soul
|
84a7f960c8
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2022-02-28 23:37:41 -08:00 |
|
ultima-soul
|
86089ce935
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2022-02-28 22:13:14 -08:00 |
|
GriffinR
|
8b43cffe09
|
Move remaining region map graphics to region map folder
|
2022-02-22 18:43:23 -05:00 |
|
GriffinR
|
a0c127f72c
|
Move region map layout to C
|
2022-02-22 18:13:11 -05:00 |
|
GriffinR
|
131ed1916e
|
Generalize name of party slot without HP
|
2022-02-15 16:24:19 -05:00 |
|
GriffinR
|
49eca60955
|
Convert party menu slots to bin files
|
2022-02-15 16:12:54 -05:00 |
|
GriffinR
|
062cdbe01c
|
Merge pull request #1599 from GriffinRichards/fix-tilemaps
Break up graphics/interface and graphics/misc
|
2022-01-20 08:53:44 -05:00 |
|
GriffinR
|
bd43b905b7
|
Apply palettes to some field effect pngs
|
2022-01-14 12:51:13 -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
|
d782d3544d
|
Move pokeblock graphics out of interface
|
2022-01-11 11:46:58 -05:00 |
|
GriffinR
|
565dd24309
|
Move party menu graphics out of interface
|
2022-01-11 11:37:13 -05:00 |
|
GriffinR
|
7103839a61
|
Move summary screen graphics out of interface, fix some names
|
2022-01-11 11:22:45 -05:00 |
|
GriffinR
|
fde18b4774
|
Fix berry crusher graphics name
|
2022-01-11 10:42:00 -05:00 |
|
GriffinR
|
0a78cb5c9e
|
Fix some battle dome graphics names
|
2022-01-11 10:04:47 -05:00 |
|
Eduardo Quezada D'Ottone
|
8d0548f732
|
Fixed Wormadam sprite. Credit to Jaizu
|
2022-01-08 20:26:16 -03:00 |
|