ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 08:23:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove EFFECT_THAW_HIT

Browse Source
This commit is contained in:
BuffelSaft 2021-06-19 11:49:00 +12:00
parent 06111bdc63
commit 4c18cb7fe7
3 changed files with 227 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/battle_scripts_1.s
View File

@ -144,7 +144,6 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectPresent .4byte BattleScript_EffectPresent
.4byte BattleScript_EffectFrustration .4byte BattleScript_EffectFrustration
.4byte BattleScript_EffectSafeguard .4byte BattleScript_EffectSafeguard
.4byte BattleScript_EffectThawHit
.4byte BattleScript_EffectMagnitude .4byte BattleScript_EffectMagnitude
.4byte BattleScript_EffectBatonPass .4byte BattleScript_EffectBatonPass
.4byte BattleScript_EffectPursuit .4byte BattleScript_EffectPursuit
@ -3814,10 +3813,6 @@ BattleScript_EffectSafeguard::
setsafeguard setsafeguard
goto BattleScript_PrintReflectLightScreenSafeguardString goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectThawHit::
setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit
BattleScript_EffectMagnitude:: BattleScript_EffectMagnitude::
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_EffectMagnitudeTarget jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_EffectMagnitudeTarget
attackcanceler attackcanceler

453
include/constants/battle_move_effects.h
View File

