reversions, trying to add mycelium might

I didn't really understand what I was doing last time so I decided I was better off reverting my code instead of creating a Frankenstein situation.

Also trying to add Mycelium Might but it seems like a lot of stuff wound up broken with priority. Oof

asm_defines.s

@@ -392,7 +392,7 @@
 .equ ABILITY_OBLIVIOUS, 0xC
 .equ ABILITY_CLOUDNINE, 0xD @;Also Air Lock
 .equ ABILITY_COMPOUNDEYES, 0xE
-.equ ABILITY_INSOMNIA, 0xF @;Also Vital Spirit
+.equ ABILITY_INSOMNIA, 0xF
 .equ ABILITY_COLORCHANGE, 0x10
 .equ ABILITY_IMMUNITY, 0x11
 .equ ABILITY_FLASHFIRE, 0x12
@@ -406,7 +406,7 @@
 .equ ABILITY_LEVITATE, 0x1A
 .equ ABILITY_EFFECTSPORE, 0x1B
 .equ ABILITY_SYNCHRONIZE, 0x1C
-.equ ABILITY_CLEARBODY, 0x1D @;Also White Smoke
+.equ ABILITY_CLEARBODY, 0x1D
 .equ ABILITY_NATURALCURE, 0x1E
 .equ ABILITY_LIGHTNINGROD, 0x1F
 .equ ABILITY_SERENEGRACE, 0x20
@@ -442,19 +442,19 @@
 .equ ABILITY_GUTS, 0x3E
 .equ ABILITY_MARVELSCALE, 0x3F
 .equ ABILITY_LIQUIDOOZE, 0x40
-.equ ABILITY_OVERGROW_BLAZE_TORRENT_SWARM, 0x41
-.equ ABILITY_WINDRIDER, 0x42
-.equ ABILITY_WINDPOWER, 0x43
-.equ ABILITY_GOODASGOLD, 0x44
+.equ ABILITY_OVERGROW, 0x41
+.equ ABILITY_BLAZE, 0x42
+.equ ABILITY_TORRENT, 0x43
+.equ ABILITY_SWARM, 0x44
 .equ ABILITY_ROCKHEAD, 0x45
 .equ ABILITY_DROUGHT, 0x46
 .equ ABILITY_ARENATRAP, 0x47
-.equ ABILITY_TYPE_DAMAGE_BOOST, 0x48 @;Was ABILITY_VITALSPIRIT
-.equ ABILITY_PARADOX_ABILITIES, 0x49 @;Was ABILITY_WHITESMOKE
-.equ ABILITY_NEUTRALIZINGGAS, 0x4A @;Was ABILITY_PUREPOWER
+.equ ABILITY_PROTOSYNTHESIS, 0x48
+.equ ABILITY_QUARKDRIVE, 0x49
+.equ ABILITY_NEUTRALIZINGGAS, 0x4A
 .equ ABILITY_SHELLARMOR, 0x4B
 .equ ABILITY_HUNGERSWITCH, 0x4C
-.equ ABILITY_OF_RUIN, 0x4D
+.equ ABILITY_TRANSISTOR, 0x4D
 .equ ABILITY_SWEETVEIL, 0x4E
 .equ ABILITY_SKILLLINK, 0x4F
 .equ ABILITY_MOTORDRIVE, 0x50
@@ -477,8 +477,8 @@
 .equ ABILITY_HEATPROOF, 0x61
 .equ ABILITY_DRYSKIN, 0x62
 .equ ABILITY_TINTEDLENS, 0x63
-.equ ABILITY_UNSEENFIST, 0x64
-.equ ABILITY_FILTER, 0x65 @;Also Solid Rock
+.equ ABILITY_SOLIDROCK, 0x64 @;Also Filter
+.equ ABILITY_FULLMETALBODY, 0x65
 .equ ABILITY_INFILTRATOR, 0x66
 .equ ABILITY_DOWNLOAD, 0x67
 .equ ABILITY_POISONHEAL, 0x68
@@ -495,10 +495,10 @@
 .equ ABILITY_MAGICGUARD, 0x73
 .equ ABILITY_BULLETPROOF, 0x74
 .equ ABILITY_GALEWINGS, 0x75
-.equ ABILITY_MOXIE, 0x76 @;Also Grim Neigh
+.equ ABILITY_MOXIE, 0x76 @;Also Chilling Neigh
 .equ ABILITY_AFTERMATH, 0x77
 .equ ABILITY_CURSEDBODY, 0x78
-.equ ABILITY_GOOEY, 0x79 @;Also Tangling Hair
+.equ ABILITY_GOOEY, 0x79
 .equ ABILITY_MUMMY, 0x7A
 .equ ABILITY_GRIMNEIGH, 0x7B
 .equ ABILITY_SANDRUSH, 0x7C
@@ -529,30 +529,30 @@
 .equ ABILITY_WONDERSKIN, 0x95
 .equ ABILITY_PROTEAN, 0x96 @;Also Libero
 .equ ABILITY_PARENTALBOND, 0x97
