Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync

2024-12-26 03:34:15 +01:00 · 2021-12-18 00:28:18 -08:00 · 2021-12-18 00:28:18 -08:00 · 18afd06f6d
commit 18afd06f6d
parent b0b8b9bf46 5788caef39
552 changed files with 2509 additions and 1240 deletions
--- a/graphics/pokemon/aegislash/anim_front.png
+++ b/graphics/pokemon/aegislash/anim_front.png
--- a/graphics/pokemon/aegislash/blade/anim_front.png
+++ b/graphics/pokemon/aegislash/blade/anim_front.png
--- a/graphics/pokemon/aegislash/footprint.png
+++ b/graphics/pokemon/aegislash/footprint.png
--- a/graphics/pokemon/aegislash/normal.pal
+++ b/graphics/pokemon/aegislash/normal.pal
@ -4,7 +4,7 @@ JASC-PAL
 152 208 160
 72 56 48
 232 224 128
-16 16 16
+0 0 0
 248 248 248
 144 128 80
 176 160 88
--- a/graphics/pokemon/alcremie/icon.png
+++ b/graphics/pokemon/alcremie/icon.png
--- a/graphics/pokemon/amaura/anim_front.png
+++ b/graphics/pokemon/amaura/anim_front.png
--- a/graphics/pokemon/amaura/back.png
+++ b/graphics/pokemon/amaura/back.png
--- a/graphics/pokemon/amaura/footprint.png
+++ b/graphics/pokemon/amaura/footprint.png
--- a/graphics/pokemon/amaura/front.png
+++ b/graphics/pokemon/amaura/front.png
--- a/graphics/pokemon/amaura/normal.pal
+++ b/graphics/pokemon/amaura/normal.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+152 216 248
+80 168 208
+248 248 144
+0 0 0
+248 192 192
+48 104 184
 224 120 152
 184 184 72
-248 192 192
-248 224 176
-80 168 208
-48 104 184
-8 16 16
-152 216 248
-0 160 224
+192 192 200
+32 64 184
+32 184 224
 248 248 248
-0 128 184
-152 208 240
-16 16 16
-112 112 104
-152 208 240
+137 214 254
+0 0 0
+0 0 0
--- a/graphics/pokemon/amaura/shiny.pal
+++ b/graphics/pokemon/amaura/shiny.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+208 240 240
+152 208 240
+248 248 144
+0 0 0
+248 192 192
+112 136 136
 224 120 152
 184 184 72
-248 192 192
-248 224 176
-160 184 184
-112 136 136
-8 16 16
-208 240 240
+192 192 200
+0 128 144
 0 208 224
 248 248 248
-0 168 184
-152 208 240
-16 16 16
-112 112 104
-152 224 240
+137 214 254
+0 0 0
+0 0 0
--- a/graphics/pokemon/arctovish/icon.png
+++ b/graphics/pokemon/arctovish/icon.png
--- a/graphics/pokemon/arctozolt/icon.png
+++ b/graphics/pokemon/arctozolt/icon.png
--- a/graphics/pokemon/aromatisse/anim_front.png
+++ b/graphics/pokemon/aromatisse/anim_front.png
--- a/graphics/pokemon/aromatisse/footprint.png
+++ b/graphics/pokemon/aromatisse/footprint.png
--- a/graphics/pokemon/arrokuda/icon.png
+++ b/graphics/pokemon/arrokuda/icon.png
--- a/graphics/pokemon/articuno/galarian/icon.png
+++ b/graphics/pokemon/articuno/galarian/icon.png
--- a/graphics/pokemon/aurorus/anim_front.png
+++ b/graphics/pokemon/aurorus/anim_front.png
--- a/graphics/pokemon/aurorus/back.png
+++ b/graphics/pokemon/aurorus/back.png
--- a/graphics/pokemon/aurorus/footprint.png
+++ b/graphics/pokemon/aurorus/footprint.png
--- a/graphics/pokemon/aurorus/front.png
+++ b/graphics/pokemon/aurorus/front.png
--- a/graphics/pokemon/avalugg/anim_front.png
+++ b/graphics/pokemon/avalugg/anim_front.png
--- a/graphics/pokemon/avalugg/back.png
+++ b/graphics/pokemon/avalugg/back.png
--- a/graphics/pokemon/avalugg/footprint.png
+++ b/graphics/pokemon/avalugg/footprint.png
--- a/graphics/pokemon/avalugg/front.png
+++ b/graphics/pokemon/avalugg/front.png
--- a/graphics/pokemon/avalugg/normal.pal
+++ b/graphics/pokemon/avalugg/normal.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-136 176 192
-80 96 104
-0 0 0
-176 224 240
-232 240 248
-160 128 184
+120 192 168
+240 248 248
+192 232 248
+128 192 224
+88 136 184
+16 16 32
+160 104 208
 120 80 160
