Merge branch 'master' into statdropanim

rh-hideout · Dec 30, 2023 · b018221 · b018221
2 parents 3dde18f + 00e7038
commit b018221
Show file tree

Hide file tree

Showing 35 changed files with 16 additions and 16 deletions.
diff --git a/graphics/pokemon/annihilape/icon.png b/graphics/pokemon/annihilape/icon.png
diff --git a/graphics/pokemon/arctibax/icon.png b/graphics/pokemon/arctibax/icon.png
diff --git a/graphics/pokemon/armarouge/icon.png b/graphics/pokemon/armarouge/icon.png
diff --git a/graphics/pokemon/baxcalibur/icon.png b/graphics/pokemon/baxcalibur/icon.png
diff --git a/graphics/pokemon/bellibolt/icon.png b/graphics/pokemon/bellibolt/icon.png
diff --git a/graphics/pokemon/brambleghast/icon.png b/graphics/pokemon/brambleghast/icon.png
diff --git a/graphics/pokemon/bramblin/icon.png b/graphics/pokemon/bramblin/icon.png
diff --git a/graphics/pokemon/ceruledge/icon.png b/graphics/pokemon/ceruledge/icon.png
diff --git a/graphics/pokemon/cetitan/icon.png b/graphics/pokemon/cetitan/icon.png
diff --git a/graphics/pokemon/cetoddle/icon.png b/graphics/pokemon/cetoddle/icon.png
diff --git a/graphics/pokemon/charcadet/icon.png b/graphics/pokemon/charcadet/icon.png
diff --git a/graphics/pokemon/chi_yu/icon.png b/graphics/pokemon/chi_yu/icon.png
diff --git a/graphics/pokemon/chien_pao/icon.png b/graphics/pokemon/chien_pao/icon.png
diff --git a/graphics/pokemon/clodsire/icon.png b/graphics/pokemon/clodsire/icon.png
diff --git a/graphics/pokemon/crocalor/icon.png b/graphics/pokemon/crocalor/icon.png
diff --git a/graphics/pokemon/dolliv/icon.png b/graphics/pokemon/dolliv/icon.png
diff --git a/graphics/pokemon/dudunsparce/icon.png b/graphics/pokemon/dudunsparce/icon.png
diff --git a/graphics/pokemon/duraludon/back.png b/graphics/pokemon/duraludon/back.png
diff --git a/graphics/pokemon/duraludon/front.png b/graphics/pokemon/duraludon/front.png
diff --git a/graphics/pokemon/duraludon/normal.pal b/graphics/pokemon/duraludon/normal.pal
@@ -1,9 +1,9 @@
 JASC-PAL
 0100
 16
-49 93 139
-98 133 172
 156 210 164
+98 133 172
+49 93 139
 106 52 57
 16 16 16
 123 129 148

diff --git a/graphics/pokemon/duraludon/shiny.pal b/graphics/pokemon/duraludon/shiny.pal
@@ -1,9 +1,9 @@
 JASC-PAL
 0100
 16
-67 119 184
-109 151 204
 156 210 164
+109 151 204
+67 119 184
 112 105 107
 16 16 16
 81 96 101

diff --git a/graphics/pokemon/espathra/icon.png b/graphics/pokemon/espathra/icon.png
diff --git a/graphics/pokemon/krookodile/anim_front.png b/graphics/pokemon/krookodile/anim_front.png
diff --git a/graphics/pokemon/linoone/anim_front.png b/graphics/pokemon/linoone/anim_front.png
diff --git a/graphics/pokemon/linoone/back.png b/graphics/pokemon/linoone/back.png
diff --git a/graphics/pokemon/linoone/normal.pal b/graphics/pokemon/linoone/normal.pal
@@ -7,13 +7,13 @@ JASC-PAL
 160 136 120
 184 160 144
 216 200 184
-88 72 56
-24 24 24
+59 48 38
+13 13 13
 144 128 120
 48 120 152
 104 176 216
 248 248 248
 112 112 112
-0 0 0
+96 79 62
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/linoone/shiny.pal b/graphics/pokemon/linoone/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 72 56
-200 104 48
-216 136 72
-192 160 144
-216 200 176
-152 72 24
+66 49 33
+206 99 33
+222 132 49
+197 165 148
+222 206 181
+156 58 0
 24 24 24
 152 120 112
 216 152 0
 248 224 48
 248 248 248
 112 112 112
-0 0 0
+189 78 13
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/litwick/anim_front.png b/graphics/pokemon/litwick/anim_front.png
diff --git a/graphics/pokemon/togepi/icon.png b/graphics/pokemon/togepi/icon.png
diff --git a/graphics/pokemon/tyrantrum/anim_front.png b/graphics/pokemon/tyrantrum/anim_front.png
diff --git a/graphics/pokemon/tyrantrum/back.png b/graphics/pokemon/tyrantrum/back.png
diff --git a/graphics/pokemon/zigzagoon/anim_front.png b/graphics/pokemon/zigzagoon/anim_front.png
diff --git a/graphics/pokemon/zigzagoon/back.png b/graphics/pokemon/zigzagoon/back.png
diff --git a/src/data/pokemon/species_info/gen_6.h b/src/data/pokemon/species_info/gen_6.h
@@ -2860,7 +2860,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
         .frontAnimFrames = sAnims_Tyrantrum,
         .frontAnimId = ANIM_V_SHAKE,
         BACK_PIC(Tyrantrum, 64, 56),
-        .backPicYOffset = 11,
+        .backPicYOffset = 5,
         .backAnimId = BACK_ANIM_V_SHAKE_H_SLIDE,
         PALETTES(Tyrantrum),
         ICON(Tyrantrum, 0),

diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h
@@ -4211,7 +4211,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
         .frontAnimFrames = sAnims_Duraludon,
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         BACK_PIC(Duraludon, 64, 64),
-        .backPicYOffset = 1,
+        .backPicYOffset = 0,
         //.backAnimId = BACK_ANIM_NONE,
         PALETTES(Duraludon),
         ICON(Duraludon, 0),
-Original file line number
+Diff line change
@@ -1,9 +1,9 @@
     JASC-PAL
-93 139
-133 172
 210 164
+133 172
+93 139
 52 57
 16 16
 129 148
@@ Expand Down @@