-.equ ABILITY_MOLDBREAKER, 0x98 @;Also Turboblaze, Teravolt
-.equ ABILITY_ASONE_GRIM, 0x99
-.equ ABILITY_ASONE_CHILLING, 0x9A
+.equ ABILITY_MOLDBREAKER, 0x98
+.equ ABILITY_QUICKDRAW, 0x99
+.equ ABILITY_CURIOUSMEDICINE, 0x9A
 .equ ABILITY_ZENMODE, 0x9B
 .equ ABILITY_BATTLEBOND, 0x9C
 .equ ABILITY_BEASTBOOST, 0x9D
 .equ ABILITY_CORROSION, 0x9E
 .equ ABILITY_DISGUISE, 0x9F
 .equ ABILITY_EMERGENCYEXIT, 0xA0 @;Also Wimp Out
 .equ ABILITY_FLUFFY, 0xA1
-.equ ABILITY_EARTHEATER, 0xA2
-.equ ABILITY_PERISHBODY, 0xA3
-.equ ABILITY_WANDERINGSPIRIT, 0xA4
+.equ ABILITY_STEELY_SPIRIT, 0xA2
+.equ ABILITY_PERISH_BODY, 0xA3
+.equ ABILITY_WANDERING_SPIRIT, 0xA4
 .equ ABILITY_POWERCONSTRUCT, 0xA5
 .equ ABILITY_PRISMARMOR, 0xA6
-.equ ABILITY_RKS_SYSTEM, 0xA7
+.equ ABILITY_RKSSYSTEM, 0xA7
 .equ ABILITY_SCHOOLING, 0xA8
 .equ ABILITY_SHADOWSHIELD, 0xA9
 .equ ABILITY_SHIELDSDOWN, 0xAA
 .equ ABILITY_SLUSHRUSH, 0xAB
 .equ ABILITY_SOULHEART, 0xAC
 .equ ABILITY_STAMINA, 0xAD
-.equ ABILITY_MYCELIUMMIGHT, 0xAE
-.equ ABILITY_FULLMETALBODY, 0xAF
+.equ ABILITY_STEELWORKER, 0xAE
+.equ ABILITY_ASONE_CHILLING, 0xAF
 .equ ABILITY_TRIAGE, 0xB0
 .equ ABILITY_WATERBUBBLE, 0xB1
 .equ ABILITY_WATERCOMPACTION, 0xB2
@@ -585,7 +585,7 @@
 .equ ABILITY_FLOWERGIFT, 0xCD
 .equ ABILITY_BADDREAMS, 0xCE
 .equ ABILITY_PICKPOCKET, 0xCF
-.equ ABILITY_PORTALPOWER, 0xD0
+.equ ABILITY_DRAGONSMAW, 0xD0
 .equ ABILITY_POISONTOUCH, 0xD1
 .equ ABILITY_MAGICIAN, 0xD2
 .equ ABILITY_STANCECHANGE, 0xD3
@@ -596,9 +596,9 @@
 .equ ABILITY_BERSERK, 0xD8
 .equ ABILITY_LONGREACH, 0xD9
 .equ ABILITY_LIQUIDVOICE, 0xDA
-.equ ABILITY_QUICKDRAW, 0xDB
+.equ ABILITY_QUEENLYMAJESTY, 0xDB
 .equ ABILITY_INNARDSOUT, 0xDC
-.equ ABILITY_DAZZLING, 0xDD @;Also Queenly Majesty
+.equ ABILITY_ASONE_GRIM, 0xDD
 .equ ABILITY_GLUTTONY, 0xDE
 .equ ABILITY_HONEYGATHER, 0xDF
 .equ ABILITY_FRIENDGUARD, 0xE0
@@ -610,9 +610,9 @@
 .equ ABILITY_STAKEOUT, 0xE6
 .equ ABILITY_COMATOSE, 0xE7
 .equ ABILITY_DANCER, 0xE8
-.equ ABILITY_ZEROTOHERO, 0xE9
-.equ ABILITY_RECEIVER, 0xEA @;Also Power of Alchemy
-.equ ABILITY_CURIOUSMEDICINE, 0xEB
+.equ ABILITY_BATTERY, 0xE9
+.equ ABILITY_RECEIVER, 0xEA
+.equ ABILITY_MYCELIUMMIGHT, 0xEB
 .equ ABILITY_NEUROFORCE, 0xEC
 .equ ABILITY_GALVANIZE, 0xED
 .equ ABILITY_INTREPIDSWORD, 0xEE
@@ -632,6 +632,7 @@
 .equ ABILITY_MIMICRY, 0xFC
 .equ ABILITY_SCREENCLEANER, 0xFD
 .equ ABILITY_PASTELVEIL, 0xFE
+.equ ABILITY_UNSEENFIST, 0xFF
 
 @moves
 .equ MOVE_NONE, 0x0

assembly/battle_scripts/ability_battle_scripts.s