-248 192 0
-184 184 184
-248 224 136
+248 240 88
+240 200 80
 248 248 248
-96 104 104
-200 200 168
+192 192 200
+120 120 144
+0 0 0
 0 0 0
 0 0 0
--- a/graphics/pokemon/avalugg/shiny.pal
+++ b/graphics/pokemon/avalugg/shiny.pal
@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-104 192 184
-64 96 104
-0 0 0
-152 232 224
-224 248 248
-152 184 128
+248 192 214
+208 240 248
+160 216 240
+104 168 192
+56 88 104
+16 16 32
+152 184 120
 104 144 72
-248 192 0
-184 184 96
 248 224 136
-248 248 248
-128 128 48
-200 200 168
+248 192 0
+232 224 80
+192 200 72
+128 136 40
+0 0 0
 0 0 0
 0 0 0
--- a/graphics/pokemon/barbaracle/anim_front.png
+++ b/graphics/pokemon/barbaracle/anim_front.png
--- a/graphics/pokemon/barbaracle/footprint.png
+++ b/graphics/pokemon/barbaracle/footprint.png
--- a/graphics/pokemon/barraskewda/icon.png
+++ b/graphics/pokemon/barraskewda/icon.png
--- a/graphics/pokemon/basculin/anim_front.png
+++ b/graphics/pokemon/basculin/anim_front.png
--- a/graphics/pokemon/bergmite/anim_front.png
+++ b/graphics/pokemon/bergmite/anim_front.png
--- a/graphics/pokemon/bergmite/back.png
+++ b/graphics/pokemon/bergmite/back.png
--- a/graphics/pokemon/bergmite/footprint.png
+++ b/graphics/pokemon/bergmite/footprint.png
--- a/graphics/pokemon/bergmite/front.png
+++ b/graphics/pokemon/bergmite/front.png
--- a/graphics/pokemon/bergmite/normal.pal
+++ b/graphics/pokemon/bergmite/normal.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 96 104
-128 152 168
-176 216 224
-0 0 0
-232 240 248
-120 80 160
-168 136 192
-248 184 0
-248 224 136
-184 184 184
+192 248 248
+152 216 248
+128 192 224
+96 144 192
 248 248 248
-96 104 104
-216 216 216
-104 176 224
+192 208 224
+96 112 128
+16 16 16
+200 168 232
+160 104 208
+248 240 88
+240 200 80
+0 0 0
+0 0 0
 0 0 0
--- a/graphics/pokemon/bergmite/shiny.pal
+++ b/graphics/pokemon/bergmite/shiny.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 96 104
+240 248 248
+184 224 224
 128 168 168
-176 224 216
-0 0 0
-232 240 248
-104 144 72
+72 88 96
+240 232 96
+216 208 16
+168 152 8
+16 16 16
 152 184 128
-216 208 64
+104 144 72
 248 248 168
-184 160 104
-248 232 160
-104 88 40
-216 200 136
-104 192 216
+216 208 64
+0 0 0
+0 0 0
 0 0 0
--- a/graphics/pokemon/binacle/anim_front.png
+++ b/graphics/pokemon/binacle/anim_front.png
--- a/graphics/pokemon/binacle/footprint.png
+++ b/graphics/pokemon/binacle/footprint.png
--- a/graphics/pokemon/braixen/anim_front.png
+++ b/graphics/pokemon/braixen/anim_front.png
--- a/graphics/pokemon/braixen/back.png
+++ b/graphics/pokemon/braixen/back.png
--- a/graphics/pokemon/braixen/footprint.png
+++ b/graphics/pokemon/braixen/footprint.png
--- a/graphics/pokemon/braixen/front.png
+++ b/graphics/pokemon/braixen/front.png
--- a/graphics/pokemon/braixen/normal.pal
+++ b/graphics/pokemon/braixen/normal.pal
@ -16,4 +16,4 @@ JASC-PAL
 104 64 24
 40 40 40
 64 64 64
