Merge branch '_RHH/master' into _RHH/upcoming

data/battle_scripts_1.s

@@ -928,19 +928,10 @@ BattleScript_BothCanNoLongerEscape::
 	return
 
 BattleScript_EffectHyperspaceFury::
-	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
+	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit
 	jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
 	goto BattleScript_PokemonCantUseTheMove
 
-BattleScript_EffectHyperspaceFuryUnbound::
-	attackcanceler
-	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
-	attackstring
-	pause B_WAIT_TIME_LONG
-	ppreduce
-	seteffectprimary MOVE_EFFECT_FEINT
-	goto BattleScript_HitFromCritCalc
-
 BattleScript_ButHoopaCantUseIt:
 	printstring STRINGID_BUTHOOPACANTUSEIT
 	waitmessage B_WAIT_TIME_LONG

graphics/pokemon/blitzle/overworld_normal.pal

@@ -10,7 +10,7 @@ JASC-PAL
 0 0 0
 200 200 200
 0 168 216
-0 0 0
+248 224 88
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/blitzle/overworld_shiny.pal

@@ -10,7 +10,7 @@ JASC-PAL
 0 0 0
 200 200 200
 24 232 104
-0 0 0
+248 224 88
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/crustle/overworld_normal.pal

@@ -8,10 +8,10 @@ JASC-PAL
 128 96 64
 224 192 64
 192 128 0
-229 229 247
 96 32 0
-224 128 64
+229 229 247
 192 96 64
+224 128 64
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/crustle/overworld_shiny.pal

@@ -8,10 +8,10 @@ JASC-PAL
 96 88 80
 176 192 72
 48 40 24
-229 229 247
 48 40 24
-136 152 72
+229 229 247
-96 104 48
+137 153 67
+179 206 83
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/diancie/mega/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 80 120
+89 80 89
-16 16 16
+115 115 115
-216 96 160
+166 58 112
-248 200 216
+217 85 69
-248 248 248
+255 229 102
-232 160 176
+128 115 128
-72 64 104
+217 87 152
-168 160 208
+179 161 179
-120 112 152
+242 242 242
-224 40 72
+242 145 178
-240 208 104
+24 24 24
-224 216 224
+255 204 217
-192 208 208
+227 219 224
-112 136 136
+191 191 191
-248 248 248
+255 249 251

graphics/pokemon/diancie/mega/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 80 120
+62 60 64
-16 16 16
+140 45 99
-216 96 160
+166 58 112
-248 200 216
+230 85 121
-248 248 248
+255 229 102
-232 160 176
+99 90 99
-48 48 48
+217 87 152
-136 136 136
+140 125 140
-88 88 88
+254 92 155
-224 40 72
+242 145 178
-240 208 104
+24 24 24
-224 216 224
+255 204 217
-168 48 104
+194 174 189
-112 40 72
+194 72 133
-224 112 160
+232 220 228

graphics/pokemon/excadrill/overworld_shiny.pal

@@ -8,7 +8,7 @@ JASC-PAL
 176 64 96
 152 152 192
 75 81 113
-78 140 154
+60 91 97
 78 140 154
 5 5 5
 201 206 220

graphics/pokemon/garganacl/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 211 165
+156 213 164
-179 179 179
+123 123 123
-217 217 217
+197 180 189
-242 242 242
+255 255 255
-138 138 138
+82 82 82
-77 50 38
+148 98 90
-148 104 90
+139 115 98
+197 148 123
+8 8 8
+65 49 41
+98 82 74
+238 139 24
+246 230 24
+90 74 57
+230 213 205
 0 0 0
-102 61 44
-195 146 123
-245 147 45
-251 242 54
-46 43 40
-93 86 80
-220 191 179
-145 131 122

