ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,973 Commits 1 Branch 0 Tags 235 MiB
0e5c78aeb6
Commit Graph

846 Commits

Author SHA1 Message Date
Eduardo Quezada
f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master 2023-07-06 13:06:31 -04: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
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
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
Bassoonian
cd6d71cd01 Add most of the new item icons (Clear Amulet & Shards missing) 2023-03-24 00:50:06 +01: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
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
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
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