-0 0 0
+248 232 48
--- a/graphics/pokemon/braixen/shiny.pal
+++ b/graphics/pokemon/braixen/shiny.pal
@ -16,4 +16,4 @@ JASC-PAL
 104 64 24
 40 40 40
 64 64 64
-0 0 0
+240 96 112
--- a/graphics/pokemon/bunnelby/anim_front.png
+++ b/graphics/pokemon/bunnelby/anim_front.png
--- a/graphics/pokemon/bunnelby/footprint.png
+++ b/graphics/pokemon/bunnelby/footprint.png
--- a/graphics/pokemon/carbink/anim_front.png
+++ b/graphics/pokemon/carbink/anim_front.png
--- a/graphics/pokemon/carbink/footprint.png
+++ b/graphics/pokemon/carbink/footprint.png
--- a/graphics/pokemon/chesnaught/anim_front.png
+++ b/graphics/pokemon/chesnaught/anim_front.png
--- a/graphics/pokemon/chesnaught/footprint.png
+++ b/graphics/pokemon/chesnaught/footprint.png
--- a/graphics/pokemon/chespin/footprint.png
+++ b/graphics/pokemon/chespin/footprint.png
--- a/graphics/pokemon/clauncher/anim_front.png
+++ b/graphics/pokemon/clauncher/anim_front.png
--- a/graphics/pokemon/clauncher/footprint.png
+++ b/graphics/pokemon/clauncher/footprint.png
--- a/graphics/pokemon/clawitzer/anim_front.png
+++ b/graphics/pokemon/clawitzer/anim_front.png
--- a/graphics/pokemon/clawitzer/footprint.png
+++ b/graphics/pokemon/clawitzer/footprint.png
--- a/graphics/pokemon/cobalion/anim_front.png
+++ b/graphics/pokemon/cobalion/anim_front.png
--- a/graphics/pokemon/combee/anim_front.png
+++ b/graphics/pokemon/combee/anim_front.png
--- a/graphics/pokemon/combee/anim_frontf.png
+++ b/graphics/pokemon/combee/anim_frontf.png
--- a/graphics/pokemon/crustle/anim_front.png
+++ b/graphics/pokemon/crustle/anim_front.png
--- a/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png
+++ b/graphics/pokemon/darmanitan/zen_mode/galarian/icon.png
--- a/graphics/pokemon/dedenne/anim_front.png
+++ b/graphics/pokemon/dedenne/anim_front.png
--- a/graphics/pokemon/dedenne/footprint.png
+++ b/graphics/pokemon/dedenne/footprint.png
--- a/graphics/pokemon/deerling/anim_front.png
+++ b/graphics/pokemon/deerling/anim_front.png
--- a/graphics/pokemon/delphox/anim_front.png
+++ b/graphics/pokemon/delphox/anim_front.png
--- a/graphics/pokemon/delphox/footprint.png
+++ b/graphics/pokemon/delphox/footprint.png
--- a/graphics/pokemon/diancie/anim_front.png
+++ b/graphics/pokemon/diancie/anim_front.png
--- a/graphics/pokemon/diancie/back.png
+++ b/graphics/pokemon/diancie/back.png
--- a/graphics/pokemon/diancie/footprint.png
+++ b/graphics/pokemon/diancie/footprint.png
--- a/graphics/pokemon/diancie/front.png
+++ b/graphics/pokemon/diancie/front.png
--- a/graphics/pokemon/diancie/normal.pal
+++ b/graphics/pokemon/diancie/normal.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 80 120
-16 16 16
+248 248 248
 248 200 216
 232 160 176
 232 120 144
-248 248 248
-72 64 104
+144 80 120
 168 160 208
-152 128 64
 120 112 152
+72 64 104
+16 16 16
 240 208 104
+152 128 64
 224 40 72
+248 248 248
 192 208 208
 112 136 136
-248 248 248
--- a/graphics/pokemon/diancie/shiny.pal
+++ b/graphics/pokemon/diancie/shiny.pal
@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 80 120
-16 16 16
+248 248 248
 248 200 216
 232 160 176
 232 120 144