graphics/pokemon/garganacl/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 211 165
+156 213 164
-161 104 55
+123 98 65
-214 153 99
+189 148 106
-237 173 116
+230 172 139
-128 81 41
+90 57 49
-77 50 38
+148 98 90
-148 104 90
+139 115 98
+197 148 123
+8 8 8
+65 49 41
+98 82 74
+238 139 24
+246 230 24
+90 74 57
+230 213 205
 0 0 0
-102 61 44
-195 146 123
-245 147 45
-251 242 54
-46 43 40
-93 86 80
-220 191 179
-145 131 122

graphics/pokemon/kilowattrel/shiny.pal

@@ -8,7 +8,7 @@ JASC-PAL
 248 204 48
 192 144 40
 248 252 248
-212 95 60
+131 27 27
 16 16 16
 96 248 208
 128 128 128
@@ -16,4 +16,4 @@ JASC-PAL
 212 95 60
 120 92 32
 72 88 96
-48 56 72
+90 91 92

graphics/pokemon/krookodile/overworld_normal.pal

@@ -10,8 +10,8 @@ JASC-PAL
 25 25 33
 99 99 99
 236 236 246
-99 99 99
+35 35 35
-185 172 189
+152 142 156
 38 37 38
 129 138 129
 182 191 199

graphics/pokemon/krookodile/overworld_shiny.pal

@@ -8,10 +8,10 @@ JASC-PAL
 168 136 88
 0 0 0
 224 200 88
-99 99 99
+48 48 48
 236 236 246
 168 144 64
-185 172 189
+122 94 0
 38 37 38
 129 138 129
 182 191 199

graphics/pokemon/landorus/normal.pal

@@ -10,10 +10,10 @@ JASC-PAL
 184 72 80
 160 88 56
 240 120 64
-51 51 34
+96 48 16
 248 200 96
-51 51 51
+72 40 24
 96 64 48
 119 51 85
 128 128 128
-0 0 0
+128 96 72

graphics/pokemon/landorus/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+153 204 153
-88 112 88
+90 115 90
-16 16 16
+17 17 17
-248 248 248
+255 255 255
-152 176 160
+164 189 164
-88 64 40
+115 65 57
-240 96 8
+238 98 8
-160 96 16
+180 115 24
-248 160 40
+255 164 41
-80 48 24
+82 49 24
-248 192 0
+255 197 0
-56 32 16
+41 24 16
-72 48 32
+74 49 32
-120 72 40
+172 82 32
-128 128 128
+90 115 90
-0 0 0
+106 65 41

graphics/pokemon/lillipup/overworld_shiny.pal

@@ -2,11 +2,11 @@ JASC-PAL
 0100
 16
 152 208 160
-104 72 16
+97 62 1
-96 72 24
+171 105 39
 184 128 72
-232 176 88
 0 0 0
+224 169 81
 240 216 152
 88 88 88
 232 232 248

graphics/pokemon/magearna/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 153 211 165
-175 92 10
+103 114 114
-252 238 137
+234 236 236
-219 168 62
+158 166 166
-218 192 200
+209 216 216
-183 132 149
+162 176 176
-119 83 89
+110 130 130
 16 16 16
-115 128 128
+94 100 100
-248 248 248
+191 194 194
-185 185 185
+140 147 147
 252 154 188
 248 82 111
 12 168 201
-54 237 227
+221 233 229
 67 63 61

graphics/pokemon/medicham/mega/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+153 211 165
-176 72 88
+23 75 93
-88 64 72
+82 65 74
-136 128 136
+164 115 41
-200 88 112
+131 65 74
-224 112 136
+180 74 90
-248 248 248
+238 189 90
-208 200 200
+230 115 139
-168 160 168
+67 163 189
-16 16 16
+139 131 139
-232 184 88
+172 164 172
-160 112 40
+17 17 17
-240 216 128
+246 222 131
-64 160 184
+197 197 197
-224 224 224
+222 222 222
-16 72 88
+250 250 250