@ -126,233 +126,232 @@
#define EFFECT_PRESENT 122 #define EFFECT_PRESENT 122
#define EFFECT_FRUSTRATION 123 #define EFFECT_FRUSTRATION 123
#define EFFECT_SAFEGUARD 124 #define EFFECT_SAFEGUARD 124
#define EFFECT_THAW_HIT 125 #define EFFECT_MAGNITUDE 125
#define EFFECT_MAGNITUDE 126 #define EFFECT_BATON_PASS 126
#define EFFECT_BATON_PASS 127 #define EFFECT_PURSUIT 127
#define EFFECT_PURSUIT 128 #define EFFECT_RAPID_SPIN 128
#define EFFECT_RAPID_SPIN 129 #define EFFECT_SONICBOOM 129
#define EFFECT_SONICBOOM 130 #define EFFECT_CAPTIVATE 130
#define EFFECT_CAPTIVATE 131 #define EFFECT_MORNING_SUN 131
#define EFFECT_MORNING_SUN 132 #define EFFECT_SYNTHESIS 132
#define EFFECT_SYNTHESIS 133 #define EFFECT_MOONLIGHT 133
#define EFFECT_MOONLIGHT 134 #define EFFECT_HIDDEN_POWER 134
#define EFFECT_HIDDEN_POWER 135 #define EFFECT_RAIN_DANCE 135
#define EFFECT_RAIN_DANCE 136 #define EFFECT_SUNNY_DAY 136
#define EFFECT_SUNNY_DAY 137 #define EFFECT_DEFENSE_UP_HIT 137
#define EFFECT_DEFENSE_UP_HIT 138 #define EFFECT_ATTACK_UP_HIT 138
#define EFFECT_ATTACK_UP_HIT 139 #define EFFECT_ALL_STATS_UP_HIT 139
#define EFFECT_ALL_STATS_UP_HIT 140 #define EFFECT_FELL_STINGER 140
#define EFFECT_FELL_STINGER 141 #define EFFECT_BELLY_DRUM 141
#define EFFECT_BELLY_DRUM 142 #define EFFECT_PSYCH_UP 142
#define EFFECT_PSYCH_UP 143 #define EFFECT_MIRROR_COAT 143
#define EFFECT_MIRROR_COAT 144 #define EFFECT_SKULL_BASH 144
#define EFFECT_SKULL_BASH 145 #define EFFECT_TWISTER 145
#define EFFECT_TWISTER 146 #define EFFECT_EARTHQUAKE 146
#define EFFECT_EARTHQUAKE 147 #define EFFECT_FUTURE_SIGHT 147
#define EFFECT_FUTURE_SIGHT 148 #define EFFECT_GUST 148
#define EFFECT_GUST 149 #define EFFECT_FLINCH_MINIMIZE_HIT 149
#define EFFECT_FLINCH_MINIMIZE_HIT 150 #define EFFECT_SOLARBEAM 150
#define EFFECT_SOLARBEAM 151 #define EFFECT_THUNDER 151
#define EFFECT_THUNDER 152 #define EFFECT_TELEPORT 152
#define EFFECT_TELEPORT 153 #define EFFECT_BEAT_UP 153
#define EFFECT_BEAT_UP 154 #define EFFECT_SEMI_INVULNERABLE 154
#define EFFECT_SEMI_INVULNERABLE 155 #define EFFECT_DEFENSE_CURL 155
#define EFFECT_DEFENSE_CURL 156 #define EFFECT_SOFTBOILED 156
#define EFFECT_SOFTBOILED 157 #define EFFECT_FAKE_OUT 157
#define EFFECT_FAKE_OUT 158 #define EFFECT_UPROAR 158
#define EFFECT_UPROAR 159 #define EFFECT_STOCKPILE 159
#define EFFECT_STOCKPILE 160 #define EFFECT_SPIT_UP 160
#define EFFECT_SPIT_UP 161 #define EFFECT_SWALLOW 161
#define EFFECT_SWALLOW 162 #define EFFECT_WORRY_SEED 162
#define EFFECT_WORRY_SEED 163 #define EFFECT_HAIL 163
#define EFFECT_HAIL 164 #define EFFECT_TORMENT 164
#define EFFECT_TORMENT 165 #define EFFECT_FLATTER 165
#define EFFECT_FLATTER 166 #define EFFECT_WILL_O_WISP 166
#define EFFECT_WILL_O_WISP 167 #define EFFECT_MEMENTO 167
#define EFFECT_MEMENTO 168 #define EFFECT_FACADE 168
#define EFFECT_FACADE 169 #define EFFECT_FOCUS_PUNCH 169
#define EFFECT_FOCUS_PUNCH 170 #define EFFECT_SMELLINGSALT 170
#define EFFECT_SMELLINGSALT 171 #define EFFECT_FOLLOW_ME 171
#define EFFECT_FOLLOW_ME 172 #define EFFECT_NATURE_POWER 172
#define EFFECT_NATURE_POWER 173 #define EFFECT_CHARGE 173
#define EFFECT_CHARGE 174 #define EFFECT_TAUNT 174
#define EFFECT_TAUNT 175 #define EFFECT_HELPING_HAND 175
#define EFFECT_HELPING_HAND 176 #define EFFECT_TRICK 176
#define EFFECT_TRICK 177 #define EFFECT_ROLE_PLAY 177
#define EFFECT_ROLE_PLAY 178 #define EFFECT_WISH 178
#define EFFECT_WISH 179 #define EFFECT_ASSIST 179
#define EFFECT_ASSIST 180 #define EFFECT_INGRAIN 180
#define EFFECT_INGRAIN 181 #define EFFECT_SUPERPOWER 181
#define EFFECT_SUPERPOWER 182 #define EFFECT_MAGIC_COAT 182
#define EFFECT_MAGIC_COAT 183 #define EFFECT_RECYCLE 183
#define EFFECT_RECYCLE 184 #define EFFECT_REVENGE 184
#define EFFECT_REVENGE 185 #define EFFECT_BRICK_BREAK 185
#define EFFECT_BRICK_BREAK 186 #define EFFECT_YAWN 186
#define EFFECT_YAWN 187 #define EFFECT_KNOCK_OFF 187
#define EFFECT_KNOCK_OFF 188 #define EFFECT_ENDEAVOR 188
#define EFFECT_ENDEAVOR 189 #define EFFECT_ERUPTION 189
#define EFFECT_ERUPTION 190 #define EFFECT_SKILL_SWAP 190
#define EFFECT_SKILL_SWAP 191 #define EFFECT_IMPRISON 191
#define EFFECT_IMPRISON 192 #define EFFECT_REFRESH 192
#define EFFECT_REFRESH 193 #define EFFECT_GRUDGE 193
#define EFFECT_GRUDGE 194 #define EFFECT_SNATCH 194
#define EFFECT_SNATCH 195 #define EFFECT_LOW_KICK 195
#define EFFECT_LOW_KICK 196 #define EFFECT_SECRET_POWER 196
#define EFFECT_SECRET_POWER 197 #define EFFECT_RECOIL_33 197
#define EFFECT_RECOIL_33 198 #define EFFECT_TEETER_DANCE 198
#define EFFECT_TEETER_DANCE 199 #define EFFECT_HIT_ESCAPE 199
#define EFFECT_HIT_ESCAPE 200 #define EFFECT_MUD_SPORT 200
#define EFFECT_MUD_SPORT 201 #define EFFECT_POISON_FANG 201
#define EFFECT_POISON_FANG 202 #define EFFECT_WEATHER_BALL 202
#define EFFECT_WEATHER_BALL 203 #define EFFECT_OVERHEAT 203
#define EFFECT_OVERHEAT 204 #define EFFECT_TICKLE 204
#define EFFECT_TICKLE 205 #define EFFECT_COSMIC_POWER 205
#define EFFECT_COSMIC_POWER 206 #define EFFECT_SKY_UPPERCUT 206
#define EFFECT_SKY_UPPERCUT 207 #define EFFECT_BULK_UP 207
#define EFFECT_BULK_UP 208 #define EFFECT_PLACEHOLDER 208
#define EFFECT_PLACEHOLDER 209 #define EFFECT_WATER_SPORT 209
#define EFFECT_WATER_SPORT 210 #define EFFECT_CALM_MIND 210
#define EFFECT_CALM_MIND 211 #define EFFECT_DRAGON_DANCE 211
#define EFFECT_DRAGON_DANCE 212 #define EFFECT_CAMOUFLAGE 212
#define EFFECT_CAMOUFLAGE 213
//
// New move effects #define EFFECT_PLEDGE 213
#define EFFECT_PLEDGE 214 #define EFFECT_FLING 214
#define EFFECT_FLING 215 #define EFFECT_NATURAL_GIFT 215
#define EFFECT_NATURAL_GIFT 216 #define EFFECT_WAKE_UP_SLAP 216
#define EFFECT_WAKE_UP_SLAP 217 #define EFFECT_WRING_OUT 217
#define EFFECT_WRING_OUT 218 #define EFFECT_HEX 218
#define EFFECT_HEX 219 #define EFFECT_ASSURANCE 219
#define EFFECT_ASSURANCE 220 #define EFFECT_TRUMP_CARD 220
#define EFFECT_TRUMP_CARD 221 #define EFFECT_ACROBATICS 221
#define EFFECT_ACROBATICS 222 #define EFFECT_HEAT_CRASH 222
#define EFFECT_HEAT_CRASH 223 #define EFFECT_PUNISHMENT 223
#define EFFECT_PUNISHMENT 224 #define EFFECT_STORED_POWER 224
#define EFFECT_STORED_POWER 225 #define EFFECT_ELECTRO_BALL 225
#define EFFECT_ELECTRO_BALL 226 #define EFFECT_GYRO_BALL 226
#define EFFECT_GYRO_BALL 227 #define EFFECT_ECHOED_VOICE 227
#define EFFECT_ECHOED_VOICE 228 #define EFFECT_PAYBACK 228
#define EFFECT_PAYBACK 229 #define EFFECT_ROUND 229
#define EFFECT_ROUND 230 #define EFFECT_BRINE 230
#define EFFECT_BRINE 231 #define EFFECT_VENOSHOCK 231
#define EFFECT_VENOSHOCK 232 #define EFFECT_RETALITATE 232
#define EFFECT_RETALITATE 233 #define EFFECT_BULLDOZE 233
#define EFFECT_BULLDOZE 234 #define EFFECT_FOUL_PLAY 234
#define EFFECT_FOUL_PLAY 235 #define EFFECT_PSYSHOCK 235
#define EFFECT_PSYSHOCK 236 #define EFFECT_ROOST 236
#define EFFECT_ROOST 237 #define EFFECT_GRAVITY 237
#define EFFECT_GRAVITY 238 #define EFFECT_MIRACLE_EYE 238
#define EFFECT_MIRACLE_EYE 239 #define EFFECT_TAILWIND 239
#define EFFECT_TAILWIND 240 #define EFFECT_EMBARGO 240
#define EFFECT_EMBARGO 241 #define EFFECT_AQUA_RING 241
#define EFFECT_AQUA_RING 242 #define EFFECT_TRICK_ROOM 242
#define EFFECT_TRICK_ROOM 243 #define EFFECT_WONDER_ROOM 243
#define EFFECT_WONDER_ROOM 244 #define EFFECT_MAGIC_ROOM 244
#define EFFECT_MAGIC_ROOM 245 #define EFFECT_MAGNET_RISE 245
#define EFFECT_MAGNET_RISE 246 #define EFFECT_TOXIC_SPIKES 246
#define EFFECT_TOXIC_SPIKES 247 #define EFFECT_GASTRO_ACID 247
#define EFFECT_GASTRO_ACID 248 #define EFFECT_STEALTH_ROCK 248
#define EFFECT_STEALTH_ROCK 249 #define EFFECT_TELEKINESIS 249
#define EFFECT_TELEKINESIS 250 #define EFFECT_POWER_SWAP 250
#define EFFECT_POWER_SWAP 251 #define EFFECT_GUARD_SWAP 251
#define EFFECT_GUARD_SWAP 252 #define EFFECT_HEART_SWAP 252
#define EFFECT_HEART_SWAP 253 #define EFFECT_POWER_SPLIT 253
#define EFFECT_POWER_SPLIT 254 #define EFFECT_GUARD_SPLIT 254
#define EFFECT_GUARD_SPLIT 255 #define EFFECT_STICKY_WEB 255
#define EFFECT_STICKY_WEB 256 #define EFFECT_METAL_BURST 256
#define EFFECT_METAL_BURST 257 #define EFFECT_LUCKY_CHANT 257
#define EFFECT_LUCKY_CHANT 258 #define EFFECT_SUCKER_PUNCH 258
#define EFFECT_SUCKER_PUNCH 259 #define EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2 259
#define EFFECT_SPECIAL_DEFENSE_DOWN_HIT_2 260 #define EFFECT_SIMPLE_BEAM 260
#define EFFECT_SIMPLE_BEAM 261 #define EFFECT_ENTRAINMENT 261
#define EFFECT_ENTRAINMENT 262 #define EFFECT_HEAL_PULSE 262
#define EFFECT_HEAL_PULSE 263 #define EFFECT_QUASH 263
#define EFFECT_QUASH 264 #define EFFECT_ION_DELUGE 264
#define EFFECT_ION_DELUGE 265 #define EFFECT_FREEZE_DRY 265
#define EFFECT_FREEZE_DRY 266 #define EFFECT_TOPSY_TURVY 266
#define EFFECT_TOPSY_TURVY 267 #define EFFECT_MISTY_TERRAIN 267
#define EFFECT_MISTY_TERRAIN 268 #define EFFECT_GRASSY_TERRAIN 268
#define EFFECT_GRASSY_TERRAIN 269 #define EFFECT_ELECTRIC_TERRAIN 269
#define EFFECT_ELECTRIC_TERRAIN 270 #define EFFECT_PSYCHIC_TERRAIN 270
#define EFFECT_PSYCHIC_TERRAIN 271 #define EFFECT_ATTACK_ACCURACY_UP 271
#define EFFECT_ATTACK_ACCURACY_UP 272 #define EFFECT_ATTACK_SPATK_UP 272
#define EFFECT_ATTACK_SPATK_UP 273 #define EFFECT_HURRICANE 273
#define EFFECT_HURRICANE 274 #define EFFECT_TWO_TYPED_MOVE 274
#define EFFECT_TWO_TYPED_MOVE 275 #define EFFECT_ME_FIRST 275
#define EFFECT_ME_FIRST 276 #define EFFECT_SPEED_UP_HIT 276
#define EFFECT_SPEED_UP_HIT 277 #define EFFECT_QUIVER_DANCE 277
#define EFFECT_QUIVER_DANCE 278 #define EFFECT_COIL 278
#define EFFECT_COIL 279 #define EFFECT_ELECTRIFY 279
#define EFFECT_ELECTRIFY 280 #define EFFECT_SCALD 280
#define EFFECT_SCALD 281 #define EFFECT_REFLECT_TYPE 281
#define EFFECT_REFLECT_TYPE 282 #define EFFECT_SOAK 282
#define EFFECT_SOAK 283 #define EFFECT_GROWTH 283
#define EFFECT_GROWTH 284 #define EFFECT_CLOSE_COMBAT 284
#define EFFECT_CLOSE_COMBAT 285 #define EFFECT_LAST_RESORT 285
#define EFFECT_LAST_RESORT 286 #define EFFECT_RECOIL_33_STATUS 286
#define EFFECT_RECOIL_33_STATUS 287 #define EFFECT_FLINCH_STATUS 287
#define EFFECT_FLINCH_STATUS 288 #define EFFECT_RECOIL_50 288
#define EFFECT_RECOIL_50 289 #define EFFECT_SHELL_SMASH 289
#define EFFECT_SHELL_SMASH 290 #define EFFECT_SHIFT_GEAR 290
#define EFFECT_SHIFT_GEAR 291 #define EFFECT_DEFENSE_UP_3 291
#define EFFECT_DEFENSE_UP_3 292 #define EFFECT_NOBLE_ROAR 292
#define EFFECT_NOBLE_ROAR 293 // Atk and Sp atk down by 1 #define EFFECT_VENOM_DRENCH 293
#define EFFECT_VENOM_DRENCH 294 #define EFFECT_TOXIC_THREAD 294
#define EFFECT_TOXIC_THREAD 295 #define EFFECT_CLEAR_SMOG 295
#define EFFECT_CLEAR_SMOG 296 #define EFFECT_HIT_SWITCH_TARGET 296
#define EFFECT_HIT_SWITCH_TARGET 297 #define EFFECT_FINAL_GAMBIT 297
#define EFFECT_FINAL_GAMBIT 298 #define EFFECT_CHANGE_TYPE_ON_ITEM 298
#define EFFECT_CHANGE_TYPE_ON_ITEM 299 // Techno Blast, Multi Attack, Judgment #define EFFECT_AUTOTOMIZE 299
#define EFFECT_AUTOTOMIZE 300 #define EFFECT_COPYCAT 300
#define EFFECT_COPYCAT 301 #define EFFECT_DEFOG 301
#define EFFECT_DEFOG 302 #define EFFECT_HIT_ENEMY_HEAL_ALLY 302
#define EFFECT_HIT_ENEMY_HEAL_ALLY 303 // Pollen Puff #define EFFECT_SMACK_DOWN 303
#define EFFECT_SMACK_DOWN 304 #define EFFECT_SYNCHRONOISE 304
#define EFFECT_SYNCHRONOISE 305 #define EFFECT_PSYCHO_SHIFT 305
#define EFFECT_PSYCHO_SHIFT 306 #define EFFECT_POWER_TRICK 306
#define EFFECT_POWER_TRICK 307 #define EFFECT_FLAME_BURST 307
#define EFFECT_FLAME_BURST 308 #define EFFECT_AFTER_YOU 308
#define EFFECT_AFTER_YOU 309 #define EFFECT_BESTOW 309
#define EFFECT_BESTOW 310 #define EFFECT_ROTOTILLER 310
#define EFFECT_ROTOTILLER 311 #define EFFECT_FLOWER_SHIELD 311
#define EFFECT_FLOWER_SHIELD 312 #define EFFECT_HIT_PREVENT_ESCAPE 312
#define EFFECT_HIT_PREVENT_ESCAPE 313 #define EFFECT_SPEED_SWAP 313
#define EFFECT_SPEED_SWAP 314 #define EFFECT_DEFENSE_UP2_HIT 314
#define EFFECT_DEFENSE_UP2_HIT 315 #define EFFECT_REVELATION_DANCE 315
#define EFFECT_REVELATION_DANCE 316 #define EFFECT_AURORA_VEIL 316
#define EFFECT_AURORA_VEIL 317 #define EFFECT_THIRD_TYPE 317
#define EFFECT_THIRD_TYPE 318 #define EFFECT_FEINT 318
#define EFFECT_FEINT 319 #define EFFECT_SPARKLING_ARIA 319
#define EFFECT_SPARKLING_ARIA 320 #define EFFECT_ACUPRESSURE 320
#define EFFECT_ACUPRESSURE 321 #define EFFECT_AROMATIC_MIST 321
#define EFFECT_AROMATIC_MIST 322 #define EFFECT_POWDER 322
#define EFFECT_POWDER 323 #define EFFECT_SP_ATTACK_UP_HIT 323
#define EFFECT_SP_ATTACK_UP_HIT 324 #define EFFECT_BELCH 324
#define EFFECT_BELCH 325 #define EFFECT_PARTING_SHOT 325
#define EFFECT_PARTING_SHOT 326 #define EFFECT_SPECTRAL_THIEF 326
#define EFFECT_SPECTRAL_THIEF 327 #define EFFECT_V_CREATE 327
#define EFFECT_V_CREATE 328 #define EFFECT_MAT_BLOCK 328
#define EFFECT_MAT_BLOCK 329 #define EFFECT_STOMPING_TANTRUM 329
#define EFFECT_STOMPING_TANTRUM 330 #define EFFECT_CORE_ENFORCER 330
#define EFFECT_CORE_ENFORCER 331 #define EFFECT_INSTRUCT 331
#define EFFECT_INSTRUCT 332 #define EFFECT_THROAT_CHOP 332
#define EFFECT_THROAT_CHOP 333 #define EFFECT_LASER_FOCUS 333
#define EFFECT_LASER_FOCUS 334 #define EFFECT_MAGNETIC_FLUX 334
#define EFFECT_MAGNETIC_FLUX 335 #define EFFECT_GEAR_UP 335
#define EFFECT_GEAR_UP 336 #define EFFECT_INCINERATE 336
#define EFFECT_INCINERATE 337 #define EFFECT_BUG_BITE 337
#define EFFECT_BUG_BITE 338 #define EFFECT_STRENGTH_SAP 338
#define EFFECT_STRENGTH_SAP 339 #define EFFECT_MIND_BLOWN 339
#define EFFECT_MIND_BLOWN 340 #define EFFECT_PURIFY 340
#define EFFECT_PURIFY 341 #define EFFECT_BURN_UP 341
#define EFFECT_BURN_UP 342 #define EFFECT_SHORE_UP 342
#define EFFECT_SHORE_UP 343 #define EFFECT_GEOMANCY 343
#define EFFECT_GEOMANCY 344 #define EFFECT_FAIRY_LOCK 344
#define EFFECT_FAIRY_LOCK 345 #define EFFECT_ALLY_SWITCH 345
#define EFFECT_ALLY_SWITCH 346 #define EFFECT_SLEEP_HIT 346
#define EFFECT_SLEEP_HIT 347 // Relic Song #define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 347
#define EFFECT_ATTACKER_DEFENSE_DOWN_HIT 348 #define EFFECT_BODY_PRESS 348
#define EFFECT_BODY_PRESS 349
#define NUM_BATTLE_MOVE_EFFECTS 350 #define NUM_BATTLE_MOVE_EFFECTS 350

2
src/battle_tv.c
View File

@ -211,7 +211,7 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] =
[EFFECT_PRESENT] = 1, [EFFECT_PRESENT] = 1,
[EFFECT_FRUSTRATION] = 1, [EFFECT_FRUSTRATION] = 1,
[EFFECT_SAFEGUARD] = 5, [EFFECT_SAFEGUARD] = 5,
[EFFECT_THAW_HIT] = 1, // [EFFECT_THAW_HIT] = 1, Now unused
[EFFECT_MAGNITUDE] = 1, [EFFECT_MAGNITUDE] = 1,
[EFFECT_BATON_PASS] = 7, [EFFECT_BATON_PASS] = 7,
[EFFECT_PURSUIT] = 2, [EFFECT_PURSUIT] = 2,