-248 248 248
-48 48 48
+144 80 120
 136 136 136
-152 128 64
 88 88 88
+48 48 48
+0 0 0
 240 208 104
+152 128 64
 224 40 72
+200 72 128
 168 48 104
 112 40 72
-224 112 160
--- a/graphics/pokemon/diggersby/anim_front.png
+++ b/graphics/pokemon/diggersby/anim_front.png
--- a/graphics/pokemon/diggersby/footprint.png
+++ b/graphics/pokemon/diggersby/footprint.png
--- a/graphics/pokemon/doublade/anim_front.png
+++ b/graphics/pokemon/doublade/anim_front.png
--- a/graphics/pokemon/doublade/footprint.png
+++ b/graphics/pokemon/doublade/footprint.png
--- a/graphics/pokemon/dracovish/icon.png
+++ b/graphics/pokemon/dracovish/icon.png
--- a/graphics/pokemon/dracozolt/icon.png
+++ b/graphics/pokemon/dracozolt/icon.png
--- a/graphics/pokemon/dragalge/anim_front.png
+++ b/graphics/pokemon/dragalge/anim_front.png
--- a/graphics/pokemon/dragalge/footprint.png
+++ b/graphics/pokemon/dragalge/footprint.png
--- a/graphics/pokemon/druddigon/anim_front.png
+++ b/graphics/pokemon/druddigon/anim_front.png
--- a/graphics/pokemon/duosion/anim_front.png
+++ b/graphics/pokemon/duosion/anim_front.png
--- a/graphics/pokemon/durant/anim_front.png
+++ b/graphics/pokemon/durant/anim_front.png
--- a/graphics/pokemon/dustox/back.png
+++ b/graphics/pokemon/dustox/back.png
--- a/graphics/pokemon/dwebble/anim_front.png
+++ b/graphics/pokemon/dwebble/anim_front.png
--- a/graphics/pokemon/espurr/anim_front.png
+++ b/graphics/pokemon/espurr/anim_front.png
--- a/graphics/pokemon/espurr/back.png
+++ b/graphics/pokemon/espurr/back.png
--- a/graphics/pokemon/espurr/footprint.png
+++ b/graphics/pokemon/espurr/footprint.png
--- a/graphics/pokemon/espurr/front.png
+++ b/graphics/pokemon/espurr/front.png
--- a/graphics/pokemon/espurr/normal.pal
+++ b/graphics/pokemon/espurr/normal.pal
@ -13,7 +13,7 @@ JASC-PAL
 200 192 192
 224 152 216
 56 48 136
-0 0 0
+152 96 136
 0 0 0
 0 0 0
 0 0 0
--- a/graphics/pokemon/espurr/shiny.pal
+++ b/graphics/pokemon/espurr/shiny.pal
@ -13,7 +13,7 @@ JASC-PAL
 200 192 192
 224 152 216
 56 48 136
-0 0 0
+152 96 136
 0 0 0
 0 0 0
 0 0 0
--- a/graphics/pokemon/eternatus/eternamax/icon.png
+++ b/graphics/pokemon/eternatus/eternamax/icon.png
--- a/graphics/pokemon/fennekin/anim_front.png
+++ b/graphics/pokemon/fennekin/anim_front.png
--- a/graphics/pokemon/fennekin/footprint.png
+++ b/graphics/pokemon/fennekin/footprint.png
--- a/graphics/pokemon/flabebe/anim_front.png
+++ b/graphics/pokemon/flabebe/anim_front.png
--- a/graphics/pokemon/flabebe/footprint.png
+++ b/graphics/pokemon/flabebe/footprint.png
--- a/graphics/pokemon/fletchinder/anim_front.png
+++ b/graphics/pokemon/fletchinder/anim_front.png
--- a/graphics/pokemon/fletchinder/back.png
+++ b/graphics/pokemon/fletchinder/back.png
--- a/graphics/pokemon/fletchinder/footprint.png
+++ b/graphics/pokemon/fletchinder/footprint.png
--- a/graphics/pokemon/fletchinder/front.png
+++ b/graphics/pokemon/fletchinder/front.png
--- a/Show More
+++ b/Show More