graphics/pokemon/medicham/mega/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+153 211 165
-16 72 88
+0 122 112
-16 16 16
+148 82 32
-136 128 136
+163 153 24
-32 120 200
+57 98 172
-80 160 224
+90 131 205
-232 224 200
+229 226 36
-232 224 200
+156 180 255
-216 168 128
+0 193 190
-16 16 16
+180 123 65
-160 112 40
+205 156 98
-160 112 40
+17 17 17
-240 216 128
+255 249 140
-64 160 184
+230 189 131
-232 224 200
+255 230 164
-16 72 88
+250 250 250

graphics/pokemon/naclstack/normal.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
+16
-153 211 165
+156 213 164
-113 113 113
+148 98 90
+98 82 74
+123 123 123
+197 148 123
+230 213 205
+197 180 189
 255 255 255
-180 180 180
+82 82 82
-18 18 18
+65 49 41
-198 135 110
+139 115 98
-135 86 81
+8 8 8
-246 195 158
+238 139 24
-87 44 39
+246 230 24
-107 65 60
+0 0 0
-255 160 0
+0 0 0
-255 255 0
-66 22 28
-194 103 16

graphics/pokemon/naclstack/shiny.pal

@@ -1,17 +1,19 @@
 JASC-PAL
 0100
-14
+16
-153 211 165
+156 213 164
-164 70 47
+148 98 90
-235 145 61
+98 82 74
-211 94 44
+123 98 65
-18 18 18
+197 148 123
-198 135 110
+230 213 205
-135 86 81
+197 131 106
-246 195 158
+238 189 148
-87 44 39
+90 57 49
-107 65 60
+65 49 41
-255 160 0
+139 115 98
-255 255 0
+8 8 8
-66 22 28
+238 139 24
-194 103 16
+246 230 24
+0 0 0
+0 0 0

graphics/pokemon/ponyta/galarian/shiny.pal

@@ -2,15 +2,15 @@ JASC-PAL
 0100
 16
 152 208 160
-72 184 120
+72 200 232
-16 144 64
+48 152 168
-128 248 176
+128 224 216
-200 144 48
+199 171 123
-248 240 160
+247 244 203
-240 200 80
+240 219 158
 72 88 72
 16 16 16
-88 32 120
+64 56 165
 232 248 240
 192 216 200
 136 160 144

graphics/pokemon/rapidash/galarian/shiny.pal

@@ -6,11 +6,11 @@ JASC-PAL
 128 224 200
 56 192 168
 16 16 16
-176 144 32
+176 160 104
 240 240 240
-224 216 128
+224 220 175
 0 24 96
-248 248 208
+247 247 228
 104 104 120
 200 200 208
 160 160 176

graphics/pokemon/serperior/overworld_normal.pal

@@ -3,17 +3,17 @@ JASC-PAL
 16
 128 208 232
 12 98 39
-106 115 57
+115 112 57
 24 156 74
-236 173 21
+248 248 248
 8 16 16
 156 213 156
 236 173 21
 115 164 115
-12 98 39
+5 59 26
-236 173 21
+248 128 0
 24 156 74
-0 0 0
+208 152 8
-0 0 0
+12 98 39
-0 0 0
+5 59 26
 0 0 0

graphics/pokemon/serperior/overworld_shiny.pal

@@ -8,12 +8,12 @@ JASC-PAL
 207 215 195
 7 14 14
 168 232 104
-185 175 53
+224 248 152
 96 166 87
-40 56 48
+40 48 56
-212 33 0
+248 64 24
 24 156 74
-0 0 0
+184 179 114
-0 0 0
+43 99 64
-0 0 0
+0 72 40
 0 0 0

graphics/pokemon/servine/overworld_normal.pal

@@ -10,9 +10,9 @@ JASC-PAL
 141 120 48
 251 243 199
 110 64 20
-0 0 0
+193 193 147
-0 0 0
+63 89 63
-0 0 0
+184 72 32
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/servine/overworld_shiny.pal

@@ -3,16 +3,16 @@ JASC-PAL
 16
 152 208 160
 32 48 72
