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
|
8c537ccd72
|
Colorize bag select button
|
2023-05-10 00:33:43 -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 |
|
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 |
|