Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
kittenchilly
48d6fe2e64
Merge branch 'upcoming' into ultraburst
2023-08-26 14:43:31 -05:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 ( #3205 )
2023-08-25 16:33:15 -04:00
voloved
2a2cd77cf4
Allow Cycling Through Balls in the Last Ball Used Menu ( #3039 )
2023-08-24 19:23:26 -04:00
CyanSMP64
ef69021f0f
some more tweaks by mrds
2023-08-24 13:00:31 +12:00
CyanSMP64
fd37946c1d
resize golduck
2023-08-22 20:31:13 +12:00
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim
...
Document stat change animation
2023-08-20 14:29:11 -04:00
CyanSMP64
4e5809a0d0
tweak graveler, pikachu
2023-08-20 22:08:54 +12:00
CyanSMP64
60a2878f8f
tweak growlithe, slowbro, poliwag
2023-08-19 16:15:20 +12:00
CyanSMP64
c33660e00f
fix arcanine and zard
2023-08-19 15:37:41 +12:00
CyanSMP64
ec24754489
fix arcanine, change bg colour of green pokemon
2023-08-18 17:24:30 +12:00
CyanSMP64
74de0ef3ca
set background colour
2023-08-16 13:58:31 +12:00
CyanSMP64
0c27db10d6
Review mon sprites 0001-0080
2023-08-15 20:24:07 +12:00
kittenchilly
3435c590c9
Merge branch 'upcoming' into ultraburst
2023-08-12 18:58:38 -05:00
gruxor
f493ae8c69
Fixed item sprites with palette errors ( #3222 )
2023-08-12 18:13:33 -04:00
kittenchilly
c3a8edae32
Sprites and fixes
2023-08-11 13:36:01 -05:00
GriffinR
60a6c9d160
Merge pull request #1903 from GriffinRichards/frontier-gfx
...
Fix some frontier gfx, adjacent cleanup
2023-08-10 14:49:44 -04:00
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use ( #1892 )
2023-08-09 12:49:21 -04:00
GriffinR
6598cb30bc
Document stat change animation
2023-08-08 23:56:16 -04:00
GriffinR
16c0be7ed2
Fix some frontier gfx, adjacent cleanup
2023-08-03 11:15:15 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul ( #3192 )
...
* [battle, anim] woodhammer animation overhaul
* squashme: timings
---------
Co-authored-by: sbird <sbird@no.tld>
2023-08-01 19:10:18 -04:00
Eclipse
c76e5deb9f
Fixed Wailord icon ( #3183 )
2023-07-30 10:08:56 -04:00
Eclipse
ca792d43cc
Gender differences sprites, final part ( #3122 )
...
* The last survivors
* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-07-18 21:31:22 -04:00
CyanSMP64
219ac7830c
Update female Alakazam's front sprite design ( #3149 )
2023-07-18 12:56:15 -04:00
Eclipse
fb8989414f
Fixed Mega Venasaur icon ( #3137 )
2023-07-16 02:40:21 -04:00
SonikkuA-DatH
6382640f8a
Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks ( #3127 )
...
* Casrform graphics. Palette changes, edited backs, and 2 Frame anims
* Castform Graphics
* Cherrim graphics, and Castform redefinitions
* Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette
* Revised Spinda Spot drawing function, removed tabs
* Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set
* Spacing
* Forgot shiny pal. Fixed
* Delete .vs directory
* remove vs ref
2023-07-14 11:45:40 -04:00
GriffinR
f4111d8082
Sync castform folder organization
2023-07-09 14:57:51 -04:00
Eduardo Quezada
1562280bce
Fixed SPECIES_NONE icon
2023-07-07 14:50:01 -04:00
Eduardo Quezada
adfc0af372
Mon graphics are now loaded depending on their availability
...
- If it has a female sprite/palette, it's loaded.
- If it the species is enabled and it has a sprite/palette, it's loaded.
- Otherwise, load the SPECIES_NONE graphics.
2023-07-07 14:36:30 -04:00
Eduardo Quezada
4405f79d24
Merge branch 'RHH/master' into RHH/upcoming
2023-07-06 13:15:06 -04:00
Eduardo Quezada
f21953f254
Merge remote-tracking branch 'pret/master' into RHH/master
2023-07-06 13:06:31 -04:00
Eduardo Quezada D'Ottone
862602233d
Gender differences sprites, part 3 ( #3095 )
2023-07-04 11:36:24 -04:00
SubzeroEclipse
c18ac55016
Tweaked Houndoom
...
Edited both male and female Houndoom sprites to make female's horns thinner.
2023-07-03 22:10:56 +02:00
SubzeroEclipse
5c98b9b427
Fixed Quagsire and Nuzleaf
...
Tweaked Quagsire female back and Nuzleaf to make their differences a bit more noticeable and faithful to the originals.
2023-07-03 18:12:39 +02:00
SubzeroEclipse
49e7893ed2
Fixed Meganium shiny
...
There was a mismatch between the normal and the shiny that I didn't notice at first, so the regular palette was fixed. Thanks to CyanSixFour for pointing that out.
2023-07-02 07:28:08 +02:00
SubzeroEclipse
23d51df7c0
Added Hisuian Sneasel
2023-07-01 11:16:31 +02:00
SubzeroEclipse
d202bdd09c
Added even more gender difference sprites, 2/2
2023-07-01 10:25:17 +02:00
Eduardo Quezada D'Ottone
2100a760ad
A selection of animation frames (redone) ( #3090 )
...
* Applin Family
* Placeholder single frames to macro
* Stufful/Bewear
* Chewtle/Drednaw
* Rookidee/Corvisquire/Corviknight
* Rolycoly/Carkol/Coalossal
* Missing animations
* Grubbin/Charjabug/Vikavolt
* Turtonator and Wimpod/Golisopod
* Jangmo-O/Hakamo-O/Kommo-O
* Pyukumuku and Dewpider/Araquanid
* Fixed Charjabug/Vikavolt palettes
* Pincurchin and Sizzlipede/Centiscorch
* Alolan Exeggutor and Salandit/Salazzle
* Reverted PLACEHOLDER_ONE_FRAME_ANIMATION for a separate PR
* Forgot Pyukumuku's animation
2023-06-30 14:13:42 +02:00
SubzeroEclipse
0733e0908c
Added even more gender difference sprites, 1/2
2023-06-30 10:40:46 +02:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff ( #3063 )
...
* Removed gCastformFrontSpriteCoords
* Removed sCastformElevations and IsCastformForm
* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct
* Scrubbed unused BS commands
* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants
* Removed redundant function in Pokémon Debug menu
* Removed handling in animation scripts
* Removed gBattleMonForms
* Reduced MAX_MON_PIC_FRAMES to 2
* Removed Castform/Cherrim makefile stuff
* Fixed weather form change tests not checking species.
* Fixed Castform palettes after Lunos' PR
2023-06-30 09:58:07 +02:00
Eduardo Quezada D'Ottone
67b196cd86
Try fixing Clear Amulet palette issue ( #3086 )
2023-06-27 22:14:56 -04:00
Eclipse
fc52414383
Added many more gender differences sprites ( #3082 )
...
Added sprites for the remaining Gen1 mons and a couple of evolutions.
2023-06-27 21:11:01 -04:00
Eclipse
a44af6f06f
Gender differences sprites, part 1 ( #3070 )
...
* Added some gender difference sprites
Added sprites for:
- Pikachu/Raichu
- Doduo/Dodrio
- Goldeen/Seaking
- Xatu
- Politoed
- Meditite/Medicham
- Gible/Gabite/Garchomp
NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird.
* Swapped Pikachu sprites
Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had.
* Added Gloom and Vileplume
* Fixed Pikachu forms
Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this.
* Swapped a few more sprites
Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back
2023-06-26 19:04:19 -04:00
PacFire
4b3b9b5e0a
Added icon for Clear Amulet ( #3078 )
...
* Update graphics.h
* Update item_icon_table.h
* Update items.h
* Add files via upload
added icon for clear amulet, shards still missing.
* Add files via upload
added clear amulet's palette
* Update graphics.h
2023-06-26 18:19:33 -04:00
ghoulslash
5de84d9a2f
Killed the bKGD invalid index warnings and fixed the bit depth of the species sprites ( #3051 )
2023-06-24 13:27:40 -04:00
ghoulslash
7371a9e401
Add many gen 8 move animations ( #2861 )
...
* port many gen8 and 9 move anims from cfru
* fix thunder cage, shell smash, shelter anims. update anim credits
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-21 13:19:54 -04:00
LOuroboros
d385ae3d5e
Killed the bKGD invalid index warning
...
Special thanks to:
-Blackforest for the tips on how to go about fixing the sprites with GIMP.
-Dat.S.H for a tip on how to make the conversion process easier to perform.
-Psf for actually going and doing it.
2023-06-07 23:13:07 -03:00
GriffinR
9c4a59f865
Fix swapped Dodrio Berry Picking palettes
2023-06-05 19:53:59 -04:00
Eduardo Quezada
4c57b84cd9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
...
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
23b57050c2
Fix some compressed tilemaps
2023-06-01 15:31:12 -04:00
GriffinR
890d00471a
Merge pull request #1886 from GriffinRichards/1bpp
...
Index footprint images, convert Spinda spots to .png files
2023-05-27 21:58:45 -04:00
AgustinGDLV
d133564e21
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-16 21:57:06 -07:00
Eduardo Quezada D'Ottone
15adbc8368
Pret merge Friday ( #2998 )
2023-05-14 18:38:33 -04:00
AaghatIsLive
a89288e30e
Fix Illumise pallete ( #2995 )
2023-05-12 08:24:47 -04:00
Bassoonian
c05404e772
Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge
2023-05-12 13:48:52 +02:00
AgustinGDLV
aec51b5b04
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-11 20:02:06 -07:00
GriffinR
6fdf75bd8c
Support plain pixel conversion, convert spinda spots to .png
2023-05-11 13:41:38 -04:00
GriffinR
8c537ccd72
Colorize bag select button
2023-05-10 00:33:43 -04:00
GriffinR
41ac28b210
Index pokemon footprint pngs
2023-05-09 22:43:48 -04:00
ghoulslash
8cce130643
Add Frostbite status ( #2942 )
2023-05-01 09:45:47 -04:00
Bassoonian
d5fb13ca17
Fix status icons
2023-04-26 23:33:22 +02:00
Salem
78c4d07b23
Add Berserk Gene Item ( #2893 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
Bassoonian
623e7c5f25
Add Frostbite status
2023-04-22 18:23:08 +02:00
Jaizu
e6505bda4b
Fix some sprites ( #2926 )
...
* Fix hisuian typlosion
* Fix mega metagross backsprite
* Fix shiny Reuniclus
* Fix Duosion mouth
* Fix front mega metagross
* Fix front Yanmega
* Fix Electivire front sprite
* Fix shiny duskull
* Fix Hariyama sprite
* Fix Shiny masquerain
2023-04-18 19:49:42 -04:00
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
aaghaht
bd54c70020
Add PLA evo items
2023-04-10 10:47:31 +05:30
Jaizu
53d837ee62
Fix gen v icons
2023-04-01 08:20:20 +02:00
Jaizu
90d33cd7a0
Fix gen 4 icons
2023-04-01 08:20:13 +02:00
Jaizu
01a12d81c7
Fix gen 3 icons
2023-04-01 08:20:06 +02:00
Jaizu
9a8f120e1d
Fix gen 2 icons
2023-04-01 08:19:58 +02:00
Jaizu
5f3070e528
Forgot to fix Venusaur
2023-04-01 08:19:50 +02:00
Jaizu
83ef5a229d
Center gen 1 pokémon icons
2023-04-01 08:19:38 +02:00
GriffinR
4b859ff1e4
Use tilemap file for cable car pylons
2023-03-31 00:44:22 -04:00
AgustinGDLV
504ec36b2b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-27 16:22:11 -07:00
TheXaman
bc2c3e1d49
Moved all HGSS pokedex code into its own file
...
- reordered all hgss code
- cleanup needed!
- restored the vanilla dex
2023-03-27 11:28:28 +02:00
TheXaman
eaa74ca7cc
Merge commit 'f4cb6d229f9c0130f763fa711c8a1f7ef59ac2c9' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss
2023-03-25 14:49:27 +01:00
Bassoonian
cd6d71cd01
Add most of the new item icons (Clear Amulet & Shards missing)
2023-03-24 00:50:06 +01:00
AgustinGDLV
69fd63a922
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
Alex
66c63ee458
hisuian sprite fixes
2023-03-14 18:23:50 +01:00
Alex
f3810465e8
samurott shiny.pal v2
2023-03-13 17:46:52 +01:00
Alex
59d5f078d2
samurott shiny.pal
2023-03-13 17:44:25 +01:00
Alex
aa29eced1f
Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites
2023-03-13 17:46:53 +01:00
AgustinGDLV
c823e19705
implemented Gigantamax form change
2023-03-11 10:48:21 -08:00
AgustinGDLV
89e778225c
dynamax indicator shares palette with alpha/omega
2023-03-11 10:47:23 -08:00
AgustinGDLV
4293dc8a24
not entirely confident implementation of Dynamax indicator
2023-03-10 23:03:51 -08:00
AgustinGDLV
317b52f3f6
added Dynamax trigger sprite
2023-03-10 22:05:23 -08:00
AgustinGDLV
ec4b330b9b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-10 21:00:41 -08:00
DizzyEggg
306c4565a0
merge
2023-03-06 15:32:28 +01:00
DizzyEggg
d3d99c3f8c
alpha omega indicator sprites use the same palete
2023-03-06 15:22:28 +01:00
Eduardo Quezada
9917f5cc8b
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
...
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
Alex
b8fec80f78
small braviary sprite fix
2023-03-02 18:04:12 +01:00
Alex
e16b5c2477
leftover
2023-03-02 17:27:45 +01:00
Alex
58b408cbbf
some new sprites
2023-03-02 17:04:24 +01:00
Alex
487e26e700
fix enamorus_t + samuroutt sprite + conflicts
2023-03-02 11:05:59 +01:00
Eduardo Quezada
501cff84b9
Removed unused single-frame front pics
2023-02-27 18:09:54 -03:00
GriffinR
adf28c2f63
Merge pull request #1855 from GriffinRichards/doc-chat
...
Add/correct some union room chat documentation
2023-02-27 13:25:05 -05:00
Jaizu
8143f57eb9
Fix sprite palettes up to Ampharos included
2023-02-26 14:06:32 +01:00
AgustinGDLV
b4ec273353
Merge branch 'upcoming' into dynamax
2023-02-25 14:04:55 -08:00
Alex
48391d8eff
Basculegion female form
2023-02-24 08:46:34 +01:00
LOuroboros
db02cd05f6
Purged the bKGD warning once and for all
2023-02-24 02:01:55 -03:00
Alex
a870ec3c22
enamorus_t cry, basculegionf sprite, new typhlosion back sprite
2023-02-23 15:20:12 +01:00
AgustinGDLV
38f462551f
pulled rhh master, i hate merge conflicts
2023-02-22 18:50:54 -08:00
Alex
1f694ae7ed
missing pla sprites
2023-02-22 20:41:01 +01:00
GriffinR
bc3805f9d3
Fix two binary palettes
2023-02-17 13:27:39 -05:00
sbird
fea54c9277
[intro] add fading, refactor abort, align intro gfx
2023-02-16 10:43:50 +01:00
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests
...
Fix Giga Impact on contests.
2023-02-13 09:22:24 +01:00
sbird
4bcbb7c9e1
[intro] refactor expansion intro
2023-02-09 23:12:29 +01:00
Jaizu
9f7267e48d
Fix Giga Impact on contests.
2023-02-09 11:29:29 +01:00
Eduardo Quezada D'Ottone
8381b14c51
Implemented Xhyzi's RHH copyright intro (with config) ( #2415 )
...
* Rhh & Pret Copyright Screen
* Porygon recovered his voice
* Expansion text
---------
Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
2023-02-08 15:54:12 +01:00
Eduardo Quezada
c2f284a1d3
Apply official palettes for Gen 1 Pokémon. #2593
...
commit 136016ee4f77c618a2ab4c55bf6534281161396ea3616fc74ea383a4e2ffa7950a1f34f0d8f5091fb0d260e689092132b3e4348006fc9808e1b2a70e0eb0c22154734e26d09ef64a73f0556df3de03c1011727960abac77a1bd89c3ac9253d4004956d55aaad68ad6242df7c97b69d4b7685715c357f209c67a098eea1c4750f39ed3792029c61d66d0a727cd43a68ee30be1a79d4ff1c0e2dd05540245f88809b55067bb7818b337dfd49ac05e98e1ffb74e8780fd6e6df1fc25f6dc173be89da731602c6ee40c6739c6a2b45effa1a8d1f381e03625938f97d78560cb9cdcd4fe6779114857d8e96a32d8839619e717c8f940b41604f7deec58f2765fa0dde855a235a04188aa7f38b107880532a73093423859bfa4c9b17943ebb05f548e0d22cdff56dad0d8ea99acbc98c70cfbb9250ce5a477d6480770d4014705cee71f086270028466f0243ba7dfa5a42b3e28baaf4658283537accb9aca57833bfb122483cc8a0705562565a8f8ca65cf78bc025887f7c8c5f2fa3606401fa6561101eceb0a9423b4052e2b36db7c752fd6f76f5bb40c5eb658c62dda7d8055bbc773678e933e8a17bd3d06b1c09e362474e83c2a20f7e1a23880134efd983de5d8407ad24d81ccf96dd9c63d6f294c9e3a94343a45d18d84573f1b48d6d9e26270d1817d85a2bfca339f5e0c8e0d3fce1a6e462b20cd71f5fd81da1a3e1d68abbaa397c78d1432e45179dd0560bfa9c6ba832697cecb0e0ee4718cf91a54c84431a762fb719541aa926d6741abf4c126663bc45dccdc7fa13bf6b7fd3c43ab392518d4c7fbacc1953397590a10d88577510b413bd2ea6620202492add12002f32c7b41e5c7431c443d7af028d57b304d60da0a581b63cdc
2023-02-06 10:25:36 -03:00
GriffinR
5793a1a5e7
Correct some union room chat documentation
2023-02-02 11:41:02 -05: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
TheXaman
933ec5ee65
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss
2022-10-30 15:10:32 +01:00
AgustinGDLV
2139e138a9
removed duplicate sprites and changed folder format for gmax
2022-10-27 19:44:06 -07:00
AgustinGDLV
caaec99e77
added data and graphics for gigantamax mons
2022-10-27 16:18:37 -07:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5
2022-10-18 22:54:25 -04:00