-0 0 0
 237 151 18
 40 152 168
-63 74 11
 32 88 160
-138 103 54
+0 0 0
+74 58 11
 218 221 187
-0 0 0
+144 24 40
-0 0 0
+182 189 145
-0 0 0
+63 84 89
+248 48 48
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/shroodle/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-96 88 88
+125 121 118
-232 236 200
+236 235 232
 16 16 16
-176 168 136
+172 166 153
-64 76 104
+79 104 117
-72 60 56
+72 68 65
 48 36 40
-128 156 168
+187 210 227
-168 168 224
+173 114 205
-96 108 136
+128 149 168
 248 252 248
-208 200 248
+225 171 233
 184 176 184
-160 112 224
+225 52 239
 0 0 0

graphics/pokemon/sigilyph/overworld_normal.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-33 112 129
+16 88 105
-72 70 22
+147 50 4
 7 7 7
 63 164 227
 171 92 25
 255 191 5
 40 40 40
-192 192 203
+248 248 248
 47 155 63
-0 0 0
+206 0 46
-0 0 0
+18 117 33
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/sigilyph/overworld_shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-203 38 19
+117 76 35
-90 63 20
+120 48 7
 7 7 7
-248 136 0
+248 168 72
+97 120 16
 192 224 88
-40 40 40
+48 48 48
-209 88 56
+248 248 248
-128 152 40
+160 136 80
-192 192 203
+217 79 61
-0 0 0
+181 114 72
-0 0 0
+199 172 109
-0 0 0
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/swoobat/overworld_shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 104 48 152
-72 32 0
+87 48 2
 248 192 48
 232 144 16
 1 1 1
 198 217 180
-198 217 180
+136 192 120
-72 32 0
+41 18 0
 96 48 16
-167 89 102
+144 72 112
-198 217 180
-167 89 102
 198 217 180
+106 48 87
+248 160 232
 198 217 180
 1 1 1
 0 0 0

graphics/pokemon/throh/overworld_normal.pal

@@ -4,7 +4,7 @@ JASC-PAL
 152 208 160
 87 18 18
 87 18 18
-152 208 160
+33 33 25
 0 0 0
 218 79 79
 164 40 40

graphics/pokemon/tranquill/overworld_normal.pal

@@ -11,8 +11,8 @@ JASC-PAL
 126 101 54
 224 176 38
 117 117 117
-0 0 0
+126 101 54
-0 0 0
+248 248 248
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/tranquill/overworld_shiny.pal

@@ -5,14 +5,14 @@ JASC-PAL
 48 64 48
 72 128 72
 0 0 0
-49 45 41
 112 168 112
-184 248 184
+195 237 195
+160 102 204
 96 79 92
 201 144 119
-217 217 233
+129 167 131
-0 0 0
+80 56 96
-0 0 0
+248 248 248
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/venipede/overworld_normal.pal

@@ -3,14 +3,14 @@ JASC-PAL
 16
 152 208 160
 11 11 11
-124 56 72
+102 46 59
 182 65 92
 191 69 98
 227 81 116
 55 55 55
 79 79 79
-26 95 77
 20 140 80
+26 95 77
 22 177 116
 55 106 55
 224 172 35

graphics/pokemon/venipede/overworld_shiny.pal

@@ -3,16 +3,16 @@ JASC-PAL
 16
 152 208 160
 11 11 11
-64 64 16
+87 39 36
-96 72 40
+152 96 75
-144 80 48
+158 103 81
-55 55 55
+193 125 98
 40 40 40
-40 72 8
+74 70 71
-80 112 0
+113 145 61
-96 144 0
+76 105 27
-55 106 55
+150 196 80
-182 65 92
+80 96 40
 224 172 35
 0 0 0
 0 0 0

graphics/pokemon/woobat/overworld_shiny.pal

@@ -2,7 +2,7 @@ JASC-PAL
 0100
 16
 152 208 160