@@ -1246,6 +1246,6 @@ SynchronizeNoEffectString: .byte 0xC3, 0xE8, 0x00, 0xDC, 0xD5, 0xD8, 0x00, 0xE2,
 
 MimikyuDisguisedTookDamageString: .byte 0xFD, 0x10, 0xB4, 0xE7, 0x00, 0xD8, 0xDD, 0xE7, 0xDB, 0xE9, 0xDD, 0xE7, 0xD9, 0xFE, 0xE7, 0xD9, 0xE6, 0xEA, 0xD9, 0xD8, 0x00, 0xD5, 0xE7, 0x00, 0xDD, 0xE8, 0xE7, 0x00, 0xD8, 0xD9, 0xD7, 0xE3, 0xED, 0xAB, /*0xFB,*/ 0xFF
 DisguiseBustedString: .byte 0xFD, 0x10, 0xB4, 0xE7, 0x00, 0xD8, 0xDD, 0xE7, 0xDB, 0xE9, 0xDD, 0xE7, 0xD9, 0xFE, 0xEB, 0xD5, 0xE7, 0x00, 0xD6, 0xE9, 0xE7, 0xE8, 0xD9, 0xD8, 0xAB, /*0xFB,*/ 0xFF
-ReceiverString: .byte 0xFD, 0x13, 0x00, 0xE8, 0xE3, 0xE3, 0xDF, 0x00, 0xE3, 0xEA, 0xD9, 0xE6, 0x00, 0xFE, 0xFD, 0x11, 0xB4, 0xE7, 0x00, 0xFD, 0x1B, 0xAB, 0xFF
+ReceiverString: .byte 0xFD, 0x13, 0x00, 0xE8, 0xE3, 0xE3, 0xDF, 0x00, 0xE3, 0xEA, 0xD9, 0xE6, 0x00, 0xFE, 0xFD, 0x11, 0xB4, 0xE7, 0x00, 0xFD, 0x1A, 0xAB, 0xFF
 SymbiosisString: .byte 0xFD, 0x13, 0x00, 0xE7, 0xDC, 0xD5, 0xE6, 0xD9, 0xD8, 0x00, 0xDD, 0xE8, 0xE7, 0xFE, 0xFD, 0x16, 0x00, 0xEB, 0xDD, 0xE8, 0xDC, 0x00, 0xFD, 0x11, 0xFA, 0xE9, 0xE7, 0xDD, 0xE2, 0xDB, 0x00, 0xFD, 0x1A, 0xAB, 0xFF
 DefiantString: .byte 0xFD, 0x13, 0xB4, 0xE7, 0x00, 0xFD, 0x1A, 0xFE, 0xE7, 0xDC, 0xD5, 0xE6, 0xE4, 0xE0, 0xED, 0x00, 0xE6, 0xD5, 0xDD, 0xE7, 0xD9, 0xD8, 0x00, 0xDD, 0xE8, 0xE7, 0x00, 0xFD, 0x00, 0xAB, 0xFF

assembly/battle_scripts/attackcanceler_battle_scripts.s

@@ -32,7 +32,6 @@ attackcanceler_battle_scripts.s
 .global BattleScript_HoopaCantUseHyperspaceFury
 .global BattleScript_MoveUsedDynamaxPrevents
 .global BattleScript_MoveUsedRaidBattlePrevents
-.global BattleScript_MoveUsedRaidShieldPrevents
 .global BattleScript_RaidBattleStatNullification
 
 .global BattleScript_TryRemoveIllusion
@@ -315,20 +314,6 @@ BattleScript_MoveUsedRaidBattlePrevents:
 	waitmessage DELAY_1SECOND
 	goto BS_MOVE_END
 
-
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-BattleScript_MoveUsedRaidShieldPrevents:
-	attackstring
-	ppreduce
-	pause DELAY_HALFSECOND
-	orbyte OUTCOME OUTCOME_FAILED
-	setword BATTLE_STRING_LOADER gText_RaidShieldProtected
-	printstring 0x184
-	waitmessage DELAY_1SECOND
-	goto BS_MOVE_END
-
-
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 BattleScript_RaidBattleStatNullification:

assembly/battle_scripts/et_battle_scripts.s

@@ -475,7 +475,7 @@ BattleScript_CalcDamage:
 	critcalc
 	callasm TryUseGemFutureSight
 	callasm FutureSightDamageCalc
-	callasm FutureSightTypeCalc
+	typecalc
 	adjustnormaldamage2
 	callasm TryActivateWeakenessBerryFutureSight
 	jumpifmove MOVE_DOOMDESIRE BattleScript_FutureHitAnimDoomDesire

assembly/data/ability_description_table.s

@@ -244,7 +244,7 @@ gAbilityDescriptions:
 .word DESC_DANCER
 .word DESC_BATTERY
 .word DESC_RECEIVER
-.word DESC_POWEROFALCHEMY
+.word DESC_MYCELIUMMIGHT
 .word DESC_NEUROFORCE
 .word DESC_GALVANIZE
 .word DESC_INTREPIDSWORD