-16 56 64
+24 64 16
 192 232 160
 0 0 0
 120 184 56
@@ -11,7 +11,7 @@ JASC-PAL
 192 104 120
 136 72 80
 240 168 176
-72 104 120
+72 120 74
 252 188 219
 0 0 0
 0 0 0

graphics/pokemon/zebstrika/overworld_normal.pal

@@ -3,7 +3,7 @@ JASC-PAL
 16
 152 208 160
 57 65 65
-57 65 65
+29 41 41
 244 245 247
 204 204 204
 7 7 7
@@ -13,7 +13,7 @@ JASC-PAL
 57 65 65
 112 112 112
 116 168 95
-7 7 7
+248 224 0
-7 7 7
+0 168 216
 7 7 7
 0 0 0

graphics/pokemon/zebstrika/overworld_shiny.pal

@@ -11,9 +11,9 @@ JASC-PAL
 0 0 0
 164 164 164
 30 109 89
-116 116 116
+104 98 115
 134 216 33
-0 0 0
+248 224 0
-0 0 0
+0 192 88
 0 0 0
 0 0 0

src/battle_main.c

@@ -3746,7 +3746,7 @@ static void DoBattleIntro(void)
                 gBattleStruct->startingStatus = GetTrainerStartingStatusFromId(gTrainerBattleOpponent_B);
                 gBattleStruct->startingStatusTimer = 0; // infinite
             }
-            else if (GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A))
+            else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A))
             {
                 gBattleStruct->startingStatus = GetTrainerStartingStatusFromId(gTrainerBattleOpponent_A);
                 gBattleStruct->startingStatusTimer = 0; // infinite
@@ -5737,8 +5737,10 @@ bool32 TrySetAteType(u32 move, u32 battlerAtk, u32 attackerAbility)
         break;
     case EFFECT_HIDDEN_POWER:
     case EFFECT_WEATHER_BALL:
-    case EFFECT_CHANGE_TYPE_ON_ITEM:
     case EFFECT_NATURAL_GIFT:
+    case EFFECT_CHANGE_TYPE_ON_ITEM:
+    case EFFECT_REVELATION_DANCE:
+    case EFFECT_TERRAIN_PULSE:
         return FALSE;
     }
 

src/battle_util.c

@@ -6027,6 +6027,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
                 gBattlescriptCurrInstr = BattleScript_AbilityStatusEffect;
                 effect++;
             }
+            break;
         }
         break;
     case ABILITYEFFECT_MOVE_END_OTHER: // Abilities that activate on *another* battler's moveend: Dancer, Soul-Heart, Receiver, Symbiosis
@@ -8558,16 +8559,20 @@ bool32 IsBattlerProtected(u32 battlerAtk, u32 battlerDef, u32 move)
     // Protective Pads doesn't stop Unseen Fist from bypassing Protect effects, so IsMoveMakingContact() isn't used here.
     // This means extra logic is needed to handle Shell Side Arm.
     if (GetBattlerAbility(gBattlerAttacker) == ABILITY_UNSEEN_FIST
-     && (gMovesInfo[move].makesContact
+        && (gMovesInfo[move].makesContact
-     || (gMovesInfo[move].effect == EFFECT_SHELL_SIDE_ARM && gBattleStruct->shellSideArmCategory[battlerAtk][battlerDef] == DAMAGE_CATEGORY_PHYSICAL))
+            || (gMovesInfo[move].effect == EFFECT_SHELL_SIDE_ARM
-     && !gProtectStructs[battlerDef].maxGuarded) // Max Guard cannot be bypassed by Unseen Fist
+                && gBattleStruct->shellSideArmCategory[battlerAtk][battlerDef] == DAMAGE_CATEGORY_PHYSICAL))
+        && !gProtectStructs[battlerDef].maxGuarded) // Max Guard cannot be bypassed by Unseen Fist
         return FALSE;
+    else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_CRAFTY_SHIELD
+             && IS_MOVE_STATUS(move))
+        return TRUE;
     else if (gMovesInfo[move].ignoresProtect)
         return FALSE;
     else if (gProtectStructs[battlerDef].protected)
         return TRUE;
     else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_WIDE_GUARD
-          && GetBattlerMoveTargetType(gBattlerAttacker, move) & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))
+             && GetBattlerMoveTargetType(gBattlerAttacker, move) & (MOVE_TARGET_BOTH | MOVE_TARGET_FOES_AND_ALLY))
         return TRUE;
     else if (gProtectStructs[battlerDef].banefulBunkered)
         return TRUE;
@@ -8584,11 +8589,8 @@ bool32 IsBattlerProtected(u32 battlerAtk, u32 battlerDef, u32 move)
     else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_QUICK_GUARD
              && GetChosenMovePriority(gBattlerAttacker) > 0)
         return TRUE;
-    else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_CRAFTY_SHIELD
-      && IS_MOVE_STATUS(move))
-        return TRUE;
     else if (gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_MAT_BLOCK
-      && !IS_MOVE_STATUS(move))
+             && !IS_MOVE_STATUS(move))
         return TRUE;
     else
         return FALSE;

src/data/pokemon/species_info/gen_9_families.h

@@ -1765,7 +1765,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .trainerOffset = 0,
         .frontPic = gMonFrontPic_Naclstack,
         .frontPicSize = MON_COORDS_SIZE(64, 64),
-        .frontPicYOffset = 2,
+        .frontPicYOffset = 9,
         .frontAnimFrames = sAnims_Naclstack,
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .backPic = gMonBackPic_Naclstack,
@@ -1818,12 +1818,12 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
         .trainerOffset = 0,
         .frontPic = gMonFrontPic_Garganacl,
         .frontPicSize = MON_COORDS_SIZE(64, 64),
-        .frontPicYOffset = 1,
+        .frontPicYOffset = 5,
         .frontAnimFrames = sAnims_Garganacl,
         //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
         .backPic = gMonBackPic_Garganacl,
         .backPicSize = MON_COORDS_SIZE(64, 64),
-        .backPicYOffset = 2,
+        .backPicYOffset = 14,
         //.backAnimId = BACK_ANIM_NONE,
         .palette = gMonPalette_Garganacl,
         .shinyPalette = gMonShinyPalette_Garganacl,

test/battle/ability/adaptability.c

@@ -1,7 +1,25 @@
 #include "global.h"
 #include "test/battle.h"
 
-TO_DO_BATTLE_TEST("Adaptability increases same-type attack bonus from x1.5 to x2");
+SINGLE_BATTLE_TEST("Adaptability increases same-type attack bonus from x1.5 to x2", s16 damage)
+{
+    u32 ability;
+    PARAMETRIZE { ability = ABILITY_HYPER_CUTTER; }
+    PARAMETRIZE { ability = ABILITY_ADAPTABILITY; }
+    GIVEN {
+        PLAYER(SPECIES_CRAWDAUNT) { Ability(ability); }
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(player, MOVE_WATER_GUN); }
+    } SCENE {
+        MESSAGE("Crawdaunt used Water Gun!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_WATER_GUN, player);
+        HP_BAR(opponent, captureDamage: &results[i].damage);
+    } FINALLY {
+        // The jump from 1.5x STAB to 2.0x STAB is a 1.33x boost.
+        EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.33), results[1].damage);
+    }
+}
 
 SINGLE_BATTLE_TEST("(TERA) Terastallizing into a different type with Adaptability gives 2.0x STAB", s16 damage)
 {

test/battle/ability/aerilate.c

@@ -21,7 +21,30 @@ SINGLE_BATTLE_TEST("Aerilate turns a Normal-type move into Flying-type move")
     }
 }
 
-TO_DO_BATTLE_TEST("Aerilate can not turn certain moves into Flying type moves");
+SINGLE_BATTLE_TEST("Aerilate can not turn certain moves into Flying type moves")
+{
+    u32 move;
+    PARAMETRIZE { move = MOVE_WEATHER_BALL; }
+    // PARAMETRIZE { move = MOVE_NATURAL_GIFT; } TODO: handle this case via Skill Swap
+    PARAMETRIZE { move = MOVE_JUDGMENT; }
+    PARAMETRIZE { move = MOVE_TECHNO_BLAST; }
+    PARAMETRIZE { move = MOVE_REVELATION_DANCE; }
+    PARAMETRIZE { move = MOVE_MULTI_ATTACK; }
+    PARAMETRIZE { move = MOVE_TERRAIN_PULSE; }
+    GIVEN {
+        PLAYER(SPECIES_MEGANIUM);
+        OPPONENT(SPECIES_SALAMENCE) { Item(ITEM_SALAMENCITE); }
+    } WHEN {
+        TURN { MOVE(opponent, move, gimmick: GIMMICK_MEGA); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponent);
+        ANIMATION(ANIM_TYPE_MOVE, move, opponent);
+        NONE_OF {
+            MESSAGE("It's super effective!");
+        }
+    }
+}
+
 TO_DO_BATTLE_TEST("Aerilate boosts power of affected moves by 20% (Gen7+)");
 TO_DO_BATTLE_TEST("Aerilate boosts power of affected moves by 30% (Gen6)");
 

test/battle/ability/aftermath.c

@@ -1,4 +1,22 @@
 #include "global.h"
 #include "test/battle.h"
 
-TO_DO_BATTLE_TEST("Aftermath damages the attacker by 1/4th of its max HP if they faint the target has this ability by a contact move");
+SINGLE_BATTLE_TEST("Aftermath damages the attacker by 1/4th of its max HP if fainted by a contact move")
+{
+    s16 aftermathDamage;
+
+    GIVEN {
+        PLAYER(SPECIES_VOLTORB) { HP(1); Ability(ABILITY_AFTERMATH); };
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN {MOVE(opponent, MOVE_TACKLE);}
+    } SCENE {
+        MESSAGE("Foe Wobbuffet used Tackle!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponent);
+        MESSAGE("Voltorb fainted!");
+        ABILITY_POPUP(player, ABILITY_AFTERMATH);
+        HP_BAR(opponent, captureDamage: &aftermathDamage);
+    } THEN {
+        EXPECT_EQ(aftermathDamage, opponent->maxHP / 4);
+    }
+}

test/battle/ability/disguise.c

@@ -134,3 +134,42 @@ SINGLE_BATTLE_TEST("Disguised Mimikyu is ignored by Mold Breaker")
         NOT ABILITY_POPUP(player, ABILITY_DISGUISE);
     }
 }
+
+SINGLE_BATTLE_TEST("Disguised Mimikyu's types revert back to Ghost/Fairy when Disguise is broken")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_SHADOW_CLAW].type == TYPE_GHOST);
+        PLAYER(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); }
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_SOAK); }
+        TURN { MOVE(opponent, MOVE_TACKLE); }
+        TURN { MOVE(opponent, MOVE_SHADOW_CLAW); }
+    } SCENE {
+        MESSAGE("Foe Wobbuffet used Soak!");
+        MESSAGE("Mimikyu transformed into the Water type!");
+        MESSAGE("Foe Wobbuffet used Tackle!");
+        ABILITY_POPUP(player, ABILITY_DISGUISE);
+        MESSAGE("Foe Wobbuffet used Shadow Claw!");
+        MESSAGE("It's super effective!");
+    }
+}
+
+SINGLE_BATTLE_TEST("Disguised Mimikyu blocks a move after getting Gastro Acid Batton Passed")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_BATON_PASS].effect == EFFECT_BATON_PASS);
+        PLAYER(SPECIES_WOBBUFFET);
+        PLAYER(SPECIES_MIMIKYU_DISGUISED) { Ability(ABILITY_DISGUISE); }
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_GASTRO_ACID); MOVE(player, MOVE_BATON_PASS); SEND_OUT(player, 1); }
+        TURN { MOVE(opponent, MOVE_SHADOW_CLAW); }
+    } SCENE {
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_GASTRO_ACID, opponent);
+        MESSAGE("Wobbuffet's ability was suppressed!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_BATON_PASS, player);
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_SHADOW_CLAW, opponent);
+        ABILITY_POPUP(player, ABILITY_DISGUISE);
+    }
+}

test/battle/move_effect/protect.c

@@ -482,3 +482,68 @@ DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from status moves")
         }
     }
 }
+
+SINGLE_BATTLE_TEST("Protect does not block Confide")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN);
+        PLAYER(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WOBBUFFET);
+    } WHEN {
+        TURN { MOVE(opponent, MOVE_PROTECT); MOVE(player, MOVE_CONFIDE); }
+    } SCENE {
+        MESSAGE("Wobbuffet used Confide!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_CONFIDE, player);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponent);
+        NOT MESSAGE("Foe Wobbuffet protected itself!");
+    }
+}
+
+DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from Confide")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_CONFIDE].effect == EFFECT_SPECIAL_ATTACK_DOWN);
+        PLAYER(SPECIES_WOBBUFFET);
+        PLAYER(SPECIES_WYNAUT);
+        OPPONENT(SPECIES_WOBBUFFET);
+        OPPONENT(SPECIES_WYNAUT);
+    } WHEN {
+        TURN { MOVE(opponentLeft, MOVE_CRAFTY_SHIELD); MOVE(playerLeft, MOVE_CONFIDE, target: opponentLeft); MOVE(playerRight, MOVE_CONFIDE, target: opponentRight); }
+    } SCENE {
+        MESSAGE("Wobbuffet used Confide!");
+        MESSAGE("Foe Wobbuffet protected itself!");
+        MESSAGE("Wynaut used Confide!");
+        MESSAGE("Foe Wynaut protected itself!");
+    }
+}
+
+DOUBLE_BATTLE_TEST("Crafty Shield does not protect against moves that target all battlers")
+{
+    GIVEN {
+        ASSUME(gMovesInfo[MOVE_FLOWER_SHIELD].target == MOVE_TARGET_ALL_BATTLERS);
+        ASSUME(gSpeciesInfo[SPECIES_TANGELA].types[0] == TYPE_GRASS);
+        ASSUME(gSpeciesInfo[SPECIES_TANGROWTH].types[0] == TYPE_GRASS);
+        ASSUME(gSpeciesInfo[SPECIES_SUNKERN].types[0] == TYPE_GRASS);
+        ASSUME(gSpeciesInfo[SPECIES_SUNFLORA].types[0] == TYPE_GRASS);
+        PLAYER(SPECIES_TANGELA);
+        PLAYER(SPECIES_TANGROWTH);
+        OPPONENT(SPECIES_SUNKERN);
+        OPPONENT(SPECIES_SUNFLORA);
+    } WHEN {
+        TURN { MOVE(opponentLeft, MOVE_CRAFTY_SHIELD); MOVE(opponentRight, MOVE_CELEBRATE); MOVE(playerLeft, MOVE_FLOWER_SHIELD); MOVE(playerRight, MOVE_CELEBRATE); }
+    } SCENE {
+        MESSAGE("Tangela used Flower Shield!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerLeft);
+        MESSAGE("Tangela's Defense rose!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentLeft);
+        MESSAGE("Foe Sunkern's Defense rose!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, playerRight);
+        MESSAGE("Tangrowth's Defense rose!");
+        ANIMATION(ANIM_TYPE_MOVE, MOVE_FLOWER_SHIELD, playerLeft);
+        ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, opponentRight);
+        MESSAGE("Foe Sunflora's Defense rose!");
+    }
+}