diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 2060614849..92f8f416f4 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -397,11 +397,11 @@
 	.byte 0x47
 	.endm
 
-	.macro playstatchangeanimation battler:req, param1:req, param2:req
+	.macro playstatchangeanimation battler:req, stats:req, statchange:req
 	.byte 0x48
 	.byte \battler
-	.byte \param1
-	.byte \param2
+	.byte \stats
+	.byte \statchange
 	.endm
 
 	.macro moveend param0:req, param1:req
@@ -748,10 +748,10 @@
 	.byte 0x88
 	.endm
 
-	.macro statbuffchange param0:req, param1:req
+	.macro statbuffchange flags:req, jumpptr:req
 	.byte 0x89
-	.2byte \param0
-	.4byte \param1
+	.2byte \flags
+	.4byte \jumpptr
 	.endm
 
 	.macro normalisebuffs
@@ -1756,15 +1756,15 @@
 	.endm
 	
 	.macro dmg_1_8_targethp
-	manipulatedamage ATK80_1_8_TARGET_HP
+	manipulatedamage DMG_1_8_TARGET_HP
 	.endm
 	
 	.macro dmgtomaxattackerhp
-	manipulatedamage ATK80_FULL_ATTACKER_HP
+	manipulatedamage DMG_FULL_ATTACKER_HP
 	.endm
 	
 	.macro dmgtocurrattackerhp
-	manipulatedamage ATK80_CURR_ATTACKER_HP
+	manipulatedamage DMG_CURR_ATTACKER_HP
 	.endm
 	
 	.macro jumpifflowerveil jumpptr:req
diff --git a/constants/gba_constants.inc b/constants/gba_constants.inc
index 9d59c8fcdd..3ff857ee8d 100644
--- a/constants/gba_constants.inc
+++ b/constants/gba_constants.inc
@@ -488,3 +488,26 @@
 	.set OAM_SIZE_8x32,          OAM_SIZE_1 | OAM_V_RECTANGLE
 	.set OAM_SIZE_16x32,         OAM_SIZE_2 | OAM_V_RECTANGLE
 	.set OAM_SIZE_32x64,         OAM_SIZE_3 | OAM_V_RECTANGLE
+
+@ BLDCNT
+
+	.set BLDCNT_TGT1_BG0,       1 << 0
+	.set BLDCNT_TGT1_BG1,       1 << 1
+	.set BLDCNT_TGT1_BG2,       1 << 2
+	.set BLDCNT_TGT1_BG3,       1 << 3
+	.set BLDCNT_TGT1_OBJ,       1 << 4
+	.set BLDCNT_TGT1_BD,        1 << 5
+	.set BLDCNT_TGT1_ALL,       BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD
+
+	.set BLDCNT_EFFECT_NONE,    0 << 6
+	.set BLDCNT_EFFECT_BLEND,   1 << 6
+	.set BLDCNT_EFFECT_LIGHTEN, 2 << 6
+	.set BLDCNT_EFFECT_DARKEN,  3 << 6
+
+	.set BLDCNT_TGT2_BG0,       1 << 8
+	.set BLDCNT_TGT2_BG1,       1 << 9
+	.set BLDCNT_TGT2_BG2,       1 << 10
+	.set BLDCNT_TGT2_BG3,       1 << 11
+	.set BLDCNT_TGT2_OBJ,       1 << 12
+	.set BLDCNT_TGT2_BD,        1 << 13
+	.set BLDCNT_TGT2_ALL,       BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index c9d555601b..d0756a2d36 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -406,21 +406,21 @@ BattleScript_VCreateStatLoss::
 	jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 0x0, BattleScript_VCreateStatLossRet
 BattleScript_VCreateStatAnim:
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF | BIT_SPEED, ATK48_STAT_NEGATIVE | ATK48_DONT_CHECK_LOWER
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_VCreateTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_VCreateTrySpDef:
 	setstatchanger STAT_SPDEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_VCreateTrySpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_VCreateTrySpeed:
 	setstatchanger STAT_SPEED, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateStatLossRet
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateStatLossRet
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_VCreateStatLossRet
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -450,21 +450,21 @@ BattleScript_EffectPartingShotTryAtk:
 	attackanimation
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectPartingShotTrySpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectPartingShotTrySpAtk
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_EffectPartingShotTrySpAtk:
-	playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_SPATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectPartingShotSwitch
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectPartingShotSwitch
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_EffectPartingShotSwitch:	
 	moveendall
-	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_PartingShotEnd
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_PartingShotEnd
 	openpartyscreen 0x1, BattleScript_PartingShotEnd
 	switchoutabilities BS_ATTACKER
 	waitstate
@@ -506,7 +506,7 @@ BattleScript_EffectAromaticMist:
 	goto BattleScript_ButItFailed
 BattleScript_EffectAromaticMistWorks:
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectAromaticMistEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
 	jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AromaticMistAnim
 	pause 0x10
 	printstring STRINGID_TARGETSTATWONTGOHIGHER
@@ -542,14 +542,14 @@ BattleScript_EffectMagneticFluxSkipAnim:
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_TARGET, BIT_DEF | BIT_SPDEF, 0x0
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMagneticFluxTrySpDef
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMagneticFluxTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectMagneticFluxTrySpDef
 	addbyte gBattleCommunication, 0x1
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_EffectMagneticFluxTrySpDef:
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMagneticFluxLoop
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMagneticFluxLoop
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectMagneticFluxLoop
 	addbyte gBattleCommunication, 0x1
 	printfromtable gStatUpStringIds
@@ -581,14 +581,14 @@ BattleScript_EffectGearUpSkipAnim:
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectGearUpTrySpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectGearUpTrySpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectGearUpTrySpAtk
 	addbyte gBattleCommunication, 0x1
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_EffectGearUpTrySpAtk:
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectGearUpLoop
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectGearUpLoop
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectGearUpLoop
 	addbyte gBattleCommunication, 0x1
 	printfromtable gStatUpStringIds
@@ -659,7 +659,7 @@ BattleScript_FlowerShieldLoop:
 	goto BattleScript_FlowerShieldMoveTargetEnd
 BattleScript_FlowerShieldLoop2:
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_FlowerShieldMoveTargetEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlowerShieldMoveTargetEnd
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlowerShieldDoAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_FlowerShieldMoveTargetEnd
 	pause 0x15
@@ -673,7 +673,7 @@ BattleScript_FlowerShieldString:
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_FlowerShieldMoveTargetEnd:
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_FlowerShieldLoop
 	end
 	
@@ -700,18 +700,18 @@ BattleScript_RototillerDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_RototillerTrySpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_RototillerTrySpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_RototillerTrySpAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_RototillerTrySpAtk::
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_RototillerMoveTargetEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_RototillerMoveTargetEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_RototillerMoveTargetEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_RototillerMoveTargetEnd:
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_RototillerLoop
 	end
 BattleScript_RototillerCantRaiseMultipleStats:
@@ -823,7 +823,7 @@ BattleScript_SynchronoiseLoop:
 	waitmessage 0x1
 	tryfaintmon BS_TARGET, FALSE, NULL
 BattleScript_SynchronoiseMoveTargetEnd:
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_SynchronoiseLoop
 	end
 BattleScript_SynchronoiseMissed:
@@ -861,7 +861,7 @@ BattleScript_DefogWorks:
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
 	ppreduce
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_DefogTryHazardsWithAnim
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_DefogTryHazardsWithAnim
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_DefogDoAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_DefogTryHazardsWithAnim
 	pause 0x20
@@ -915,7 +915,7 @@ BattleScript_EffectAutonomize:
 	attackcanceler
 	attackstring
 	ppreduce
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AutonomizeWeightLoss
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AutonomizeWeightLoss
 	jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AutonomizeAttackAnim
 	pause 0x20
 	goto BattleScript_AutonomizePrintString
@@ -1005,7 +1005,7 @@ BattleScript_ToxicThreadWorks:
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
 	attackstring
 	ppreduce
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_ToxicThreadTryPsn
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_ToxicThreadTryPsn
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_ToxicThreadDoAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_ToxicThreadTryPsn
 	pause 0x20
@@ -1038,24 +1038,24 @@ BattleScript_VenomDrenchDoMoveAnim::
 	attackanimation
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK | BIT_SPEED, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_VenomDrenchTryLowerSpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_VenomDrenchTryLowerSpAtk
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_VenomDrenchTryLowerSpAtk::
-	playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_SPATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_VenomDrenchTryLowerSpeed
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_VenomDrenchTryLowerSpeed
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_VenomDrenchTryLowerSpeed::
-	playstatchangeanimation BS_TARGET, BIT_SPEED, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_SPEED, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_VenomDrenchEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_VenomDrenchEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_VenomDrenchEnd
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -1073,17 +1073,17 @@ BattleScript_NobleRoarDoMoveAnim::
 	attackanimation
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_NobleRoarTryLowerSpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_NobleRoarTryLowerSpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_NobleRoarTryLowerSpAtk
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_NobleRoarTryLowerSpAtk::
-	playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_SPATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_NobleRoarEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_NobleRoarEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_NobleRoarEnd
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -1103,35 +1103,35 @@ BattleScript_ShellSmashTryDef::
 	attackanimation
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, ATK48_STAT_NEGATIVE | ATK48_DONT_CHECK_LOWER
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShellSmashTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShellSmashTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_ShellSmashTrySpDef:
 	setstatchanger STAT_SPDEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShellSmashTryAttack
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTryAttack
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShellSmashTryAttack
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_ShellSmashTryAttack:
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_ATK | BIT_SPEED, ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_ATK | BIT_SPEED, STAT_CHANGE_BY_TWO
 	setstatchanger STAT_ATK, 2, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShellSmashTrySpAtk
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShellSmashTrySpAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_ShellSmashTrySpAtk:
 	setstatchanger STAT_SPATK, 2, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShellSmashTrySpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashTrySpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShellSmashTrySpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_ShellSmashTrySpeed:
 	setstatchanger STAT_SPEED, 2, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShellSmashEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShellSmashEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShellSmashEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1163,7 +1163,7 @@ BattleScript_GrowthDoMoveAnim::
 BattleScript_GrowthAtk2:
 	setstatchanger STAT_ATK, 2, FALSE
 BattleScript_GrowthAtk:
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_GrowthTrySpAtk
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GrowthTrySpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_GrowthTrySpAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1174,7 +1174,7 @@ BattleScript_GrowthTrySpAtk::
 BattleScript_GrowthSpAtk2:
 	setstatchanger STAT_SPATK, 2, FALSE
 BattleScript_GrowthSpAtk:
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_GrowthEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_GrowthEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_GrowthEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1231,20 +1231,20 @@ BattleScript_ShiftGearDoMoveAnim:
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0xA, BattleScript_ShiftGearSpeedBy1
-	playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPEED, 2, FALSE
 	goto BattleScript_ShiftGearDoSpeed
 BattleScript_ShiftGearSpeedBy1:
 	playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, 0x0
 	setstatchanger STAT_SPEED, 1, FALSE
 BattleScript_ShiftGearDoSpeed:
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShiftGearTryAtk
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShiftGearTryAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShiftGearTryAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_ShiftGearTryAtk:
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_ShiftGearEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ShiftGearEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_ShiftGearEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1264,19 +1264,19 @@ BattleScript_CoilDoMoveAnim:
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_ACC, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CoilTryDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilTryDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CoilTryDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CoilTryDef:
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CoilTryAcc
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilTryAcc
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CoilTryAcc
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CoilTryAcc:
 	setstatchanger STAT_ACC, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CoilEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CoilEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CoilEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1296,19 +1296,19 @@ BattleScript_QuiverDanceDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0x0
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_QuiverDanceTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_QuiverDanceTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_QuiverDanceTrySpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_QuiverDanceTrySpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceTrySpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_QuiverDanceTrySpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_QuiverDanceTrySpeed::
 	setstatchanger STAT_SPEED, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_QuiverDanceEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_QuiverDanceEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_QuiverDanceEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1341,13 +1341,13 @@ BattleScript_AttackSpAttackUpDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AttackSpAttackUpTrySpAtk
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackSpAttackUpTrySpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AttackSpAttackUpTrySpAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AttackSpAttackUpTrySpAtk::
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AttackSpAttackUpEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackSpAttackUpEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AttackSpAttackUpEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1366,13 +1366,13 @@ BattleScript_AttackAccUpDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AttackAccUpTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackAccUpTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AttackAccUpTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AttackAccUpTrySpDef::
 	setstatchanger STAT_ACC, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AttackAccUpEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AttackAccUpEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AttackAccUpEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -1514,7 +1514,7 @@ BattleScript_EffectHealingWish:
 	instanthpdrop BS_ATTACKER
 	setatkhptozero
 	tryfaintmon BS_ATTACKER, FALSE, NULL
-	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_EffectHealingWishEnd
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_EffectHealingWishEnd
 	openpartyscreen 0x1, BattleScript_EffectHealingWishEnd
 	switchoutabilities BS_ATTACKER
 	waitstate
@@ -1536,7 +1536,7 @@ BattleScript_EffectHealingWishNewMon:
 	playanimation BS_ATTACKER, B_ANIM_WISH_HEAL, NULL
 	waitanimation
 	dmgtomaxattackerhp
-	manipulatedamage ATK80_DMG_CHANGE_SIGN
+	manipulatedamage DMG_CHANGE_SIGN
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	clearstatus BS_ATTACKER
@@ -1786,7 +1786,7 @@ BattleScript_GravityLoopDrop:
 	printstring STRINGID_GRAVITYGROUNDING 
 	waitmessage 0x40
 BattleScript_GravityLoopEnd:	
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_GravityLoop
 	end   
 
@@ -1851,7 +1851,7 @@ BattleScript_EffectHitEscape:
 	moveendall
 	jumpifbattleend BattleScript_HitEscapeEnd
 	jumpifbyte CMP_NOT_EQUAL gBattleOutcome 0, BattleScript_HitEscapeEnd
-	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_HitEscapeEnd
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_HitEscapeEnd
 	openpartyscreen 0x1, BattleScript_HitEscapeEnd
 	switchoutabilities BS_ATTACKER
 	waitstate
@@ -2095,7 +2095,7 @@ BattleScript_EffectAbsorb::
 	setbyte cMULTISTRING_CHOOSER, 0x0
 	goto BattleScript_AbsorbUpdateHp
 BattleScript_AbsorbLiquidOoze::
-	manipulatedamage ATK80_DMG_CHANGE_SIGN
+	manipulatedamage DMG_CHANGE_SIGN
 	setbyte cMULTISTRING_CHOOSER, 0x1
 BattleScript_AbsorbUpdateHp::
 	healthbarupdate BS_ATTACKER
@@ -2152,7 +2152,7 @@ BattleScript_ExplosionLoop:
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_ExplosionLoop
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	end
@@ -2160,7 +2160,7 @@ BattleScript_ExplosionMissed:
 	effectivenesssound
 	resultmessage
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_ExplosionLoop
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	end
@@ -2252,7 +2252,7 @@ BattleScript_EffectStatUp::
 BattleScript_EffectStatUpAfterAtkCanceler::
 	attackstring
 	ppreduce
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_StatUpEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpEnd
 	jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim
 	pause 0x20
 	goto BattleScript_StatUpPrintString
@@ -2308,7 +2308,7 @@ BattleScript_EffectStatDown:
 BattleScript_StatDownFromAttackString:
 	attackstring
 	ppreduce
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_StatDownEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StatDownEnd
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatDownDoAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StatDownEnd
 	pause 0x20
@@ -2407,7 +2407,7 @@ BattleScript_DoMultiHit::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
 	addbyte sMULTIHIT_STRING + 4, 0x1
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
 	decrementmultihit BattleScript_MultiHitLoop
 	goto BattleScript_MultiHitPrintStrings
@@ -2423,8 +2423,8 @@ BattleScript_MultiHitPrintStrings::
 BattleScript_MultiHitEnd::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendcase ATK49_SYNCHRONIZE_TARGET
-	moveendfrom ATK49_STATUS_IMMUNITY_ABILITIES
+	moveendcase MOVEEND_SYNCHRONIZE_TARGET
+	moveendfrom MOVEEND_STATUS_IMMUNITY_ABILITIES
 	end
 
 BattleScript_EffectConversion::
@@ -2658,7 +2658,7 @@ BattleScript_MoveMissedDoDamage::
 	damagecalc
 	typecalc
 	adjustdamage
-	manipulatedamage ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP
+	manipulatedamage DMG_RECOIL_FROM_MISS
 	bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
 	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
 	healthbarupdate BS_ATTACKER
@@ -3277,7 +3277,7 @@ BattleScript_DoTripleKickAttack::
 	waitmessage 0x40
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
 	decrementmultihit BattleScript_TripleKickLoop
 	goto BattleScript_TripleKickPrintStrings
@@ -3296,7 +3296,7 @@ BattleScript_TripleKickPrintStrings::
 BattleScript_TripleKickEnd::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendfrom ATK49_UPDATE_LAST_MOVES
+	moveendfrom MOVEEND_UPDATE_LAST_MOVES
 	end
 
 BattleScript_EffectThief::
@@ -3359,17 +3359,17 @@ BattleScript_CurseTrySpeed::
 	attackanimation
 	waitanimation
 	setstatchanger STAT_SPEED, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseTryAttack
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryAttack
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_CurseTryAttack::
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseTryDefence
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryDefence
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CurseTryDefence::
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CurseEnd::
@@ -3488,7 +3488,7 @@ BattleScript_EffectSwagger::
 	attackanimation
 	waitanimation
 	setstatchanger STAT_ATK, 2, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_SwaggerTryConfuse
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_SwaggerTryConfuse
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SwaggerTryConfuse
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -3562,7 +3562,7 @@ BattleScript_EffectBatonPass::
 	attackstring
 	ppreduce
 	jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
-	jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | BS_ATTACKER, BattleScript_ButItFailed
+	jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	openpartyscreen BS_ATTACKER, BattleScript_ButItFailed
@@ -3677,7 +3677,7 @@ BattleScript_EffectSkullBash::
 	setbyte sTWOTURN_STRINGID, 0x2
 	call BattleScriptFirstChargingTurn
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_SkullBashEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SkullBashEnd
 	setgraphicalstatchangevalues
 	playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -3729,7 +3729,7 @@ BattleScript_DoHitAllWithUndergroundBonus::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
 	end
 BattleScript_HitAllWithUndergroundBonusMissed::
@@ -3738,7 +3738,7 @@ BattleScript_HitAllWithUndergroundBonusMissed::
 	effectivenesssound
 	resultmessage
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
 	end
 
@@ -3813,7 +3813,7 @@ BattleScript_BeatUpLoop::
 	printstring STRINGID_PKMNATTACK
 	critcalc
 	jumpifbyte CMP_NOT_EQUAL, gIsCriticalHit, TRUE, BattleScript_BeatUpAttack
-	manipulatedamage ATK80_DMG_DOUBLED
+	manipulatedamage DMG_DOUBLED
 BattleScript_BeatUpAttack::
 	adjustdamage
 	attackanimation
@@ -3828,7 +3828,7 @@ BattleScript_BeatUpAttack::
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	goto BattleScript_BeatUpLoop
 BattleScript_BeatUpEnd::
 	end
@@ -3881,7 +3881,7 @@ BattleScript_EffectDefenseCurl::
 	ppreduce
 	setdefensecurlbit
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DefenseCurlDoStatUpAnim
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString
 	attackanimation
 	waitanimation
@@ -3959,13 +3959,13 @@ BattleScript_EffectStockpileDef:
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0x0
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_EffectStockpileSpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectStockpileSpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectStockpileSpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_EffectStockpileSpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_EffectStockpileEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_EffectStockpileEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_EffectStockpileEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -4042,7 +4042,7 @@ BattleScript_EffectFlatter::
 	attackanimation
 	waitanimation
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_FlatterTryConfuse
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlatterTryConfuse
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlatterTryConfuse
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -4097,17 +4097,17 @@ BattleScript_EffectMemento::
 	waitanimation
 	jumpifsubstituteblocks BattleScript_EffectMementoPrintNoEffect
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
 	setstatchanger STAT_ATK, 2, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMementoTrySpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTrySpAtk
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_EffectMementoTrySpAtk:
-	playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPATK, 2, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMementoTryFaint
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTryFaint
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTryFaint
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -4458,7 +4458,7 @@ BattleScript_TeeterDanceLoop::
 	resultmessage
 	waitmessage 0x40
 BattleScript_TeeterDanceDoMoveEndIncrement::
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 BattleScript_TeeterDanceLoopIncrement::
 	addbyte gBattlerTarget, 0x1
 	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
@@ -4529,17 +4529,17 @@ BattleScript_TickleDoMoveAnim::
 	attackanimation
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleTryLowerDef
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleTryLowerDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleTryLowerDef
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_TickleTryLowerDef::
-	playstatchangeanimation BS_TARGET, BIT_DEF, ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleEnd
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -4565,13 +4565,13 @@ BattleScript_CosmicPowerDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0x0
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CosmicPowerTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CosmicPowerTrySpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CosmicPowerEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -4594,13 +4594,13 @@ BattleScript_BulkUpDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_BulkUpTryDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpTryDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_BulkUpTryDef::
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_BulkUpEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -4619,13 +4619,13 @@ BattleScript_CalmMindDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CalmMindTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_CalmMindTrySpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CalmMindEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -4651,13 +4651,13 @@ BattleScript_DragonDanceDoMoveAnim::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DragonDanceTrySpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_DragonDanceTrySpeed::
 	setstatchanger STAT_SPEED, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DragonDanceEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceEnd
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
@@ -4723,7 +4723,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
 	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
 	jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
-	jumpifcantswitch 11, BattleScript_FaintedMonChooseAnother
+	jumpifcantswitch BS_PLAYER1, BattleScript_FaintedMonChooseAnother
 	printstring STRINGID_ENEMYABOUTTOSWITCHPKMN
 	setbyte gBattleCommunication, 0x0
 	yesnobox
@@ -4986,8 +4986,8 @@ BattleScript_DoSwitchOut::
 	switchinanim BS_ATTACKER, FALSE
 	waitstate
 	switchineffects BS_ATTACKER
-	moveendcase ATK49_STATUS_IMMUNITY_ABILITIES
-	moveendcase ATK49_MIRROR_MOVE
+	moveendcase MOVEEND_STATUS_IMMUNITY_ABILITIES
+	moveendcase MOVEEND_MIRROR_MOVE
 	end2
 
 BattleScript_PursuitDmgOnSwitchOut::
@@ -5009,7 +5009,7 @@ BattleScript_PursuitDmgOnSwitchOut::
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	moveendfromto ATK49_MOVE_END_ABILITIES, ATK49_CHOICE_MOVE
+	moveendfromto MOVEEND_ABILITIES, MOVEEND_CHOICE_MOVE
 	various4 BS_TARGET
 	jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
 	setbyte sGIVEEXP_STATE, 0x0
@@ -5209,7 +5209,7 @@ BattleScript_LeechSeedTurnDrain::
 	datahpupdate BS_ATTACKER
 	copyword gBattleMoveDamage, gHpDealt
 	jumpifability BS_ATTACKER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze
-	manipulatedamage ATK80_DMG_CHANGE_SIGN
+	manipulatedamage DMG_CHANGE_SIGN
 	setbyte cMULTISTRING_CHOOSER, 0x3
 	goto BattleScript_LeechSeedTurnPrintAndUpdateHp
 BattleScript_LeechSeedTurnPrintLiquidOoze::
@@ -5292,15 +5292,15 @@ BattleScript_WeaknessPolicyAtk:
 	playanimation BS_TARGET, B_ANIM_ITEM_EFFECT, NULL
 	waitanimation
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_BY_TWO
 	setstatchanger STAT_ATK, 2, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_WeaknessPolicySpAtk
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeaknessPolicySpAtk
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_WeaknessPolicySpAtk
 	printstring STRINGID_USINGXTHEYOFZN
 	waitmessage 0x40
 BattleScript_WeaknessPolicySpAtk:
 	setstatchanger STAT_SPATK, 2, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_WeaknessPolicyRemoveItem
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeaknessPolicyRemoveItem
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_WeaknessPolicyRemoveItem
 	printstring STRINGID_USINGXTHEYOFZN
 	waitmessage 0x40
@@ -5352,7 +5352,7 @@ BattleScript_DisabledNoMore::
 BattleScript_SelectingDisabledMoveInPalace::
 	printstring STRINGID_PKMNMOVEISDISABLED
 BattleScript_SelectingUnusableMoveInPalace::
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_EncoredNoMore::
@@ -5437,7 +5437,7 @@ BattleScript_StickyWebOnSwitchIn::
 	copybyte gBattlerTarget, sBATTLER
 	printstring STRINGID_STICKYWEBSWITCHIN
 	waitmessage 0x40
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_StickyWebOnSwitchInEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StickyWebOnSwitchInEnd
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StickyWebOnSwitchInStatAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StickyWebOnSwitchInEnd
 	pause 0x20
@@ -5476,27 +5476,27 @@ BattleScript_AllStatsUpAtk::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
 	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpDef::
 	setstatchanger STAT_DEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpeed
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpeed
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpSpeed::
 	setstatchanger STAT_SPEED, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpAtk
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpSpAtk::
 	setstatchanger STAT_SPATK, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpDef
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpSpDef::
 	setstatchanger STAT_SPDEF, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpRet
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpRet
 	printfromtable gStatUpStringIds
 	waitmessage 0x40
 BattleScript_AllStatsUpRet::
@@ -5569,9 +5569,9 @@ BattleScript_DoFutureAttackResult:
 	tryfaintmon BS_TARGET, FALSE, NULL
 	atk24 BattleScript_FutureAttackEnd
 BattleScript_FutureAttackEnd::
-	moveendcase ATK49_RAGE
-	moveendfromto ATK49_ITEM_EFFECTS_ALL, ATK49_UPDATE_LAST_MOVES
-	sethword gMoveResultFlags, 0
+	moveendcase MOVEEND_RAGE
+	moveendfromto MOVEEND_ITEM_EFFECTS_ALL, MOVEEND_UPDATE_LAST_MOVES
+	setbyte gMoveResultFlags, 0
 	end2
 BattleScript_FutureAttackMiss::
 	pause 0x20
@@ -5717,17 +5717,17 @@ BattleScript_PrintMonIsRooted::
 
 BattleScript_AtkDefDown::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_ATTACKER, BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_AtkDefDownTryDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDownTryDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AtkDefDownTryDef
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_AtkDefDownTryDef:
-	playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_AtkDefDownRet
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDownRet
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AtkDefDownRet
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -5736,17 +5736,17 @@ BattleScript_AtkDefDownRet:
 	
 BattleScript_DefSpDefDown::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_ONLY_MULTIPLE
+	playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_DefSpDefDownTrySpDef
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefSpDefDownTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DefSpDefDownTrySpDef
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_DefSpDefDownTrySpDef::
-	playstatchangeanimation BS_ATTACKER, BIT_SPDEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
+	playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
 	setstatchanger STAT_SPDEF, 1, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_DefSpDefDownRet
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefSpDefDownRet
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DefSpDefDownRet
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -5818,9 +5818,9 @@ BattleScript_OneHitKOMsg::
 
 BattleScript_SAtkDown2::
 	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, BIT_SPATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
+	playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
 	setstatchanger STAT_SPATK, 2, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_SAtkDown2End
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_SAtkDown2End
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SAtkDown2End
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
@@ -5963,7 +5963,7 @@ BattleScript_MoveUsedFlinchedEnd:
 	goto BattleScript_MoveEnd
 BattleScript_TryActivateSteadFast:
 	setstatchanger STAT_SPEED, 1, FALSE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_MoveUsedFlinchedEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveUsedFlinchedEnd
 	setgraphicalstatchangevalues
 	playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -6322,7 +6322,7 @@ BattleScript_IntimidateActivatesLoop:
 	jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
 	jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
 	jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
-	statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_BS_PTR, BattleScript_IntimidateActivatesLoopIncrement
+	statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -6610,7 +6610,7 @@ BattleScript_MummyActivates::
 	
 BattleScript_AngryPointActivates::
 	call BattleScript_AbilityPopUp
-	statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
+	statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
 	printstring STRINGID_ANGRYPOINTACTIVATES
@@ -6619,7 +6619,7 @@ BattleScript_AngryPointActivates::
 	
 BattleScript_TargetAbilityStatRaise::
 	call BattleScript_AbilityPopUp
-	statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
+	statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
 	setgraphicalstatchangevalues
 	playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
 	waitanimation
@@ -6630,7 +6630,7 @@ BattleScript_TargetAbilityStatRaise::
 BattleScript_WeakArmorActivates::
 	call BattleScript_AbilityPopUp
 	setstatchanger STAT_DEF, 1, TRUE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_WeakArmorActivatesSpeed
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_WeakArmorDefAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_WeakArmorActivatesSpeed
 	pause 0x10
@@ -6644,7 +6644,7 @@ BattleScript_WeakArmorDefAnim:
 	waitmessage 0x40
 BattleScript_WeakArmorActivatesSpeed:
 	setstatchanger STAT_SPEED, 2, FALSE
-	statbuffchange STAT_CHANGE_BS_PTR, BattleScript_WeakArmorActivatesEnd
+	statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
 	jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_WeakArmorSpeedAnim
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_WeakArmorActivatesEnd
 	pause 0x10
@@ -6669,7 +6669,7 @@ BattleScript_AttackerAbilityStatRaise::
 	return
 	
 BattleScript_FellStingerRaisesStat::
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_FellStingerRaisesAtkEnd
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_FellStingerRaisesAtkEnd
 	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_FellStingerRaisesAtkEnd
 	setgraphicalstatchangevalues
 	playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -6779,7 +6779,7 @@ BattleScript_AbilityCuredStatus::
 BattleScript_IgnoresWhileAsleep::
 	printstring STRINGID_PKMNIGNORESASLEEP
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndUsesRandomMove::
@@ -6796,7 +6796,7 @@ BattleScript_MoveUsedLoafingAround::
 BattleScript_82DB6C7::
 	printfromtable gInobedientStringIds
 	waitmessage 0x40
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end	
 BattleScript_TruantLoafingAround:
 	call BattleScript_AbilityPopUp
@@ -6807,7 +6807,7 @@ BattleScript_IgnoresAndFallsAsleep::
 	waitmessage 0x40
 	setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
 	seteffectprimary
-	moveendto ATK49_NEXT_TARGET
+	moveendto MOVEEND_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndHitsItself::
@@ -7021,7 +7021,7 @@ BattleScript_BerryConfuseHealEnd2::
 
 BattleScript_BerryStatRaiseEnd2::
 	playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_82DB85B
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_82DB85B
 BattleScript_82DB85B::
 	setbyte cMULTISTRING_CHOOSER, 0x4
 	call BattleScript_StatUp
diff --git a/data/io_reg.s b/data/io_reg.s
index bbb93b4900..0941b4345b 100644
--- a/data/io_reg.s
+++ b/data/io_reg.s
@@ -25,13 +25,13 @@ gUnref_82EC784:: @ 82EC784
 	.4byte 0x08000400
 
 gOverworldBackgroundLayerFlags:: @ 82EC7C4
-	.2byte 0x0100 /* BLDCNT_TGT2_BG0 */
-	.2byte 0x0200 /* BLDCNT_TGT2_BG1 */
-	.2byte 0x0400 /* BLDCNT_TGT2_BG2 */
-	.2byte 0x0800 /* BLDCNT_TGT2_BG3 */
+	.2byte BLDCNT_TGT2_BG0
+	.2byte BLDCNT_TGT2_BG1
+	.2byte BLDCNT_TGT2_BG2
+	.2byte BLDCNT_TGT2_BG3
 
 gOrbEffectBackgroundLayerFlags:: @ 82EC7CC
-	.2byte 0x0001 /* BLDCNT_TGT1_BG0 */
-	.2byte 0x0002 /* BLDCNT_TGT1_BG1 */
-	.2byte 0x0004 /* BLDCNT_TGT1_BG2 */
-	.2byte 0x0008 /* BLDCNT_TGT1_BG3 */
+	.2byte BLDCNT_TGT1_BG0
+	.2byte BLDCNT_TGT1_BG1
+	.2byte BLDCNT_TGT1_BG2
+	.2byte BLDCNT_TGT1_BG3
diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc
index ff8b6c16d0..b246862a72 100644
--- a/data/maps/AquaHideout_1F/scripts.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -41,7 +41,7 @@ AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE
 	end
 
 AquaHideout_1F_EventScript_Grunt1:: @ 82334F8
-	trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
 	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json
index 78e37bdf9a..f31180f8bd 100644
--- a/data/maps/AquaHideout_B1F/map.json
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AquaHideout_B1F_EventScript_Grunt21",
+      "script": "AquaHideout_B1F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "AquaHideout_B1F_EventScript_Grunt25",
+      "script": "AquaHideout_B1F_EventScript_Grunt7",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     }
   ],
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 8b1a07c545..17e803814f 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -82,7 +82,7 @@ AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C
 	end
 
 AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85
-	trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
 	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -94,7 +94,7 @@ AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0
 	end
 
 AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0
-	trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
 	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -103,14 +103,14 @@ AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB
 	release
 	end
 
-AquaHideout_B1F_EventScript_Grunt21:: @ 8233AD5
-	trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_Grunt21Intro, AquaHideout_B1F_Text_Grunt21Defeat
-	msgbox AquaHideout_B1F_Text_Grunt21PostBattle, MSGBOX_AUTOCLOSE
+AquaHideout_B1F_EventScript_Grunt5:: @ 8233AD5
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_5, AquaHideout_B1F_Text_Grunt5Intro, AquaHideout_B1F_Text_Grunt5Defeat
+	msgbox AquaHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt25:: @ 8233AEC
-	trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_Grunt25Intro, AquaHideout_B1F_Text_Grunt25Defeat
-	msgbox AquaHideout_B1F_Text_Grunt25PostBattle, MSGBOX_AUTOCLOSE
+AquaHideout_B1F_EventScript_Grunt7:: @ 8233AEC
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_7, AquaHideout_B1F_Text_Grunt7Intro, AquaHideout_B1F_Text_Grunt7Defeat
+	msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03
@@ -141,27 +141,27 @@ AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41
 	.string "This was supposed to happen!\p"
 	.string "My mission was to just hold you up!$"
 
-AquaHideout_B1F_Text_Grunt21Intro: @ 8233C89
+AquaHideout_B1F_Text_Grunt5Intro: @ 8233C89
 	.string "Yawn… Keeping watch over the\n"
 	.string "HIDEOUT bores me. I'll take you on.$"
 
-AquaHideout_B1F_Text_Grunt21Defeat: @ 8233CCA
+AquaHideout_B1F_Text_Grunt5Defeat: @ 8233CCA
 	.string "Yawn…\n"
 	.string "Oh, I lost…$"
 
-AquaHideout_B1F_Text_Grunt21PostBattle: @ 8233CDC
+AquaHideout_B1F_Text_Grunt5PostBattle: @ 8233CDC
 	.string "If you scurry too much, other TEAM\n"
 	.string "AQUA members might get you.$"
 
-AquaHideout_B1F_Text_Grunt25Intro: @ 8233D1B
+AquaHideout_B1F_Text_Grunt7Intro: @ 8233D1B
 	.string "Hey!\n"
 	.string "You there!\p"
 	.string "Which do you think is cooler?\n"
 	.string "TEAM AQUA's uniform or TEAM MAGMA's?$"
 
-AquaHideout_B1F_Text_Grunt25Defeat: @ 8233D6E
+AquaHideout_B1F_Text_Grunt7Defeat: @ 8233D6E
 	.string "I lost in a cool way…$"
 
-AquaHideout_B1F_Text_Grunt25PostBattle: @ 8233D84
+AquaHideout_B1F_Text_Grunt7PostBattle: @ 8233D84
 	.string "If you have a cool uniform, you look\n"
 	.string "good even in a loss, don't you think?$"
diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json
index a5d58554dd..1ae0fcecd3 100644
--- a/data/maps/AquaHideout_B2F/map.json
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "AquaHideout_B2F_EventScript_Grunt22",
+      "script": "AquaHideout_B2F_EventScript_Grunt6",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "AquaHideout_B2F_EventScript_Grunt26",
+      "script": "AquaHideout_B2F_EventScript_Grunt8",
       "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
     }
   ],
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
index 84e0c66227..dd2c38fa41 100644
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -67,7 +67,7 @@ AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85
 	step_end
 
 AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A
-	trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
 	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
@@ -76,14 +76,14 @@ AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5
 	release
 	end
 
-AquaHideout_B2F_EventScript_Grunt22:: @ 8233EAF
-	trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_Grunt22Intro, AquaHideout_B2F_Text_Grunt22Defeat
-	msgbox AquaHideout_B2F_Text_Grunt22PostBattle, MSGBOX_AUTOCLOSE
+AquaHideout_B2F_EventScript_Grunt6:: @ 8233EAF
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_6, AquaHideout_B2F_Text_Grunt6Intro, AquaHideout_B2F_Text_Grunt6Defeat
+	msgbox AquaHideout_B2F_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_Grunt26:: @ 8233EC6
-	trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_Grunt26Intro, AquaHideout_B2F_Text_Grunt26Defeat
-	msgbox AquaHideout_B2F_Text_Grunt26PostBattle, MSGBOX_AUTOCLOSE
+AquaHideout_B2F_EventScript_Grunt8:: @ 8233EC6
+	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_8, AquaHideout_B2F_Text_Grunt8Intro, AquaHideout_B2F_Text_Grunt8Defeat
+	msgbox AquaHideout_B2F_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B2F_Text_MattIntro: @ 8233EDD
@@ -127,7 +127,7 @@ AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112
 	.string "BOSS…\n"
 	.string "Is this good enough?$"
 
-AquaHideout_B2F_Text_Grunt22Intro: @ 823412D
+AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
 	.string "Warp panels, the HIDEOUT's pride\n"
 	.string "and joy!\p"
 	.string "You're clueless about where you are,\n"
@@ -135,25 +135,25 @@ AquaHideout_B2F_Text_Grunt22Intro: @ 823412D
 	.string "Fluster and tire out the enemy, then\n"
 	.string "lower the boom! That's our plan!$"
 
-AquaHideout_B2F_Text_Grunt22Defeat: @ 82341CE
+AquaHideout_B2F_Text_Grunt6Defeat: @ 82341CE
 	.string "What's wrong with you?\n"
 	.string "You're not tired at all!$"
 
-AquaHideout_B2F_Text_Grunt22PostBattle: @ 82341FE
+AquaHideout_B2F_Text_Grunt6PostBattle: @ 82341FE
 	.string "That reminds me… I can't remember\n"
 	.string "where I put the MASTER BALL.\p"
 	.string "If I fail to guard it, our BOSS will\n"
 	.string "chew me out…$"
 
-AquaHideout_B2F_Text_Grunt26Intro: @ 823426F
+AquaHideout_B2F_Text_Grunt8Intro: @ 823426F
 	.string "When I joined TEAM AQUA, the first\n"
 	.string "thing I had to learn was how these\l"
 	.string "warp panels connected.$"
 
-AquaHideout_B2F_Text_Grunt26Defeat: @ 82342CC
+AquaHideout_B2F_Text_Grunt8Defeat: @ 82342CC
 	.string "I was too occupied thinking about\n"
 	.string "the warp panels…$"
 
-AquaHideout_B2F_Text_Grunt26PostBattle: @ 82342FF
+AquaHideout_B2F_Text_Grunt8PostBattle: @ 82342FF
 	.string "I'll have to learn about how I can\n"
 	.string "battle more effectively…$"
diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json
index 46f6de9af3..f4adf6c367 100644
--- a/data/maps/BattleFrontier_Mart/map.json
+++ b/data/maps/BattleFrontier_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267ACC",
+      "script": "BattleFrontier_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267B0B",
+      "script": "BattleFrontier_Mart_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267B02",
+      "script": "BattleFrontier_Mart_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_Mart_EventScript_267B20",
+      "script": "BattleFrontier_Mart_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc
index 59ba707d81..e04a2e6d34 100644
--- a/data/maps/BattleFrontier_Mart/scripts.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
@@ -1,18 +1,18 @@
 BattleFrontier_Mart_MapScripts:: @ 8267ACB
 	.byte 0
 
-BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC
+BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart BattleFrontier_Mart_Pokemart_267AE4
+	pokemart BattleFrontier_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4
+BattleFrontier_Mart_Pokemart: @ 8267AE4
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -30,35 +30,35 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4
 	release
 	end
 
-BattleFrontier_Mart_EventScript_267B02:: @ 8267B02
-	msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC
+BattleFrontier_Mart_EventScript_OldMan:: @ 8267B02
+	msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B
+BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B
 	lock
 	applymovement 2, Common_Movement_FaceDown
 	waitmovement 0
-	msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT
+	msgbox BattleFrontier_Mart_Text_ProteinMakeNiceGift, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Mart_EventScript_267B20:: @ 8267B20
-	msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC
+BattleFrontier_Mart_EventScript_Boy:: @ 8267B20
+	msgbox BattleFrontier_Mart_Text_FacilitiesDontAllowItems, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_Text_267B29: @ 8267B29
+BattleFrontier_Mart_Text_ChaperonGrandson: @ 8267B29
 	.string "We came here to chaperon our\n"
 	.string "grandson.\p"
 	.string "But since we're here, we thought\n"
 	.string "we should get some souvenirs.$"
 
-BattleFrontier_Mart_Text_267B8F: @ 8267B8F
+BattleFrontier_Mart_Text_ProteinMakeNiceGift: @ 8267B8F
 	.string "Dear, what do you think of this?\n"
 	.string "Wouldn't this make a nice gift?\p"
 	.string "It's…PRO…TE…IN?\n"
 	.string "It sounds delicious, doesn't it?$"
 
-BattleFrontier_Mart_Text_267C01: @ 8267C01
+BattleFrontier_Mart_Text_FacilitiesDontAllowItems: @ 8267C01
 	.string "A lot of the BATTLE FRONTIER's\n"
 	.string "facilities don't allow the use of items\l"
 	.string "during battles.\p"
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
index 8f8153c085..743bab8b00 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Picnicker",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931",
+      "script": "BattleFrontier_PokemonCenter_1F_EventScript_Skitty",
       "flag": "0"
     }
   ],
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 84aeef1822..f77d9ab831 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -1,13 +1,14 @@
 BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
-	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
+BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904
 	setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
+@ VAR_0x800B is the Nurse's object event id
+BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,29 +16,29 @@ BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267916:: @ 8267916
-	msgbox BattleFrontier_PokemonCenter_1F_Text_267944, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916
+	msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_26791F:: @ 826791F
-	msgbox BattleFrontier_PokemonCenter_1F_Text_2679EB, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F
+	msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267928:: @ 8267928
-	msgbox BattleFrontier_PokemonCenter_1F_Text_267A4B, MSGBOX_NPC
+BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928
+	msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_267931:: @ 8267931
+BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox BattleFrontier_PokemonCenter_1F_Text_267A90, MSGBOX_DEFAULT
+	msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
+BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
 	.string "There was someone here using a \n"
 	.string "POKéMON I've never seen before.\p"
 	.string "I never learned about it at\n"
@@ -45,15 +46,15 @@ BattleFrontier_PokemonCenter_1F_Text_267944: @ 8267944
 	.string "I wonder where you can catch POKéMON\n"
 	.string "like that.$"
 
-BattleFrontier_PokemonCenter_1F_Text_2679EB: @ 82679EB
+BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB
 	.string "Okay! Next stop, the BATTLE ARENA!\n"
 	.string "I'd better get the right POKéMON from\l"
 	.string "the PC Storage System.$"
 
-BattleFrontier_PokemonCenter_1F_Text_267A4B: @ 8267A4B
+BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B
 	.string "Giggle… I'm going to go through every\n"
 	.string "challenge with just this baby!$"
 
-BattleFrontier_PokemonCenter_1F_Text_267A90: @ 8267A90
+BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90
 	.string "SKITTY: Mya myaaah!$"
 
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json
index 89acf1ea8f..67e0e57219 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/map.json
+++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E",
+      "script": "DewfordTown_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 6fc9abb99d..99d180d8f6 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537
+@ VAR_0x800B is the Nurse's object event id
+DewfordTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC537
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,21 +17,21 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537
 	release
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545
-	msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, MSGBOX_NPC
+DewfordTown_PokemonCenter_1F_EventScript_PokefanF:: @ 81FC545
+	msgbox DewfordTown_PokemonCenter_1F_Text_StoneCavern, MSGBOX_NPC
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E
-	msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, MSGBOX_NPC
+DewfordTown_PokemonCenter_1F_EventScript_Man:: @ 81FC54E
+	msgbox DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM, MSGBOX_NPC
 	end
 
-DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557
+DewfordTown_PokemonCenter_1F_Text_StoneCavern: @ 81FC557
 	.string "There's a stone cavern at the edge\n"
 	.string "of town.\p"
 	.string "I've heard you can find rare stones\n"
 	.string "there.$"
 
-DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE
+DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM: @ 81FC5AE
 	.string "Even if a POKéMON faints and can't\n"
 	.string "battle, it can still use a move learned\l"
 	.string "from a HIDDEN MACHINE (HM).$"
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
index 38c527b34e..23bbe085f2 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79",
+      "script": "EverGrandeCity_PokemonCenter_1F_EventScript_Scott",
       "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT"
     }
   ],
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 2d1f1de37c..95be20f751 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -5,15 +5,16 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 
 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
-	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
+	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
+EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott:: @ 8229A4C
 	goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	return
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
+@ VAR_0x800B is the Nurse's object event id
+EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 8229A59
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -21,25 +22,25 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59
 	release
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, MSGBOX_NPC
+EverGrandeCity_PokemonCenter_1F_EventScript_Woman:: @ 8229A67
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad, MSGBOX_NPC
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, MSGBOX_NPC
+EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM:: @ 8229A70
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon, MSGBOX_NPC
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
+EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79
 	lock
 	faceplayer
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
+	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
+	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
+	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
 	playse SE_KAIDAN
@@ -48,17 +49,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
 	release
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229AB6:: @ 8229AB6
-	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229ACC
+EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: @ 8229AB6
+	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1
-	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_229AD3
+EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: @ 8229AC1
+	applymovement 4, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
+EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth: @ 8229ACC
 	walk_left
 	walk_down
 	walk_down
@@ -67,7 +68,7 @@ EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC
 	walk_down
 	step_end
 
-EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
+EverGrandeCity_PokemonCenter_1F_Movement_ScottExit: @ 8229AD3
 	walk_down
 	walk_down
 	walk_left
@@ -76,20 +77,20 @@ EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3
 	walk_down
 	step_end
 
-EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA
+EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad: @ 8229ADA
 	.string "The POKéMON LEAGUE is only a short\n"
 	.string "distance after the VICTORY ROAD.\p"
 	.string "If you've come this far, what choice\n"
 	.string "do you have but to keep going?$"
 
-EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62
+EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon: @ 8229B62
 	.string "The long and harrowing VICTORY ROAD…\p"
 	.string "It's like reliving the path one has\n"
 	.string "traveled in life…\p"
 	.string "Believe in your POKéMON and give it\n"
 	.string "your very best!$"
 
-EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1
+EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou: @ 8229BF1
 	.string "SCOTT: {PLAYER}{KUN}, you've clawed your\n"
 	.string "way up to face the POKéMON LEAGUE!\p"
 	.string "I'm happy for you!\n"
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
index 2a9efbeaf9..8efb63b9a2 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636",
+      "script": "EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard",
       "flag": "0"
     }
   ],
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index 84693e2fac..8140258953 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -6,15 +6,16 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
 	setflag FLAG_LANDMARK_POKEMON_LEAGUE
-	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
+	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
+EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor:: @ 82295ED
 	setobjectxyperm 3, 9, 2
 	setobjectxyperm 4, 10, 2
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
+@ VAR_0x800B is the Nurse's object event id
+EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: @ 82295FC
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -22,18 +23,18 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC
 	release
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A
+EverGrandeCity_PokemonLeague_1F_EventScript_Clerk:: @ 822960A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624
+	pokemart EverGrandeCity_PokemonLeague_1F_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
+EverGrandeCity_PokemonLeague_1F_Pokemart: @ 8229624
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -45,52 +46,27 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624
 	release
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
-	special SavePlayerParty
-	
-	fadescreen 1
-    special ChooseHalfPartyForBattle
-    waitstate
-	@ Check here to see if the player didn't choose Cancel.
-	
-	special ReducePlayerPartyToSelectedMons
-    setvar VAR_0x8004, 2
-    setvar VAR_0x8005, 4
-    special CallFrontierUtilFunc
-	
-	trainerbattle 10, 1, 0, NULL, EverGrandeCity_PokemonLeague_1F_Text_2296E8
-	trainerbattle 11, TRAINER_ALEXA, 0, NULL, EverGrandeCity_PokemonLeague_1F_Text_2297EF
-	
-	setvar VAR_0x8004, SPECIAL_BATTLE_MULTI
-	setvar VAR_0x8005, 2 | 0x80
-	setvar VAR_0x8006, TRAINER_EDWARDO
-	setvar VAR_0x8007, TRAINER_BACK_PIC_LEAF
-	special DoSpecialTrainerBattle
-	waitstate
-	
-	setvar VAR_0x8004, 6
-    special CallFrontierUtilFunc
-	
-	special LoadPlayerParty
-	
+@ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped
+@ Its assumed the player has the remaining badges
+EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636
 	lockall
-	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
+	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GoForth
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 11
-	call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698
+	call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight
 	compare VAR_TEMP_0, 8
-	call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_2296A3
-	message EverGrandeCity_PokemonLeague_1F_Text_2296E8
+	call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft
+	message EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges
 	waitmessage
 	delay 120
-	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE
+	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges
 	closemessage
-	applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2
-	applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5
+	applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay
+	applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay
 	waitmovement 0
 	delay 10
 	playfanfare MUS_ME_BACHI
-	message EverGrandeCity_PokemonLeague_1F_Text_2297EF
+	message EverGrandeCity_PokemonLeague_1F_Text_GoForth
 	waitmessage
 	waitfanfare
 	closemessage
@@ -100,67 +76,67 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DA
+EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 8229698
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3
-	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DE
+EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A3
+	applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
+EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE
 	playse SE_HAZURE
-	msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
+EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: @ 82296BB
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT
+	msgbox EverGrandeCity_PokemonLeague_1F_Text_GoForth, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA
+EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight: @ 82296DA
 	walk_down
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE
+EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft: @ 82296DE
 	walk_down
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2
+EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay: @ 82296E2
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5
+EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay: @ 82296E5
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8
+EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges: @ 82296E8
 	.string "Beyond this point, only those TRAINERS\n"
 	.string "who have collected all the GYM BADGES\l"
 	.string "are permitted to enter.\p"
 	.string "TRAINER, let us confirm that you have\n"
 	.string "all the GYM BADGES.$"
 
-EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787
+EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges: @ 8229787
 	.string "You haven't obtained all the BADGES.\p"
 	.string "If you're bound for the POKéMON\n"
 	.string "LEAGUE, you must return with them.$"
 
-EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF
+EverGrandeCity_PokemonLeague_1F_Text_GoForth: @ 82297EF
 	.string "TRAINER! Believe in yourself and your\n"
 	.string "POKéMON, and go forth!$"
 
diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json
index 60b0be26ae..f58c0d9e2f 100644
--- a/data/maps/FallarborTown_Mart/map.json
+++ b/data/maps/FallarborTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFCBF",
+      "script": "FallarborTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFCF4",
+      "script": "FallarborTown_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFCFD",
+      "script": "FallarborTown_Mart_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_Mart_EventScript_1FFD06",
+      "script": "FallarborTown_Mart_EventScript_Skitty",
       "flag": "0"
     },
     {
diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc
index 3ae8dc9dd5..bf106781a8 100644
--- a/data/maps/FallarborTown_Mart/scripts.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 FallarborTown_Mart_MapScripts:: @ 81FFCBE
 	.byte 0
 
-FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF
+FallarborTown_Mart_EventScript_Clerk:: @ 81FFCBF
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart FallarborTown_Mart_Pokemart_1FFCD8
+	pokemart FallarborTown_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8
+FallarborTown_Mart_Pokemart: @ 81FFCD8
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -29,25 +29,25 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8
 	release
 	end
 
-FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4
-	msgbox FallarborTown_Mart_Text_1FFD19, MSGBOX_NPC
+FallarborTown_Mart_EventScript_Woman:: @ 81FFCF4
+	msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC
 	end
 
-FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD
-	msgbox FallarborTown_Mart_Text_1FFE09, MSGBOX_NPC
+FallarborTown_Mart_EventScript_PokefanM:: @ 81FFCFD
+	msgbox FallarborTown_Mart_Text_SellNuggetIFound, MSGBOX_NPC
 	end
 
-FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06
+FallarborTown_Mart_EventScript_Skitty:: @ 81FFD06
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox FallarborTown_Mart_Text_1FFDFA, MSGBOX_DEFAULT
+	msgbox FallarborTown_Mart_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-FallarborTown_Mart_Text_1FFD19: @ 81FFD19
+FallarborTown_Mart_Text_DecidingSkittyEvolve: @ 81FFD19
 	.string "I'm having a hard time deciding if I\n"
 	.string "should make my SKITTY evolve or not.\p"
 	.string "I only have to use this MOON STONE,\n"
@@ -56,10 +56,10 @@ FallarborTown_Mart_Text_1FFD19: @ 81FFD19
 	.string "much stronger.\p"
 	.string "But it will look so different, too.$"
 
-FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA
+FallarborTown_Mart_Text_Skitty: @ 81FFDFA
 	.string "SKITTY: Miyao?$"
 
-FallarborTown_Mart_Text_1FFE09: @ 81FFE09
+FallarborTown_Mart_Text_SellNuggetIFound: @ 81FFE09
 	.string "This NUGGET I found here…\n"
 	.string "I suppose I'll have to sell it, seeing\l"
 	.string "as how it has no other use.$"
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json
index b1ea1ed144..0b55de01a9 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/map.json
+++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01",
+      "script": "FallarborTown_PokemonCenter_1F_EventScript_Lanette",
       "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE"
     }
   ],
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index db9122b6d0..70c209ef95 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
+@ VAR_0x800B is the Nurse's object event id
+FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,44 +17,44 @@ FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF
-	msgbox FallarborTown_PokemonCenter_1F_Text_200E22, MSGBOX_NPC
+FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8200BEF
+	msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8
-	msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, MSGBOX_NPC
+FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8200BF8
+	msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
+FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01
 	lock
 	faceplayer
-	msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT
+	msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
-	case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_200C28
-	case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_200C38
+	case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth
+	case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C53
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8200C28
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth
 	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C38:: @ 8200C38
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_200C60
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest
 	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_200C48
+	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48
 	playse SE_JIDO_DOA
 	removeobject 4
 	clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53
 	walk_right
 	walk_down
 	walk_down
@@ -68,7 +69,7 @@ FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60
 	walk_down
 	walk_down
 	walk_left
@@ -81,7 +82,7 @@ FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
+FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B
 	.string "Oh, hello.\n"
 	.string "You are?\p"
 	.string "Okay, your name's {PLAYER}{KUN}.\n"
@@ -98,13 +99,13 @@ FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B
 	.string "If you could, please visit me at home.\n"
 	.string "My house is on ROUTE 114.$"
 
-FallarborTown_PokemonCenter_1F_Text_200E22: @ 8200E22
+FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown: @ 8200E22
 	.string "I wonder what POKéMON looked like\n"
 	.string "long, long ago?\p"
 	.string "Maybe the FOSSIL MANIAC at the edge\n"
 	.string "of town will know.$"
 
-FallarborTown_PokemonCenter_1F_Text_200E8B: @ 8200E8B
+FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees: @ 8200E8B
 	.string "In the fields of FALLARBOR, we plant\n"
 	.string "seedlings of hardy trees that thrive\l"
 	.string "even in volcanic ash.$"
diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json
index c1bb6df86c..a8bca3743f 100644
--- a/data/maps/FortreeCity_Mart/map.json
+++ b/data/maps/FortreeCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_217666",
+      "script": "FortreeCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_217698",
+      "script": "FortreeCity_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_2176A1",
+      "script": "FortreeCity_Mart_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_Mart_EventScript_2176AA",
+      "script": "FortreeCity_Mart_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 30caaeff33..05318e7bdc 100644
--- a/data/maps/FortreeCity_Mart/scripts.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
@@ -1,18 +1,18 @@
 FortreeCity_Mart_MapScripts:: @ 8217665
 	.byte 0
 
-FortreeCity_Mart_EventScript_217666:: @ 8217666
+FortreeCity_Mart_EventScript_Clerk:: @ 8217666
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart FortreeCity_Mart_Pokemart_217680
+	pokemart FortreeCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-FortreeCity_Mart_Pokemart_217680: @ 8217680
+FortreeCity_Mart_Pokemart: @ 8217680
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_SUPER_POTION
@@ -27,31 +27,31 @@ FortreeCity_Mart_Pokemart_217680: @ 8217680
 	release
 	end
 
-FortreeCity_Mart_EventScript_217698:: @ 8217698
-	msgbox FortreeCity_Mart_Text_2176B3, MSGBOX_NPC
+FortreeCity_Mart_EventScript_Woman:: @ 8217698
+	msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_EventScript_2176A1:: @ 82176A1
-	msgbox FortreeCity_Mart_Text_217715, MSGBOX_NPC
+FortreeCity_Mart_EventScript_Girl:: @ 82176A1
+	msgbox FortreeCity_Mart_Text_StockUpOnItems, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_EventScript_2176AA:: @ 82176AA
-	msgbox FortreeCity_Mart_Text_21778E, MSGBOX_NPC
+FortreeCity_Mart_EventScript_Boy:: @ 82176AA
+	msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_Text_2176B3: @ 82176B3
+FortreeCity_Mart_Text_SuperRepelBetter: @ 82176B3
 	.string "SUPER REPEL lasts a long time,\n"
 	.string "and it gets the job done.\p"
 	.string "It's much better than an ordinary\n"
 	.string "REPEL.$"
 
-FortreeCity_Mart_Text_217715: @ 8217715
+FortreeCity_Mart_Text_StockUpOnItems: @ 8217715
 	.string "I always stock up on more items than\n"
 	.string "I'm sure I'll need.\p"
 	.string "You never know what might happen.\n"
 	.string "Better to be safe than sorry!$"
 
-FortreeCity_Mart_Text_21778E: @ 821778E
+FortreeCity_Mart_Text_RareCandyMakesMonGrow: @ 821778E
 	.string "A RARE CANDY makes a POKéMON grow\n"
 	.string "immediately by one level.$"
 
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json
index efa58e87bb..38f133cc0a 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/map.json
+++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "FortreeCity_PokemonCenter_1F_EventScript_217407",
+      "script": "FortreeCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index fa88bd7523..e759d2d93d 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
 	setrespawn HEAL_LOCATION_FORTREE_CITY
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7
+@ VAR_0x800B is the Nurse's object event id
+FortreeCity_PokemonCenter_1F_EventScript_Nurse:: @ 82173E7
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,25 +16,25 @@ FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7
 	release
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5
-	msgbox FortreeCity_PokemonCenter_1F_Text_217410, MSGBOX_NPC
+FortreeCity_PokemonCenter_1F_EventScript_Gentleman:: @ 82173F5
+	msgbox FortreeCity_PokemonCenter_1F_Text_GoToSafariZone, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE
-	msgbox FortreeCity_PokemonCenter_1F_Text_21746D, MSGBOX_NPC
+FortreeCity_PokemonCenter_1F_EventScript_Man:: @ 82173FE
+	msgbox FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407
-	msgbox FortreeCity_PokemonCenter_1F_Text_21751F, MSGBOX_NPC
+FortreeCity_PokemonCenter_1F_EventScript_Boy:: @ 8217407
+	msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410
+FortreeCity_PokemonCenter_1F_Text_GoToSafariZone: @ 8217410
 	.string "Listen, kid, are you working\n"
 	.string "on a POKéDEX?\p"
 	.string "Hmm… Go to the SAFARI ZONE.\n"
 	.string "That's my suggestion.$"
 
-FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D
+FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat: @ 821746D
 	.string "Have you done anything at\n"
 	.string "the RECORD CORNER?\p"
 	.string "It's pretty neat. It mixes and matches\n"
@@ -41,7 +42,7 @@ FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D
 	.string "I don't know quite how it works,\n"
 	.string "but it's cool. It's exciting, even!$"
 
-FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F
+FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav: @ 821751F
 	.string "Oh, wow, you have a POKéNAV!\n"
 	.string "And it's just like mine!\p"
 	.string "Do you know about POKéNAV's\n"
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index d0a032ab23..5e6712c681 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -77,9 +77,9 @@ JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718
 	waitmovement 0
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox JaggedPass_Text_Grunt30Intro, MSGBOX_DEFAULT
+	msgbox JaggedPass_Text_GruntIntro, MSGBOX_DEFAULT
 	closemessage
-	trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_Grunt30Defeat
+	trainerbattle_no_intro TRAINER_GRUNT_JAGGED_PASS, JaggedPass_Text_GruntDefeat
 	setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -226,13 +226,13 @@ JaggedPass_Text_EthanPostRematch: @ 8230C94
 	.string "I should get an ACRO BIKE from RYDEL\n"
 	.string "in MAUVILLE CITY…$"
 
-JaggedPass_Text_Grunt30Intro: @ 8230CCB
+JaggedPass_Text_GruntIntro: @ 8230CCB
 	.string "Wah!\n"
 	.string "What are you doing here?\p"
 	.string "What am I doing in a place like this?\p"
 	.string "What business is it of yours?$"
 
-JaggedPass_Text_Grunt30Defeat: @ 8230D2D
+JaggedPass_Text_GruntDefeat: @ 8230D2D
 	.string "Urrrgh…\p"
 	.string "I should've ducked into our HIDEOUT\n"
 	.string "right away…$"
diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json
index 2f8d1278f2..d55b562dbf 100644
--- a/data/maps/LavaridgeTown_Mart/map.json
+++ b/data/maps/LavaridgeTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Mart_EventScript_1FF9CE",
+      "script": "LavaridgeTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Mart_EventScript_1FF9FE",
+      "script": "LavaridgeTown_Mart_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Mart_EventScript_1FFA07",
+      "script": "LavaridgeTown_Mart_EventScript_OldWoman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index d1d2ec4d2b..b5b3cb6f13 100644
--- a/data/maps/LavaridgeTown_Mart/scripts.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 LavaridgeTown_Mart_MapScripts:: @ 81FF9CD
 	.byte 0
 
-LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE
+LavaridgeTown_Mart_EventScript_Clerk:: @ 81FF9CE
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LavaridgeTown_Mart_Pokemart_1FF9E8
+	pokemart LavaridgeTown_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8
+LavaridgeTown_Mart_Pokemart: @ 81FF9E8
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -26,21 +26,21 @@ LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8
 	release
 	end
 
-LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE
-	msgbox LavaridgeTown_Mart_Text_1FFA10, MSGBOX_NPC
+LavaridgeTown_Mart_EventScript_ExpertM:: @ 81FF9FE
+	msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC
 	end
 
-LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07
-	msgbox LavaridgeTown_Mart_Text_1FFA83, MSGBOX_NPC
+LavaridgeTown_Mart_EventScript_OldWoman:: @ 81FFA07
+	msgbox LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney, MSGBOX_NPC
 	end
 
-LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10
+LavaridgeTown_Mart_Text_XSpeedFirstStrike: @ 81FFA10
 	.string "Use X SPEED to add to a POKéMON's\n"
 	.string "SPEED in battle.\p"
 	.string "That will help it get in the first\n"
 	.string "strike--a decided advantage!$"
 
-LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83
+LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney: @ 81FFA83
 	.string "On MT. CHIMNEY's peak, there's a local\n"
 	.string "specialty that you can buy only there.\p"
 	.string "Give it to a POKéMON--it will be elated.$"
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
index ef32ef6605..4df734a49d 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E",
+      "script": "LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 3a27182d5a..a2b25fe0e7 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E
+@ VAR_0x800B is the Nurse's object event id
+LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FFB0E
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,31 +17,31 @@ LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E
 	release
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, MSGBOX_NPC
+LavaridgeTown_PokemonCenter_1F_EventScript_Youngster:: @ 81FFB1C
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, MSGBOX_NPC
+LavaridgeTown_PokemonCenter_1F_EventScript_Woman:: @ 81FFB25
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, MSGBOX_NPC
+LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FFB2E
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37
+LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether: @ 81FFB37
 	.string "I think POKéMON get closer to their\n"
 	.string "TRAINERS if they spend time together.\p"
 	.string "The longer the better.\n"
 	.string "That's what I think.$"
 
-LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD
+LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate: @ 81FFBAD
 	.string "It's sort of magical how just sitting\n"
 	.string "in a hot-spring pool can invigorate.\p"
 	.string "I wish I could let my POKéMON\n"
 	.string "soak, too.$"
 
-LavaridgeTown_PokemonCenter_1F_Text_1FFC21: @ 81FFC21
+LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo: @ 81FFC21
 	.string "Hohoho! Hey, kid, you can reach\n"
 	.string "the hot springs from here.\p"
 	.string "If POKéMON are getting rest, so too\n"
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
index 75a1fddf9e..abc4e18dde 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624",
+      "script": "LilycoveCity_DepartmentStoreElevator_EventScript_Attendant",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index d7061d7e4b..b7d6e4a49d 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -1,11 +1,11 @@
 LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623
 	.byte 0
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
+LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 8220624
 	lock
 	faceplayer
 	setvar VAR_0x8004, 0
-	call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC
+	call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor
 	copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR
 	special ShowDeptStoreElevatorFloorSelect
 	message gText_WhichFloorWouldYouLike
@@ -13,105 +13,106 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice
 	switch VAR_RESULT
-	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_220689
-	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220695
-	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_2206A1
-	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2206AD
-	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_2206B9
+	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th
+	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th
+	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd
+	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd
+	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220689:: @ 8220689
+@ Below scripts ensure the cursor for floor select always starts on the current floor
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th:: @ 8220689
 	multichoicedefault 0, 0, MULTI_FLOORS, 0, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220695:: @ 8220695
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th:: @ 8220695
 	multichoicedefault 0, 0, MULTI_FLOORS, 1, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206A1:: @ 82206A1
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd:: @ 82206A1
 	multichoicedefault 0, 0, MULTI_FLOORS, 2, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206AD:: @ 82206AD
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd:: @ 82206AD
 	multichoicedefault 0, 0, MULTI_FLOORS, 3, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206B9:: @ 82206B9
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st:: @ 82206B9
 	multichoicedefault 0, 0, MULTI_FLOORS, 4, 0
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2206C5
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor:: @ 82206C5
 	switch VAR_RESULT
-	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207B8
-	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_220790
-	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_220768
-	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_220740
-	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_220718
-	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor
+	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor
+	case 2, LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor
+	case 3, LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor
+	case 4, LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor
+	case 5, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718
+LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor:: @ 8220718
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740
+LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor:: @ 8220740
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768
+LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor:: @ 8220768
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790
+LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor:: @ 8220790
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8
+LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor:: @ 82207B8
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
-	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
-	call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5
+	goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+	call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
 	setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
-	goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0
+	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
+LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect:: @ 82207E0
 	special CloseDeptStoreElevatorWindow
 	release
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
+LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: @ 82207E5
 	special CloseDeptStoreElevatorWindow
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -122,7 +123,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	setflag FLAG_TEMP_2
 	return
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
+LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor:: @ 82207FC
 	special SetDeptStoreFloor
 	return
 
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
index 06159b81a6..44f54006c9 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F",
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman",
       "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN"
     },
     {
@@ -84,7 +84,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295"
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine"
     },
     {
       "type": "sign",
@@ -92,7 +92,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295"
+      "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 44b9b2d242..0cb3e79fe7 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -4,32 +4,32 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
 
 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
 	getpricereduction POKENEWS_LILYCOVE
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
-	compare VAR_RESULT, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22022B
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman
+	compare VAR_RESULT, FALSE
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227
+LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman:: @ 8220227
 	clearflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B
+LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman:: @ 822022B
 	setflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
+LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman:: @ 822022F
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248
+	pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
+LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale: @ 8220248
 	.2byte DECOR_MUD_BALL
 	.2byte DECOR_FENCE_LENGTH
 	.2byte DECOR_FENCE_WIDTH
@@ -48,189 +48,189 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268
+LilycoveCity_DepartmentStoreRooftop_EventScript_Man:: @ 8220268
 	lock
 	faceplayer
 	getpricereduction POKENEWS_LILYCOVE
-	compare VAR_RESULT, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale:: @ 8220282
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, MSGBOX_NPC
+LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan:: @ 822028C
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295
+LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 8220295
 	lockall
-	message LilycoveCity_DepartmentStoreRooftop_Text_22056D
+	message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike
 	waitmessage
 	showmoneybox 0, 0, 0
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6
+LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 82202A6
 	multichoice 16, 0, MULTI_VENDING_MACHINE, 0
 	copyvar VAR_TEMP_1, VAR_RESULT
 	switch VAR_TEMP_1
-	case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4
-	case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF
-	case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
+	case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater
+	case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop
+	case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink, MSGBOX_DEFAULT
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4:: @ 82202E4
+LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater:: @ 82202E4
 	setvar VAR_TEMP_0, ITEM_FRESH_WATER
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF:: @ 82202EF
+LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop:: @ 82202EF
 	setvar VAR_TEMP_0, ITEM_SODA_POP
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA:: @ 82202FA
+LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade:: @ 82202FA
 	setvar VAR_TEMP_0, ITEM_LEMONADE
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22032F
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220305:: @ 8220305
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater:: @ 8220305
 	checkmoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22030C:: @ 822030C
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop:: @ 822030C
 	checkmoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220313:: @ 8220313
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 8220313
 	checkmoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22031A:: @ 822031A
+LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater:: @ 822031A
 	takemoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220321:: @ 8220321
+LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop:: @ 8220321
 	takemoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328
+LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade:: @ 8220328
 	takemoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
+LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	compare VAR_TEMP_1, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220305
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22030C
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220313
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink
 	checkitemspace VAR_TEMP_0, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	compare VAR_TEMP_1, 0
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22031A
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328
+	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_TakeMoneyLemonade
 	updatemoneybox 0, 0
 	bufferitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	random 64
+	random 64  @ 1/64 chance of an additional drink dropping
 	compare VAR_RESULT, 0
-	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
+	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
+	checkitemspace VAR_TEMP_0, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
+	playse SE_JIHANKI
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
+	giveitem VAR_TEMP_0, 1
+	bufferitemname 1, VAR_TEMP_0
+	bufferstdstring 2, STDSTRING_ITEMS
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
+	random 64  @ 1/64 * the prev 1/64 chance of a third additional drink dropping, ~ 0.02% chance
+	compare VAR_RESULT, 0
+	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
 	checkitemspace VAR_TEMP_0, 1
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
+	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	giveitem VAR_TEMP_0, 1
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, STDSTRING_ITEMS
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	random 64
-	compare VAR_RESULT, 0
-	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
-	checkitemspace VAR_TEMP_0, 1
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450
-	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT
-	giveitem VAR_TEMP_0, 1
-	bufferitemname 1, VAR_TEMP_0
-	bufferstdstring 2, STDSTRING_ITEMS
-	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436
-	message LilycoveCity_DepartmentStoreRooftop_Text_22056D
+LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink:: @ 8220436
+	message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike
 	waitmessage
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
+LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink:: @ 8220442
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney, MSGBOX_DEFAULT
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450
+LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E
+	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E
+LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E
 	hidemoneybox
 	nop
 	nop
 	releaseall
 	end
 
-LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463
+LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales: @ 8220463
 	.string "Don't they have set dates for their\n"
 	.string "clear-out sales?\p"
 	.string "I watch TV, but they never show any\n"
 	.string "commercials.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9
+LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale: @ 82204C9
 	.string "Yes! I've been waiting a long time for\n"
 	.string "this clear-out sale.\p"
 	.string "They have items that you can only get\n"
 	.string "here. I'm going to load up, that I am!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552
+LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty: @ 8220552
 	.string "Ohh… I'm bone-dry thirsty!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D
+LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike: @ 822056D
 	.string "It's a VENDING MACHINE.\n"
 	.string "Which drink would you like?$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1
+LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown: @ 82205A1
 	.string "Clang!\p"
 	.string "A can of {STR_VAR_1} dropped down.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2205C2: @ 82205C2
+LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown: @ 82205C2
 	.string "Clang!\p"
 	.string "Score! An extra can of {STR_VAR_1}\n"
 	.string "dropped down!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1
+LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney: @ 82205F1
 	.string "Not enough money…$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603
+LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink: @ 8220603
 	.string "Decided against buying a drink.$"
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
index 564377f7fe..0fc05dd5a5 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_Greeter",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A",
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_Azumarill",
       "flag": "0"
     }
   ],
@@ -131,7 +131,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D"
+      "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index 3f9378b7a2..117dc60347 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
@@ -1,27 +1,27 @@
 LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692
 	.byte 0
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_Greeter:: @ 821F693
+	msgbox LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
+LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C
 	lock
 	faceplayer
 	dotimebasedevents
-	compare VAR_POKELOT_PRIZE_ITEM, 0
-	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7
-	goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO
+	compare VAR_POKELOT_PRIZE_ITEM, ITEM_NONE
+	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier
+	goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow
+	msgbox LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain
 	setflag FLAG_DAILY_PICKED_LOTO_TICKET
-	message LilycoveCity_DepartmentStore_1F_Text_2A64C8
+	message LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket
 	waitmessage
 	special RetrieveLotteryNumber
 	copyvar VAR_0x8008, VAR_RESULT
 	special BufferLottoTicketNumber
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT
 	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PC_ON
@@ -33,142 +33,142 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8004, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoMatch
 	incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY
 	compare VAR_0x8006, 0
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon
 	compare VAR_0x8006, 1
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F784
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon
 	bufferitemname 0, VAR_0x8005
 	compare VAR_0x8004, 1
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7B9
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch
 	compare VAR_0x8004, 2
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7C2
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch
 	compare VAR_0x8004, 3
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7CB
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch
 	compare VAR_0x8004, 4
-	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7D4
+	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_FullMatch
 	giveitem_std VAR_0x8005
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD
-	special sub_80EE2CC
-	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom
+	special TryPutLotteryWinnerReportOnAir
+	goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon:: @ 821F77B
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon:: @ 821F784
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow:: @ 821F78D
+	msgbox LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain:: @ 821F797
+	msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, MSGBOX_DEFAULT
-	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF
+LilycoveCity_DepartmentStore_1F_EventScript_NoMatch:: @ 821F7A1
+	msgbox LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched, MSGBOX_DEFAULT
+	goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2:: @ 821F7AF
+	msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch:: @ 821F7B9
+	msgbox LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch:: @ 821F7C2
+	msgbox LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch:: @ 821F7CB
+	msgbox LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_FullMatch:: @ 821F7D4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD
+LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom:: @ 821F7DD
 	copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004
 	copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005
-	goto LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
+	goto LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 821F7ED
+	msgbox LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7
-	msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7
+	msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT
 	giveitem_std VAR_POKELOT_PRIZE_ITEM
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize
 	copyvar VAR_0x8004, VAR_POKELOT_PRIZE_PLACE
 	copyvar VAR_0x8005, VAR_POKELOT_PRIZE_ITEM
-	special sub_80EE2CC
-	setvar VAR_POKELOT_PRIZE_ITEM, 0
+	special TryPutLotteryWinnerReportOnAir
+	setvar VAR_POKELOT_PRIZE_ITEM, ITEM_NONE
 	setvar VAR_POKELOT_PRIZE_PLACE, 0
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_PokefanF:: @ 821F82F
+	msgbox LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl:: @ 821F838
+	msgbox LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, MSGBOX_NPC
+LilycoveCity_DepartmentStore_1F_EventScript_PokefanM:: @ 821F841
+	msgbox LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A
+LilycoveCity_DepartmentStore_1F_EventScript_Azumarill:: @ 821F84A
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, MSGBOX_DEFAULT
+	msgbox LilycoveCity_DepartmentStore_1F_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D
-	msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, MSGBOX_SIGN
+LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign:: @ 821F85D
+	msgbox LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866
+LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore: @ 821F866
 	.string "Welcome to LILYCOVE DEPARTMENT STORE.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C
+LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings: @ 821F88C
 	.string "Whenever I come to the DEPARTMENT\n"
 	.string "STORE, I always end up buying all sorts\l"
 	.string "of things because it's so fun.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5
+LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture: @ 821F8F5
 	.string "Today, my mom is going to buy me some\n"
 	.string "nice furniture.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B
+LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill: @ 821F92B
 	.string "I'm buying something for my AZUMARILL\n"
 	.string "as a reward for winning a CONTEST.$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974
+LilycoveCity_DepartmentStore_1F_Text_Azumarill: @ 821F974
 	.string "AZUMARILL: Maririroo!$"
 
-LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A
+LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign: @ 821F98A
 	.string "1F: SERVICE COUNTER\n"
 	.string "    LOTTERY CORNER\p"
 	.string "2F: TRAINER'S ZONE\p"
@@ -177,7 +177,8 @@ LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A
 	.string "5F: POKé DOLL FLOOR\p"
 	.string "ROOFTOP: ROOFTOP PLAZA$"
 
-LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13
+@ Unused
+LilycoveCity_DepartmentStore_1F_Text_WirelessCommIsFun: @ 821FA13
 	.string "Wireless Communication is a\n"
 	.string "lot of fun, isn't it?\p"
 	.string "I think it lets you do things that\n"
@@ -186,7 +187,8 @@ LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13
 	.string "with people you couldn't before.\p"
 	.string "I think it's going to be exciting!$"
 
-LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5
+@ Unused
+LilycoveCity_DepartmentStore_1F_Text_SpreadWordAboutWirelessComm: @ 821FAE5
 	.string "I want to spread the word about how\n"
 	.string "fun Wireless Communication can be.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
index 3238eeee88..fd30dc5164 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48",
+      "script": "LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 33f0bff9a1..9ced6b347b 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
@@ -1,30 +1,30 @@
 LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C
 	.byte 0
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D
-	msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, MSGBOX_NPC
+LilycoveCity_DepartmentStore_2F_EventScript_Cook:: @ 821FB2D
+	msgbox LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36
-	msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, MSGBOX_NPC
+LilycoveCity_DepartmentStore_2F_EventScript_PokefanF:: @ 821FB36
+	msgbox LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F
-	msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, MSGBOX_NPC
+LilycoveCity_DepartmentStore_2F_EventScript_Sailor:: @ 821FB3F
+	msgbox LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48
+LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft:: @ 821FB48
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60
+	pokemart LilycoveCity_DepartmentStore_2F_Pokemart1
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60
+LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
@@ -40,18 +40,18 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60
 	release
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A
+LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight:: @ 821FB7A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94
+	pokemart LilycoveCity_DepartmentStore_2F_Pokemart2
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94
+LilycoveCity_DepartmentStore_2F_Pokemart2: @ 821FB94
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_HYPER_POTION
@@ -66,15 +66,15 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94
 	release
 	end
 
-LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC
+LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly: @ 821FBAC
 	.string "Learn to use items properly.\n"
 	.string "That's basic, really.$"
 
-LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF
+LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband: @ 821FBDF
 	.string "My husband is waiting at home.\n"
 	.string "What would make a good gift for him?$"
 
-LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23
+LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems: @ 821FC23
 	.string "I'm leaving on a long journey soon.\n"
 	.string "I need to stock up on items.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
index 9ecf5104ae..cf25e1798f 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C",
+      "script": "LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 23c24b6814..bec38867c0 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
@@ -1,17 +1,17 @@
 LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64
 	.byte 0
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65
+LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: @ 821FC65
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C
+	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C
+LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins: @ 821FC7C
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_CALCIUM
 	.2byte ITEM_IRON
@@ -22,18 +22,18 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C
+LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight:: @ 821FC8C
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4
+	pokemart LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4
+LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters: @ 821FCA4
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_SPECIAL
 	.2byte ITEM_X_ATTACK
@@ -45,31 +45,31 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6
-	msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, MSGBOX_NPC
+LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM:: @ 821FCB6
+	msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF
-	msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, MSGBOX_NPC
+LilycoveCity_DepartmentStore_3F_EventScript_PokefanM:: @ 821FCBF
+	msgbox LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8
-	msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, MSGBOX_NPC
+LilycoveCity_DepartmentStore_3F_EventScript_Woman:: @ 821FCC8
+	msgbox LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1
+LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon: @ 821FCD1
 	.string "For quickly toughening up POKéMON,\n"
 	.string "items are the best.\p"
 	.string "PROTEIN boosts ATTACK,\n"
 	.string "and CALCIUM raises SP. ATK.$"
 
-LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B
+LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance: @ 821FD3B
 	.string "I want my POKéMON to have more\n"
 	.string "endurance.\p"
 	.string "I'm trying to decide whether to raise\n"
 	.string "DEFENSE with IRON, or SP. DEF with ZINC.$"
 
-LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4
+LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon: @ 821FDB4
 	.string "I gave a CARBOS to my POKéMON,\n"
 	.string "and its SPEED went up.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
index 2abccb7831..a95cf6c3e4 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C",
+      "script": "LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index 25bc7c33cf..441697a7cc 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
@@ -1,72 +1,72 @@
 LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA
 	.byte 0
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB
-	msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, MSGBOX_NPC
+LilycoveCity_DepartmentStore_4F_EventScript_Gentleman:: @ 821FDEB
+	msgbox LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4
-	msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, MSGBOX_NPC
+LilycoveCity_DepartmentStore_4F_EventScript_Woman:: @ 821FDF4
+	msgbox LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD
-	msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, MSGBOX_NPC
+LilycoveCity_DepartmentStore_4F_EventScript_Youngster:: @ 821FDFD
+	msgbox LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06
+LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft:: @ 821FE06
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20
+	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20
-	.2byte ITEM_TM38
-	.2byte ITEM_TM25
-	.2byte ITEM_TM14
-	.2byte ITEM_TM15
+LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs: @ 821FE20
+	.2byte ITEM_TM38  @ Fire Blast
+	.2byte ITEM_TM25  @ Thunder
+	.2byte ITEM_TM14  @ Blizzard
+	.2byte ITEM_TM15  @ Hyper Beam
 	.2byte ITEM_NONE
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C
+LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight:: @ 821FE2C
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44
+	pokemart LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_4F_Pokemart_21FE44: @ 821FE44
-	.2byte ITEM_TM17
-	.2byte ITEM_TM20
-	.2byte ITEM_TM33
-	.2byte ITEM_TM16
+LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs: @ 821FE44
+	.2byte ITEM_TM17  @ Protect
+	.2byte ITEM_TM20  @ Safeguard
+	.2byte ITEM_TM33  @ Reflect
+	.2byte ITEM_TM16  @ Light Screen
 	.2byte ITEM_NONE
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50
+LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM: @ 821FE50
 	.string "Hmm…\p"
 	.string "An attacking move…\n"
 	.string "Or a defensive move…\p"
 	.string "It's no easy matter to decide which TM\n"
 	.string "moves should be taught to POKéMON…$"
 
-LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7
+LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs: @ 821FEC7
 	.string "There are so many different kinds of\n"
 	.string "TM moves.\p"
 	.string "A catalog I read said there are fifty\n"
 	.string "different kinds.$"
 
-LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D
+LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves: @ 821FF2D
 	.string "I'd like to get all the different TMs,\n"
 	.string "but a POKéMON learns only four moves.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
index a49de92558..98d15787ed 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075",
+      "script": "LilycoveCity_DepartmentStore_5F_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 79943cec3a..012fe12f53 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
@@ -1,19 +1,21 @@
 LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_MapScript2_21FF80
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp
 	.byte 0
 
-LilycoveCity_DepartmentStore_5F_MapScript2_21FF80: @ 821FF80
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_21FF9A
+@ During the unusual weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
+@ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors
+LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
 	.2byte 0
 
-LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A
+LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs:: @ 821FF9A
 	setobjectxy 7, 16, 2
 	turnobject 7, DIR_NORTH
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @ 821FFA6
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -41,7 +43,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft:: @ 821FFDC
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -66,7 +68,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight:: @ 822000A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -91,7 +93,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight:: @ 822003A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -117,53 +119,53 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C
-	msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, MSGBOX_NPC
+LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: @ 822006C
+	msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075
+LilycoveCity_DepartmentStore_5F_EventScript_Woman:: @ 8220075
 	lockall
 	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
-	goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C
+	goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C
-	goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7
+	goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal
+	goto LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C
-	msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: @ 822009C
+	msgbox LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7
-	msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT
+LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: @ 82200A7
+	msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC
-	msgbox LilycoveCity_DepartmentStore_5F_Text_220122, MSGBOX_NPC
+LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl:: @ 82200BC
+	msgbox LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5
+LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls: @ 82200C5
 	.string "This place is full of cute DOLLS.\p"
 	.string "I should buy some for me, instead of\n"
 	.string "just for my children.$"
 
-LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122
+LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon: @ 8220122
 	.string "I'm not big enough to raise POKéMON,\n"
 	.string "so I'm getting a cute DOLL instead.$"
 
-LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B
+LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere: @ 822016B
 	.string "They sell many cute MATS here.\p"
 	.string "I wonder which one I should get?\n"
 	.string "Maybe I'll buy them all…$"
 
-LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4
+LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather: @ 82201C4
 	.string "I think they closed the rooftop\n"
 	.string "because the weather is wild today.$"
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
index 023717a59a..4f87f50b0a 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF",
+      "script": "LilycoveCity_PokemonCenter_1F_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon",
-      "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY"
+      "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON"
     }
   ],
   "warp_events": [
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index 09b18f4bd9..a7df8528e6 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -5,26 +5,28 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
 
 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
-	goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6
+	goto LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6
+@ SetLilycoveLadyGfx returns TRUE if its the Contest Lady
+LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx:: @ 821C5C6
 	special SetLilycoveLadyGfx
-	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0
-	compare VAR_RESULT, 1
-	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4
+	compare VAR_RESULT, FALSE
+	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon
+	compare VAR_RESULT, TRUE
+	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0
-	setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
+LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon:: @ 821C5E0
+	setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4
-	clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
+LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon:: @ 821C5E4
+	clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8
+@ VAR_0x800B is the Nurse's object event id
+LilycoveCity_PokemonCenter_1F_EventScript_Nurse:: @ 821C5E8
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -32,35 +34,35 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6
-	msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, MSGBOX_NPC
+LilycoveCity_PokemonCenter_1F_EventScript_Boy:: @ 821C5F6
+	msgbox LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF
+LilycoveCity_PokemonCenter_1F_EventScript_Maniac:: @ 821C5FF
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_21C614
-	msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone
+	msgbox LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614
-	msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone:: @ 821C614
+	msgbox LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E
+LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon: @ 821C61E
 	.string "I wonder how many kinds of POKéMON\n"
 	.string "there are in the world.\p"
 	.string "It'd be great to cross seas and\n"
 	.string "trade POKéMON with people far away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D
+LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels: @ 821C69D
 	.string "I've been hearing about some rotten\n"
 	.string "scoundrels who steal POKéMON and rip\l"
 	.string "off METEORITES.$"
 
-LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6
+LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels: @ 821C6F6
 	.string "Those rotten scoundrels who steal\n"
 	.string "POKéMON and rip off METEORITES…\p"
 	.string "I haven't seen them around recently.$"
diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
index 37bad78ffb..ce7474c6f9 100644
--- a/data/maps/MagmaHideout_1F/map.json
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MagmaHideout_1F_EventScript_Grunt38",
+      "script": "MagmaHideout_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_1F_EventScript_Grunt39",
+      "script": "MagmaHideout_1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 6b41021a9c..7c6997ca2c 100644
--- a/data/maps/MagmaHideout_1F/scripts.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -6,33 +6,33 @@ MagmaHideout_1F_OnTransition: @ 8239886
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-MagmaHideout_1F_EventScript_Grunt38:: @ 823988C
-	trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_Grunt38Intro, MagmaHideout_1F_Text_Grunt38Defeat
-	msgbox MagmaHideout_1F_Text_Grunt38PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_1F_EventScript_Grunt1:: @ 823988C
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_1, MagmaHideout_1F_Text_Grunt1Intro, MagmaHideout_1F_Text_Grunt1Defeat
+	msgbox MagmaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_1F_EventScript_Grunt39:: @ 82398A3
-	trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_Grunt39Intro, MagmaHideout_1F_Text_Grunt39Defeat
-	msgbox MagmaHideout_1F_Text_Grunt39PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_1F_EventScript_Grunt2:: @ 82398A3
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_2, MagmaHideout_1F_Text_Grunt2Intro, MagmaHideout_1F_Text_Grunt2Defeat
+	msgbox MagmaHideout_1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_1F_Text_Grunt38Intro: @ 82398BA
+MagmaHideout_1F_Text_Grunt1Intro: @ 82398BA
 	.string "When TEAM MAGMA has roll call, we get\n"
 	.string "important guarding assignments in\l"
 	.string "the order that we line up.\p"
 	.string "That's why I'm stuck off in this corner.\n"
 	.string "I'm always late to roll call!$"
 
-MagmaHideout_1F_Text_Grunt38Defeat: @ 8239964
+MagmaHideout_1F_Text_Grunt1Defeat: @ 8239964
 	.string "I'm always late for training sessions,\n"
 	.string "too!\p"
 	.string "I hate to say it, but I'm wimpy…$"
 
-MagmaHideout_1F_Text_Grunt38PostBattle: @ 82399B1
+MagmaHideout_1F_Text_Grunt1PostBattle: @ 82399B1
 	.string "Okay, I'll try to put a little more\n"
 	.string "effort into things from now on…$"
 
-MagmaHideout_1F_Text_Grunt39Intro: @ 82399F5
+MagmaHideout_1F_Text_Grunt2Intro: @ 82399F5
 	.string "Our leader told us to dig into\n"
 	.string "MT. CHIMNEY, so we dug and dug.\p"
 	.string "And in the course of digging, we came\n"
@@ -41,11 +41,11 @@ MagmaHideout_1F_Text_Grunt39Intro: @ 82399F5
 	.string "Fuhahaha!\n"
 	.string "I'll tell you if you beat me!$"
 
-MagmaHideout_1F_Text_Grunt39Defeat: @ 8239ABA
+MagmaHideout_1F_Text_Grunt2Defeat: @ 8239ABA
 	.string "Arrgh!\n"
 	.string "Taken down!$"
 
-MagmaHideout_1F_Text_Grunt39PostBattle: @ 8239ACD
+MagmaHideout_1F_Text_Grunt2PostBattle: @ 8239ACD
 	.string "I won't tell you after all.\n"
 	.string "You'll find out when you get there!\p"
 	.string "It'd be better if you saved surprises\n"
diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json
index 6b0d9614d4..a059ed3d9b 100644
--- a/data/maps/MagmaHideout_2F_1R/map.json
+++ b/data/maps/MagmaHideout_2F_1R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MagmaHideout_2F_1R_EventScript_Grunt41",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 6,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_2F_1R_EventScript_Grunt42",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt5",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "MagmaHideout_2F_1R_EventScript_Grunt51",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt14",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_2F_1R_EventScript_Grunt40",
+      "script": "MagmaHideout_2F_1R_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     }
   ],
diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc
index b6c3154b00..6f117c0062 100644
--- a/data/maps/MagmaHideout_2F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_1R/scripts.inc
@@ -1,27 +1,27 @@
 MagmaHideout_2F_1R_MapScripts:: @ 8239B50
 	.byte 0
 
-MagmaHideout_2F_1R_EventScript_Grunt51:: @ 8239B51
-	trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_Grunt51Intro, MagmaHideout_2F_1R_Text_Grunt51Defeat
-	msgbox MagmaHideout_2F_1R_Text_Grunt51PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt14:: @ 8239B51
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_14, MagmaHideout_2F_1R_Text_Grunt14Intro, MagmaHideout_2F_1R_Text_Grunt14Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt14PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_Grunt40:: @ 8239B68
-	trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_Grunt40Intro, MagmaHideout_2F_1R_Text_Grunt40Defeat
-	msgbox MagmaHideout_2F_1R_Text_Grunt40PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt3:: @ 8239B68
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_3, MagmaHideout_2F_1R_Text_Grunt3Intro, MagmaHideout_2F_1R_Text_Grunt3Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_Grunt41:: @ 8239B7F
-	trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_Grunt41Intro, MagmaHideout_2F_1R_Text_Grunt41Defeat
-	msgbox MagmaHideout_2F_1R_Text_Grunt41PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt4:: @ 8239B7F
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_4, MagmaHideout_2F_1R_Text_Grunt4Intro, MagmaHideout_2F_1R_Text_Grunt4Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_Grunt42:: @ 8239B96
-	trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_Grunt42Intro, MagmaHideout_2F_1R_Text_Grunt42Defeat
-	msgbox MagmaHideout_2F_1R_Text_Grunt42PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_1R_EventScript_Grunt5:: @ 8239B96
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_5, MagmaHideout_2F_1R_Text_Grunt5Intro, MagmaHideout_2F_1R_Text_Grunt5Defeat
+	msgbox MagmaHideout_2F_1R_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_Text_Grunt51Intro: @ 8239BAD
+MagmaHideout_2F_1R_Text_Grunt14Intro: @ 8239BAD
 	.string "What, what, what?\p"
 	.string "Only TEAM MAGMA members are supposed\n"
 	.string "to be in here!\p"
@@ -30,46 +30,46 @@ MagmaHideout_2F_1R_Text_Grunt51Intro: @ 8239BAD
 	.string "You rouse my suspicion!\n"
 	.string "Battle with me!$"
 
-MagmaHideout_2F_1R_Text_Grunt51Defeat: @ 8239C4B
+MagmaHideout_2F_1R_Text_Grunt14Defeat: @ 8239C4B
 	.string "Aiyiyi…\n"
 	.string "My pride as a TEAM MAGMA member…$"
 
-MagmaHideout_2F_1R_Text_Grunt51PostBattle: @ 8239C74
+MagmaHideout_2F_1R_Text_Grunt14PostBattle: @ 8239C74
 	.string "If you suffer from chills, you should\n"
 	.string "join TEAM MAGMA.$"
 
-MagmaHideout_2F_1R_Text_Grunt40Intro: @ 8239CAB
+MagmaHideout_2F_1R_Text_Grunt3Intro: @ 8239CAB
 	.string "Hold it right there!\p"
 	.string "You don't really expect me to keep\n"
 	.string "my trap shut and let you waltz by me?$"
 
-MagmaHideout_2F_1R_Text_Grunt40Defeat: @ 8239D09
+MagmaHideout_2F_1R_Text_Grunt3Defeat: @ 8239D09
 	.string "Ooh wow!\n"
 	.string "I concede!$"
 
-MagmaHideout_2F_1R_Text_Grunt40PostBattle: @ 8239D1D
+MagmaHideout_2F_1R_Text_Grunt3PostBattle: @ 8239D1D
 	.string "Maybe it would've been better if I did\n"
 	.string "just let you go unchallenged…$"
 
-MagmaHideout_2F_1R_Text_Grunt41Intro: @ 8239D62
+MagmaHideout_2F_1R_Text_Grunt4Intro: @ 8239D62
 	.string "Ahah!\n"
 	.string "An intruder!$"
 
-MagmaHideout_2F_1R_Text_Grunt41Defeat: @ 8239D75
+MagmaHideout_2F_1R_Text_Grunt4Defeat: @ 8239D75
 	.string "Graaah!$"
 
-MagmaHideout_2F_1R_Text_Grunt41PostBattle: @ 8239D7D
+MagmaHideout_2F_1R_Text_Grunt4PostBattle: @ 8239D7D
 	.string "I've already lost.\p"
 	.string "Do I really need to keep running\n"
 	.string "around in a circle?$"
 
-MagmaHideout_2F_1R_Text_Grunt42Intro: @ 8239DC5
+MagmaHideout_2F_1R_Text_Grunt5Intro: @ 8239DC5
 	.string "Oh, oh!\n"
 	.string "An intruder!$"
 
-MagmaHideout_2F_1R_Text_Grunt42Defeat: @ 8239DDA
+MagmaHideout_2F_1R_Text_Grunt5Defeat: @ 8239DDA
 	.string "Mutter…$"
 
-MagmaHideout_2F_1R_Text_Grunt42PostBattle: @ 8239DE2
+MagmaHideout_2F_1R_Text_Grunt5PostBattle: @ 8239DE2
 	.string "Actually, I'm no expert at battling…$"
 
diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json
index 8befdc42ad..5d70de4899 100644
--- a/data/maps/MagmaHideout_2F_2R/map.json
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "MagmaHideout_2F_2R_EventScript_Grunt45",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt8",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MagmaHideout_2F_2R_EventScript_Grunt44",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt7",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_2F_2R_EventScript_Grunt43",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt6",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MagmaHideout_2F_2R_EventScript_Grunt52",
+      "script": "MagmaHideout_2F_2R_EventScript_Grunt15",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc
index af63aa5de5..d0121f9534 100644
--- a/data/maps/MagmaHideout_2F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_2R/scripts.inc
@@ -1,78 +1,78 @@
 MagmaHideout_2F_2R_MapScripts:: @ 8239E07
 	.byte 0
 
-MagmaHideout_2F_2R_EventScript_Grunt52:: @ 8239E08
-	trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_Grunt52Intro, MagmaHideout_2F_2R_Text_Grunt52Defeat
-	msgbox MagmaHideout_2F_2R_Text_Grunt52PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt15:: @ 8239E08
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_15, MagmaHideout_2F_2R_Text_Grunt15Intro, MagmaHideout_2F_2R_Text_Grunt15Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt15PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_Grunt43:: @ 8239E1F
-	trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_Grunt43Intro, MagmaHideout_2F_2R_Text_Grunt43Defeat
-	msgbox MagmaHideout_2F_2R_Text_Grunt43PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt6:: @ 8239E1F
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_6, MagmaHideout_2F_2R_Text_Grunt6Intro, MagmaHideout_2F_2R_Text_Grunt6Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_Grunt44:: @ 8239E36
-	trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_Grunt44Intro, MagmaHideout_2F_2R_Text_Grunt44Defeat
-	msgbox MagmaHideout_2F_2R_Text_Grunt44PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt7:: @ 8239E36
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_7, MagmaHideout_2F_2R_Text_Grunt7Intro, MagmaHideout_2F_2R_Text_Grunt7Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_Grunt45:: @ 8239E4D
-	trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_Grunt45Intro, MagmaHideout_2F_2R_Text_Grunt45Defeat
-	msgbox MagmaHideout_2F_2R_Text_Grunt45PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_2F_2R_EventScript_Grunt8:: @ 8239E4D
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_8, MagmaHideout_2F_2R_Text_Grunt8Intro, MagmaHideout_2F_2R_Text_Grunt8Defeat
+	msgbox MagmaHideout_2F_2R_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_Text_Grunt52Intro: @ 8239E64
+MagmaHideout_2F_2R_Text_Grunt15Intro: @ 8239E64
 	.string "I don't have a bone to pick with you.\n"
 	.string "I'm just following orders!$"
 
-MagmaHideout_2F_2R_Text_Grunt52Defeat: @ 8239EA5
+MagmaHideout_2F_2R_Text_Grunt15Defeat: @ 8239EA5
 	.string "I may have lost, but…$"
 
-MagmaHideout_2F_2R_Text_Grunt52PostBattle: @ 8239EBB
+MagmaHideout_2F_2R_Text_Grunt15PostBattle: @ 8239EBB
 	.string "We dug up something beyond belief!\n"
 	.string "And, we got the BLUE ORB!\p"
 	.string "All that's left is for our leader to…\n"
 	.string "Fufufu… Fwahahaha!$"
 
-MagmaHideout_2F_2R_Text_Grunt43Intro: @ 8239F31
+MagmaHideout_2F_2R_Text_Grunt6Intro: @ 8239F31
 	.string "I can't stand heat. Maybe I should've\n"
 	.string "joined TEAM AQUA instead…$"
 
-MagmaHideout_2F_2R_Text_Grunt43Defeat: @ 8239F71
+MagmaHideout_2F_2R_Text_Grunt6Defeat: @ 8239F71
 	.string "Yeah, I really may not be right for\n"
 	.string "TEAM MAGMA…$"
 
-MagmaHideout_2F_2R_Text_Grunt43PostBattle: @ 8239FA1
+MagmaHideout_2F_2R_Text_Grunt6PostBattle: @ 8239FA1
 	.string "Don't you get lonely for the sea\n"
 	.string "being in a place like this?$"
 
-MagmaHideout_2F_2R_Text_Grunt44Intro: @ 8239FDE
+MagmaHideout_2F_2R_Text_Grunt7Intro: @ 8239FDE
 	.string "You can hear tremors here sometimes.\p"
 	.string "Could it be the volcano rattling?\n"
 	.string "Or is it GROU…\p"
 	.string "Whoops!\n"
 	.string "No, no, never mind!$"
 
-MagmaHideout_2F_2R_Text_Grunt44Defeat: @ 823A050
+MagmaHideout_2F_2R_Text_Grunt7Defeat: @ 823A050
 	.string "You're a fiery battler.\n"
 	.string "Just like a volcano!$"
 
-MagmaHideout_2F_2R_Text_Grunt44PostBattle: @ 823A07D
+MagmaHideout_2F_2R_Text_Grunt7PostBattle: @ 823A07D
 	.string "You just happened to win this time,\n"
 	.string "but that doesn't matter.\p"
 	.string "TEAM MAGMA's goal is about to be\n"
 	.string "reached!$"
 
-MagmaHideout_2F_2R_Text_Grunt45Intro: @ 823A0E4
+MagmaHideout_2F_2R_Text_Grunt8Intro: @ 823A0E4
 	.string "One of our guys was freaking out that\n"
 	.string "he lost his MAGMA EMBLEM…\p"
 	.string "Wait a minute!\n"
 	.string "Was it you who found it?$"
 
-MagmaHideout_2F_2R_Text_Grunt45Defeat: @ 823A14C
+MagmaHideout_2F_2R_Text_Grunt8Defeat: @ 823A14C
 	.string "I'm having trouble believing this…$"
 
-MagmaHideout_2F_2R_Text_Grunt45PostBattle: @ 823A16F
+MagmaHideout_2F_2R_Text_Grunt8PostBattle: @ 823A16F
 	.string "I'm getting this feeling that our plan\n"
 	.string "is going to end in failure…$"
 
diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json
index ef370ee8b9..edf3e66716 100644
--- a/data/maps/MagmaHideout_3F_1R/map.json
+++ b/data/maps/MagmaHideout_3F_1R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "MagmaHideout_3F_1R_EventScript_Grunt46",
+      "script": "MagmaHideout_3F_1R_EventScript_Grunt9",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MagmaHideout_3F_1R_EventScript_Grunt53",
+      "script": "MagmaHideout_3F_1R_EventScript_Grunt16",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc
index a54e38c659..04e5526aee 100644
--- a/data/maps/MagmaHideout_3F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_1R/scripts.inc
@@ -1,29 +1,29 @@
 MagmaHideout_3F_1R_MapScripts:: @ 823A1B2
 	.byte 0
 
-MagmaHideout_3F_1R_EventScript_Grunt46:: @ 823A1B3
-	trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_Grunt46Intro, MagmaHideout_3F_1R_Text_Grunt46Defeat
-	msgbox MagmaHideout_3F_1R_Text_Grunt46PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_3F_1R_EventScript_Grunt9:: @ 823A1B3
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_9, MagmaHideout_3F_1R_Text_Grunt9Intro, MagmaHideout_3F_1R_Text_Grunt9Defeat
+	msgbox MagmaHideout_3F_1R_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_1R_EventScript_Grunt53:: @ 823A1CA
-	trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_Grunt53Intro, MagmaHideout_3F_1R_Text_Grunt53Defeat
-	msgbox MagmaHideout_3F_1R_Text_Grunt53PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_3F_1R_EventScript_Grunt16:: @ 823A1CA
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_16, MagmaHideout_3F_1R_Text_Grunt16Intro, MagmaHideout_3F_1R_Text_Grunt16Defeat
+	msgbox MagmaHideout_3F_1R_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_1R_Text_Grunt46Intro: @ 823A1E1
+MagmaHideout_3F_1R_Text_Grunt9Intro: @ 823A1E1
 	.string "What did I do to deserve this guard\n"
 	.string "posting?\p"
 	.string "My left ear is burning up!$"
 
-MagmaHideout_3F_1R_Text_Grunt46Defeat: @ 823A229
+MagmaHideout_3F_1R_Text_Grunt9Defeat: @ 823A229
 	.string "I'm getting heat exhaustion…$"
 
-MagmaHideout_3F_1R_Text_Grunt46PostBattle: @ 823A246
+MagmaHideout_3F_1R_Text_Grunt9PostBattle: @ 823A246
 	.string "Do you think it's odd that we're wearing\n"
 	.string "hoods in this magma-filled volcano?$"
 
-MagmaHideout_3F_1R_Text_Grunt53Intro: @ 823A293
+MagmaHideout_3F_1R_Text_Grunt16Intro: @ 823A293
 	.string "We joined so we can help our leader\n"
 	.string "achieve his fantastic vision.\p"
 	.string "I don't care if you're with TEAM AQUA\n"
@@ -31,11 +31,11 @@ MagmaHideout_3F_1R_Text_Grunt53Intro: @ 823A293
 	.string "No one interferes with us and gets\n"
 	.string "away with it!$"
 
-MagmaHideout_3F_1R_Text_Grunt53Defeat: @ 823A353
+MagmaHideout_3F_1R_Text_Grunt16Defeat: @ 823A353
 	.string "Oh, no!\n"
 	.string "You're not to be trusted at all!$"
 
-MagmaHideout_3F_1R_Text_Grunt53PostBattle: @ 823A37C
+MagmaHideout_3F_1R_Text_Grunt16PostBattle: @ 823A37C
 	.string "Listen to me.\n"
 	.string "TEAM MAGMA is right!\p"
 	.string "Don't listen to TEAM AQUA.\n"
diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json
index c6fc9906cb..70dd1bdf8f 100644
--- a/data/maps/MagmaHideout_3F_2R/map.json
+++ b/data/maps/MagmaHideout_3F_2R/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_3F_2R_EventScript_Grunt47",
+      "script": "MagmaHideout_3F_2R_EventScript_Grunt10",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc
index 968754b06d..06f371151e 100644
--- a/data/maps/MagmaHideout_3F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_2R/scripts.inc
@@ -1,12 +1,12 @@
 MagmaHideout_3F_2R_MapScripts:: @ 823A3D4
 	.byte 0
 
-MagmaHideout_3F_2R_EventScript_Grunt47:: @ 823A3D5
-	trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_Grunt47Intro, MagmaHideout_3F_2R_Text_Grunt47Defeat
-	msgbox MagmaHideout_3F_2R_Text_Grunt47PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_3F_2R_EventScript_Grunt10:: @ 823A3D5
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_10, MagmaHideout_3F_2R_Text_Grunt10Intro, MagmaHideout_3F_2R_Text_Grunt10Defeat
+	msgbox MagmaHideout_3F_2R_Text_Grunt10PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_2R_Text_Grunt47Intro: @ 823A3EC
+MagmaHideout_3F_2R_Text_Grunt10Intro: @ 823A3EC
 	.string "I understand everything our leader\n"
 	.string "says. But you know what?\p"
 	.string "Doing stuff like digging up a super-\n"
@@ -15,11 +15,11 @@ MagmaHideout_3F_2R_Text_Grunt47Intro: @ 823A3EC
 	.string "I think we're going a little too far.\n"
 	.string "What do you think?$"
 
-MagmaHideout_3F_2R_Text_Grunt47Defeat: @ 823A4BB
+MagmaHideout_3F_2R_Text_Grunt10Defeat: @ 823A4BB
 	.string "Yeah, I think we are doing something\n"
 	.string "wrong somehow.$"
 
-MagmaHideout_3F_2R_Text_Grunt47PostBattle: @ 823A4EF
+MagmaHideout_3F_2R_Text_Grunt10PostBattle: @ 823A4EF
 	.string "You know, losing to you cleared my mind.\p"
 	.string "The next time I see our leader,\n"
 	.string "I'm going to ask him about what we do.$"
diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json
index e7ea5b6693..b01200f08a 100644
--- a/data/maps/MagmaHideout_4F/map.json
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_4F_EventScript_Grunt48",
+      "script": "MagmaHideout_4F_EventScript_Grunt11",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_4F_EventScript_Grunt49",
+      "script": "MagmaHideout_4F_EventScript_Grunt12",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MagmaHideout_4F_EventScript_Grunt50",
+      "script": "MagmaHideout_4F_EventScript_Grunt13",
       "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS"
     },
     {
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 1c5ea4dbb8..44a1353684 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -108,19 +108,19 @@ MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680
 	delay_16
 	step_end
 
-MagmaHideout_4F_EventScript_Grunt48:: @ 823A68C
-	trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_Grunt48Intro, MagmaHideout_4F_Text_Grunt48Defeat
-	msgbox MagmaHideout_4F_Text_Grunt48PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Grunt11:: @ 823A68C
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_11, MagmaHideout_4F_Text_Grunt11Intro, MagmaHideout_4F_Text_Grunt11Defeat
+	msgbox MagmaHideout_4F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_Grunt49:: @ 823A6A3
-	trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_Grunt49Intro, MagmaHideout_4F_Text_Grunt49Defeat
-	msgbox MagmaHideout_4F_Text_Grunt49PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Grunt12:: @ 823A6A3
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_12, MagmaHideout_4F_Text_Grunt12Intro, MagmaHideout_4F_Text_Grunt12Defeat
+	msgbox MagmaHideout_4F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_Grunt50:: @ 823A6BA
-	trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_Grunt50Intro, MagmaHideout_4F_Text_Grunt50Defeat
-	msgbox MagmaHideout_4F_Text_Grunt50PostBattle, MSGBOX_AUTOCLOSE
+MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
+	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_13, MagmaHideout_4F_Text_Grunt13Intro, MagmaHideout_4F_Text_Grunt13Defeat
+	msgbox MagmaHideout_4F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
@@ -128,41 +128,41 @@ MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
 	msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_Text_Grunt48Intro: @ 823A6E8
+MagmaHideout_4F_Text_Grunt11Intro: @ 823A6E8
 	.string "I want to see GROUDON, too, but they\n"
 	.string "won't let me see even its tail…\p"
 	.string "It's got me feeling really frustrated.\p"
 	.string "Oh, no!\n"
 	.string "I blabbed about GROUDON!$"
 
-MagmaHideout_4F_Text_Grunt48Defeat: @ 823A775
+MagmaHideout_4F_Text_Grunt11Defeat: @ 823A775
 	.string "I guess it's impossible to win if one\n"
 	.string "doesn't have a calm mind…$"
 
-MagmaHideout_4F_Text_Grunt48PostBattle: @ 823A7B5
+MagmaHideout_4F_Text_Grunt11PostBattle: @ 823A7B5
 	.string "I wonder if GROUDON even has a tail?$"
 
-MagmaHideout_4F_Text_Grunt49Intro: @ 823A7DA
+MagmaHideout_4F_Text_Grunt12Intro: @ 823A7DA
 	.string "Fuhahaha!\n"
 	.string "Soon! Very soon!\l"
 	.string "Our grand objective will be achieved!$"
 
-MagmaHideout_4F_Text_Grunt49Defeat: @ 823A81B
+MagmaHideout_4F_Text_Grunt12Defeat: @ 823A81B
 	.string "Grrr…\n"
 	.string "I've come so far, but now this?$"
 
-MagmaHideout_4F_Text_Grunt49PostBattle: @ 823A841
+MagmaHideout_4F_Text_Grunt12PostBattle: @ 823A841
 	.string "MAXIE, sir!\n"
 	.string "An intruder is headed your way!$"
 
-MagmaHideout_4F_Text_Grunt50Intro: @ 823A86D
+MagmaHideout_4F_Text_Grunt13Intro: @ 823A86D
 	.string "You're not finished yet!\n"
 	.string "You're not getting by me easily!$"
 
-MagmaHideout_4F_Text_Grunt50Defeat: @ 823A8A7
+MagmaHideout_4F_Text_Grunt13Defeat: @ 823A8A7
 	.string "Was I that easy to knock down?$"
 
-MagmaHideout_4F_Text_Grunt50PostBattle: @ 823A8C6
+MagmaHideout_4F_Text_Grunt13PostBattle: @ 823A8C6
 	.string "C-come on, one more match…$"
 
 MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1
diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json
index 598ed6e526..72e323bfed 100644
--- a/data/maps/MauvilleCity_Mart/map.json
+++ b/data/maps/MauvilleCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Mart_EventScript_2110E6",
+      "script": "MauvilleCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Mart_EventScript_21111C",
+      "script": "MauvilleCity_Mart_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Mart_EventScript_211125",
+      "script": "MauvilleCity_Mart_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 25d52e0157..b288d42b7d 100644
--- a/data/maps/MauvilleCity_Mart/scripts.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
@@ -1,18 +1,18 @@
 MauvilleCity_Mart_MapScripts:: @ 82110E5
 	.byte 0
 
-MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6
+MauvilleCity_Mart_EventScript_Clerk:: @ 82110E6
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart MauvilleCity_Mart_Pokemart_211100
+	pokemart MauvilleCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-MauvilleCity_Mart_Pokemart_211100: @ 8211100
+MauvilleCity_Mart_Pokemart: @ 8211100
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
@@ -29,15 +29,15 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100
 	release
 	end
 
-MauvilleCity_Mart_EventScript_21111C:: @ 821111C
-	msgbox MauvilleCity_Mart_Text_21112E, MSGBOX_NPC
+MauvilleCity_Mart_EventScript_ExpertM:: @ 821111C
+	msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC
 	end
 
-MauvilleCity_Mart_EventScript_211125:: @ 8211125
-	msgbox MauvilleCity_Mart_Text_2111D8, MSGBOX_NPC
+MauvilleCity_Mart_EventScript_Man:: @ 8211125
+	msgbox MauvilleCity_Mart_Text_DecisionsDetermineBattle, MSGBOX_NPC
 	end
 
-MauvilleCity_Mart_Text_21112E: @ 821112E
+MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats: @ 821112E
 	.string "There are items that temporarily\n"
 	.string "elevate the stats of POKéMON.\p"
 	.string "The ones I know you use in battle\n"
@@ -45,7 +45,7 @@ MauvilleCity_Mart_Text_21112E: @ 821112E
 	.string "I do believe that there are others\n"
 	.string "like them.$"
 
-MauvilleCity_Mart_Text_2111D8: @ 82111D8
+MauvilleCity_Mart_Text_DecisionsDetermineBattle: @ 82111D8
 	.string "Use a certain move, or use an item\n"
 	.string "instead…\p"
 	.string "The TRAINER's decisions determine how\n"
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
index c5fd1b32f1..6540334bef 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98",
+      "script": "MauvilleCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index dd302167bd..f37f362e21 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -6,14 +6,15 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
 	setrespawn HEAL_LOCATION_MAUVILLE_CITY
 	call Common_EventScript_UpdateBrineyLocation
-	goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
+	goto MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74
+MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8210E74
 	special ScrSpecial_SetMauvilleOldManEventObjGfx
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
+@ VAR_0x800B is the Nurse's object event id
+MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: @ 8210E78
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -21,32 +22,32 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, MSGBOX_NPC
+MauvilleCity_PokemonCenter_1F_EventScript_Woman1:: @ 8210E86
+	msgbox MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, MSGBOX_NPC
+MauvilleCity_PokemonCenter_1F_EventScript_Woman2:: @ 8210E8F
+	msgbox MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98
-	msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, MSGBOX_NPC
+MauvilleCity_PokemonCenter_1F_EventScript_Youngster:: @ 8210E98
+	msgbox MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1
+MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings: @ 8210EA1
 	.string "That man over there, he says weird\n"
 	.string "things!\p"
 	.string "He's funny in a weird way.\n"
 	.string "I doubt I'll forget about him!$"
 
-MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06
+MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner: @ 8210F06
 	.string "When I accessed the RECORD CORNER,\n"
 	.string "the data for what's hot in DEWFORD\l"
 	.string "got updated.\p"
 	.string "Now that bit of data is the same\n"
 	.string "as my friend's!$"
 
-MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A
+MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun: @ 8210F8A
 	.string "A RECORD CORNER opened upstairs in\n"
 	.string "the POKéMON CENTER.\p"
 	.string "I don't know what it's about, but it\n"
diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json
index bd14a30c16..8be148fada 100644
--- a/data/maps/MossdeepCity_Mart/map.json
+++ b/data/maps/MossdeepCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_2223C8",
+      "script": "MossdeepCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_2223F6",
+      "script": "MossdeepCity_Mart_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_2223FF",
+      "script": "MossdeepCity_Mart_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_Mart_EventScript_222408",
+      "script": "MossdeepCity_Mart_EventScript_Sailor",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index 1a555af489..c0d0ae3116 100644
--- a/data/maps/MossdeepCity_Mart/scripts.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
@@ -1,18 +1,18 @@
 MossdeepCity_Mart_MapScripts:: @ 82223C7
 	.byte 0
 
-MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8
+MossdeepCity_Mart_EventScript_Clerk:: @ 82223C8
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart MossdeepCity_Mart_Pokemart_2223E0
+	pokemart MossdeepCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0
+MossdeepCity_Mart_Pokemart: @ 82223E0
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_NET_BALL
 	.2byte ITEM_DIVE_BALL
@@ -26,31 +26,31 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0
 	release
 	end
 
-MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6
-	msgbox MossdeepCity_Mart_Text_222411, MSGBOX_NPC
+MossdeepCity_Mart_EventScript_Woman:: @ 82223F6
+	msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF
-	msgbox MossdeepCity_Mart_Text_2224A0, MSGBOX_NPC
+MossdeepCity_Mart_EventScript_Boy:: @ 82223FF
+	msgbox MossdeepCity_Mart_Text_MaxRepelLastsLongest, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_EventScript_222408:: @ 8222408
-	msgbox MossdeepCity_Mart_Text_2224FA, MSGBOX_NPC
+MossdeepCity_Mart_EventScript_Sailor:: @ 8222408
+	msgbox MossdeepCity_Mart_Text_NetAndDiveBallsRare, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_Text_222411: @ 8222411
+MossdeepCity_Mart_Text_ReviveIsFantastic: @ 8222411
 	.string "REVIVE is fantastic!\p"
 	.string "Give it to a fainted POKéMON,\n"
 	.string "and the POKéMON will arise.\p"
 	.string "But be careful, REVIVE doesn't restore\n"
 	.string "the used-up PP of moves.$"
 
-MossdeepCity_Mart_Text_2224A0: @ 82224A0
+MossdeepCity_Mart_Text_MaxRepelLastsLongest: @ 82224A0
 	.string "MAX REPEL keeps all weak POKéMON away.\p"
 	.string "Out of all the REPEL sprays, it lasts\n"
 	.string "the longest.$"
 
-MossdeepCity_Mart_Text_2224FA: @ 82224FA
+MossdeepCity_Mart_Text_NetAndDiveBallsRare: @ 82224FA
 	.string "The NET and DIVE BALLS are rare POKé\n"
 	.string "BALLS that are only made in MOSSDEEP.\p"
 	.string "A NET BALL is effective against\n"
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
index fc78cc9678..c8018bc364 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265",
+      "script": "MossdeepCity_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 02e8b33b4f..49c31dc6b4 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
 	setrespawn HEAL_LOCATION_MOSSDEEP_CITY
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E
+@ VAR_0x800B is the Nurse's object event id
+MossdeepCity_PokemonCenter_1F_EventScript_Nurse:: @ 822224E
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,21 +16,21 @@ MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E
 	release
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C
-	msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, MSGBOX_NPC
+MossdeepCity_PokemonCenter_1F_EventScript_Woman:: @ 822225C
+	msgbox MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265
-	msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, MSGBOX_NPC
+MossdeepCity_PokemonCenter_1F_EventScript_Girl:: @ 8222265
+	msgbox MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E
+MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable: @ 822226E
 	.string "The GYM LEADERS in this town are\n"
 	.string "a formidable duo.\p"
 	.string "Their combination attacks are, like,\n"
 	.string "excellent and wow!$"
 
-MossdeepCity_PokemonCenter_1F_Text_2222D9: @ 82222D9
+MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves: @ 82222D9
 	.string "Depending on the special abilities of\n"
 	.string "POKéMON, some moves might change\l"
 	.string "or not work at all.$"
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
index b79f758cda..22f008ed17 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt32",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt16",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt33",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt23",
+      "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA"
     },
     {
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 17bf5c8964..3499244edc 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -215,27 +215,27 @@ MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote:: @ 82231CF
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt32:: @ 82231DA
-	trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat
-	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle, MSGBOX_AUTOCLOSE
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt3:: @ 82231DA
+	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_3, MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt16:: @ 82231F1
-	trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat
-	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt1:: @ 82231F1
+	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_1, MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt33:: @ 8223208
-	trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat
-	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle, MSGBOX_AUTOCLOSE
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt4:: @ 8223208
+	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_4, MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt23:: @ 822321F
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated
-	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat
+	goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_2, MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat
 	setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
 	copyobjectxytoperm 9
 	switch VAR_FACING
@@ -247,8 +247,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt23:: @ 822321F
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated:: @ 822326E
-	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle, MSGBOX_DEFAULT
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated:: @ 822326E
+	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
@@ -375,52 +375,52 @@ MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849
 	.string "In the meantime, why don't you go\n"
 	.string "check out the town?$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro: @ 822396C
+MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro: @ 822396C
 	.string "As promised, we've come for\n"
 	.string "the rocket fuel!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat: @ 8223999
+MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat: @ 8223999
 	.string "Ran out of fuel…$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle: @ 82239AA
+MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle: @ 82239AA
 	.string "Don't think you're on a roll just\n"
 	.string "because you've beaten me!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro: @ 82239E6
+MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro: @ 82239E6
 	.string "We gave you fair warning!\n"
 	.string "There's nothing sneaky about us!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat: @ 8223A21
+MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat: @ 8223A21
 	.string "Grrr…\n"
 	.string "We should've used sneaky treachery…$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle: @ 8223A4B
+MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle: @ 8223A4B
 	.string "Okay, I get it already! The next time,\n"
 	.string "we'll come unannounced.$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro: @ 8223A8A
+MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro: @ 8223A8A
 	.string "The rocket fuel the SPACE CENTER has\n"
 	.string "in storage--that's what we're after.\p"
 	.string "We mean to take every last bit of it!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat: @ 8223AFA
+MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat: @ 8223AFA
 	.string "Please, can you spare some fuel?\n"
 	.string "Even a chintzy cup will do!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle: @ 8223B37
+MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle: @ 8223B37
 	.string "What are we going to do with\n"
 	.string "the rocket fuel?\p"
 	.string "How would I know?\n"
 	.string "Ask our leader upstairs!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro: @ 8223B90
+MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro: @ 8223B90
 	.string "Our leader said no one, but no one,\n"
 	.string "gets past me!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat: @ 8223BC2
+MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat: @ 8223BC2
 	.string "Ack! Ack! Aaack!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle: @ 8223BD3
+MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle: @ 8223BD3
 	.string "Please, tell our leader that\n"
 	.string "I never abandoned my post.\l"
 	.string "That I stayed to the bitter end…$"
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
index 9da5809104..61729d0037 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt35",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt6",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt34",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt36",
+      "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt7",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA"
     },
     {
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index ddce7efc8e..14b1b6368f 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -53,21 +53,21 @@ MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: @ 8223E07
 	step_end
 
 MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
-	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat
-	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat
+	applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat
-	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat
+	applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat
-	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat
+	applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated
 	waitmovement 0
 	setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 2
 	copyobjectxytoperm 5
@@ -76,19 +76,19 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated: @ 8223E81
+MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated: @ 8223E81
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated: @ 8223E85
+MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated: @ 8223E85
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated: @ 8223E89
+MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated: @ 8223E89
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
@@ -158,16 +158,16 @@ MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma:: @ 8223F34
 	end
 
 @ Battle for the below 3 grunts is handled in MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts
-MossdeepCity_SpaceCenter_2F_EventScript_Grunt35:: @ 8223F3E
-	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle, MSGBOX_NPC
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt6:: @ 8223F3E
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Grunt36:: @ 8223F47
-	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle, MSGBOX_NPC
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt7:: @ 8223F47
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Grunt34:: @ 8223F50
-	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle, MSGBOX_NPC
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt5:: @ 8223F50
+	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle, MSGBOX_NPC
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59
@@ -408,39 +408,39 @@ MossdeepCity_SpaceCenter_2F_Text_GoodAnswer: @ 82243FE
 	.string "Good answer!\n"
 	.string "That's what a smart person'll do!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro: @ 822442D
+MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro: @ 822442D
 	.string "A reckless go-getter, are you?\n"
 	.string "Okay, I'll go first!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat: @ 8224461
+MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat: @ 8224461
 	.string "I lost!\n"
 	.string "But!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro: @ 822446E
+MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro: @ 822446E
 	.string "It's too soon to be relieved!\n"
 	.string "I'm up next!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat: @ 8224499
+MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat: @ 8224499
 	.string "I lost, too!\n"
 	.string "But!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro: @ 82244AB
+MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro: @ 82244AB
 	.string "I bet you want to take a break.\n"
 	.string "But I'm not about to let you do that!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat: @ 82244F1
+MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat: @ 82244F1
 	.string "We should've taken a break…\n"
 	.string "That's what we should've done…$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle: @ 822452C
+MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle: @ 822452C
 	.string "Three of us here, and look at the sorry\n"
 	.string "mess we got ourselves into.$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle: @ 8224570
+MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle: @ 8224570
 	.string "We three losing like this…\n"
 	.string "We look worse than usual by triple!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle: @ 82245AF
+MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle: @ 82245AF
 	.string "Are we being useful to our leader\n"
 	.string "at all?$"
 
diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json
index c0763b1bc5..52a795bdb8 100644
--- a/data/maps/MtChimney/map.json
+++ b/data/maps/MtChimney/map.json
@@ -297,7 +297,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_Grunt31",
+      "script": "MtChimney_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
@@ -388,7 +388,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtChimney_EventScript_Grunt24",
+      "script": "MtChimney_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA"
     },
     {
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 411857e2d1..c7283ef0f1 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -427,9 +427,9 @@ MtChimney_EventScript_Tabitha:: @ 822F06E
 	msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Grunt31:: @ 822F085
-	trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_Grunt31Intro, MtChimney_Text_Grunt31Defeat
-	msgbox MtChimney_Text_Grunt31PostBattle, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Grunt2:: @ 822F085
+	trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_2, MtChimney_Text_Grunt2Intro, MtChimney_Text_Grunt2Defeat
+	msgbox MtChimney_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MtChimney_EventScript_BusyMagmaGrunt1:: @ 822F09C
@@ -533,9 +533,9 @@ MtChimney_EventScript_Shirley:: @ 822F1DA
 	msgbox MtChimney_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Grunt24:: @ 822F1F1
-	trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_Grunt24Intro, MtChimney_Text_Grunt24Defeat
-	msgbox MtChimney_Text_Grunt24PostBattle, MSGBOX_AUTOCLOSE
+MtChimney_EventScript_Grunt1:: @ 822F1F1
+	trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_1, MtChimney_Text_Grunt1Intro, MtChimney_Text_Grunt1Defeat
+	msgbox MtChimney_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 MtChimney_EventScript_Sawyer:: @ 822F208
@@ -627,32 +627,32 @@ MtChimney_Text_TabithaPostBattle: @ 822F76D
 	.string "Give it the METEORITE's energy!\p"
 	.string "Hehehe…$"
 
-MtChimney_Text_Grunt31Intro: @ 822F7A2
+MtChimney_Text_Grunt2Intro: @ 822F7A2
 	.string "We of TEAM MAGMA are working hard for\n"
 	.string "everyone's sake.\p"
 	.string "Like, if that thing's power made more\n"
 	.string "land, there'd be more places to live.\p"
 	.string "Everyone'd be happy!$"
 
-MtChimney_Text_Grunt31Defeat: @ 822F83A
+MtChimney_Text_Grunt2Defeat: @ 822F83A
 	.string "Hunh?\n"
 	.string "What do you mean I lost?$"
 
-MtChimney_Text_Grunt31PostBattle: @ 822F859
+MtChimney_Text_Grunt2PostBattle: @ 822F859
 	.string "Our BOSS says, “It will make everyone\n"
 	.string "happy.”\p"
 	.string "But why does everyone keep getting\n"
 	.string "in our way?$"
 
-MtChimney_Text_Grunt24Intro: @ 822F8B6
+MtChimney_Text_Grunt1Intro: @ 822F8B6
 	.string "If there were more land, I'd be able\n"
 	.string "to get a big house of my own!\p"
 	.string "I'm going to build it on hardened lava!$"
 
-MtChimney_Text_Grunt24Defeat: @ 822F921
+MtChimney_Text_Grunt1Defeat: @ 822F921
 	.string "My dream of a big house…$"
 
-MtChimney_Text_Grunt24PostBattle: @ 822F93A
+MtChimney_Text_Grunt1PostBattle: @ 822F93A
 	.string "A kid like you, you ought to be\n"
 	.string "splashing about in the waves!$"
 
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
index 93bc0b7558..f032fbbdf1 100644
--- a/data/maps/MtPyre_Summit/map.json
+++ b/data/maps/MtPyre_Summit/map.json
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_Grunt17",
+      "script": "MtPyre_Summit_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_Grunt18",
+      "script": "MtPyre_Summit_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_Grunt19",
+      "script": "MtPyre_Summit_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_Summit_EventScript_Grunt29",
+      "script": "MtPyre_Summit_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA"
     },
     {
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 1a9e5d31c5..577b870764 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -422,40 +422,40 @@ MtPyre_Summit_Movement_MaxieApproachArchie2: @ 82323F8
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_EventScript_Grunt17:: @ 82323FD
-	trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_Grunt17Intro, MtPyre_Summit_Text_Grunt17Defeat
-	msgbox MtPyre_Summit_Text_Grunt17PostBattle, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt1:: @ 82323FD
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_1, MtPyre_Summit_Text_Grunt1Intro, MtPyre_Summit_Text_Grunt1Defeat
+	msgbox MtPyre_Summit_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_Grunt18:: @ 8232414
-	trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_Grunt18Intro, MtPyre_Summit_Text_Grunt18Defeat
-	msgbox MtPyre_Summit_Text_Grunt18PostBattle, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt2:: @ 8232414
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_2, MtPyre_Summit_Text_Grunt2Intro, MtPyre_Summit_Text_Grunt2Defeat
+	msgbox MtPyre_Summit_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_Grunt19:: @ 823242B
-	trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_Grunt19Intro, MtPyre_Summit_Text_Grunt19Defeat
-	msgbox MtPyre_Summit_Text_Grunt19PostBattle, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt3:: @ 823242B
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_3, MtPyre_Summit_Text_Grunt3Intro, MtPyre_Summit_Text_Grunt3Defeat
+	msgbox MtPyre_Summit_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_Grunt29:: @ 8232442
-	trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_Grunt29Intro, MtPyre_Summit_Text_Grunt29Defeat
-	msgbox MtPyre_Summit_Text_Grunt29PostBattle, MSGBOX_AUTOCLOSE
+MtPyre_Summit_EventScript_Grunt4:: @ 8232442
+	trainerbattle_single TRAINER_GRUNT_MT_PYRE_4, MtPyre_Summit_Text_Grunt4Intro, MtPyre_Summit_Text_Grunt4Defeat
+	msgbox MtPyre_Summit_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_Text_Grunt17Intro: @ 8232459
+MtPyre_Summit_Text_Grunt1Intro: @ 8232459
 	.string "No! Those TEAM MAGMA goons got\n"
 	.string "here ahead of us!\p"
 	.string "We can't fall behind!$"
 
-MtPyre_Summit_Text_Grunt17Defeat: @ 82324A0
+MtPyre_Summit_Text_Grunt1Defeat: @ 82324A0
 	.string "I thought you were one of the MAGMAS\n"
 	.string "who happened to come back…$"
 
-MtPyre_Summit_Text_Grunt17PostBattle: @ 82324E0
+MtPyre_Summit_Text_Grunt1PostBattle: @ 82324E0
 	.string "Yeah, so you are strong…\n"
 	.string "But there're a lot of us!$"
 
-MtPyre_Summit_Text_Grunt18Intro: @ 8232513
+MtPyre_Summit_Text_Grunt2Intro: @ 8232513
 	.string "Hah!\n"
 	.string "Too bad for you!\p"
 	.string "If you came earlier, you only would've\n"
@@ -463,42 +463,42 @@ MtPyre_Summit_Text_Grunt18Intro: @ 8232513
 	.string "But since you arrived now, you have\n"
 	.string "to take on us toughies!$"
 
-MtPyre_Summit_Text_Grunt18Defeat: @ 82325B0
+MtPyre_Summit_Text_Grunt2Defeat: @ 82325B0
 	.string "Urgh… I should've let you take on\n"
 	.string "TEAM MAGMA first…$"
 
-MtPyre_Summit_Text_Grunt18PostBattle: @ 82325E4
+MtPyre_Summit_Text_Grunt2PostBattle: @ 82325E4
 	.string "You don't know anything!\n"
 	.string "So why are you messing with us?$"
 
-MtPyre_Summit_Text_Grunt19Intro: @ 823261D
+MtPyre_Summit_Text_Grunt3Intro: @ 823261D
 	.string "You…\n"
 	.string "We saw you at MT. CHIMNEY.\p"
 	.string "You don't belong to either TEAM,\n"
 	.string "so why would you be here?$"
 
-MtPyre_Summit_Text_Grunt19Defeat: @ 8232678
+MtPyre_Summit_Text_Grunt3Defeat: @ 8232678
 	.string "If you're going to mess with anyone,\n"
 	.string "let it be TEAM MAGMA…$"
 
-MtPyre_Summit_Text_Grunt19PostBattle: @ 82326B3
+MtPyre_Summit_Text_Grunt3PostBattle: @ 82326B3
 	.string "Heh, it doesn't matter!\n"
 	.string "We bought ourselves some time!\p"
 	.string "The BOSS should have snatched what\n"
 	.string "he was after!$"
 
-MtPyre_Summit_Text_Grunt29Intro: @ 823271B
+MtPyre_Summit_Text_Grunt4Intro: @ 823271B
 	.string "Oh, I know!\n"
 	.string "You tried to join TEAM MAGMA,\l"
 	.string "but they wouldn't have you!\p"
 	.string "Well, don't think that we'll let you\n"
 	.string "join our TEAM AQUA!$"
 
-MtPyre_Summit_Text_Grunt29Defeat: @ 823279A
+MtPyre_Summit_Text_Grunt4Defeat: @ 823279A
 	.string "If you want to join TEAM AQUA that\n"
 	.string "badly, we can consider it…$"
 
-MtPyre_Summit_Text_Grunt29PostBattle: @ 82327D8
+MtPyre_Summit_Text_Grunt4PostBattle: @ 82327D8
 	.string "We have a great combination going\n"
 	.string "with us members and our leader.$"
 
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index 4e54cc8e4e..df405376a0 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -8,6 +8,7 @@ OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
+@ VAR_0x800B is the Nurse's object event id
 OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
index 83fdd1f792..dd5dfcb9c9 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD",
+      "script": "PacifidlogTown_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index e51f6e89f5..8b0f0805a1 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
 	setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6
+@ VAR_0x800B is the Nurse's object event id
+PacifidlogTown_PokemonCenter_1F_EventScript_Nurse:: @ 82034B6
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,29 +16,29 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6
 	release
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, MSGBOX_NPC
+PacifidlogTown_PokemonCenter_1F_EventScript_Girl:: @ 82034C4
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, MSGBOX_NPC
+PacifidlogTown_PokemonCenter_1F_EventScript_Woman:: @ 82034CD
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, MSGBOX_NPC
+PacifidlogTown_PokemonCenter_1F_EventScript_OldMan:: @ 82034D6
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF
+PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard: @ 82034DF
 	.string "What color is your TRAINER CARD?\n"
 	.string "Mine's copper!$"
 
-PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F
+PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola: @ 820350F
 	.string "PACIFIDLOG TOWN floats on top of\n"
 	.string "a colony of CORSOLA.\p"
 	.string "If I told you that, would you believe\n"
 	.string "me?$"
 
-PacifidlogTown_PokemonCenter_1F_Text_20356F: @ 820356F
+PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats: @ 820356F
 	.string "The ancestors of the people in\n"
 	.string "PACIFIDLOG were said to have been\l"
 	.string "born on boats and then lived and died \l"
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 60b56837cd..151cd8afb4 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -8,6 +8,7 @@ PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
+@ VAR_0x800B is the Nurse's object event id
 PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
index 42f0fb35ad..4c53891fd1 100644
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -26,7 +26,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
 	applymovement 3, PetalburgWoods_Movement_AquaApproachPlayer
 	waitmovement 0
 	msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe
+	trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
 	applymovement 3, PetalburgWoods_Movement_AquaBackOff
 	waitmovement 0
 	call PetalburgWoods_EventScript_DevonResearcherPostBattle
@@ -62,7 +62,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe
+	trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
 	applymovement 3, PetalburgWoods_Movement_AquaBackOff
 	waitmovement 0
 	call PetalburgWoods_EventScript_DevonResearcherPostBattle
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json
index 74629d77e8..626d008fc0 100644
--- a/data/maps/Route119_WeatherInstitute_1F/map.json
+++ b/data/maps/Route119_WeatherInstitute_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_WeatherInstitute_1F_EventScript_Grunt11",
+      "script": "Route119_WeatherInstitute_1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route119_WeatherInstitute_1F_EventScript_Grunt20",
+      "script": "Route119_WeatherInstitute_1F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index 630f69a297..0b7eb4f4a1 100644
--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -61,40 +61,40 @@ Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18
 	releaseall
 	end
 
-Route119_WeatherInstitute_1F_EventScript_Grunt11:: @ 826FB29
-	trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_Grunt11Intro, Route119_WeatherInstitute_1F_Text_Grunt11Defeat
-	msgbox Route119_WeatherInstitute_1F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_1F_EventScript_Grunt1:: @ 826FB29
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_1, Route119_WeatherInstitute_1F_Text_Grunt1Intro, Route119_WeatherInstitute_1F_Text_Grunt1Defeat
+	msgbox Route119_WeatherInstitute_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_1F_EventScript_Grunt20:: @ 826FB40
-	trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_Grunt20Intro, Route119_WeatherInstitute_1F_Text_Grunt20Defeat
-	msgbox Route119_WeatherInstitute_1F_Text_Grunt20PostBattle, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_1F_EventScript_Grunt4:: @ 826FB40
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_4, Route119_WeatherInstitute_1F_Text_Grunt4Intro, Route119_WeatherInstitute_1F_Text_Grunt4Defeat
+	msgbox Route119_WeatherInstitute_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_1F_Text_Grunt11Intro: @ 826FB57
+Route119_WeatherInstitute_1F_Text_Grunt1Intro: @ 826FB57
 	.string "The BOSS got interested in\n"
 	.string "the research they have going here,\l"
 	.string "so he sent us out.\p"
 	.string "You quit meddling!$"
 
-Route119_WeatherInstitute_1F_Text_Grunt11Defeat: @ 826FBBB
+Route119_WeatherInstitute_1F_Text_Grunt1Defeat: @ 826FBBB
 	.string "Blast it…\n"
 	.string "Blasted by a kid…$"
 
-Route119_WeatherInstitute_1F_Text_Grunt11PostBattle: @ 826FBD7
+Route119_WeatherInstitute_1F_Text_Grunt1PostBattle: @ 826FBD7
 	.string "Our BOSS knows everything.\p"
 	.string "But I'm just a GRUNT. What would I know\n"
 	.string "about what he's thinking?$"
 
-Route119_WeatherInstitute_1F_Text_Grunt20Intro: @ 826FC34
+Route119_WeatherInstitute_1F_Text_Grunt4Intro: @ 826FC34
 	.string "Huh?\n"
 	.string "What's a kid doing here?$"
 
-Route119_WeatherInstitute_1F_Text_Grunt20Defeat: @ 826FC52
+Route119_WeatherInstitute_1F_Text_Grunt4Defeat: @ 826FC52
 	.string "Huh?\n"
 	.string "I lost?!$"
 
-Route119_WeatherInstitute_1F_Text_Grunt20PostBattle: @ 826FC60
+Route119_WeatherInstitute_1F_Text_Grunt4PostBattle: @ 826FC60
 	.string "Oh, no…\n"
 	.string "I'll catch an earful for losing to a kid…\p"
 	.string "I should just take a nap in the bed…$"
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json
index 5b0301878c..c8048db6f2 100644
--- a/data/maps/Route119_WeatherInstitute_2F/map.json
+++ b/data/maps/Route119_WeatherInstitute_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt12",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt13",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt37",
+      "script": "Route119_WeatherInstitute_2F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA"
     }
   ],
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index 211a98f0fa..df1021530b 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -25,19 +25,19 @@ Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: @ 826FF5C
 	setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP
 	return
 
-Route119_WeatherInstitute_2F_EventScript_Grunt37:: @ 826FF68
-	trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_Grunt37Intro, Route119_WeatherInstitute_2F_Text_Grunt37Defeat
-	msgbox Route119_WeatherInstitute_2F_Text_Grunt37PostBattle, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Grunt5:: @ 826FF68
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_5, Route119_WeatherInstitute_2F_Text_Grunt5Intro, Route119_WeatherInstitute_2F_Text_Grunt5Defeat
+	msgbox Route119_WeatherInstitute_2F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_Grunt12:: @ 826FF7F
-	trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_Grunt12Intro, Route119_WeatherInstitute_2F_Text_Grunt12Defeat
-	msgbox Route119_WeatherInstitute_2F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Grunt2:: @ 826FF7F
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_2, Route119_WeatherInstitute_2F_Text_Grunt2Intro, Route119_WeatherInstitute_2F_Text_Grunt2Defeat
+	msgbox Route119_WeatherInstitute_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_Grunt13:: @ 826FF96
-	trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_Grunt13Intro, Route119_WeatherInstitute_2F_Text_Grunt13Defeat
-	msgbox Route119_WeatherInstitute_2F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE
+Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
+	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_3, Route119_WeatherInstitute_2F_Text_Grunt3Intro, Route119_WeatherInstitute_2F_Text_Grunt3Defeat
+	msgbox Route119_WeatherInstitute_2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
@@ -211,42 +211,42 @@ Route119_WeatherInstitute_2F_EventScript_WeatherScientist:: @ 827018B
 	goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
 	end
 
-Route119_WeatherInstitute_2F_Text_Grunt12Intro: @ 827019C
+Route119_WeatherInstitute_2F_Text_Grunt2Intro: @ 827019C
 	.string "The INSTITUTE created a type of\n"
 	.string "POKéMON that has something to do with\l"
 	.string "the weather. We're here to take them!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt12Defeat: @ 8270208
+Route119_WeatherInstitute_2F_Text_Grunt2Defeat: @ 8270208
 	.string "Our plan's being spoiled by a kid?$"
 
-Route119_WeatherInstitute_2F_Text_Grunt12PostBattle: @ 827022B
+Route119_WeatherInstitute_2F_Text_Grunt2PostBattle: @ 827022B
 	.string "If the POKéMON they made here can\n"
 	.string "control the weather freely, then we of\l"
 	.string "TEAM AQUA definitely need it!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt13Intro: @ 8270292
+Route119_WeatherInstitute_2F_Text_Grunt3Intro: @ 8270292
 	.string "We're TEAM AQUA!\n"
 	.string "We appear wherever anything rare is\l"
 	.string "found!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt13Defeat: @ 82702CE
+Route119_WeatherInstitute_2F_Text_Grunt3Defeat: @ 82702CE
 	.string "You got me!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt13PostBattle: @ 82702DA
+Route119_WeatherInstitute_2F_Text_Grunt3PostBattle: @ 82702DA
 	.string "You don't have any idea what we of\n"
 	.string "TEAM AQUA are working towards!\l"
 	.string "You stay out of our way!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt37Intro: @ 8270335
+Route119_WeatherInstitute_2F_Text_Grunt5Intro: @ 8270335
 	.string "Don't tell me you're looking for that\n"
 	.string "weather POKéMON, too?\p"
 	.string "That's a no-no!\n"
 	.string "We were here to get it first!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt37Defeat: @ 827039F
+Route119_WeatherInstitute_2F_Text_Grunt5Defeat: @ 827039F
 	.string "Oh, will you look at my POKéMON?$"
 
-Route119_WeatherInstitute_2F_Text_Grunt37PostBattle: @ 82703C0
+Route119_WeatherInstitute_2F_Text_Grunt5PostBattle: @ 82703C0
 	.string "Humph, so what?\n"
 	.string "What we want…\p"
 	.string "What we really want isn't here…\n"
diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json
index a2a5a846f3..d56aa3095b 100644
--- a/data/maps/RustboroCity_Mart/map.json
+++ b/data/maps/RustboroCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F06",
+      "script": "RustboroCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F7D",
+      "script": "RustboroCity_Mart_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F74",
+      "script": "RustboroCity_Mart_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Mart_EventScript_214F86",
+      "script": "RustboroCity_Mart_EventScript_BugCatcher",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc
index 88a5403561..063c5b64f5 100644
--- a/data/maps/RustboroCity_Mart/scripts.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
@@ -1,22 +1,22 @@
 RustboroCity_Mart_MapScripts:: @ 8214F05
 	.byte 0
 
-RustboroCity_Mart_EventScript_214F06:: @ 8214F06
+RustboroCity_Mart_EventScript_Clerk:: @ 8214F06
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48
+	goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartBasic
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded
 	end
 
-RustboroCity_Mart_EventScript_214F21:: @ 8214F21
-	pokemart RustboroCity_Mart_Pokemart_214F30
+RustboroCity_Mart_EventScript_PokemartBasic:: @ 8214F21
+	pokemart RustboroCity_Mart_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Mart_Pokemart_214F30: @ 8214F30
+RustboroCity_Mart_Pokemart_Basic: @ 8214F30
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
@@ -31,14 +31,14 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30
 	release
 	end
 
-RustboroCity_Mart_EventScript_214F48:: @ 8214F48
-	pokemart RustboroCity_Mart_Pokemart_214F58
+RustboroCity_Mart_EventScript_PokemartExpanded:: @ 8214F48
+	pokemart RustboroCity_Mart_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-RustboroCity_Mart_Pokemart_214F58: @ 8214F58
+RustboroCity_Mart_Pokemart_Expanded: @ 8214F58
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_TIMER_BALL
 	.2byte ITEM_REPEAT_BALL
@@ -55,31 +55,31 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58
 	release
 	end
 
-RustboroCity_Mart_EventScript_214F74:: @ 8214F74
-	msgbox RustboroCity_Mart_Text_214F8F, MSGBOX_NPC
+RustboroCity_Mart_EventScript_PokefanF:: @ 8214F74
+	msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D
-	msgbox RustboroCity_Mart_Text_214FF1, MSGBOX_NPC
+RustboroCity_Mart_EventScript_Boy:: @ 8214F7D
+	msgbox RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_EventScript_214F86:: @ 8214F86
-	msgbox RustboroCity_Mart_Text_21505C, MSGBOX_NPC
+RustboroCity_Mart_EventScript_BugCatcher:: @ 8214F86
+	msgbox RustboroCity_Mart_Text_GettingEscapeRopeJustInCase, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_Text_214F8F: @ 8214F8F
+RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish: @ 8214F8F
 	.string "I'm buying some PARLYZ HEALS and\n"
 	.string "ANTIDOTES.\p"
 	.string "Just in case I run into SHROOMISH\n"
 	.string "in PETALBURG WOODS.$"
 
-RustboroCity_Mart_Text_214FF1: @ 8214FF1
+RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead: @ 8214FF1
 	.string "My POKéMON evolved.\n"
 	.string "It has a lot of HP now.\p"
 	.string "I should buy SUPER POTIONS for it\n"
 	.string "instead of ordinary POTIONS.$"
 
-RustboroCity_Mart_Text_21505C: @ 821505C
+RustboroCity_Mart_Text_GettingEscapeRopeJustInCase: @ 821505C
 	.string "I'm getting an ESCAPE ROPE just in\n"
 	.string "case I get lost in a cave.\p"
 	.string "I just need to use it to get back to\n"
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json
index b91dd25ac4..db28ddcf3d 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/map.json
+++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96",
+      "script": "RustboroCity_PokemonCenter_1F_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 46555ba284..ca10592b0a 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
+@ VAR_0x800B is the Nurse's object event id
+RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8214D76
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,31 +17,31 @@ RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
 	release
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84
-	msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8214D84
+	msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D
-	msgbox RustboroCity_PokemonCenter_1F_Text_214E13, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8214D8D
+	msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96
-	msgbox RustboroCity_PokemonCenter_1F_Text_214E81, MSGBOX_NPC
+RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8214D96
+	msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F
+RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities: @ 8214D9F
 	.string "My POKéMON has a NAIVE nature, and my\n"
 	.string "friend's has a JOLLY nature.\p"
 	.string "It's fascinating how POKéMON have\n"
 	.string "personalities!$"
 
-RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13
+RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon: @ 8214E13
 	.string "Just like people, there are male and\n"
 	.string "female POKéMON.\p"
 	.string "But no one seems to have any idea how\n"
 	.string "they're different.$"
 
-RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81
+RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor: @ 8214E81
 	.string "The man next door gave me an HM!\p"
 	.string "I used it to teach my POKéMON how to\n"
 	.string "CUT down skinny trees.$"
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 9bdec7e8e0..aa66ffcc18 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -312,7 +312,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	faceplayer
 	playbgm MUS_AQA_0, 0
 	msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0
+	trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_22D2B0
 	msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_GOODS
 	closemessage
diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json
index a4849023ae..68cbba71db 100644
--- a/data/maps/SeafloorCavern_Room1/map.json
+++ b/data/maps/SeafloorCavern_Room1/map.json
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "SeafloorCavern_Room1_EventScript_Grunt5",
+      "script": "SeafloorCavern_Room1_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SeafloorCavern_Room1_EventScript_Grunt6",
+      "script": "SeafloorCavern_Room1_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index 375797d7bc..6baa9ca4ee 100644
--- a/data/maps/SeafloorCavern_Room1/scripts.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
@@ -1,35 +1,35 @@
 SeafloorCavern_Room1_MapScripts:: @ 82347EB
 	.byte 0
 
-SeafloorCavern_Room1_EventScript_Grunt5:: @ 82347EC
-	trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_Grunt5Intro, SeafloorCavern_Room1_Text_Grunt5Defeat
-	msgbox SeafloorCavern_Room1_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room1_EventScript_Grunt1:: @ 82347EC
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_1, SeafloorCavern_Room1_Text_Grunt1Intro, SeafloorCavern_Room1_Text_Grunt1Defeat
+	msgbox SeafloorCavern_Room1_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room1_EventScript_Grunt6:: @ 8234803
-	trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_Grunt6Intro, SeafloorCavern_Room1_Text_Grunt6Defeat
-	msgbox SeafloorCavern_Room1_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room1_EventScript_Grunt2:: @ 8234803
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_2, SeafloorCavern_Room1_Text_Grunt2Intro, SeafloorCavern_Room1_Text_Grunt2Defeat
+	msgbox SeafloorCavern_Room1_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room1_Text_Grunt5Intro: @ 823481A
+SeafloorCavern_Room1_Text_Grunt1Intro: @ 823481A
 	.string "We don't need a kid around!\n"
 	.string "Go on home already!$"
 
-SeafloorCavern_Room1_Text_Grunt5Defeat: @ 823484A
+SeafloorCavern_Room1_Text_Grunt1Defeat: @ 823484A
 	.string "I want to go home…$"
 
-SeafloorCavern_Room1_Text_Grunt5PostBattle: @ 823485D
+SeafloorCavern_Room1_Text_Grunt1PostBattle: @ 823485D
 	.string "I want to get a promotion so I can\n"
 	.string "boss around the GRUNTS…$"
 
-SeafloorCavern_Room1_Text_Grunt6Intro: @ 8234898
+SeafloorCavern_Room1_Text_Grunt2Intro: @ 8234898
 	.string "That submarine… It's tiny inside.\n"
 	.string "I'm sore all over!$"
 
-SeafloorCavern_Room1_Text_Grunt6Defeat: @ 82348CD
+SeafloorCavern_Room1_Text_Grunt2Defeat: @ 82348CD
 	.string "Losing makes me sore!$"
 
-SeafloorCavern_Room1_Text_Grunt6PostBattle: @ 82348E3
+SeafloorCavern_Room1_Text_Grunt2PostBattle: @ 82348E3
 	.string "That submarine we jacked, man,\n"
 	.string "it's brutal as a ride.\l"
 	.string "It's way too tight in there!$"
diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json
index 3a0d2afb76..428070faf6 100644
--- a/data/maps/SeafloorCavern_Room3/map.json
+++ b/data/maps/SeafloorCavern_Room3/map.json
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "SeafloorCavern_Room3_EventScript_Grunt27",
+      "script": "SeafloorCavern_Room3_EventScript_Grunt5",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index c3cbff28d8..29cd0dbed7 100644
--- a/data/maps/SeafloorCavern_Room3/scripts.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
@@ -6,9 +6,9 @@ SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
 	msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room3_EventScript_Grunt27:: @ 823494F
-	trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_Grunt27Intro, SeafloorCavern_Room3_Text_Grunt27Defeat
-	msgbox SeafloorCavern_Room3_Text_Grunt27PostBattle, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room3_EventScript_Grunt5:: @ 823494F
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_5, SeafloorCavern_Room3_Text_Grunt5Intro, SeafloorCavern_Room3_Text_Grunt5Defeat
+	msgbox SeafloorCavern_Room3_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
 SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966
@@ -36,7 +36,7 @@ SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A
 	.string "world our BOSS has promised as\l"
 	.string "one of us…$"
 
-SeafloorCavern_Room3_Text_Grunt27Intro: @ 8234B3A
+SeafloorCavern_Room3_Text_Grunt5Intro: @ 8234B3A
 	.string "For our dream to become real, we need\n"
 	.string "the power of POKéMON.\p"
 	.string "But meddlers like you use the power of\n"
@@ -45,10 +45,10 @@ SeafloorCavern_Room3_Text_Grunt27Intro: @ 8234B3A
 	.string "Life just doesn't work the way we\n"
 	.string "need it to!$"
 
-SeafloorCavern_Room3_Text_Grunt27Defeat: @ 8234BFE
+SeafloorCavern_Room3_Text_Grunt5Defeat: @ 8234BFE
 	.string "Gwah!$"
 
-SeafloorCavern_Room3_Text_Grunt27PostBattle: @ 8234C04
+SeafloorCavern_Room3_Text_Grunt5PostBattle: @ 8234C04
 	.string "You know, we don't dare question\n"
 	.string "the motives of our leader.\p"
 	.string "But here you are, just some punk,\n"
diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json
index 7bd919eaba..c04e22e39d 100644
--- a/data/maps/SeafloorCavern_Room4/map.json
+++ b/data/maps/SeafloorCavern_Room4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SeafloorCavern_Room4_EventScript_Grunt7",
+      "script": "SeafloorCavern_Room4_EventScript_Grunt3",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SeafloorCavern_Room4_EventScript_Grunt9",
+      "script": "SeafloorCavern_Room4_EventScript_Grunt4",
       "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS"
     }
   ],
diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index c647482510..e2f32287ad 100644
--- a/data/maps/SeafloorCavern_Room4/scripts.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
@@ -1,35 +1,35 @@
 SeafloorCavern_Room4_MapScripts:: @ 8234C9B
 	.byte 0
 
-SeafloorCavern_Room4_EventScript_Grunt7:: @ 8234C9C
-	trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_Grunt7Intro, SeafloorCavern_Room4_Text_Grunt7Defeat
-	msgbox SeafloorCavern_Room4_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room4_EventScript_Grunt3:: @ 8234C9C
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_3, SeafloorCavern_Room4_Text_Grunt3Intro, SeafloorCavern_Room4_Text_Grunt3Defeat
+	msgbox SeafloorCavern_Room4_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room4_EventScript_Grunt9:: @ 8234CB3
-	trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_Grunt9Intro, SeafloorCavern_Room4_Text_Grunt9Defeat
-	msgbox SeafloorCavern_Room4_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE
+SeafloorCavern_Room4_EventScript_Grunt4:: @ 8234CB3
+	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_4, SeafloorCavern_Room4_Text_Grunt4Intro, SeafloorCavern_Room4_Text_Grunt4Defeat
+	msgbox SeafloorCavern_Room4_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room4_Text_Grunt7Intro: @ 8234CCA
+SeafloorCavern_Room4_Text_Grunt3Intro: @ 8234CCA
 	.string "Who are you?\n"
 	.string "Where did you come in from?$"
 
-SeafloorCavern_Room4_Text_Grunt7Defeat: @ 8234CF3
+SeafloorCavern_Room4_Text_Grunt3Defeat: @ 8234CF3
 	.string "Lost it…$"
 
-SeafloorCavern_Room4_Text_Grunt7PostBattle: @ 8234CFC
+SeafloorCavern_Room4_Text_Grunt3PostBattle: @ 8234CFC
 	.string "I can't find the way out!\p"
 	.string "I'm not afraid. Don't get me wrong!$"
 
-SeafloorCavern_Room4_Text_Grunt9Intro: @ 8234D3A
+SeafloorCavern_Room4_Text_Grunt4Intro: @ 8234D3A
 	.string "Who are you?\n"
 	.string "Where do you think you're going?$"
 
-SeafloorCavern_Room4_Text_Grunt9Defeat: @ 8234D68
+SeafloorCavern_Room4_Text_Grunt4Defeat: @ 8234D68
 	.string "I failed to win!$"
 
-SeafloorCavern_Room4_Text_Grunt9PostBattle: @ 8234D79
+SeafloorCavern_Room4_Text_Grunt4PostBattle: @ 8234D79
 	.string "My partner forgot the map in that\n"
 	.string "submarine!\p"
 	.string "How's that for being useless?$"
diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json
index 597abbf066..ca1c23717d 100644
--- a/data/maps/SlateportCity_Mart/map.json
+++ b/data/maps/SlateportCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Mart_EventScript_20DC49",
+      "script": "SlateportCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Mart_EventScript_20DC76",
+      "script": "SlateportCity_Mart_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Mart_EventScript_20DC7F",
+      "script": "SlateportCity_Mart_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc
index 63042338b2..a1c557ad28 100644
--- a/data/maps/SlateportCity_Mart/scripts.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
@@ -1,17 +1,17 @@
 SlateportCity_Mart_MapScripts:: @ 820DC48
 	.byte 0
 
-SlateportCity_Mart_EventScript_20DC49:: @ 820DC49
+SlateportCity_Mart_EventScript_Clerk:: @ 820DC49
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart SlateportCity_Mart_Pokemart_20DC60
+	pokemart SlateportCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Mart_Pokemart_20DC60: @ 820DC60
+SlateportCity_Mart_Pokemart: @ 820DC60
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_POTION
@@ -25,21 +25,21 @@ SlateportCity_Mart_Pokemart_20DC60: @ 820DC60
 	release
 	end
 
-SlateportCity_Mart_EventScript_20DC76:: @ 820DC76
-	msgbox SlateportCity_Mart_Text_20DC88, MSGBOX_NPC
+SlateportCity_Mart_EventScript_BlackBelt:: @ 820DC76
+	msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC
 	end
 
-SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F
-	msgbox SlateportCity_Mart_Text_20DCF8, MSGBOX_NPC
+SlateportCity_Mart_EventScript_Man:: @ 820DC7F
+	msgbox SlateportCity_Mart_Text_GreatBallIsBetter, MSGBOX_NPC
 	end
 
-SlateportCity_Mart_Text_20DC88: @ 820DC88
+SlateportCity_Mart_Text_SomeItemsOnlyAtMart: @ 820DC88
 	.string "The MARKET does have some interesting\n"
 	.string "merchandise.\p"
 	.string "But there are some items you can only\n"
 	.string "get at a POKéMON MART.$"
 
-SlateportCity_Mart_Text_20DCF8: @ 820DCF8
+SlateportCity_Mart_Text_GreatBallIsBetter: @ 820DCF8
 	.string "A GREAT BALL is better than a POKé BALL\n"
 	.string "at catching POKéMON.\p"
 	.string "With this, I should be able to get that\n"
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index e3d91cd28d..9facd09375 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -32,7 +32,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth
 	compare VAR_FACING, DIR_WEST
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest
-	trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat
+	trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_1, SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat
 	msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated
@@ -40,7 +40,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat
+	trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_2, SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated
 	waitmovement 0
 	applymovement 3, Common_Movement_WalkInPlaceFastestDown
@@ -295,7 +295,7 @@ SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua: @ 820BE93
 	.string "Our BOSS wants those parts!\n"
 	.string "Shut your yap and fork them over!$"
 
-SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat: @ 820BEE2
+SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat: @ 820BEE2
 	.string "Awaaaah!\n"
 	.string "A kid beat me!$"
 
@@ -307,7 +307,7 @@ SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis: @ 820BF35
 	.string "Humph, sniveling wimp!\n"
 	.string "Let me take care of this!$"
 
-SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat: @ 820BF66
+SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat: @ 820BF66
 	.string "What?!\n"
 	.string "I lost, too!$"
 
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json
index 3e87ae2562..4f8cefda93 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/map.json
+++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA",
+      "script": "SlateportCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index f148e5d3fd..ba4319cba9 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3
+@ VAR_0x800B is the Nurse's object event id
+SlateportCity_PokemonCenter_1F_EventScript_Nurse:: @ 820DAD3
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,15 +17,15 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3
 	release
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1
-	msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, MSGBOX_NPC
+SlateportCity_PokemonCenter_1F_EventScript_Sailor:: @ 820DAE1
+	msgbox SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA
-	msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, MSGBOX_NPC
+SlateportCity_PokemonCenter_1F_EventScript_Woman:: @ 820DAEA
+	msgbox SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3
+SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon: @ 820DAF3
 	.string "Want a tip for battling?\p"
 	.string "I'd say it's raising different kinds\n"
 	.string "of POKéMON in a balanced manner.\p"
@@ -33,7 +34,7 @@ SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3
 	.string "If it has a type disadvantage,\n"
 	.string "it might not stand a chance.$"
 
-SlateportCity_PokemonCenter_1F_Text_20DBBC: @ 820DBBC
+SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend: @ 820DBBC
 	.string "I trade POKéMON with my friends.\p"
 	.string "If a traded POKéMON is holding an\n"
 	.string "item, it makes me twice as happy!$"
diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json
index e9b9780137..9d8ef277dc 100644
--- a/data/maps/SootopolisCity_Mart/map.json
+++ b/data/maps/SootopolisCity_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_Mart_EventScript_226795",
+      "script": "SootopolisCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_Mart_EventScript_2267C2",
+      "script": "SootopolisCity_Mart_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_Mart_EventScript_2267EC",
+      "script": "SootopolisCity_Mart_EventScript_Gentleman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 0b477ce471..f7856916cc 100644
--- a/data/maps/SootopolisCity_Mart/scripts.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
@@ -1,17 +1,17 @@
 SootopolisCity_Mart_MapScripts:: @ 8226794
 	.byte 0
 
-SootopolisCity_Mart_EventScript_226795:: @ 8226795
+SootopolisCity_Mart_EventScript_Clerk:: @ 8226795
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart SootopolisCity_Mart_Pokemart_2267AC
+	pokemart SootopolisCity_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
+SootopolisCity_Mart_Pokemart: @ 82267AC
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -25,54 +25,54 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC
 	release
 	end
 
-SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2
+SootopolisCity_Mart_EventScript_FatMan:: @ 82267C2
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_Mart_EventScript_2267E2
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2
-	msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_Mart_EventScript_FatManNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_FatManNoLegendaries
+	msgbox SootopolisCity_Mart_Text_TooScaryOutside, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2
-	msgbox SootopolisCity_Mart_Text_226816, MSGBOX_DEFAULT
+SootopolisCity_Mart_EventScript_FatManNoLegendaries:: @ 82267E2
+	msgbox SootopolisCity_Mart_Text_PPUpIsGreat, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC
+SootopolisCity_Mart_EventScript_Gentleman:: @ 82267EC
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_Mart_EventScript_22680C
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C
-	msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_Mart_EventScript_GentlemanNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_GentlemanNoLegendaries
+	msgbox SootopolisCity_Mart_Text_DidSomethingAwaken, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_22680C:: @ 822680C
-	msgbox SootopolisCity_Mart_Text_2268AF, MSGBOX_DEFAULT
+SootopolisCity_Mart_EventScript_GentlemanNoLegendaries:: @ 822680C
+	msgbox SootopolisCity_Mart_Text_FullRestoreItemOfDreams, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_Text_226816: @ 8226816
+SootopolisCity_Mart_Text_PPUpIsGreat: @ 8226816
 	.string "PP UP is great!\p"
 	.string "It raises the POWER POINTS, the PP,\n"
 	.string "of a POKéMON move.$"
 
-SootopolisCity_Mart_Text_22685D: @ 822685D
+SootopolisCity_Mart_Text_TooScaryOutside: @ 822685D
 	.string "What…\n"
 	.string "What is happening?\p"
 	.string "I really want to know, but it's too\n"
 	.string "scary to go outside.$"
 
-SootopolisCity_Mart_Text_2268AF: @ 82268AF
+SootopolisCity_Mart_Text_FullRestoreItemOfDreams: @ 82268AF
 	.string "Do you know FULL RESTORE?\p"
 	.string "Full restoration of HP!\n"
 	.string "Eradication of all status problems!\p"
 	.string "It's truly an item of your dreams!$"
 
-SootopolisCity_Mart_Text_226928: @ 8226928
+SootopolisCity_Mart_Text_DidSomethingAwaken: @ 8226928
 	.string "This weather…\n"
 	.string "Did something awaken?$"
 
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
index a2307dc100..4a5eec7474 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538",
+      "script": "SootopolisCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index d2b5468318..d8ff4e7f62 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -7,7 +7,8 @@ SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC
 	setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500
+@ VAR_0x800B is the Nurse's object event id
+SootopolisCity_PokemonCenter_1F_EventScript_Nurse:: @ 8226500
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -15,37 +16,37 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E
+SootopolisCity_PokemonCenter_1F_EventScript_Gentleman:: @ 822650E
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E
-	msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries
+	msgbox SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E
-	msgbox SootopolisCity_PokemonCenter_1F_Text_226562, MSGBOX_DEFAULT
+SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries:: @ 822652E
+	msgbox SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538
+SootopolisCity_PokemonCenter_1F_EventScript_Woman:: @ 8226538
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
-	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558
-	msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries
+	msgbox SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558
-	msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, MSGBOX_DEFAULT
+SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries:: @ 8226558
+	msgbox SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562
+SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn: @ 8226562
 	.string "WALLACE is rumored to be the toughest\n"
 	.string "TRAINER in the whole HOENN region.\p"
 	.string "This town's GYM is led by the TRAINER\n"
@@ -54,19 +55,19 @@ SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562
 	.string "even stronger than WALLACE's mentor.\p"
 	.string "How strong could they be?$"
 
-SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B
+SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge: @ 822664B
 	.string "Everyone in town has taken refuge\n"
 	.string "and won't come out of their homes.\p"
 	.string "Even I would rather not venture\n"
 	.string "outside.$"
 
-SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9
+SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon: @ 82266B9
 	.string "Whenever, wherever, and whatever\n"
 	.string "happens, I will always be friends with\l"
 	.string "POKéMON.\p"
 	.string "Because it's fun to be with POKéMON!$"
 
-SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F
+SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends: @ 822672F
 	.string "Aren't POKéMON our friends?\p"
 	.string "Why are they going wild this way?$"
 
diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json
index 4f9b8296e5..702a70f3dd 100644
--- a/data/maps/VerdanturfTown_Mart/map.json
+++ b/data/maps/VerdanturfTown_Mart/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_202587",
+      "script": "VerdanturfTown_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_2025BA",
+      "script": "VerdanturfTown_Mart_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_2025C3",
+      "script": "VerdanturfTown_Mart_EventScript_ExpertF",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_Mart_EventScript_2025CC",
+      "script": "VerdanturfTown_Mart_EventScript_Lass",
       "flag": "0"
     }
   ],
diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index 2b3ccfc3ac..cc4694fe1b 100644
--- a/data/maps/VerdanturfTown_Mart/scripts.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
@@ -1,18 +1,18 @@
 VerdanturfTown_Mart_MapScripts:: @ 8202586
 	.byte 0
 
-VerdanturfTown_Mart_EventScript_202587:: @ 8202587
+VerdanturfTown_Mart_EventScript_Clerk:: @ 8202587
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart VerdanturfTown_Mart_Pokemart_2025A0
+	pokemart VerdanturfTown_Mart_Pokemart
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0
+VerdanturfTown_Mart_Pokemart: @ 82025A0
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_NEST_BALL
 	.2byte ITEM_SUPER_POTION
@@ -28,31 +28,31 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0
 	release
 	end
 
-VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA
-	msgbox VerdanturfTown_Mart_Text_2025D5, MSGBOX_NPC
+VerdanturfTown_Mart_EventScript_Boy:: @ 82025BA
+	msgbox VerdanturfTown_Mart_Text_XSpecialIsCrucial, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3
-	msgbox VerdanturfTown_Mart_Text_20264C, MSGBOX_NPC
+VerdanturfTown_Mart_EventScript_ExpertF:: @ 82025C3
+	msgbox VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC
-	msgbox VerdanturfTown_Mart_Text_2026C9, MSGBOX_NPC
+VerdanturfTown_Mart_EventScript_Lass:: @ 82025CC
+	msgbox VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_Text_2025D5: @ 82025D5
+VerdanturfTown_Mart_Text_XSpecialIsCrucial: @ 82025D5
 	.string "For any POKéMON match, X SPECIAL\n"
 	.string "is crucial.\p"
 	.string "It jacks up the power of some moves\n"
 	.string "even though it's only for one battle.$"
 
-VerdanturfTown_Mart_Text_20264C: @ 820264C
+VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent: @ 820264C
 	.string "They don't seem to sell any winning\n"
 	.string "strategy guides for the BATTLE TENT…\p"
 	.string "It seems one must rely on one's\n"
 	.string "own wits after all…$"
 
-VerdanturfTown_Mart_Text_2026C9: @ 82026C9
+VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon: @ 82026C9
 	.string "The NEST BALL works better on\n"
 	.string "weakened POKéMON.\p"
 	.string "VERDANTURF is the only place you can\n"
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
index c437aeecef..056e82ed14 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751",
+      "script": "VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM",
       "flag": "0"
     },
     {
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 32cecf1524..040e69a16b 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -8,7 +8,8 @@ VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A
+@ VAR_0x800B is the Nurse's object event id
+VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: @ 820273A
 	setvar VAR_0x800B, 1
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -16,15 +17,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A
 	release
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748
-	msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, MSGBOX_NPC
+VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman:: @ 8202748
+	msgbox VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon, MSGBOX_NPC
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751
-	msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, MSGBOX_NPC
+VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8202751
+	msgbox VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent, MSGBOX_NPC
 	end
 
-VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A
+VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon: @ 820275A
 	.string "You can't consider yourself a real\n"
 	.string "TRAINER if you don't have faith\l"
 	.string "in your POKéMON.\p"
@@ -32,7 +33,7 @@ VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A
 	.string "in their battling POKéMON can win\l"
 	.string "through to the very end.$"
 
-VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B
+VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent: @ 820280B
 	.string "The reason why anyone would visit\n"
 	.string "VERDANTURF…\p"
 	.string "It's the BATTLE TENT. It goes without\n"
diff --git a/data/specials.inc b/data/specials.inc
index 5017c3dc3b..c8fd515db9 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -353,7 +353,7 @@ gSpecials:: @ 81DBA64
 	def_special ScriptRandom
 	def_special sub_81AFDD0
 	def_special TryPutTreasureInvestigatorsOnAir
-	def_special sub_80EE2CC
+	def_special TryPutLotteryWinnerReportOnAir
 	def_special sub_80EE72C
 	def_special sub_80EE7C0
 	def_special ShowGlassWorkshopMenu
diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc
index 674fed52e6..102e6b4a27 100644
--- a/data/text/lottery_corner.inc
+++ b/data/text/lottery_corner.inc
@@ -1,4 +1,4 @@
-LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390
+LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket: @ 82A6390
 	.string "This is the POKéMON LOTTERY CORNER.\p"
 	.string "All shoppers at our DEPARTMENT STORE\n"
 	.string "get to draw a POKéMON LOTO TICKET.\p"
@@ -8,70 +8,70 @@ LilycoveCity_DepartmentStore_1F_Text_2A6390: @ 82A6390
 	.string "Would you like to draw a POKéMON\n"
 	.string "LOTO TICKET?$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6496: @ 82A6496
+LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow: @ 82A6496
 	.string "Please come back tomorrow.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A64B1: @ 82A64B1
+LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain: @ 82A64B1
 	.string "Please do visit again.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A64C8: @ 82A64C8
+LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket: @ 82A64C8
 	.string "Please pick a LOTO TICKET.\n"
 	.string "…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A650B: @ 82A650B
+LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait: @ 82A650B
 	.string "The LOTO TICKET number is {STR_VAR_1}.\p"
 	.string "I need to run a check on this number\n"
 	.string "to see if it matches any of your\l"
 	.string "POKéMON's ID numbers. Please wait.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6592: @ 82A6592
+LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon: @ 82A6592
 	.string "Congratulations!\p"
 	.string "The ID number of your team's\n"
 	.string "{STR_VAR_1} matches your\l"
 	.string "LOTO TICKET's number!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A65E6: @ 82A65E6
+LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon: @ 82A65E6
 	.string "Congratulations!\p"
 	.string "The ID number of your PC-boxed\n"
 	.string "{STR_VAR_1} matches your\l"
 	.string "LOTO TICKET's number!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A663C: @ 82A663C
+LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched: @ 82A663C
 	.string "I'm sorry.\n"
 	.string "None of the numbers matched.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6664: @ 82A6664
+LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched: @ 82A6664
 	.string "Two digits matched, so you win the\n"
 	.string "third prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A66A7: @ 82A66A7
+LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched: @ 82A66A7
 	.string "Three digits matched, so you win the\n"
 	.string "second prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A66ED: @ 82A66ED
+LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched: @ 82A66ED
 	.string "Four digits matched, so you win the\n"
 	.string "first prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6731: @ 82A6731
+LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched: @ 82A6731
 	.string "Oh, my goodness, all five digits\n"
 	.string "matched!\p"
 	.string "You've won the jackpot prize!\n"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A678C: @ 82A678C
+LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis: @ 82A678C
 	.string "Oh?\n"
 	.string "You seem to have no room for this.\p"
 	.string "Please make room in your BAG and\n"
 	.string "let me know.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A67E1: @ 82A67E1
+LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding: @ 82A67E1
 	.string "{PLAYER}?\n"
 	.string "Yes, I've been expecting you.\p"
 	.string "This is the prize we've been holding\n"
 	.string "for you.$"
 
-LilycoveCity_DepartmentStore_1F_Text_2A6831: @ 82A6831
+LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2: @ 82A6831
 	.string "Please do visit again.$"
diff --git a/include/battle.h b/include/battle.h
index 7164453073..ba29c43cb9 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -582,7 +582,7 @@ struct BattleScripting
     u8 animArg1;
     u8 animArg2;
     u16 tripleKickPower;
-    u8 atk49_state;
+    u8 moveendState;
     u8 unused_15;
     u8 unused_16;
     u8 battler;
@@ -590,9 +590,9 @@ struct BattleScripting
     u8 animTargetsHit;
     u8 statChanger;
     bool8 statAnimPlayed;
-    u8 atk23_state;
+    u8 getexpState;
     u8 battleStyle;
-    u8 atk6C_state;
+    u8 drawlvlupboxState;
     u8 learnMoveState;
     u8 field_20;
     u8 reshowMainState;
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 89faba55aa..6f6d4faae5 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -43,9 +43,9 @@
 #define BS_EFFECT_BATTLER           2
 #define BS_FAINTED                  3
 #define BS_BATTLER_0                7
-#define BS_ATTACKER_WITH_PARTNER    4 // for atk98_status_icon_update
-#define BS_ATTACKER_SIDE            8 // for atk1E_jumpifability
-#define BS_TARGET_SIDE              9 // for atk1E_jumpifability
+#define BS_ATTACKER_WITH_PARTNER    4 // for Cmd_updatestatusicon
+#define BS_ATTACKER_SIDE            8 // for Cmd_jumpifability
+#define BS_TARGET_SIDE              9 // for Cmd_jumpifability
 #define BS_SCRIPTING                10
 #define BS_PLAYER1                  11
 #define BS_OPPONENT1                12
@@ -53,7 +53,7 @@
 #define BS_OPPONENT2                14
 #define BS_ABILITY_BATTLER          15
 
-// atk 01, accuracy calc
+// Cmd_accuracycheck
 #define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF
 #define ACC_CURR_MOVE 0
 
@@ -65,7 +65,7 @@
 #define CMP_COMMON_BITS         0x4
 #define CMP_NO_COMMON_BITS      0x5
 
-// atk76, various
+// Cmd_various
 #define VARIOUS_CANCEL_MULTI_TURN_MOVES         0
 #define VARIOUS_SET_MAGIC_COAT_TARGET           1
 #define VARIOUS_IS_RUNNING_IMPOSSIBLE           2
@@ -146,51 +146,52 @@
 #define VARIOUS_TRY_ILLUSION_OFF                83
 #define VARIOUS_SET_SPRITEIGNORE0HP             84
 
-// atk80, dmg manipulation
-#define ATK80_DMG_CHANGE_SIGN                               0
-#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP     1
-#define ATK80_DMG_DOUBLED                                   2
-#define ATK80_1_8_TARGET_HP                                 3
-#define ATK80_FULL_ATTACKER_HP                              4
-#define ATK80_CURR_ATTACKER_HP                              5
+// Cmd_manipulatedmg
+#define DMG_CHANGE_SIGN            0
+#define DMG_RECOIL_FROM_MISS       1
+#define DMG_DOUBLED                2
+#define DMG_1_8_TARGET_HP          3
+#define DMG_FULL_ATTACKER_HP       4
+#define DMG_CURR_ATTACKER_HP       5
 
-// atk4F, a flag used for the jumpifcantswitch command
-#define ATK4F_DONT_CHECK_STATUSES   0x80
+// Cmd_jumpifcantswitch
+#define SWITCH_IGNORE_ESCAPE_PREVENTION   0x80
 
-// statchange defines
-#define STAT_CHANGE_BS_PTR                  0x1
-#define STAT_CHANGE_NOT_PROTECT_AFFECTED    0x20
+// Cmd_statbuffchange
+#define STAT_BUFF_ALLOW_PTR                 0x1   // If set, allow use of jumpptr. Set in every use of statbuffchange
+#define STAT_BUFF_NOT_PROTECT_AFFECTED      0x20
 
-// atk48
-#define ATK48_STAT_NEGATIVE         0x1
-#define ATK48_STAT_BY_TWO           0x2
-#define ATK48_ONLY_MULTIPLE         0x4
-#define ATK48_DONT_CHECK_LOWER      0x8
+// stat change flags for Cmd_playstatchangeanimation
+#define STAT_CHANGE_NEGATIVE         0x1
+#define STAT_CHANGE_BY_TWO           0x2
+#define STAT_CHANGE_ONLY_MULTIPLE    0x4
+#define STAT_CHANGE_CANT_PREVENT 	 0x8
 
-// atk49, moveend cases
-#define ATK49_PROTECT_LIKE_EFFECT 0
-#define ATK49_RAGE 1
-#define ATK49_DEFROST 2
-#define ATK49_SYNCHRONIZE_TARGET 3
-#define ATK49_MOVE_END_ABILITIES 4
-#define ATK49_STATUS_IMMUNITY_ABILITIES 5
-#define ATK49_SYNCHRONIZE_ATTACKER 6
-#define ATK49_CHOICE_MOVE 7
-#define ATK49_CHANGED_ITEMS 8
-#define ATK49_ATTACKER_INVISIBLE 9
-#define ATK49_ATTACKER_VISIBLE 10
-#define ATK49_TARGET_VISIBLE 11
-#define ATK49_ITEM_EFFECTS_TARGET 12
-#define ATK49_ITEM_EFFECTS_ALL 13
-#define ATK49_KINGSROCK_SHELLBELL 14
-#define ATK49_SUBSTITUTE 15
-#define ATK49_UPDATE_LAST_MOVES 16
-#define ATK49_MIRROR_MOVE 17
-#define ATK49_NEXT_TARGET 18
-#define ATK49_LIFE_ORB 19
-#define ATK49_CLEAR_BITS 20
-#define ATK49_COUNT 21
+// cases for Cmd_moveend
+#define MOVEEND_PROTECT_LIKE_EFFECT 0
+#define MOVEEND_RAGE 1
+#define MOVEEND_DEFROST 2
+#define MOVEEND_SYNCHRONIZE_TARGET 3
+#define MOVEEND_ABILITIES 4
+#define MOVEEND_STATUS_IMMUNITY_ABILITIES 5
+#define MOVEEND_SYNCHRONIZE_ATTACKER 6
+#define MOVEEND_CHOICE_MOVE 7
+#define MOVEEND_CHANGED_ITEMS 8
+#define MOVEEND_ATTACKER_INVISIBLE 9
+#define MOVEEND_ATTACKER_VISIBLE 10
+#define MOVEEND_TARGET_VISIBLE 11
+#define MOVEEND_ITEM_EFFECTS_TARGET 12
+#define MOVEEND_ITEM_EFFECTS_ALL 13
+#define MOVEEND_KINGSROCK_SHELLBELL 14
+#define MOVEEND_SUBSTITUTE 15
+#define MOVEEND_UPDATE_LAST_MOVES 16
+#define MOVEEND_MIRROR_MOVE 17
+#define MOVEEND_NEXT_TARGET 18
+#define MOVEEND_LIFE_ORB 19
+#define MOVEEND_CLEAR_BITS 20
+#define MOVEEND_COUNT 21
 
+// stat flags for Cmd_playstatchangeanimation
 #define BIT_HP                      0x1
 #define BIT_ATK                     0x2
 #define BIT_DEF                     0x4
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0e85e2570b..687fea766b 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1033,7 +1033,7 @@
 #define FLAG_HIDE_ROUTE_119_KECLEON_2                               0x3DE
 #define FLAG_HIDE_ROUTE_101_BOY                                     0x3DF
 #define FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M                 0x3E0
-#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY                      0x3E1
+#define FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON          0x3E1
 #define FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY                       0x3E2
 #define FLAG_HIDE_PETALBURG_CITY_SCOTT                              0x3E3
 #define FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA                          0x3E4
diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index 9f74baf675..9917b84baf 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -1,862 +1,862 @@
 #ifndef GUARD_CONSTANTS_OPPONENTS_H
 #define GUARD_CONSTANTS_OPPONENTS_H
 
-#define TRAINER_NONE              0
-#define TRAINER_SAWYER_1          1
-#define TRAINER_GRUNT_1           2
-#define TRAINER_GRUNT_2           3
-#define TRAINER_GRUNT_3           4
-#define TRAINER_GRUNT_4           5
-#define TRAINER_GRUNT_5           6
-#define TRAINER_GRUNT_6           7
-#define TRAINER_GRUNT_7           8
-#define TRAINER_GABRIELLE_1       9
-#define TRAINER_GRUNT_8          10
-#define TRAINER_MARCEL           11
-#define TRAINER_ALBERTO          12
-#define TRAINER_ED               13
-#define TRAINER_GRUNT_9          14
-#define TRAINER_DECLAN           15
-#define TRAINER_GRUNT_10         16
-#define TRAINER_GRUNT_11         17
-#define TRAINER_GRUNT_12         18
-#define TRAINER_GRUNT_13         19
-#define TRAINER_GRUNT_14         20
-#define TRAINER_GRUNT_15         21
-#define TRAINER_GRUNT_16         22
-#define TRAINER_GRUNT_17         23
-#define TRAINER_GRUNT_18         24
-#define TRAINER_GRUNT_19         25
-#define TRAINER_GRUNT_20         26
-#define TRAINER_GRUNT_21         27
-#define TRAINER_GRUNT_22         28
-#define TRAINER_FREDRICK         29
-#define TRAINER_MATT             30
-#define TRAINER_ZANDER           31
-#define TRAINER_SHELLY_1         32
-#define TRAINER_SHELLY_2         33
-#define TRAINER_ARCHIE           34
-#define TRAINER_LEAH             35
-#define TRAINER_DAISY            36
-#define TRAINER_ROSE_1           37
-#define TRAINER_FELIX            38
-#define TRAINER_VIOLET           39
-#define TRAINER_ROSE_2           40
-#define TRAINER_ROSE_3           41
-#define TRAINER_ROSE_4           42
-#define TRAINER_ROSE_5           43
-#define TRAINER_DUSTY_1          44
-#define TRAINER_CHIP             45
-#define TRAINER_FOSTER           46
-#define TRAINER_DUSTY_2          47
-#define TRAINER_DUSTY_3          48
-#define TRAINER_DUSTY_4          49
-#define TRAINER_DUSTY_5          50
-#define TRAINER_GABBY_AND_TY_1   51
-#define TRAINER_GABBY_AND_TY_2   52
-#define TRAINER_GABBY_AND_TY_3   53
-#define TRAINER_GABBY_AND_TY_4   54
-#define TRAINER_GABBY_AND_TY_5   55
-#define TRAINER_GABBY_AND_TY_6   56
-#define TRAINER_LOLA_1           57
-#define TRAINER_AUSTINA          58
-#define TRAINER_GWEN             59
-#define TRAINER_LOLA_2           60
-#define TRAINER_LOLA_3           61
-#define TRAINER_LOLA_4           62
-#define TRAINER_LOLA_5           63
-#define TRAINER_RICKY_1          64
-#define TRAINER_SIMON            65
-#define TRAINER_CHARLIE          66
-#define TRAINER_RICKY_2          67
-#define TRAINER_RICKY_3          68
-#define TRAINER_RICKY_4          69
-#define TRAINER_RICKY_5          70
-#define TRAINER_RANDALL          71
-#define TRAINER_PARKER           72
-#define TRAINER_GEORGE           73
-#define TRAINER_BERKE            74
-#define TRAINER_BRAXTON          75
-#define TRAINER_VINCENT          76
-#define TRAINER_LEROY            77
-#define TRAINER_WILTON_1         78
-#define TRAINER_EDGAR            79
-#define TRAINER_ALBERT           80
-#define TRAINER_SAMUEL           81
-#define TRAINER_VITO             82
-#define TRAINER_OWEN             83
-#define TRAINER_WILTON_2         84
-#define TRAINER_WILTON_3         85
-#define TRAINER_WILTON_4         86
-#define TRAINER_WILTON_5         87
-#define TRAINER_WARREN           88
-#define TRAINER_MARY             89
-#define TRAINER_ALEXIA           90
-#define TRAINER_JODY             91
-#define TRAINER_WENDY            92
-#define TRAINER_KEIRA            93
-#define TRAINER_BROOKE_1         94
-#define TRAINER_JENNIFER         95
-#define TRAINER_HOPE             96
-#define TRAINER_SHANNON          97
-#define TRAINER_MICHELLE         98
-#define TRAINER_CAROLINE         99
-#define TRAINER_JULIE           100
-#define TRAINER_BROOKE_2        101
-#define TRAINER_BROOKE_3        102
-#define TRAINER_BROOKE_4        103
-#define TRAINER_BROOKE_5        104
-#define TRAINER_PATRICIA        105
-#define TRAINER_KINDRA          106
-#define TRAINER_TAMMY           107
-#define TRAINER_VALERIE_1       108
-#define TRAINER_TASHA           109
-#define TRAINER_VALERIE_2       110
-#define TRAINER_VALERIE_3       111
-#define TRAINER_VALERIE_4       112
-#define TRAINER_VALERIE_5       113
-#define TRAINER_CINDY_1         114
-#define TRAINER_DAPHNE          115
-#define TRAINER_GRUNT_23        116
-#define TRAINER_CINDY_2         117
-#define TRAINER_BRIANNA         118
-#define TRAINER_NAOMI           119
-#define TRAINER_CINDY_3         120
-#define TRAINER_CINDY_4         121
-#define TRAINER_CINDY_5         122
-#define TRAINER_CINDY_6         123
-#define TRAINER_MELISSA         124
-#define TRAINER_SHEILA          125
-#define TRAINER_SHIRLEY         126
-#define TRAINER_JESSICA_1       127
-#define TRAINER_CONNIE          128
-#define TRAINER_BRIDGET         129
-#define TRAINER_OLIVIA          130
-#define TRAINER_TIFFANY         131
-#define TRAINER_JESSICA_2       132
-#define TRAINER_JESSICA_3       133
-#define TRAINER_JESSICA_4       134
-#define TRAINER_JESSICA_5       135
-#define TRAINER_WINSTON_1       136
-#define TRAINER_MOLLIE          137
-#define TRAINER_GARRET          138
-#define TRAINER_WINSTON_2       139
-#define TRAINER_WINSTON_3       140
-#define TRAINER_WINSTON_4       141
-#define TRAINER_WINSTON_5       142
-#define TRAINER_STEVE_1         143
-#define TRAINER_THALIA_1        144
-#define TRAINER_MARK            145
-#define TRAINER_GRUNT_24        146
-#define TRAINER_STEVE_2         147
-#define TRAINER_STEVE_3         148
-#define TRAINER_STEVE_4         149
-#define TRAINER_STEVE_5         150
-#define TRAINER_LUIS            151
-#define TRAINER_DOMINIK         152
-#define TRAINER_DOUGLAS         153
-#define TRAINER_DARRIN          154
-#define TRAINER_TONY_1          155
-#define TRAINER_JEROME          156
-#define TRAINER_MATTHEW         157
-#define TRAINER_DAVID           158
-#define TRAINER_SPENCER         159
-#define TRAINER_ROLAND          160
-#define TRAINER_NOLEN           161
-#define TRAINER_STAN            162
-#define TRAINER_BARRY           163
-#define TRAINER_DEAN            164
-#define TRAINER_RODNEY          165
-#define TRAINER_RICHARD         166
-#define TRAINER_HERMAN          167
-#define TRAINER_SANTIAGO        168
-#define TRAINER_GILBERT         169
-#define TRAINER_FRANKLIN        170
-#define TRAINER_KEVIN           171
-#define TRAINER_JACK            172
-#define TRAINER_DUDLEY          173
-#define TRAINER_CHAD            174
-#define TRAINER_TONY_2          175
-#define TRAINER_TONY_3          176
-#define TRAINER_TONY_4          177
-#define TRAINER_TONY_5          178
-#define TRAINER_TAKAO           179
-#define TRAINER_HITOSHI         180
-#define TRAINER_KIYO            181
-#define TRAINER_KOICHI          182
-#define TRAINER_NOB_1           183
-#define TRAINER_NOB_2           184
-#define TRAINER_NOB_3           185
-#define TRAINER_NOB_4           186
-#define TRAINER_NOB_5           187
-#define TRAINER_YUJI            188
-#define TRAINER_DAISUKE         189
-#define TRAINER_ATSUSHI         190
-#define TRAINER_KIRK            191
-#define TRAINER_GRUNT_25        192
-#define TRAINER_GRUNT_26        193
-#define TRAINER_SHAWN           194
-#define TRAINER_FERNANDO_1      195
-#define TRAINER_DALTON_1        196
-#define TRAINER_DALTON_2        197
-#define TRAINER_DALTON_3        198
-#define TRAINER_DALTON_4        199
-#define TRAINER_DALTON_5        200
-#define TRAINER_COLE            201
-#define TRAINER_JEFF            202
-#define TRAINER_AXLE            203
-#define TRAINER_JACE            204
-#define TRAINER_KEEGAN          205
-#define TRAINER_BERNIE_1        206
-#define TRAINER_BERNIE_2        207
-#define TRAINER_BERNIE_3        208
-#define TRAINER_BERNIE_4        209
-#define TRAINER_BERNIE_5        210
-#define TRAINER_DREW            211
-#define TRAINER_BEAU            212
-#define TRAINER_LARRY           213
-#define TRAINER_SHANE           214
-#define TRAINER_JUSTIN          215
-#define TRAINER_ETHAN_1         216
-#define TRAINER_AUTUMN          217
-#define TRAINER_TRAVIS          218
-#define TRAINER_ETHAN_2         219
-#define TRAINER_ETHAN_3         220
-#define TRAINER_ETHAN_4         221
-#define TRAINER_ETHAN_5         222
-#define TRAINER_BRENT           223
-#define TRAINER_DONALD          224
-#define TRAINER_TAYLOR          225
-#define TRAINER_JEFFREY_1       226
-#define TRAINER_DEREK           227
-#define TRAINER_JEFFREY_2       228
-#define TRAINER_JEFFREY_3       229
-#define TRAINER_JEFFREY_4       230
-#define TRAINER_JEFFREY_5       231
-#define TRAINER_EDWARD          232
-#define TRAINER_PRESTON         233
-#define TRAINER_VIRGIL          234
-#define TRAINER_BLAKE           235
-#define TRAINER_WILLIAM         236
-#define TRAINER_JOSHUA          237
-#define TRAINER_CAMERON_1       238
-#define TRAINER_CAMERON_2       239
-#define TRAINER_CAMERON_3       240
-#define TRAINER_CAMERON_4       241
-#define TRAINER_CAMERON_5       242
-#define TRAINER_JACLYN          243
-#define TRAINER_HANNAH          244
-#define TRAINER_SAMANTHA        245
-#define TRAINER_MAURA           246
-#define TRAINER_KAYLA           247
-#define TRAINER_ALEXIS          248
-#define TRAINER_JACKI_1         249
-#define TRAINER_JACKI_2         250
-#define TRAINER_JACKI_3         251
-#define TRAINER_JACKI_4         252
-#define TRAINER_JACKI_5         253
-#define TRAINER_WALTER_1        254
-#define TRAINER_MICAH           255
-#define TRAINER_THOMAS          256
-#define TRAINER_WALTER_2        257
-#define TRAINER_WALTER_3        258
-#define TRAINER_WALTER_4        259
-#define TRAINER_WALTER_5        260
-#define TRAINER_SIDNEY          261
-#define TRAINER_PHOEBE          262
-#define TRAINER_GLACIA          263
-#define TRAINER_DRAKE           264
-#define TRAINER_ROXANNE_1       265
-#define TRAINER_BRAWLY_1        266
-#define TRAINER_WATTSON_1       267
-#define TRAINER_FLANNERY_1      268
-#define TRAINER_NORMAN_1        269
-#define TRAINER_WINONA_1        270
-#define TRAINER_TATE_AND_LIZA_1 271
-#define TRAINER_JUAN_1          272
-#define TRAINER_JERRY_1         273
-#define TRAINER_TED             274
-#define TRAINER_PAUL            275
-#define TRAINER_JERRY_2         276
-#define TRAINER_JERRY_3         277
-#define TRAINER_JERRY_4         278
-#define TRAINER_JERRY_5         279
-#define TRAINER_KAREN_1         280
-#define TRAINER_GEORGIA         281
-#define TRAINER_KAREN_2         282
-#define TRAINER_KAREN_3         283
-#define TRAINER_KAREN_4         284
-#define TRAINER_KAREN_5         285
-#define TRAINER_KATE_AND_JOY    286
-#define TRAINER_ANNA_AND_MEG_1  287
-#define TRAINER_ANNA_AND_MEG_2  288
-#define TRAINER_ANNA_AND_MEG_3  289
-#define TRAINER_ANNA_AND_MEG_4  290
-#define TRAINER_ANNA_AND_MEG_5  291
-#define TRAINER_VICTOR          292
-#define TRAINER_MIGUEL_1        293
-#define TRAINER_COLTON          294
-#define TRAINER_MIGUEL_2        295
-#define TRAINER_MIGUEL_3        296
-#define TRAINER_MIGUEL_4        297
-#define TRAINER_MIGUEL_5        298
-#define TRAINER_VICTORIA        299
-#define TRAINER_VANESSA         300
-#define TRAINER_BETHANY         301
-#define TRAINER_ISABEL_1        302
-#define TRAINER_ISABEL_2        303
-#define TRAINER_ISABEL_3        304
-#define TRAINER_ISABEL_4        305
-#define TRAINER_ISABEL_5        306
-#define TRAINER_TIMOTHY_1       307
-#define TRAINER_TIMOTHY_2       308
-#define TRAINER_TIMOTHY_3       309
-#define TRAINER_TIMOTHY_4       310
-#define TRAINER_TIMOTHY_5       311
-#define TRAINER_VICKY           312
-#define TRAINER_SHELBY_1        313
-#define TRAINER_SHELBY_2        314
-#define TRAINER_SHELBY_3        315
-#define TRAINER_SHELBY_4        316
-#define TRAINER_SHELBY_5        317
-#define TRAINER_CALVIN_1        318
-#define TRAINER_BILLY           319
-#define TRAINER_JOSH            320
-#define TRAINER_TOMMY           321
-#define TRAINER_JOEY            322
-#define TRAINER_BEN             323
-#define TRAINER_QUINCY          324
-#define TRAINER_KATELYNN        325
-#define TRAINER_JAYLEN          326
-#define TRAINER_DILLON          327
-#define TRAINER_CALVIN_2        328
-#define TRAINER_CALVIN_3        329
-#define TRAINER_CALVIN_4        330
-#define TRAINER_CALVIN_5        331
-#define TRAINER_EDDIE           332
-#define TRAINER_ALLEN           333
-#define TRAINER_TIMMY           334
-#define TRAINER_WALLACE         335
-#define TRAINER_ANDREW          336
-#define TRAINER_IVAN            337
-#define TRAINER_CLAUDE          338
-#define TRAINER_ELLIOT_1        339
-#define TRAINER_NED             340
-#define TRAINER_DALE            341
-#define TRAINER_NOLAN           342
-#define TRAINER_BARNY           343
-#define TRAINER_WADE            344
-#define TRAINER_CARTER          345
-#define TRAINER_ELLIOT_2        346
-#define TRAINER_ELLIOT_3        347
-#define TRAINER_ELLIOT_4        348
-#define TRAINER_ELLIOT_5        349
-#define TRAINER_RONALD          350
-#define TRAINER_JACOB           351
-#define TRAINER_ANTHONY         352
-#define TRAINER_BENJAMIN_1      353
-#define TRAINER_BENJAMIN_2      354
-#define TRAINER_BENJAMIN_3      355
-#define TRAINER_BENJAMIN_4      356
-#define TRAINER_BENJAMIN_5      357
-#define TRAINER_ABIGAIL_1       358
-#define TRAINER_JASMINE         359
-#define TRAINER_ABIGAIL_2       360
-#define TRAINER_ABIGAIL_3       361
-#define TRAINER_ABIGAIL_4       362
-#define TRAINER_ABIGAIL_5       363
-#define TRAINER_DYLAN_1         364
-#define TRAINER_DYLAN_2         365
-#define TRAINER_DYLAN_3         366
-#define TRAINER_DYLAN_4         367
-#define TRAINER_DYLAN_5         368
-#define TRAINER_MARIA_1         369
-#define TRAINER_MARIA_2         370
-#define TRAINER_MARIA_3         371
-#define TRAINER_MARIA_4         372
-#define TRAINER_MARIA_5         373
-#define TRAINER_CAMDEN          374
-#define TRAINER_DEMETRIUS       375
-#define TRAINER_ISAIAH_1        376
-#define TRAINER_PABLO_1         377
-#define TRAINER_CHASE           378
-#define TRAINER_ISAIAH_2        379
-#define TRAINER_ISAIAH_3        380
-#define TRAINER_ISAIAH_4        381
-#define TRAINER_ISAIAH_5        382
-#define TRAINER_ISOBEL          383
-#define TRAINER_DONNY           384
-#define TRAINER_TALIA           385
-#define TRAINER_KATELYN_1       386
-#define TRAINER_ALLISON         387
-#define TRAINER_KATELYN_2       388
-#define TRAINER_KATELYN_3       389
-#define TRAINER_KATELYN_4       390
-#define TRAINER_KATELYN_5       391
-#define TRAINER_NICOLAS_1       392
-#define TRAINER_NICOLAS_2       393
-#define TRAINER_NICOLAS_3       394
-#define TRAINER_NICOLAS_4       395
-#define TRAINER_NICOLAS_5       396
-#define TRAINER_AARON           397
-#define TRAINER_PERRY           398
-#define TRAINER_HUGH            399
-#define TRAINER_PHIL            400
-#define TRAINER_JARED           401
-#define TRAINER_HUMBERTO        402
-#define TRAINER_PRESLEY         403
-#define TRAINER_EDWARDO         404
-#define TRAINER_COLIN           405
-#define TRAINER_ROBERT_1        406
-#define TRAINER_BENNY           407
-#define TRAINER_CHESTER         408
-#define TRAINER_ROBERT_2        409
-#define TRAINER_ROBERT_3        410
-#define TRAINER_ROBERT_4        411
-#define TRAINER_ROBERT_5        412
-#define TRAINER_ALEX            413
-#define TRAINER_BECK            414
-#define TRAINER_YASU            415
-#define TRAINER_TAKASHI         416
-#define TRAINER_DIANNE          417
-#define TRAINER_JANI            418
-#define TRAINER_LAO_1           419
-#define TRAINER_LUNG            420
-#define TRAINER_LAO_2           421
-#define TRAINER_LAO_3           422
-#define TRAINER_LAO_4           423
-#define TRAINER_LAO_5           424
-#define TRAINER_JOCELYN         425
-#define TRAINER_LAURA           426
-#define TRAINER_CYNDY_1         427
-#define TRAINER_CORA            428
-#define TRAINER_PAULA           429
-#define TRAINER_CYNDY_2         430
-#define TRAINER_CYNDY_3         431
-#define TRAINER_CYNDY_4         432
-#define TRAINER_CYNDY_5         433
-#define TRAINER_MADELINE_1      434
-#define TRAINER_CLARISSA        435
-#define TRAINER_ANGELICA        436
-#define TRAINER_MADELINE_2      437
-#define TRAINER_MADELINE_3      438
-#define TRAINER_MADELINE_4      439
-#define TRAINER_MADELINE_5      440
-#define TRAINER_BEVERLY         441
-#define TRAINER_IMANI           442
-#define TRAINER_KYLA            443
-#define TRAINER_DENISE          444
-#define TRAINER_BETH            445
-#define TRAINER_TARA            446
-#define TRAINER_MISSY           447
-#define TRAINER_ALICE           448
-#define TRAINER_JENNY_1         449
-#define TRAINER_GRACE           450
-#define TRAINER_TANYA           451
-#define TRAINER_SHARON          452
-#define TRAINER_NIKKI           453
-#define TRAINER_BRENDA          454
-#define TRAINER_KATIE           455
-#define TRAINER_SUSIE           456
-#define TRAINER_KARA            457
-#define TRAINER_DANA            458
-#define TRAINER_SIENNA          459
-#define TRAINER_DEBRA           460
-#define TRAINER_LINDA           461
-#define TRAINER_KAYLEE          462
-#define TRAINER_LAUREL          463
-#define TRAINER_CARLEE          464
-#define TRAINER_JENNY_2         465
-#define TRAINER_JENNY_3         466
-#define TRAINER_JENNY_4         467
-#define TRAINER_JENNY_5         468
-#define TRAINER_HEIDI           469
-#define TRAINER_BECKY           470
-#define TRAINER_CAROL           471
-#define TRAINER_NANCY           472
-#define TRAINER_MARTHA          473
-#define TRAINER_DIANA_1         474
-#define TRAINER_CEDRIC          475
-#define TRAINER_IRENE           476
-#define TRAINER_DIANA_2         477
-#define TRAINER_DIANA_3         478
-#define TRAINER_DIANA_4         479
-#define TRAINER_DIANA_5         480
-#define TRAINER_AMY_AND_LIV_1   481
-#define TRAINER_AMY_AND_LIV_2   482
-#define TRAINER_GINA_AND_MIA_1  483
-#define TRAINER_MIU_AND_YUKI    484
-#define TRAINER_AMY_AND_LIV_3   485
-#define TRAINER_GINA_AND_MIA_2  486
-#define TRAINER_AMY_AND_LIV_4   487
-#define TRAINER_AMY_AND_LIV_5   488
-#define TRAINER_AMY_AND_LIV_6   489
-#define TRAINER_HUEY            490
-#define TRAINER_EDMOND          491
-#define TRAINER_ERNEST_1        492
-#define TRAINER_DWAYNE          493
-#define TRAINER_PHILLIP         494
-#define TRAINER_LEONARD         495
-#define TRAINER_DUNCAN          496
-#define TRAINER_ERNEST_2        497
-#define TRAINER_ERNEST_3        498
-#define TRAINER_ERNEST_4        499
-#define TRAINER_ERNEST_5        500
-#define TRAINER_ELI             501
-#define TRAINER_ANNIKA          502
-#define TRAINER_JAZMYN          503
-#define TRAINER_JONAS           504
-#define TRAINER_KAYLEY          505
-#define TRAINER_AURON           506
-#define TRAINER_KELVIN          507
-#define TRAINER_MARLEY          508
-#define TRAINER_REYNA           509
-#define TRAINER_HUDSON          510
-#define TRAINER_CONOR           511
-#define TRAINER_EDWIN_1         512
-#define TRAINER_HECTOR          513
-#define TRAINER_TABITHA_1       514
-#define TRAINER_EDWIN_2         515
-#define TRAINER_EDWIN_3         516
-#define TRAINER_EDWIN_4         517
-#define TRAINER_EDWIN_5         518
-#define TRAINER_WALLY_1         519
-#define TRAINER_BRENDAN_1       520
-#define TRAINER_BRENDAN_2       521
-#define TRAINER_BRENDAN_3       522
-#define TRAINER_BRENDAN_4       523
-#define TRAINER_BRENDAN_5       524
-#define TRAINER_BRENDAN_6       525
-#define TRAINER_BRENDAN_7       526
-#define TRAINER_BRENDAN_8       527
-#define TRAINER_BRENDAN_9       528
-#define TRAINER_MAY_1           529
-#define TRAINER_MAY_2           530
-#define TRAINER_MAY_3           531
-#define TRAINER_MAY_4           532
-#define TRAINER_MAY_5           533
-#define TRAINER_MAY_6           534
-#define TRAINER_MAY_7           535
-#define TRAINER_MAY_8           536
-#define TRAINER_MAY_9           537
-#define TRAINER_ISAAC_1         538
-#define TRAINER_DAVIS           539
-#define TRAINER_MITCHELL        540
-#define TRAINER_ISAAC_2         541
-#define TRAINER_ISAAC_3         542
-#define TRAINER_ISAAC_4         543
-#define TRAINER_ISAAC_5         544
-#define TRAINER_LYDIA_1         545
-#define TRAINER_HALLE           546
-#define TRAINER_GARRISON        547
-#define TRAINER_LYDIA_2         548
-#define TRAINER_LYDIA_3         549
-#define TRAINER_LYDIA_4         550
-#define TRAINER_LYDIA_5         551
-#define TRAINER_JACKSON_1       552
-#define TRAINER_LORENZO         553
-#define TRAINER_SEBASTIAN       554
-#define TRAINER_JACKSON_2       555
-#define TRAINER_JACKSON_3       556
-#define TRAINER_JACKSON_4       557
-#define TRAINER_JACKSON_5       558
-#define TRAINER_CATHERINE_1     559
-#define TRAINER_JENNA           560
-#define TRAINER_SOPHIA          561
-#define TRAINER_CATHERINE_2     562
-#define TRAINER_CATHERINE_3     563
-#define TRAINER_CATHERINE_4     564
-#define TRAINER_CATHERINE_5     565
-#define TRAINER_JULIO           566
-#define TRAINER_GRUNT_27        567
-#define TRAINER_GRUNT_28        568
-#define TRAINER_GRUNT_29        569
-#define TRAINER_GRUNT_30        570
-#define TRAINER_MARC            571
-#define TRAINER_BRENDEN         572
-#define TRAINER_LILITH          573
-#define TRAINER_CRISTIAN        574
-#define TRAINER_SYLVIA          575
-#define TRAINER_LEONARDO        576
-#define TRAINER_ATHENA          577
-#define TRAINER_HARRISON        578
-#define TRAINER_GRUNT_31        579
-#define TRAINER_CLARENCE        580
-#define TRAINER_TERRY           581
-#define TRAINER_NATE            582
-#define TRAINER_KATHLEEN        583
-#define TRAINER_CLIFFORD        584
-#define TRAINER_NICHOLAS        585
-#define TRAINER_GRUNT_32        586
-#define TRAINER_GRUNT_33        587
-#define TRAINER_GRUNT_34        588
-#define TRAINER_GRUNT_35        589
-#define TRAINER_GRUNT_36        590
-#define TRAINER_MACEY           591
-#define TRAINER_BRENDAN_10      592
-#define TRAINER_BRENDAN_11      593
-#define TRAINER_PAXTON          594
-#define TRAINER_ISABELLA        595
-#define TRAINER_GRUNT_37        596
-#define TRAINER_TABITHA_2       597
-#define TRAINER_JONATHAN        598
-#define TRAINER_BRENDAN_12      599
-#define TRAINER_MAY_10          600
-#define TRAINER_MAXIE_1         601
-#define TRAINER_MAXIE_2         602
-#define TRAINER_TIANA           603
-#define TRAINER_HALEY_1         604
-#define TRAINER_JANICE          605
-#define TRAINER_VIVI            606
-#define TRAINER_HALEY_2         607
-#define TRAINER_HALEY_3         608
-#define TRAINER_HALEY_4         609
-#define TRAINER_HALEY_5         610
-#define TRAINER_SALLY           611
-#define TRAINER_ROBIN           612
-#define TRAINER_ANDREA          613
-#define TRAINER_CRISSY          614
-#define TRAINER_RICK            615
-#define TRAINER_LYLE            616
-#define TRAINER_JOSE            617
-#define TRAINER_DOUG            618
-#define TRAINER_GREG            619
-#define TRAINER_KENT            620
-#define TRAINER_JAMES_1         621
-#define TRAINER_JAMES_2         622
-#define TRAINER_JAMES_3         623
-#define TRAINER_JAMES_4         624
-#define TRAINER_JAMES_5         625
-#define TRAINER_BRICE           626
-#define TRAINER_TRENT_1         627
-#define TRAINER_LENNY           628
-#define TRAINER_LUCAS_1         629
-#define TRAINER_ALAN            630
-#define TRAINER_CLARK           631
-#define TRAINER_ERIC            632
-#define TRAINER_LUCAS_2         633
-#define TRAINER_MIKE_1          634
-#define TRAINER_MIKE_2          635
-#define TRAINER_TRENT_2         636
-#define TRAINER_TRENT_3         637
-#define TRAINER_TRENT_4         638
-#define TRAINER_TRENT_5         639
-#define TRAINER_DEZ_AND_LUKE    640
-#define TRAINER_LEA_AND_JED     641
-#define TRAINER_KIRA_AND_DAN_1  642
-#define TRAINER_KIRA_AND_DAN_2  643
-#define TRAINER_KIRA_AND_DAN_3  644
-#define TRAINER_KIRA_AND_DAN_4  645
-#define TRAINER_KIRA_AND_DAN_5  646
-#define TRAINER_JOHANNA         647
-#define TRAINER_GERALD          648
-#define TRAINER_VIVIAN          649
-#define TRAINER_DANIELLE        650
-#define TRAINER_HIDEO           651
-#define TRAINER_KEIGO           652
-#define TRAINER_RILEY           653
-#define TRAINER_FLINT           654
-#define TRAINER_ASHLEY          655
-#define TRAINER_WALLY_2         656
-#define TRAINER_WALLY_3         657
-#define TRAINER_WALLY_4         658
-#define TRAINER_WALLY_5         659
-#define TRAINER_WALLY_6         660
-#define TRAINER_BRENDAN_13      661
-#define TRAINER_BRENDAN_14      662
-#define TRAINER_BRENDAN_15      663
-#define TRAINER_MAY_11          664
-#define TRAINER_MAY_12          665
-#define TRAINER_MAY_13          666
-#define TRAINER_JONAH           667
-#define TRAINER_HENRY           668
-#define TRAINER_ROGER           669
-#define TRAINER_ALEXA           670
-#define TRAINER_RUBEN           671
-#define TRAINER_KOJI_1          672
-#define TRAINER_WAYNE           673
-#define TRAINER_AIDAN           674
-#define TRAINER_REED            675
-#define TRAINER_TISHA           676
-#define TRAINER_TORI_AND_TIA    677
-#define TRAINER_KIM_AND_IRIS    678
-#define TRAINER_TYRA_AND_IVY    679
-#define TRAINER_MEL_AND_PAUL    680
-#define TRAINER_JOHN_AND_JAY_1  681
-#define TRAINER_JOHN_AND_JAY_2  682
-#define TRAINER_JOHN_AND_JAY_3  683
-#define TRAINER_JOHN_AND_JAY_4  684
-#define TRAINER_JOHN_AND_JAY_5  685
-#define TRAINER_RELI_AND_IAN    686
-#define TRAINER_LILA_AND_ROY_1  687
-#define TRAINER_LILA_AND_ROY_2  688
-#define TRAINER_LILA_AND_ROY_3  689
-#define TRAINER_LILA_AND_ROY_4  690
-#define TRAINER_LILA_AND_ROY_5  691
-#define TRAINER_LISA_AND_RAY    692
-#define TRAINER_CHRIS           693
-#define TRAINER_DAWSON          694
-#define TRAINER_SARAH           695
-#define TRAINER_DARIAN          696
-#define TRAINER_HAILEY          697
-#define TRAINER_CHANDLER        698
-#define TRAINER_KALEB           699
-#define TRAINER_JOSEPH          700
-#define TRAINER_ALYSSA          701
-#define TRAINER_MARCOS          702
-#define TRAINER_RHETT           703
-#define TRAINER_TYRON           704
-#define TRAINER_CELINA          705
-#define TRAINER_BIANCA          706
-#define TRAINER_HAYDEN          707
-#define TRAINER_SOPHIE          708
-#define TRAINER_COBY            709
-#define TRAINER_LAWRENCE        710
-#define TRAINER_WYATT           711
-#define TRAINER_ANGELINA        712
-#define TRAINER_KAI             713
-#define TRAINER_CHARLOTTE       714
-#define TRAINER_DEANDRE         715
-#define TRAINER_GRUNT_38        716
-#define TRAINER_GRUNT_39        717
-#define TRAINER_GRUNT_40        718
-#define TRAINER_GRUNT_41        719
-#define TRAINER_GRUNT_42        720
-#define TRAINER_GRUNT_43        721
-#define TRAINER_GRUNT_44        722
-#define TRAINER_GRUNT_45        723
-#define TRAINER_GRUNT_46        724
-#define TRAINER_GRUNT_47        725
-#define TRAINER_GRUNT_48        726
-#define TRAINER_GRUNT_49        727
-#define TRAINER_GRUNT_50        728
-#define TRAINER_GRUNT_51        729
-#define TRAINER_GRUNT_52        730
-#define TRAINER_GRUNT_53        731
-#define TRAINER_TABITHA_3       732
-#define TRAINER_DARCY           733
-#define TRAINER_MAXIE_3         734
-#define TRAINER_PETE            735
-#define TRAINER_ISABELLE        736
-#define TRAINER_ANDRES_1        737
-#define TRAINER_JOSUE           738
-#define TRAINER_CAMRON          739
-#define TRAINER_CORY_1          740
-#define TRAINER_CAROLINA        741
-#define TRAINER_ELIJAH          742
-#define TRAINER_CELIA           743
-#define TRAINER_BRYAN           744
-#define TRAINER_BRANDEN         745
-#define TRAINER_BRYANT          746
-#define TRAINER_SHAYLA          747
-#define TRAINER_KYRA            748
-#define TRAINER_JAIDEN          749
-#define TRAINER_ALIX            750
-#define TRAINER_HELENE          751
-#define TRAINER_MARLENE         752
-#define TRAINER_DEVAN           753
-#define TRAINER_JOHNSON         754
-#define TRAINER_MELINA          755
-#define TRAINER_BRANDI          756
-#define TRAINER_AISHA           757
-#define TRAINER_MAKAYLA         758
-#define TRAINER_FABIAN          759
-#define TRAINER_DAYTON          760
-#define TRAINER_RACHEL          761
-#define TRAINER_LEONEL          762
-#define TRAINER_CALLIE          763
-#define TRAINER_CALE            764
-#define TRAINER_MYLES           765
-#define TRAINER_PAT             766
-#define TRAINER_CRISTIN_1       767
-#define TRAINER_MAY_14          768
-#define TRAINER_MAY_15          769
-#define TRAINER_ROXANNE_2       770
-#define TRAINER_ROXANNE_3       771
-#define TRAINER_ROXANNE_4       772
-#define TRAINER_ROXANNE_5       773
-#define TRAINER_BRAWLY_2        774
-#define TRAINER_BRAWLY_3        775
-#define TRAINER_BRAWLY_4        776
-#define TRAINER_BRAWLY_5        777
-#define TRAINER_WATTSON_2       778
-#define TRAINER_WATTSON_3       779
-#define TRAINER_WATTSON_4       780
-#define TRAINER_WATTSON_5       781
-#define TRAINER_FLANNERY_2      782
-#define TRAINER_FLANNERY_3      783
-#define TRAINER_FLANNERY_4      784
-#define TRAINER_FLANNERY_5      785
-#define TRAINER_NORMAN_2        786
-#define TRAINER_NORMAN_3        787
-#define TRAINER_NORMAN_4        788
-#define TRAINER_NORMAN_5        789
-#define TRAINER_WINONA_2        790
-#define TRAINER_WINONA_3        791
-#define TRAINER_WINONA_4        792
-#define TRAINER_WINONA_5        793
-#define TRAINER_TATE_AND_LIZA_2 794
-#define TRAINER_TATE_AND_LIZA_3 795
-#define TRAINER_TATE_AND_LIZA_4 796
-#define TRAINER_TATE_AND_LIZA_5 797
-#define TRAINER_JUAN_2          798
-#define TRAINER_JUAN_3          799
-#define TRAINER_JUAN_4          800
-#define TRAINER_JUAN_5          801
-#define TRAINER_ANGELO          802
-#define TRAINER_DARIUS          803
-#define TRAINER_STEVEN          804
-#define TRAINER_ANABEL          805
-#define TRAINER_TUCKER          806
-#define TRAINER_SPENSER         807
-#define TRAINER_GRETA           808
-#define TRAINER_NOLAND          809
-#define TRAINER_LUCY            810
-#define TRAINER_BRANDON         811
-#define TRAINER_ANDRES_2        812
-#define TRAINER_ANDRES_3        813
-#define TRAINER_ANDRES_4        814
-#define TRAINER_ANDRES_5        815
-#define TRAINER_CORY_2          816
-#define TRAINER_CORY_3          817
-#define TRAINER_CORY_4          818
-#define TRAINER_CORY_5          819
-#define TRAINER_PABLO_2         820
-#define TRAINER_PABLO_3         821
-#define TRAINER_PABLO_4         822
-#define TRAINER_PABLO_5         823
-#define TRAINER_KOJI_2          824
-#define TRAINER_KOJI_3          825
-#define TRAINER_KOJI_4          826
-#define TRAINER_KOJI_5          827
-#define TRAINER_CRISTIN_2       828
-#define TRAINER_CRISTIN_3       829
-#define TRAINER_CRISTIN_4       830
-#define TRAINER_CRISTIN_5       831
-#define TRAINER_FERNANDO_2      832
-#define TRAINER_FERNANDO_3      833
-#define TRAINER_FERNANDO_4      834
-#define TRAINER_FERNANDO_5      835
-#define TRAINER_SAWYER_2        836
-#define TRAINER_SAWYER_3        837
-#define TRAINER_SAWYER_4        838
-#define TRAINER_SAWYER_5        839
-#define TRAINER_GABRIELLE_2     840
-#define TRAINER_GABRIELLE_3     841
-#define TRAINER_GABRIELLE_4     842
-#define TRAINER_GABRIELLE_5     843
-#define TRAINER_THALIA_2        844
-#define TRAINER_THALIA_3        845
-#define TRAINER_THALIA_4        846
-#define TRAINER_THALIA_5        847
-#define TRAINER_MARIELA         848
-#define TRAINER_ALVARO          849
-#define TRAINER_EVERETT         850
-#define TRAINER_RED             851
-#define TRAINER_LEAF            852
-#define TRAINER_BRENDAN_16      853
-#define TRAINER_MAY_16          854
+#define TRAINER_NONE                          0
+#define TRAINER_SAWYER_1                      1
+#define TRAINER_GRUNT_AQUA_HIDEOUT_1          2
+#define TRAINER_GRUNT_AQUA_HIDEOUT_2          3
+#define TRAINER_GRUNT_AQUA_HIDEOUT_3          4
+#define TRAINER_GRUNT_AQUA_HIDEOUT_4          5
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_1       6
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_2       7
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_3       8
+#define TRAINER_GABRIELLE_1                   9
+#define TRAINER_GRUNT_PETALBURG_WOODS        10
+#define TRAINER_MARCEL                       11
+#define TRAINER_ALBERTO                      12
+#define TRAINER_ED                           13
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_4      14
+#define TRAINER_DECLAN                       15
+#define TRAINER_GRUNT_RUSTURF_TUNNEL         16
+#define TRAINER_GRUNT_WEATHER_INST_1         17
+#define TRAINER_GRUNT_WEATHER_INST_2         18
+#define TRAINER_GRUNT_WEATHER_INST_3         19
+#define TRAINER_GRUNT_MUSEUM_1               20
+#define TRAINER_GRUNT_MUSEUM_2               21
+#define TRAINER_GRUNT_SPACE_CENTER_1         22
+#define TRAINER_GRUNT_MT_PYRE_1              23
+#define TRAINER_GRUNT_MT_PYRE_2              24
+#define TRAINER_GRUNT_MT_PYRE_3              25
+#define TRAINER_GRUNT_WEATHER_INST_4         26
+#define TRAINER_GRUNT_AQUA_HIDEOUT_5         27
+#define TRAINER_GRUNT_AQUA_HIDEOUT_6         28
+#define TRAINER_FREDRICK                     29
+#define TRAINER_MATT                         30
+#define TRAINER_ZANDER                       31
+#define TRAINER_SHELLY_1                     32
+#define TRAINER_SHELLY_2                     33
+#define TRAINER_ARCHIE                       34
+#define TRAINER_LEAH                         35
+#define TRAINER_DAISY                        36
+#define TRAINER_ROSE_1                       37
+#define TRAINER_FELIX                        38
+#define TRAINER_VIOLET                       39
+#define TRAINER_ROSE_2                       40
+#define TRAINER_ROSE_3                       41
+#define TRAINER_ROSE_4                       42
+#define TRAINER_ROSE_5                       43
+#define TRAINER_DUSTY_1                      44
+#define TRAINER_CHIP                         45
+#define TRAINER_FOSTER                       46
+#define TRAINER_DUSTY_2                      47
+#define TRAINER_DUSTY_3                      48
+#define TRAINER_DUSTY_4                      49
+#define TRAINER_DUSTY_5                      50
+#define TRAINER_GABBY_AND_TY_1               51
+#define TRAINER_GABBY_AND_TY_2               52
+#define TRAINER_GABBY_AND_TY_3               53
+#define TRAINER_GABBY_AND_TY_4               54
+#define TRAINER_GABBY_AND_TY_5               55
+#define TRAINER_GABBY_AND_TY_6               56
+#define TRAINER_LOLA_1                       57
+#define TRAINER_AUSTINA                      58
+#define TRAINER_GWEN                         59
+#define TRAINER_LOLA_2                       60
+#define TRAINER_LOLA_3                       61
+#define TRAINER_LOLA_4                       62
+#define TRAINER_LOLA_5                       63
+#define TRAINER_RICKY_1                      64
+#define TRAINER_SIMON                        65
+#define TRAINER_CHARLIE                      66
+#define TRAINER_RICKY_2                      67
+#define TRAINER_RICKY_3                      68
+#define TRAINER_RICKY_4                      69
+#define TRAINER_RICKY_5                      70
+#define TRAINER_RANDALL                      71
+#define TRAINER_PARKER                       72
+#define TRAINER_GEORGE                       73
+#define TRAINER_BERKE                        74
+#define TRAINER_BRAXTON                      75
+#define TRAINER_VINCENT                      76
+#define TRAINER_LEROY                        77
+#define TRAINER_WILTON_1                     78
+#define TRAINER_EDGAR                        79
+#define TRAINER_ALBERT                       80
+#define TRAINER_SAMUEL                       81
+#define TRAINER_VITO                         82
+#define TRAINER_OWEN                         83
+#define TRAINER_WILTON_2                     84
+#define TRAINER_WILTON_3                     85
+#define TRAINER_WILTON_4                     86
+#define TRAINER_WILTON_5                     87
+#define TRAINER_WARREN                       88
+#define TRAINER_MARY                         89
+#define TRAINER_ALEXIA                       90
+#define TRAINER_JODY                         91
+#define TRAINER_WENDY                        92
+#define TRAINER_KEIRA                        93
+#define TRAINER_BROOKE_1                     94
+#define TRAINER_JENNIFER                     95
+#define TRAINER_HOPE                         96
+#define TRAINER_SHANNON                      97
+#define TRAINER_MICHELLE                     98
+#define TRAINER_CAROLINE                     99
+#define TRAINER_JULIE                       100
+#define TRAINER_BROOKE_2                    101
+#define TRAINER_BROOKE_3                    102
+#define TRAINER_BROOKE_4                    103
+#define TRAINER_BROOKE_5                    104
+#define TRAINER_PATRICIA                    105
+#define TRAINER_KINDRA                      106
+#define TRAINER_TAMMY                       107
+#define TRAINER_VALERIE_1                   108
+#define TRAINER_TASHA                       109
+#define TRAINER_VALERIE_2                   110
+#define TRAINER_VALERIE_3                   111
+#define TRAINER_VALERIE_4                   112
+#define TRAINER_VALERIE_5                   113
+#define TRAINER_CINDY_1                     114
+#define TRAINER_DAPHNE                      115
+#define TRAINER_GRUNT_SPACE_CENTER_2        116
+#define TRAINER_CINDY_2                     117
+#define TRAINER_BRIANNA                     118
+#define TRAINER_NAOMI                       119
+#define TRAINER_CINDY_3                     120
+#define TRAINER_CINDY_4                     121
+#define TRAINER_CINDY_5                     122
+#define TRAINER_CINDY_6                     123
+#define TRAINER_MELISSA                     124
+#define TRAINER_SHEILA                      125
+#define TRAINER_SHIRLEY                     126
+#define TRAINER_JESSICA_1                   127
+#define TRAINER_CONNIE                      128
+#define TRAINER_BRIDGET                     129
+#define TRAINER_OLIVIA                      130
+#define TRAINER_TIFFANY                     131
+#define TRAINER_JESSICA_2                   132
+#define TRAINER_JESSICA_3                   133
+#define TRAINER_JESSICA_4                   134
+#define TRAINER_JESSICA_5                   135
+#define TRAINER_WINSTON_1                   136
+#define TRAINER_MOLLIE                      137
+#define TRAINER_GARRET                      138
+#define TRAINER_WINSTON_2                   139
+#define TRAINER_WINSTON_3                   140
+#define TRAINER_WINSTON_4                   141
+#define TRAINER_WINSTON_5                   142
+#define TRAINER_STEVE_1                     143
+#define TRAINER_THALIA_1                    144
+#define TRAINER_MARK                        145
+#define TRAINER_GRUNT_MT_CHIMNEY_1          146
+#define TRAINER_STEVE_2                     147
+#define TRAINER_STEVE_3                     148
+#define TRAINER_STEVE_4                     149
+#define TRAINER_STEVE_5                     150
+#define TRAINER_LUIS                        151
+#define TRAINER_DOMINIK                     152
+#define TRAINER_DOUGLAS                     153
+#define TRAINER_DARRIN                      154
+#define TRAINER_TONY_1                      155
+#define TRAINER_JEROME                      156
+#define TRAINER_MATTHEW                     157
+#define TRAINER_DAVID                       158
+#define TRAINER_SPENCER                     159
+#define TRAINER_ROLAND                      160
+#define TRAINER_NOLEN                       161
+#define TRAINER_STAN                        162
+#define TRAINER_BARRY                       163
+#define TRAINER_DEAN                        164
+#define TRAINER_RODNEY                      165
+#define TRAINER_RICHARD                     166
+#define TRAINER_HERMAN                      167
+#define TRAINER_SANTIAGO                    168
+#define TRAINER_GILBERT                     169
+#define TRAINER_FRANKLIN                    170
+#define TRAINER_KEVIN                       171
+#define TRAINER_JACK                        172
+#define TRAINER_DUDLEY                      173
+#define TRAINER_CHAD                        174
+#define TRAINER_TONY_2                      175
+#define TRAINER_TONY_3                      176
+#define TRAINER_TONY_4                      177
+#define TRAINER_TONY_5                      178
+#define TRAINER_TAKAO                       179
+#define TRAINER_HITOSHI                     180
+#define TRAINER_KIYO                        181
+#define TRAINER_KOICHI                      182
+#define TRAINER_NOB_1                       183
+#define TRAINER_NOB_2                       184
+#define TRAINER_NOB_3                       185
+#define TRAINER_NOB_4                       186
+#define TRAINER_NOB_5                       187
+#define TRAINER_YUJI                        188
+#define TRAINER_DAISUKE                     189
+#define TRAINER_ATSUSHI                     190
+#define TRAINER_KIRK                        191
+#define TRAINER_GRUNT_AQUA_HIDEOUT_7        192
+#define TRAINER_GRUNT_AQUA_HIDEOUT_8        193
+#define TRAINER_SHAWN                       194
+#define TRAINER_FERNANDO_1                  195
+#define TRAINER_DALTON_1                    196
+#define TRAINER_DALTON_2                    197
+#define TRAINER_DALTON_3                    198
+#define TRAINER_DALTON_4                    199
+#define TRAINER_DALTON_5                    200
+#define TRAINER_COLE                        201
+#define TRAINER_JEFF                        202
+#define TRAINER_AXLE                        203
+#define TRAINER_JACE                        204
+#define TRAINER_KEEGAN                      205
+#define TRAINER_BERNIE_1                    206
+#define TRAINER_BERNIE_2                    207
+#define TRAINER_BERNIE_3                    208
+#define TRAINER_BERNIE_4                    209
+#define TRAINER_BERNIE_5                    210
+#define TRAINER_DREW                        211
+#define TRAINER_BEAU                        212
+#define TRAINER_LARRY                       213
+#define TRAINER_SHANE                       214
+#define TRAINER_JUSTIN                      215
+#define TRAINER_ETHAN_1                     216
+#define TRAINER_AUTUMN                      217
+#define TRAINER_TRAVIS                      218
+#define TRAINER_ETHAN_2                     219
+#define TRAINER_ETHAN_3                     220
+#define TRAINER_ETHAN_4                     221
+#define TRAINER_ETHAN_5                     222
+#define TRAINER_BRENT                       223
+#define TRAINER_DONALD                      224
+#define TRAINER_TAYLOR                      225
+#define TRAINER_JEFFREY_1                   226
+#define TRAINER_DEREK                       227
+#define TRAINER_JEFFREY_2                   228
+#define TRAINER_JEFFREY_3                   229
+#define TRAINER_JEFFREY_4                   230
+#define TRAINER_JEFFREY_5                   231
+#define TRAINER_EDWARD                      232
+#define TRAINER_PRESTON                     233
+#define TRAINER_VIRGIL                      234
+#define TRAINER_BLAKE                       235
+#define TRAINER_WILLIAM                     236
+#define TRAINER_JOSHUA                      237
+#define TRAINER_CAMERON_1                   238
+#define TRAINER_CAMERON_2                   239
+#define TRAINER_CAMERON_3                   240
+#define TRAINER_CAMERON_4                   241
+#define TRAINER_CAMERON_5                   242
+#define TRAINER_JACLYN                      243
+#define TRAINER_HANNAH                      244
+#define TRAINER_SAMANTHA                    245
+#define TRAINER_MAURA                       246
+#define TRAINER_KAYLA                       247
+#define TRAINER_ALEXIS                      248
+#define TRAINER_JACKI_1                     249
+#define TRAINER_JACKI_2                     250
+#define TRAINER_JACKI_3                     251
+#define TRAINER_JACKI_4                     252
+#define TRAINER_JACKI_5                     253
+#define TRAINER_WALTER_1                    254
+#define TRAINER_MICAH                       255
+#define TRAINER_THOMAS                      256
+#define TRAINER_WALTER_2                    257
+#define TRAINER_WALTER_3                    258
+#define TRAINER_WALTER_4                    259
+#define TRAINER_WALTER_5                    260
+#define TRAINER_SIDNEY                      261
+#define TRAINER_PHOEBE                      262
+#define TRAINER_GLACIA                      263
+#define TRAINER_DRAKE                       264
+#define TRAINER_ROXANNE_1                   265
+#define TRAINER_BRAWLY_1                    266
+#define TRAINER_WATTSON_1                   267
+#define TRAINER_FLANNERY_1                  268
+#define TRAINER_NORMAN_1                    269
+#define TRAINER_WINONA_1                    270
+#define TRAINER_TATE_AND_LIZA_1             271
+#define TRAINER_JUAN_1                      272
+#define TRAINER_JERRY_1                     273
+#define TRAINER_TED                         274
+#define TRAINER_PAUL                        275
+#define TRAINER_JERRY_2                     276
+#define TRAINER_JERRY_3                     277
+#define TRAINER_JERRY_4                     278
+#define TRAINER_JERRY_5                     279
+#define TRAINER_KAREN_1                     280
+#define TRAINER_GEORGIA                     281
+#define TRAINER_KAREN_2                     282
+#define TRAINER_KAREN_3                     283
+#define TRAINER_KAREN_4                     284
+#define TRAINER_KAREN_5                     285
+#define TRAINER_KATE_AND_JOY                286
+#define TRAINER_ANNA_AND_MEG_1              287
+#define TRAINER_ANNA_AND_MEG_2              288
+#define TRAINER_ANNA_AND_MEG_3              289
+#define TRAINER_ANNA_AND_MEG_4              290
+#define TRAINER_ANNA_AND_MEG_5              291
+#define TRAINER_VICTOR                      292
+#define TRAINER_MIGUEL_1                    293
+#define TRAINER_COLTON                      294
+#define TRAINER_MIGUEL_2                    295
+#define TRAINER_MIGUEL_3                    296
+#define TRAINER_MIGUEL_4                    297
+#define TRAINER_MIGUEL_5                    298
+#define TRAINER_VICTORIA                    299
+#define TRAINER_VANESSA                     300
+#define TRAINER_BETHANY                     301
+#define TRAINER_ISABEL_1                    302
+#define TRAINER_ISABEL_2                    303
+#define TRAINER_ISABEL_3                    304
+#define TRAINER_ISABEL_4                    305
+#define TRAINER_ISABEL_5                    306
+#define TRAINER_TIMOTHY_1                   307
+#define TRAINER_TIMOTHY_2                   308
+#define TRAINER_TIMOTHY_3                   309
+#define TRAINER_TIMOTHY_4                   310
+#define TRAINER_TIMOTHY_5                   311
+#define TRAINER_VICKY                       312
+#define TRAINER_SHELBY_1                    313
+#define TRAINER_SHELBY_2                    314
+#define TRAINER_SHELBY_3                    315
+#define TRAINER_SHELBY_4                    316
+#define TRAINER_SHELBY_5                    317
+#define TRAINER_CALVIN_1                    318
+#define TRAINER_BILLY                       319
+#define TRAINER_JOSH                        320
+#define TRAINER_TOMMY                       321
+#define TRAINER_JOEY                        322
+#define TRAINER_BEN                         323
+#define TRAINER_QUINCY                      324
+#define TRAINER_KATELYNN                    325
+#define TRAINER_JAYLEN                      326
+#define TRAINER_DILLON                      327
+#define TRAINER_CALVIN_2                    328
+#define TRAINER_CALVIN_3                    329
+#define TRAINER_CALVIN_4                    330
+#define TRAINER_CALVIN_5                    331
+#define TRAINER_EDDIE                       332
+#define TRAINER_ALLEN                       333
+#define TRAINER_TIMMY                       334
+#define TRAINER_WALLACE                     335
+#define TRAINER_ANDREW                      336
+#define TRAINER_IVAN                        337
+#define TRAINER_CLAUDE                      338
+#define TRAINER_ELLIOT_1                    339
+#define TRAINER_NED                         340
+#define TRAINER_DALE                        341
+#define TRAINER_NOLAN                       342
+#define TRAINER_BARNY                       343
+#define TRAINER_WADE                        344
+#define TRAINER_CARTER                      345
+#define TRAINER_ELLIOT_2                    346
+#define TRAINER_ELLIOT_3                    347
+#define TRAINER_ELLIOT_4                    348
+#define TRAINER_ELLIOT_5                    349
+#define TRAINER_RONALD                      350
+#define TRAINER_JACOB                       351
+#define TRAINER_ANTHONY                     352
+#define TRAINER_BENJAMIN_1                  353
+#define TRAINER_BENJAMIN_2                  354
+#define TRAINER_BENJAMIN_3                  355
+#define TRAINER_BENJAMIN_4                  356
+#define TRAINER_BENJAMIN_5                  357
+#define TRAINER_ABIGAIL_1                   358
+#define TRAINER_JASMINE                     359
+#define TRAINER_ABIGAIL_2                   360
+#define TRAINER_ABIGAIL_3                   361
+#define TRAINER_ABIGAIL_4                   362
+#define TRAINER_ABIGAIL_5                   363
+#define TRAINER_DYLAN_1                     364
+#define TRAINER_DYLAN_2                     365
+#define TRAINER_DYLAN_3                     366
+#define TRAINER_DYLAN_4                     367
+#define TRAINER_DYLAN_5                     368
+#define TRAINER_MARIA_1                     369
+#define TRAINER_MARIA_2                     370
+#define TRAINER_MARIA_3                     371
+#define TRAINER_MARIA_4                     372
+#define TRAINER_MARIA_5                     373
+#define TRAINER_CAMDEN                      374
+#define TRAINER_DEMETRIUS                   375
+#define TRAINER_ISAIAH_1                    376
+#define TRAINER_PABLO_1                     377
+#define TRAINER_CHASE                       378
+#define TRAINER_ISAIAH_2                    379
+#define TRAINER_ISAIAH_3                    380
+#define TRAINER_ISAIAH_4                    381
+#define TRAINER_ISAIAH_5                    382
+#define TRAINER_ISOBEL                      383
+#define TRAINER_DONNY                       384
+#define TRAINER_TALIA                       385
+#define TRAINER_KATELYN_1                   386
+#define TRAINER_ALLISON                     387
+#define TRAINER_KATELYN_2                   388
+#define TRAINER_KATELYN_3                   389
+#define TRAINER_KATELYN_4                   390
+#define TRAINER_KATELYN_5                   391
+#define TRAINER_NICOLAS_1                   392
+#define TRAINER_NICOLAS_2                   393
+#define TRAINER_NICOLAS_3                   394
+#define TRAINER_NICOLAS_4                   395
+#define TRAINER_NICOLAS_5                   396
+#define TRAINER_AARON                       397
+#define TRAINER_PERRY                       398
+#define TRAINER_HUGH                        399
+#define TRAINER_PHIL                        400
+#define TRAINER_JARED                       401
+#define TRAINER_HUMBERTO                    402
+#define TRAINER_PRESLEY                     403
+#define TRAINER_EDWARDO                     404
+#define TRAINER_COLIN                       405
+#define TRAINER_ROBERT_1                    406
+#define TRAINER_BENNY                       407
+#define TRAINER_CHESTER                     408
+#define TRAINER_ROBERT_2                    409
+#define TRAINER_ROBERT_3                    410
+#define TRAINER_ROBERT_4                    411
+#define TRAINER_ROBERT_5                    412
+#define TRAINER_ALEX                        413
+#define TRAINER_BECK                        414
+#define TRAINER_YASU                        415
+#define TRAINER_TAKASHI                     416
+#define TRAINER_DIANNE                      417
+#define TRAINER_JANI                        418
+#define TRAINER_LAO_1                       419
+#define TRAINER_LUNG                        420
+#define TRAINER_LAO_2                       421
+#define TRAINER_LAO_3                       422
+#define TRAINER_LAO_4                       423
+#define TRAINER_LAO_5                       424
+#define TRAINER_JOCELYN                     425
+#define TRAINER_LAURA                       426
+#define TRAINER_CYNDY_1                     427
+#define TRAINER_CORA                        428
+#define TRAINER_PAULA                       429
+#define TRAINER_CYNDY_2                     430
+#define TRAINER_CYNDY_3                     431
+#define TRAINER_CYNDY_4                     432
+#define TRAINER_CYNDY_5                     433
+#define TRAINER_MADELINE_1                  434
+#define TRAINER_CLARISSA                    435
+#define TRAINER_ANGELICA                    436
+#define TRAINER_MADELINE_2                  437
+#define TRAINER_MADELINE_3                  438
+#define TRAINER_MADELINE_4                  439
+#define TRAINER_MADELINE_5                  440
+#define TRAINER_BEVERLY                     441
+#define TRAINER_IMANI                       442
+#define TRAINER_KYLA                        443
+#define TRAINER_DENISE                      444
+#define TRAINER_BETH                        445
+#define TRAINER_TARA                        446
+#define TRAINER_MISSY                       447
+#define TRAINER_ALICE                       448
+#define TRAINER_JENNY_1                     449
+#define TRAINER_GRACE                       450
+#define TRAINER_TANYA                       451
+#define TRAINER_SHARON                      452
+#define TRAINER_NIKKI                       453
+#define TRAINER_BRENDA                      454
+#define TRAINER_KATIE                       455
+#define TRAINER_SUSIE                       456
+#define TRAINER_KARA                        457
+#define TRAINER_DANA                        458
+#define TRAINER_SIENNA                      459
+#define TRAINER_DEBRA                       460
+#define TRAINER_LINDA                       461
+#define TRAINER_KAYLEE                      462
+#define TRAINER_LAUREL                      463
+#define TRAINER_CARLEE                      464
+#define TRAINER_JENNY_2                     465
+#define TRAINER_JENNY_3                     466
+#define TRAINER_JENNY_4                     467
+#define TRAINER_JENNY_5                     468
+#define TRAINER_HEIDI                       469
+#define TRAINER_BECKY                       470
+#define TRAINER_CAROL                       471
+#define TRAINER_NANCY                       472
+#define TRAINER_MARTHA                      473
+#define TRAINER_DIANA_1                     474
+#define TRAINER_CEDRIC                      475
+#define TRAINER_IRENE                       476
+#define TRAINER_DIANA_2                     477
+#define TRAINER_DIANA_3                     478
+#define TRAINER_DIANA_4                     479
+#define TRAINER_DIANA_5                     480
+#define TRAINER_AMY_AND_LIV_1               481
+#define TRAINER_AMY_AND_LIV_2               482
+#define TRAINER_GINA_AND_MIA_1              483
+#define TRAINER_MIU_AND_YUKI                484
+#define TRAINER_AMY_AND_LIV_3               485
+#define TRAINER_GINA_AND_MIA_2              486
+#define TRAINER_AMY_AND_LIV_4               487
+#define TRAINER_AMY_AND_LIV_5               488
+#define TRAINER_AMY_AND_LIV_6               489
+#define TRAINER_HUEY                        490
+#define TRAINER_EDMOND                      491
+#define TRAINER_ERNEST_1                    492
+#define TRAINER_DWAYNE                      493
+#define TRAINER_PHILLIP                     494
+#define TRAINER_LEONARD                     495
+#define TRAINER_DUNCAN                      496
+#define TRAINER_ERNEST_2                    497
+#define TRAINER_ERNEST_3                    498
+#define TRAINER_ERNEST_4                    499
+#define TRAINER_ERNEST_5                    500
+#define TRAINER_ELI                         501
+#define TRAINER_ANNIKA                      502
+#define TRAINER_JAZMYN                      503
+#define TRAINER_JONAS                       504
+#define TRAINER_KAYLEY                      505
+#define TRAINER_AURON                       506
+#define TRAINER_KELVIN                      507
+#define TRAINER_MARLEY                      508
+#define TRAINER_REYNA                       509
+#define TRAINER_HUDSON                      510
+#define TRAINER_CONOR                       511
+#define TRAINER_EDWIN_1                     512
+#define TRAINER_HECTOR                      513
+#define TRAINER_TABITHA_1                   514
+#define TRAINER_EDWIN_2                     515
+#define TRAINER_EDWIN_3                     516
+#define TRAINER_EDWIN_4                     517
+#define TRAINER_EDWIN_5                     518
+#define TRAINER_WALLY_1                     519
+#define TRAINER_BRENDAN_1                   520
+#define TRAINER_BRENDAN_2                   521
+#define TRAINER_BRENDAN_3                   522
+#define TRAINER_BRENDAN_4                   523
+#define TRAINER_BRENDAN_5                   524
+#define TRAINER_BRENDAN_6                   525
+#define TRAINER_BRENDAN_7                   526
+#define TRAINER_BRENDAN_8                   527
+#define TRAINER_BRENDAN_9                   528
+#define TRAINER_MAY_1                       529
+#define TRAINER_MAY_2                       530
+#define TRAINER_MAY_3                       531
+#define TRAINER_MAY_4                       532
+#define TRAINER_MAY_5                       533
+#define TRAINER_MAY_6                       534
+#define TRAINER_MAY_7                       535
+#define TRAINER_MAY_8                       536
+#define TRAINER_MAY_9                       537
+#define TRAINER_ISAAC_1                     538
+#define TRAINER_DAVIS                       539
+#define TRAINER_MITCHELL                    540
+#define TRAINER_ISAAC_2                     541
+#define TRAINER_ISAAC_3                     542
+#define TRAINER_ISAAC_4                     543
+#define TRAINER_ISAAC_5                     544
+#define TRAINER_LYDIA_1                     545
+#define TRAINER_HALLE                       546
+#define TRAINER_GARRISON                    547
+#define TRAINER_LYDIA_2                     548
+#define TRAINER_LYDIA_3                     549
+#define TRAINER_LYDIA_4                     550
+#define TRAINER_LYDIA_5                     551
+#define TRAINER_JACKSON_1                   552
+#define TRAINER_LORENZO                     553
+#define TRAINER_SEBASTIAN                   554
+#define TRAINER_JACKSON_2                   555
+#define TRAINER_JACKSON_3                   556
+#define TRAINER_JACKSON_4                   557
+#define TRAINER_JACKSON_5                   558
+#define TRAINER_CATHERINE_1                 559
+#define TRAINER_JENNA                       560
+#define TRAINER_SOPHIA                      561
+#define TRAINER_CATHERINE_2                 562
+#define TRAINER_CATHERINE_3                 563
+#define TRAINER_CATHERINE_4                 564
+#define TRAINER_CATHERINE_5                 565
+#define TRAINER_JULIO                       566
+#define TRAINER_GRUNT_SEAFLOOR_CAVERN_5     567
+#define TRAINER_GRUNT_UNUSED                568
+#define TRAINER_GRUNT_MT_PYRE_4             569
+#define TRAINER_GRUNT_JAGGED_PASS           570
+#define TRAINER_MARC                        571
+#define TRAINER_BRENDEN                     572
+#define TRAINER_LILITH                      573
+#define TRAINER_CRISTIAN                    574
+#define TRAINER_SYLVIA                      575
+#define TRAINER_LEONARDO                    576
+#define TRAINER_ATHENA                      577
+#define TRAINER_HARRISON                    578
+#define TRAINER_GRUNT_MT_CHIMNEY_2          579
+#define TRAINER_CLARENCE                    580
+#define TRAINER_TERRY                       581
+#define TRAINER_NATE                        582
+#define TRAINER_KATHLEEN                    583
+#define TRAINER_CLIFFORD                    584
+#define TRAINER_NICHOLAS                    585
+#define TRAINER_GRUNT_SPACE_CENTER_3        586
+#define TRAINER_GRUNT_SPACE_CENTER_4        587
+#define TRAINER_GRUNT_SPACE_CENTER_5        588
+#define TRAINER_GRUNT_SPACE_CENTER_6        589
+#define TRAINER_GRUNT_SPACE_CENTER_7        590
+#define TRAINER_MACEY                       591
+#define TRAINER_BRENDAN_10                  592
+#define TRAINER_BRENDAN_11                  593
+#define TRAINER_PAXTON                      594
+#define TRAINER_ISABELLA                    595
+#define TRAINER_GRUNT_WEATHER_INST_5        596
+#define TRAINER_TABITHA_2                   597
+#define TRAINER_JONATHAN                    598
+#define TRAINER_BRENDAN_12                  599
+#define TRAINER_MAY_10                      600
+#define TRAINER_MAXIE_1                     601
+#define TRAINER_MAXIE_2                     602
+#define TRAINER_TIANA                       603
+#define TRAINER_HALEY_1                     604
+#define TRAINER_JANICE                      605
+#define TRAINER_VIVI                        606
+#define TRAINER_HALEY_2                     607
+#define TRAINER_HALEY_3                     608
+#define TRAINER_HALEY_4                     609
+#define TRAINER_HALEY_5                     610
+#define TRAINER_SALLY                       611
+#define TRAINER_ROBIN                       612
+#define TRAINER_ANDREA                      613
+#define TRAINER_CRISSY                      614
+#define TRAINER_RICK                        615
+#define TRAINER_LYLE                        616
+#define TRAINER_JOSE                        617
+#define TRAINER_DOUG                        618
+#define TRAINER_GREG                        619
+#define TRAINER_KENT                        620
+#define TRAINER_JAMES_1                     621
+#define TRAINER_JAMES_2                     622
+#define TRAINER_JAMES_3                     623
+#define TRAINER_JAMES_4                     624
+#define TRAINER_JAMES_5                     625
+#define TRAINER_BRICE                       626
+#define TRAINER_TRENT_1                     627
+#define TRAINER_LENNY                       628
+#define TRAINER_LUCAS_1                     629
+#define TRAINER_ALAN                        630
+#define TRAINER_CLARK                       631
+#define TRAINER_ERIC                        632
+#define TRAINER_LUCAS_2                     633
+#define TRAINER_MIKE_1                      634
+#define TRAINER_MIKE_2                      635
+#define TRAINER_TRENT_2                     636
+#define TRAINER_TRENT_3                     637
+#define TRAINER_TRENT_4                     638
+#define TRAINER_TRENT_5                     639
+#define TRAINER_DEZ_AND_LUKE                640
+#define TRAINER_LEA_AND_JED                 641
+#define TRAINER_KIRA_AND_DAN_1              642
+#define TRAINER_KIRA_AND_DAN_2              643
+#define TRAINER_KIRA_AND_DAN_3              644
+#define TRAINER_KIRA_AND_DAN_4              645
+#define TRAINER_KIRA_AND_DAN_5              646
+#define TRAINER_JOHANNA                     647
+#define TRAINER_GERALD                      648
+#define TRAINER_VIVIAN                      649
+#define TRAINER_DANIELLE                    650
+#define TRAINER_HIDEO                       651
+#define TRAINER_KEIGO                       652
+#define TRAINER_RILEY                       653
+#define TRAINER_FLINT                       654
+#define TRAINER_ASHLEY                      655
+#define TRAINER_WALLY_2                     656
+#define TRAINER_WALLY_3                     657
+#define TRAINER_WALLY_4                     658
+#define TRAINER_WALLY_5                     659
+#define TRAINER_WALLY_6                     660
+#define TRAINER_BRENDAN_13                  661
+#define TRAINER_BRENDAN_14                  662
+#define TRAINER_BRENDAN_15                  663
+#define TRAINER_MAY_11                      664
+#define TRAINER_MAY_12                      665
+#define TRAINER_MAY_13                      666
+#define TRAINER_JONAH                       667
+#define TRAINER_HENRY                       668
+#define TRAINER_ROGER                       669
+#define TRAINER_ALEXA                       670
+#define TRAINER_RUBEN                       671
+#define TRAINER_KOJI_1                      672
+#define TRAINER_WAYNE                       673
+#define TRAINER_AIDAN                       674
+#define TRAINER_REED                        675
+#define TRAINER_TISHA                       676
+#define TRAINER_TORI_AND_TIA                677
+#define TRAINER_KIM_AND_IRIS                678
+#define TRAINER_TYRA_AND_IVY                679
+#define TRAINER_MEL_AND_PAUL                680
+#define TRAINER_JOHN_AND_JAY_1              681
+#define TRAINER_JOHN_AND_JAY_2              682
+#define TRAINER_JOHN_AND_JAY_3              683
+#define TRAINER_JOHN_AND_JAY_4              684
+#define TRAINER_JOHN_AND_JAY_5              685
+#define TRAINER_RELI_AND_IAN                686
+#define TRAINER_LILA_AND_ROY_1              687
+#define TRAINER_LILA_AND_ROY_2              688
+#define TRAINER_LILA_AND_ROY_3              689
+#define TRAINER_LILA_AND_ROY_4              690
+#define TRAINER_LILA_AND_ROY_5              691
+#define TRAINER_LISA_AND_RAY                692
+#define TRAINER_CHRIS                       693
+#define TRAINER_DAWSON                      694
+#define TRAINER_SARAH                       695
+#define TRAINER_DARIAN                      696
+#define TRAINER_HAILEY                      697
+#define TRAINER_CHANDLER                    698
+#define TRAINER_KALEB                       699
+#define TRAINER_JOSEPH                      700
+#define TRAINER_ALYSSA                      701
+#define TRAINER_MARCOS                      702
+#define TRAINER_RHETT                       703
+#define TRAINER_TYRON                       704
+#define TRAINER_CELINA                      705
+#define TRAINER_BIANCA                      706
+#define TRAINER_HAYDEN                      707
+#define TRAINER_SOPHIE                      708
+#define TRAINER_COBY                        709
+#define TRAINER_LAWRENCE                    710
+#define TRAINER_WYATT                       711
+#define TRAINER_ANGELINA                    712
+#define TRAINER_KAI                         713
+#define TRAINER_CHARLOTTE                   714
+#define TRAINER_DEANDRE                     715
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_1       716
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_2       717
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_3       718
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_4       719
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_5       720
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_6       721
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_7       722
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_8       723
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_9       724
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_10      725
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_11      726
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_12      727
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_13      728
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_14      729
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_15      730
+#define TRAINER_GRUNT_MAGMA_HIDEOUT_16      731
+#define TRAINER_TABITHA_3                   732
+#define TRAINER_DARCY                       733
+#define TRAINER_MAXIE_3                     734
+#define TRAINER_PETE                        735
+#define TRAINER_ISABELLE                    736
+#define TRAINER_ANDRES_1                    737
+#define TRAINER_JOSUE                       738
+#define TRAINER_CAMRON                      739
+#define TRAINER_CORY_1                      740
+#define TRAINER_CAROLINA                    741
+#define TRAINER_ELIJAH                      742
+#define TRAINER_CELIA                       743
+#define TRAINER_BRYAN                       744
+#define TRAINER_BRANDEN                     745
+#define TRAINER_BRYANT                      746
+#define TRAINER_SHAYLA                      747
+#define TRAINER_KYRA                        748
+#define TRAINER_JAIDEN                      749
+#define TRAINER_ALIX                        750
+#define TRAINER_HELENE                      751
+#define TRAINER_MARLENE                     752
+#define TRAINER_DEVAN                       753
+#define TRAINER_JOHNSON                     754
+#define TRAINER_MELINA                      755
+#define TRAINER_BRANDI                      756
+#define TRAINER_AISHA                       757
+#define TRAINER_MAKAYLA                     758
+#define TRAINER_FABIAN                      759
+#define TRAINER_DAYTON                      760
+#define TRAINER_RACHEL                      761
+#define TRAINER_LEONEL                      762
+#define TRAINER_CALLIE                      763
+#define TRAINER_CALE                        764
+#define TRAINER_MYLES                       765
+#define TRAINER_PAT                         766
+#define TRAINER_CRISTIN_1                   767
+#define TRAINER_MAY_14                      768
+#define TRAINER_MAY_15                      769
+#define TRAINER_ROXANNE_2                   770
+#define TRAINER_ROXANNE_3                   771
+#define TRAINER_ROXANNE_4                   772
+#define TRAINER_ROXANNE_5                   773
+#define TRAINER_BRAWLY_2                    774
+#define TRAINER_BRAWLY_3                    775
+#define TRAINER_BRAWLY_4                    776
+#define TRAINER_BRAWLY_5                    777
+#define TRAINER_WATTSON_2                   778
+#define TRAINER_WATTSON_3                   779
+#define TRAINER_WATTSON_4                   780
+#define TRAINER_WATTSON_5                   781
+#define TRAINER_FLANNERY_2                  782
+#define TRAINER_FLANNERY_3                  783
+#define TRAINER_FLANNERY_4                  784
+#define TRAINER_FLANNERY_5                  785
+#define TRAINER_NORMAN_2                    786
+#define TRAINER_NORMAN_3                    787
+#define TRAINER_NORMAN_4                    788
+#define TRAINER_NORMAN_5                    789
+#define TRAINER_WINONA_2                    790
+#define TRAINER_WINONA_3                    791
+#define TRAINER_WINONA_4                    792
+#define TRAINER_WINONA_5                    793
+#define TRAINER_TATE_AND_LIZA_2             794
+#define TRAINER_TATE_AND_LIZA_3             795
+#define TRAINER_TATE_AND_LIZA_4             796
+#define TRAINER_TATE_AND_LIZA_5             797
+#define TRAINER_JUAN_2                      798
+#define TRAINER_JUAN_3                      799
+#define TRAINER_JUAN_4                      800
+#define TRAINER_JUAN_5                      801
+#define TRAINER_ANGELO                      802
+#define TRAINER_DARIUS                      803
+#define TRAINER_STEVEN                      804
+#define TRAINER_ANABEL                      805
+#define TRAINER_TUCKER                      806
+#define TRAINER_SPENSER                     807
+#define TRAINER_GRETA                       808
+#define TRAINER_NOLAND                      809
+#define TRAINER_LUCY                        810
+#define TRAINER_BRANDON                     811
+#define TRAINER_ANDRES_2                    812
+#define TRAINER_ANDRES_3                    813
+#define TRAINER_ANDRES_4                    814
+#define TRAINER_ANDRES_5                    815
+#define TRAINER_CORY_2                      816
+#define TRAINER_CORY_3                      817
+#define TRAINER_CORY_4                      818
+#define TRAINER_CORY_5                      819
+#define TRAINER_PABLO_2                     820
+#define TRAINER_PABLO_3                     821
+#define TRAINER_PABLO_4                     822
+#define TRAINER_PABLO_5                     823
+#define TRAINER_KOJI_2                      824
+#define TRAINER_KOJI_3                      825
+#define TRAINER_KOJI_4                      826
+#define TRAINER_KOJI_5                      827
+#define TRAINER_CRISTIN_2                   828
+#define TRAINER_CRISTIN_3                   829
+#define TRAINER_CRISTIN_4                   830
+#define TRAINER_CRISTIN_5                   831
+#define TRAINER_FERNANDO_2                  832
+#define TRAINER_FERNANDO_3                  833
+#define TRAINER_FERNANDO_4                  834
+#define TRAINER_FERNANDO_5                  835
+#define TRAINER_SAWYER_2                    836
+#define TRAINER_SAWYER_3                    837
+#define TRAINER_SAWYER_4                    838
+#define TRAINER_SAWYER_5                    839
+#define TRAINER_GABRIELLE_2                 840
+#define TRAINER_GABRIELLE_3                 841
+#define TRAINER_GABRIELLE_4                 842
+#define TRAINER_GABRIELLE_5                 843
+#define TRAINER_THALIA_2                    844
+#define TRAINER_THALIA_3                    845
+#define TRAINER_THALIA_4                    846
+#define TRAINER_THALIA_5                    847
+#define TRAINER_MARIELA                     848
+#define TRAINER_ALVARO                      849
+#define TRAINER_EVERETT                     850
+#define TRAINER_RED                         851
+#define TRAINER_LEAF                        852
+#define TRAINER_BRENDAN_16                  853
+#define TRAINER_MAY_16                      854
 
-#define TRAINERS_COUNT          855
+#define TRAINERS_COUNT                      855
 
 #endif  // GUARD_CONSTANTS_OPPONENTS_H
diff --git a/include/tv.h b/include/tv.h
index 8f697afe99..d0ca648bea 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -13,7 +13,7 @@ void sub_80EE8C8(u16 winStreak, u8 facility);
 void DoTVShow(void);
 void DoTVShowInSearchOfTrainers(void);
 void TryPutTreasureInvestigatorsOnAir(void);
-void sub_80EE2CC(void);
+void TryPutLotteryWinnerReportOnAir(void);
 void sub_80EE72C(void);
 void IncrementDailyPlantedBerries(void);
 void IncrementDailyPickedBerries(void);
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 98a28eea29..4b3b008036 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -58,123 +58,123 @@ static bool8 AIStackPop(void);
 static s32 CountUsablePartyMons(u8 battlerId);
 static s32 AI_GetAbility(u32 battlerId, bool32 guess);
 
-static void BattleAICmd_if_random_less_than(void);
-static void BattleAICmd_if_random_greater_than(void);
-static void BattleAICmd_if_random_equal(void);
-static void BattleAICmd_if_random_not_equal(void);
-static void BattleAICmd_score(void);
-static void BattleAICmd_if_hp_less_than(void);
-static void BattleAICmd_if_hp_more_than(void);
-static void BattleAICmd_if_hp_equal(void);
-static void BattleAICmd_if_hp_not_equal(void);
-static void BattleAICmd_if_status(void);
-static void BattleAICmd_if_not_status(void);
-static void BattleAICmd_if_status2(void);
-static void BattleAICmd_if_not_status2(void);
-static void BattleAICmd_if_status3(void);
-static void BattleAICmd_if_not_status3(void);
-static void BattleAICmd_if_side_affecting(void);
-static void BattleAICmd_if_not_side_affecting(void);
-static void BattleAICmd_if_less_than(void);
-static void BattleAICmd_if_more_than(void);
-static void BattleAICmd_if_equal(void);
-static void BattleAICmd_if_not_equal(void);
-static void BattleAICmd_if_less_than_ptr(void);
-static void BattleAICmd_if_more_than_ptr(void);
-static void BattleAICmd_if_equal_ptr(void);
-static void BattleAICmd_if_not_equal_ptr(void);
-static void BattleAICmd_if_move(void);
-static void BattleAICmd_if_not_move(void);
-static void BattleAICmd_if_in_bytes(void);
-static void BattleAICmd_if_not_in_bytes(void);
-static void BattleAICmd_if_in_hwords(void);
-static void BattleAICmd_if_not_in_hwords(void);
-static void BattleAICmd_if_user_has_attacking_move(void);
-static void BattleAICmd_if_user_has_no_attacking_moves(void);
-static void BattleAICmd_get_turn_count(void);
-static void BattleAICmd_get_type(void);
-static void BattleAICmd_get_considered_move_power(void);
-static void BattleAICmd_get_how_powerful_move_is(void);
-static void BattleAICmd_get_last_used_battler_move(void);
-static void BattleAICmd_if_equal_u32(void);
-static void BattleAICmd_if_not_equal_u32(void);
-static void BattleAICmd_if_user_goes(void);
-static void BattleAICmd_if_cant_use_belch(void);
-static void BattleAICmd_nullsub_2A(void);
-static void BattleAICmd_nullsub_2B(void);
-static void BattleAICmd_count_usable_party_mons(void);
-static void BattleAICmd_get_considered_move(void);
-static void BattleAICmd_get_considered_move_effect(void);
-static void BattleAICmd_get_ability(void);
-static void BattleAICmd_get_highest_type_effectiveness(void);
-static void BattleAICmd_if_type_effectiveness(void);
-static void BattleAICmd_nullsub_32(void);
-static void BattleAICmd_nullsub_33(void);
-static void BattleAICmd_if_status_in_party(void);
-static void BattleAICmd_if_status_not_in_party(void);
-static void BattleAICmd_get_weather(void);
-static void BattleAICmd_if_effect(void);
-static void BattleAICmd_if_not_effect(void);
-static void BattleAICmd_if_stat_level_less_than(void);
-static void BattleAICmd_if_stat_level_more_than(void);
-static void BattleAICmd_if_stat_level_equal(void);
-static void BattleAICmd_if_stat_level_not_equal(void);
-static void BattleAICmd_if_can_faint(void);
-static void BattleAICmd_if_cant_faint(void);
-static void BattleAICmd_if_has_move(void);
-static void BattleAICmd_if_doesnt_have_move(void);
-static void BattleAICmd_if_has_move_with_effect(void);
-static void BattleAICmd_if_doesnt_have_move_with_effect(void);
-static void BattleAICmd_if_any_move_disabled_or_encored(void);
-static void BattleAICmd_if_curr_move_disabled_or_encored(void);
-static void BattleAICmd_flee(void);
-static void BattleAICmd_if_random_safari_flee(void);
-static void BattleAICmd_watch(void);
-static void BattleAICmd_get_hold_effect(void);
-static void BattleAICmd_get_gender(void);
-static void BattleAICmd_is_first_turn_for(void);
-static void BattleAICmd_get_stockpile_count(void);
-static void BattleAICmd_is_double_battle(void);
-static void BattleAICmd_get_used_held_item(void);
-static void BattleAICmd_get_move_type_from_result(void);
-static void BattleAICmd_get_move_power_from_result(void);
-static void BattleAICmd_get_move_effect_from_result(void);
-static void BattleAICmd_get_protect_count(void);
-static void BattleAICmd_if_move_flag(void);
-static void BattleAICmd_if_field_status(void);
-static void BattleAICmd_get_move_accuracy(void);
-static void BattleAICmd_call_if_eq(void);
-static void BattleAICmd_call_if_move_flag(void);
-static void BattleAICmd_nullsub_57(void);
-static void BattleAICmd_call(void);
-static void BattleAICmd_goto(void);
-static void BattleAICmd_end(void);
-static void BattleAICmd_if_level_cond(void);
-static void BattleAICmd_if_target_taunted(void);
-static void BattleAICmd_if_target_not_taunted(void);
-static void BattleAICmd_check_ability(void);
-static void BattleAICmd_is_of_type(void);
-static void BattleAICmd_if_target_is_ally(void);
-static void BattleAICmd_if_flash_fired(void);
-static void BattleAICmd_if_holds_item(void);
-static void BattleAICmd_get_ally_chosen_move(void);
-static void BattleAICmd_if_has_no_attacking_moves(void);
-static void BattleAICmd_get_hazards_count(void);
-static void BattleAICmd_if_doesnt_hold_berry(void);
-static void BattleAICmd_if_share_type(void);
-static void BattleAICmd_if_cant_use_last_resort(void);
-static void BattleAICmd_if_has_move_with_split(void);
-static void BattleAICmd_if_has_no_move_with_split(void);
-static void BattleAICmd_if_physical_moves_unusable(void);
-static void BattleAICmd_if_ai_can_go_down(void);
-static void BattleAICmd_if_has_move_with_type(void);
-static void BattleAICmd_if_no_move_used(void);
-static void BattleAICmd_if_has_move_with_flag(void);
-static void BattleAICmd_if_battler_absent(void);
-static void BattleAICmd_is_grounded(void);
-static void BattleAICmd_get_best_dmg_hp_percent(void);
-static void BattleAICmd_get_curr_dmg_hp_percent(void);
-static void BattleAICmd_get_move_split_from_result(void);
+static void Cmd_if_random_less_than(void);
+static void Cmd_if_random_greater_than(void);
+static void Cmd_if_random_equal(void);
+static void Cmd_if_random_not_equal(void);
+static void Cmd_score(void);
+static void Cmd_if_hp_less_than(void);
+static void Cmd_if_hp_more_than(void);
+static void Cmd_if_hp_equal(void);
+static void Cmd_if_hp_not_equal(void);
+static void Cmd_if_status(void);
+static void Cmd_if_not_status(void);
+static void Cmd_if_status2(void);
+static void Cmd_if_not_status2(void);
+static void Cmd_if_status3(void);
+static void Cmd_if_not_status3(void);
+static void Cmd_if_side_affecting(void);
+static void Cmd_if_not_side_affecting(void);
+static void Cmd_if_less_than(void);
+static void Cmd_if_more_than(void);
+static void Cmd_if_equal(void);
+static void Cmd_if_not_equal(void);
+static void Cmd_if_less_than_ptr(void);
+static void Cmd_if_more_than_ptr(void);
+static void Cmd_if_equal_ptr(void);
+static void Cmd_if_not_equal_ptr(void);
+static void Cmd_if_move(void);
+static void Cmd_if_not_move(void);
+static void Cmd_if_in_bytes(void);
+static void Cmd_if_not_in_bytes(void);
+static void Cmd_if_in_hwords(void);
+static void Cmd_if_not_in_hwords(void);
+static void Cmd_if_user_has_attacking_move(void);
+static void Cmd_if_user_has_no_attacking_moves(void);
+static void Cmd_get_turn_count(void);
+static void Cmd_get_type(void);
+static void Cmd_get_considered_move_power(void);
+static void Cmd_get_how_powerful_move_is(void);
+static void Cmd_get_last_used_battler_move(void);
+static void Cmd_if_equal_u32(void);
+static void Cmd_if_not_equal_u32(void);
+static void Cmd_if_user_goes(void);
+static void Cmd_if_cant_use_belch(void);
+static void Cmd_nullsub_2A(void);
+static void Cmd_nullsub_2B(void);
+static void Cmd_count_usable_party_mons(void);
+static void Cmd_get_considered_move(void);
+static void Cmd_get_considered_move_effect(void);
+static void Cmd_get_ability(void);
+static void Cmd_get_highest_type_effectiveness(void);
+static void Cmd_if_type_effectiveness(void);
+static void Cmd_nullsub_32(void);
+static void Cmd_nullsub_33(void);
+static void Cmd_if_status_in_party(void);
+static void Cmd_if_status_not_in_party(void);
+static void Cmd_get_weather(void);
+static void Cmd_if_effect(void);
+static void Cmd_if_not_effect(void);
+static void Cmd_if_stat_level_less_than(void);
+static void Cmd_if_stat_level_more_than(void);
+static void Cmd_if_stat_level_equal(void);
+static void Cmd_if_stat_level_not_equal(void);
+static void Cmd_if_can_faint(void);
+static void Cmd_if_cant_faint(void);
+static void Cmd_if_has_move(void);
+static void Cmd_if_doesnt_have_move(void);
+static void Cmd_if_has_move_with_effect(void);
+static void Cmd_if_doesnt_have_move_with_effect(void);
+static void Cmd_if_any_move_disabled_or_encored(void);
+static void Cmd_if_curr_move_disabled_or_encored(void);
+static void Cmd_flee(void);
+static void Cmd_if_random_safari_flee(void);
+static void Cmd_watch(void);
+static void Cmd_get_hold_effect(void);
+static void Cmd_get_gender(void);
+static void Cmd_is_first_turn_for(void);
+static void Cmd_get_stockpile_count(void);
+static void Cmd_is_double_battle(void);
+static void Cmd_get_used_held_item(void);
+static void Cmd_get_move_type_from_result(void);
+static void Cmd_get_move_power_from_result(void);
+static void Cmd_get_move_effect_from_result(void);
+static void Cmd_get_protect_count(void);
+static void Cmd_if_move_flag(void);
+static void Cmd_if_field_status(void);
+static void Cmd_get_move_accuracy(void);
+static void Cmd_call_if_eq(void);
+static void Cmd_call_if_move_flag(void);
+static void Cmd_nullsub_57(void);
+static void Cmd_call(void);
+static void Cmd_goto(void);
+static void Cmd_end(void);
+static void Cmd_if_level_cond(void);
+static void Cmd_if_target_taunted(void);
+static void Cmd_if_target_not_taunted(void);
+static void Cmd_check_ability(void);
+static void Cmd_is_of_type(void);
+static void Cmd_if_target_is_ally(void);
+static void Cmd_if_flash_fired(void);
+static void Cmd_if_holds_item(void);
+static void Cmd_get_ally_chosen_move(void);
+static void Cmd_if_has_no_attacking_moves(void);
+static void Cmd_get_hazards_count(void);
+static void Cmd_if_doesnt_hold_berry(void);
+static void Cmd_if_share_type(void);
+static void Cmd_if_cant_use_last_resort(void);
+static void Cmd_if_has_move_with_split(void);
+static void Cmd_if_has_no_move_with_split(void);
+static void Cmd_if_physical_moves_unusable(void);
+static void Cmd_if_ai_can_go_down(void);
+static void Cmd_if_has_move_with_type(void);
+static void Cmd_if_no_move_used(void);
+static void Cmd_if_has_move_with_flag(void);
+static void Cmd_if_battler_absent(void);
+static void Cmd_is_grounded(void);
+static void Cmd_get_best_dmg_hp_percent(void);
+static void Cmd_get_curr_dmg_hp_percent(void);
+static void Cmd_get_move_split_from_result(void);
 
 // ewram
 EWRAM_DATA const u8 *gAIScriptPtr = NULL;
@@ -185,123 +185,123 @@ typedef void (*BattleAICmdFunc)(void);
 
 static const BattleAICmdFunc sBattleAICmdTable[] =
 {
-    BattleAICmd_if_random_less_than,                        // 0x0
-    BattleAICmd_if_random_greater_than,                     // 0x1
-    BattleAICmd_if_random_equal,                            // 0x2
-    BattleAICmd_if_random_not_equal,                        // 0x3
-    BattleAICmd_score,                                      // 0x4
-    BattleAICmd_if_hp_less_than,                            // 0x5
-    BattleAICmd_if_hp_more_than,                            // 0x6
-    BattleAICmd_if_hp_equal,                                // 0x7
-    BattleAICmd_if_hp_not_equal,                            // 0x8
-    BattleAICmd_if_status,                                  // 0x9
-    BattleAICmd_if_not_status,                              // 0xA
-    BattleAICmd_if_status2,                                 // 0xB
-    BattleAICmd_if_not_status2,                             // 0xC
-    BattleAICmd_if_status3,                                 // 0xD
-    BattleAICmd_if_not_status3,                             // 0xE
-    BattleAICmd_if_side_affecting,                          // 0xF
-    BattleAICmd_if_not_side_affecting,                      // 0x10
-    BattleAICmd_if_less_than,                               // 0x11
-    BattleAICmd_if_more_than,                               // 0x12
-    BattleAICmd_if_equal,                                   // 0x13
-    BattleAICmd_if_not_equal,                               // 0x14
-    BattleAICmd_if_less_than_ptr,                           // 0x15
-    BattleAICmd_if_more_than_ptr,                           // 0x16
-    BattleAICmd_if_equal_ptr,                               // 0x17
-    BattleAICmd_if_not_equal_ptr,                           // 0x18
-    BattleAICmd_if_move,                                    // 0x19
-    BattleAICmd_if_not_move,                                // 0x1A
-    BattleAICmd_if_in_bytes,                                // 0x1B
-    BattleAICmd_if_not_in_bytes,                            // 0x1C
-    BattleAICmd_if_in_hwords,                               // 0x1D
-    BattleAICmd_if_not_in_hwords,                           // 0x1E
-    BattleAICmd_if_user_has_attacking_move,                 // 0x1F
-    BattleAICmd_if_user_has_no_attacking_moves,             // 0x20
-    BattleAICmd_get_turn_count,                             // 0x21
-    BattleAICmd_get_type,                                   // 0x22
-    BattleAICmd_get_considered_move_power,                  // 0x23
-    BattleAICmd_get_how_powerful_move_is,                   // 0x24
-    BattleAICmd_get_last_used_battler_move,                 // 0x25
-    BattleAICmd_if_equal_u32,                               // 0x26
-    BattleAICmd_if_not_equal_u32,                           // 0x27
-    BattleAICmd_if_user_goes,                               // 0x28
-    BattleAICmd_if_cant_use_belch,                          // 0x29
-    BattleAICmd_nullsub_2A,                                 // 0x2A
-    BattleAICmd_nullsub_2B,                                 // 0x2B
-    BattleAICmd_count_usable_party_mons,                    // 0x2C
-    BattleAICmd_get_considered_move,                        // 0x2D
-    BattleAICmd_get_considered_move_effect,                 // 0x2E
-    BattleAICmd_get_ability,                                // 0x2F
-    BattleAICmd_get_highest_type_effectiveness,             // 0x30
-    BattleAICmd_if_type_effectiveness,                      // 0x31
-    BattleAICmd_nullsub_32,                                 // 0x32
-    BattleAICmd_nullsub_33,                                 // 0x33
-    BattleAICmd_if_status_in_party,                         // 0x34
-    BattleAICmd_if_status_not_in_party,                     // 0x35
-    BattleAICmd_get_weather,                                // 0x36
-    BattleAICmd_if_effect,                                  // 0x37
-    BattleAICmd_if_not_effect,                              // 0x38
-    BattleAICmd_if_stat_level_less_than,                    // 0x39
-    BattleAICmd_if_stat_level_more_than,                    // 0x3A
-    BattleAICmd_if_stat_level_equal,                        // 0x3B
-    BattleAICmd_if_stat_level_not_equal,                    // 0x3C
-    BattleAICmd_if_can_faint,                               // 0x3D
-    BattleAICmd_if_cant_faint,                              // 0x3E
-    BattleAICmd_if_has_move,                                // 0x3F
-    BattleAICmd_if_doesnt_have_move,                        // 0x40
-    BattleAICmd_if_has_move_with_effect,                    // 0x41
-    BattleAICmd_if_doesnt_have_move_with_effect,            // 0x42
-    BattleAICmd_if_any_move_disabled_or_encored,            // 0x43
-    BattleAICmd_if_curr_move_disabled_or_encored,           // 0x44
-    BattleAICmd_flee,                                       // 0x45
-    BattleAICmd_if_random_safari_flee,                      // 0x46
-    BattleAICmd_watch,                                      // 0x47
-    BattleAICmd_get_hold_effect,                            // 0x48
-    BattleAICmd_get_gender,                                 // 0x49
-    BattleAICmd_is_first_turn_for,                          // 0x4A
-    BattleAICmd_get_stockpile_count,                        // 0x4B
-    BattleAICmd_is_double_battle,                           // 0x4C
-    BattleAICmd_get_used_held_item,                         // 0x4D
-    BattleAICmd_get_move_type_from_result,                  // 0x4E
-    BattleAICmd_get_move_power_from_result,                 // 0x4F
-    BattleAICmd_get_move_effect_from_result,                // 0x50
-    BattleAICmd_get_protect_count,                          // 0x51
-    BattleAICmd_if_move_flag,                               // 0x52
-    BattleAICmd_if_field_status,                            // 0x53
-    BattleAICmd_get_move_accuracy,                          // 0x54
-    BattleAICmd_call_if_eq,                                 // 0x55
-    BattleAICmd_call_if_move_flag,                          // 0x56
-    BattleAICmd_nullsub_57,                                 // 0x57
-    BattleAICmd_call,                                       // 0x58
-    BattleAICmd_goto,                                       // 0x59
-    BattleAICmd_end,                                        // 0x5A
-    BattleAICmd_if_level_cond,                              // 0x5B
-    BattleAICmd_if_target_taunted,                          // 0x5C
-    BattleAICmd_if_target_not_taunted,                      // 0x5D
-    BattleAICmd_if_target_is_ally,                          // 0x5E
-    BattleAICmd_is_of_type,                                 // 0x5F
-    BattleAICmd_check_ability,                              // 0x60
-    BattleAICmd_if_flash_fired,                             // 0x61
-    BattleAICmd_if_holds_item,                              // 0x62
-    BattleAICmd_get_ally_chosen_move,                       // 0x63
-    BattleAICmd_if_has_no_attacking_moves,                  // 0x64
-    BattleAICmd_get_hazards_count,                          // 0x65
-    BattleAICmd_if_doesnt_hold_berry,                       // 0x66
-    BattleAICmd_if_share_type,                              // 0x67
-    BattleAICmd_if_cant_use_last_resort,                    // 0x68
-    BattleAICmd_if_has_move_with_split,                     // 0x69
-    BattleAICmd_if_has_no_move_with_split,                  // 0x6A
-    BattleAICmd_if_physical_moves_unusable,                 // 0x6B
-    BattleAICmd_if_ai_can_go_down,                          // 0x6C
-    BattleAICmd_if_has_move_with_type,                      // 0x6D
-    BattleAICmd_if_no_move_used,                            // 0x6E
-    BattleAICmd_if_has_move_with_flag,                      // 0x6F
-    BattleAICmd_if_battler_absent,                          // 0x70
-    BattleAICmd_is_grounded,                                // 0x71
-    BattleAICmd_get_best_dmg_hp_percent,                    // 0x72
-    BattleAICmd_get_curr_dmg_hp_percent,                    // 0x73
-    BattleAICmd_get_move_split_from_result,                 // 0x74
+    Cmd_if_random_less_than,                        // 0x0
+    Cmd_if_random_greater_than,                     // 0x1
+    Cmd_if_random_equal,                            // 0x2
+    Cmd_if_random_not_equal,                        // 0x3
+    Cmd_score,                                      // 0x4
+    Cmd_if_hp_less_than,                            // 0x5
+    Cmd_if_hp_more_than,                            // 0x6
+    Cmd_if_hp_equal,                                // 0x7
+    Cmd_if_hp_not_equal,                            // 0x8
+    Cmd_if_status,                                  // 0x9
+    Cmd_if_not_status,                              // 0xA
+    Cmd_if_status2,                                 // 0xB
+    Cmd_if_not_status2,                             // 0xC
+    Cmd_if_status3,                                 // 0xD
+    Cmd_if_not_status3,                             // 0xE
+    Cmd_if_side_affecting,                          // 0xF
+    Cmd_if_not_side_affecting,                      // 0x10
+    Cmd_if_less_than,                               // 0x11
+    Cmd_if_more_than,                               // 0x12
+    Cmd_if_equal,                                   // 0x13
+    Cmd_if_not_equal,                               // 0x14
+    Cmd_if_less_than_ptr,                           // 0x15
+    Cmd_if_more_than_ptr,                           // 0x16
+    Cmd_if_equal_ptr,                               // 0x17
+    Cmd_if_not_equal_ptr,                           // 0x18
+    Cmd_if_move,                                    // 0x19
+    Cmd_if_not_move,                                // 0x1A
+    Cmd_if_in_bytes,                                // 0x1B
+    Cmd_if_not_in_bytes,                            // 0x1C
+    Cmd_if_in_hwords,                               // 0x1D
+    Cmd_if_not_in_hwords,                           // 0x1E
+    Cmd_if_user_has_attacking_move,                 // 0x1F
+    Cmd_if_user_has_no_attacking_moves,             // 0x20
+    Cmd_get_turn_count,                             // 0x21
+    Cmd_get_type,                                   // 0x22
+    Cmd_get_considered_move_power,                  // 0x23
+    Cmd_get_how_powerful_move_is,                   // 0x24
+    Cmd_get_last_used_battler_move,                 // 0x25
+    Cmd_if_equal_u32,                               // 0x26
+    Cmd_if_not_equal_u32,                           // 0x27
+    Cmd_if_user_goes,                               // 0x28
+    Cmd_if_cant_use_belch,                          // 0x29
+    Cmd_nullsub_2A,                                 // 0x2A
+    Cmd_nullsub_2B,                                 // 0x2B
+    Cmd_count_usable_party_mons,                    // 0x2C
+    Cmd_get_considered_move,                        // 0x2D
+    Cmd_get_considered_move_effect,                 // 0x2E
+    Cmd_get_ability,                                // 0x2F
+    Cmd_get_highest_type_effectiveness,             // 0x30
+    Cmd_if_type_effectiveness,                      // 0x31
+    Cmd_nullsub_32,                                 // 0x32
+    Cmd_nullsub_33,                                 // 0x33
+    Cmd_if_status_in_party,                         // 0x34
+    Cmd_if_status_not_in_party,                     // 0x35
+    Cmd_get_weather,                                // 0x36
+    Cmd_if_effect,                                  // 0x37
+    Cmd_if_not_effect,                              // 0x38
+    Cmd_if_stat_level_less_than,                    // 0x39
+    Cmd_if_stat_level_more_than,                    // 0x3A
+    Cmd_if_stat_level_equal,                        // 0x3B
+    Cmd_if_stat_level_not_equal,                    // 0x3C
+    Cmd_if_can_faint,                               // 0x3D
+    Cmd_if_cant_faint,                              // 0x3E
+    Cmd_if_has_move,                                // 0x3F
+    Cmd_if_doesnt_have_move,                        // 0x40
+    Cmd_if_has_move_with_effect,                    // 0x41
+    Cmd_if_doesnt_have_move_with_effect,            // 0x42
+    Cmd_if_any_move_disabled_or_encored,            // 0x43
+    Cmd_if_curr_move_disabled_or_encored,           // 0x44
+    Cmd_flee,                                       // 0x45
+    Cmd_if_random_safari_flee,                      // 0x46
+    Cmd_watch,                                      // 0x47
+    Cmd_get_hold_effect,                            // 0x48
+    Cmd_get_gender,                                 // 0x49
+    Cmd_is_first_turn_for,                          // 0x4A
+    Cmd_get_stockpile_count,                        // 0x4B
+    Cmd_is_double_battle,                           // 0x4C
+    Cmd_get_used_held_item,                         // 0x4D
+    Cmd_get_move_type_from_result,                  // 0x4E
+    Cmd_get_move_power_from_result,                 // 0x4F
+    Cmd_get_move_effect_from_result,                // 0x50
+    Cmd_get_protect_count,                          // 0x51
+    Cmd_if_move_flag,                               // 0x52
+    Cmd_if_field_status,                            // 0x53
+    Cmd_get_move_accuracy,                          // 0x54
+    Cmd_call_if_eq,                                 // 0x55
+    Cmd_call_if_move_flag,                          // 0x56
+    Cmd_nullsub_57,                                 // 0x57
+    Cmd_call,                                       // 0x58
+    Cmd_goto,                                       // 0x59
+    Cmd_end,                                        // 0x5A
+    Cmd_if_level_cond,                              // 0x5B
+    Cmd_if_target_taunted,                          // 0x5C
+    Cmd_if_target_not_taunted,                      // 0x5D
+    Cmd_if_target_is_ally,                          // 0x5E
+    Cmd_is_of_type,                                 // 0x5F
+    Cmd_check_ability,                              // 0x60
+    Cmd_if_flash_fired,                             // 0x61
+    Cmd_if_holds_item,                              // 0x62
+    Cmd_get_ally_chosen_move,                       // 0x63
+    Cmd_if_has_no_attacking_moves,                  // 0x64
+    Cmd_get_hazards_count,                          // 0x65
+    Cmd_if_doesnt_hold_berry,                       // 0x66
+    Cmd_if_share_type,                              // 0x67
+    Cmd_if_cant_use_last_resort,                    // 0x68
+    Cmd_if_has_move_with_split,                     // 0x69
+    Cmd_if_has_no_move_with_split,                  // 0x6A
+    Cmd_if_physical_moves_unusable,                 // 0x6B
+    Cmd_if_ai_can_go_down,                          // 0x6C
+    Cmd_if_has_move_with_type,                      // 0x6D
+    Cmd_if_no_move_used,                            // 0x6E
+    Cmd_if_has_move_with_flag,                      // 0x6F
+    Cmd_if_battler_absent,                          // 0x70
+    Cmd_is_grounded,                                // 0x71
+    Cmd_get_best_dmg_hp_percent,                    // 0x72
+    Cmd_get_curr_dmg_hp_percent,                    // 0x73
+    Cmd_get_move_split_from_result,                 // 0x74
 };
 
 static const u16 sDiscouragedPowerfulMoveEffects[] =
@@ -936,7 +936,7 @@ u16 AI_GetTypeEffectiveness(u16 move, u8 battlerAtk, u8 battlerDef)
     return typeEffectiveness;
 }
 
-static void BattleAICmd_if_random_less_than(void)
+static void Cmd_if_random_less_than(void)
 {
     u16 random = Random();
 
@@ -946,7 +946,7 @@ static void BattleAICmd_if_random_less_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_random_greater_than(void)
+static void Cmd_if_random_greater_than(void)
 {
     u16 random = Random();
 
@@ -956,7 +956,7 @@ static void BattleAICmd_if_random_greater_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_random_equal(void)
+static void Cmd_if_random_equal(void)
 {
     u16 random = Random();
 
@@ -966,7 +966,7 @@ static void BattleAICmd_if_random_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_random_not_equal(void)
+static void Cmd_if_random_not_equal(void)
 {
     u16 random = Random();
 
@@ -976,7 +976,7 @@ static void BattleAICmd_if_random_not_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_score(void)
+static void Cmd_score(void)
 {
     AI_THINKING_STRUCT->score[AI_THINKING_STRUCT->movesetIndex] += gAIScriptPtr[1]; // Add the result to the array of the move consider's score.
 
@@ -1002,7 +1002,7 @@ static u8 BattleAI_GetWantedBattler(u8 wantedBattler)
     }
 }
 
-static void BattleAICmd_if_hp_less_than(void)
+static void Cmd_if_hp_less_than(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -1012,7 +1012,7 @@ static void BattleAICmd_if_hp_less_than(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_hp_more_than(void)
+static void Cmd_if_hp_more_than(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -1022,7 +1022,7 @@ static void BattleAICmd_if_hp_more_than(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_hp_equal(void)
+static void Cmd_if_hp_equal(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -1032,7 +1032,7 @@ static void BattleAICmd_if_hp_equal(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_hp_not_equal(void)
+static void Cmd_if_hp_not_equal(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -1042,7 +1042,7 @@ static void BattleAICmd_if_hp_not_equal(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_status(void)
+static void Cmd_if_status(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1053,7 +1053,7 @@ static void BattleAICmd_if_status(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_status(void)
+static void Cmd_if_not_status(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1064,7 +1064,7 @@ static void BattleAICmd_if_not_status(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_status2(void)
+static void Cmd_if_status2(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1075,7 +1075,7 @@ static void BattleAICmd_if_status2(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_status2(void)
+static void Cmd_if_not_status2(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1086,7 +1086,7 @@ static void BattleAICmd_if_not_status2(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_status3(void)
+static void Cmd_if_status3(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1097,7 +1097,7 @@ static void BattleAICmd_if_status3(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_status3(void)
+static void Cmd_if_not_status3(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1108,7 +1108,7 @@ static void BattleAICmd_if_not_status3(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_side_affecting(void)
+static void Cmd_if_side_affecting(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1120,7 +1120,7 @@ static void BattleAICmd_if_side_affecting(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_not_side_affecting(void)
+static void Cmd_if_not_side_affecting(void)
 {
     u16 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 status = T1_READ_32(gAIScriptPtr + 2);
@@ -1132,7 +1132,7 @@ static void BattleAICmd_if_not_side_affecting(void)
         gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_less_than(void)
+static void Cmd_if_less_than(void)
 {
     if (AI_THINKING_STRUCT->funcResult < gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1140,7 +1140,7 @@ static void BattleAICmd_if_less_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_more_than(void)
+static void Cmd_if_more_than(void)
 {
     if (AI_THINKING_STRUCT->funcResult > gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1148,7 +1148,7 @@ static void BattleAICmd_if_more_than(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_equal(void)
+static void Cmd_if_equal(void)
 {
     if (AI_THINKING_STRUCT->funcResult == gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1156,7 +1156,7 @@ static void BattleAICmd_if_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_not_equal(void)
+static void Cmd_if_not_equal(void)
 {
     if (AI_THINKING_STRUCT->funcResult != gAIScriptPtr[1])
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
@@ -1164,7 +1164,7 @@ static void BattleAICmd_if_not_equal(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_if_less_than_ptr(void)
+static void Cmd_if_less_than_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1174,7 +1174,7 @@ static void BattleAICmd_if_less_than_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_more_than_ptr(void)
+static void Cmd_if_more_than_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1184,7 +1184,7 @@ static void BattleAICmd_if_more_than_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_equal_ptr(void)
+static void Cmd_if_equal_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1194,7 +1194,7 @@ static void BattleAICmd_if_equal_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_equal_ptr(void)
+static void Cmd_if_not_equal_ptr(void)
 {
     const u8 *value = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1204,7 +1204,7 @@ static void BattleAICmd_if_not_equal_ptr(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_move(void)
+static void Cmd_if_move(void)
 {
     u16 move = T1_READ_16(gAIScriptPtr + 1);
 
@@ -1214,7 +1214,7 @@ static void BattleAICmd_if_move(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_not_move(void)
+static void Cmd_if_not_move(void)
 {
     u16 move = T1_READ_16(gAIScriptPtr + 1);
 
@@ -1224,7 +1224,7 @@ static void BattleAICmd_if_not_move(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_in_bytes(void)
+static void Cmd_if_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1240,7 +1240,7 @@ static void BattleAICmd_if_in_bytes(void)
     gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_in_bytes(void)
+static void Cmd_if_not_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1256,7 +1256,7 @@ static void BattleAICmd_if_not_in_bytes(void)
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5);
 }
 
-static void BattleAICmd_if_in_hwords(void)
+static void Cmd_if_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1272,7 +1272,7 @@ static void BattleAICmd_if_in_hwords(void)
     gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_in_hwords(void)
+static void Cmd_if_not_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
@@ -1288,7 +1288,7 @@ static void BattleAICmd_if_not_in_hwords(void)
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5);
 }
 
-static void BattleAICmd_if_user_has_attacking_move(void)
+static void Cmd_if_user_has_attacking_move(void)
 {
     s32 i;
 
@@ -1305,7 +1305,7 @@ static void BattleAICmd_if_user_has_attacking_move(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_if_user_has_no_attacking_moves(void)
+static void Cmd_if_user_has_no_attacking_moves(void)
 {
     s32 i;
 
@@ -1322,13 +1322,13 @@ static void BattleAICmd_if_user_has_no_attacking_moves(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_get_turn_count(void)
+static void Cmd_get_turn_count(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleResults.battleTurnCounter;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_type(void)
+static void Cmd_get_type(void)
 {
     u8 typeVar = gAIScriptPtr[1];
 
@@ -1353,7 +1353,7 @@ static void BattleAICmd_get_type(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_is_of_type(void)
+static void Cmd_is_of_type(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -1365,7 +1365,7 @@ static void BattleAICmd_is_of_type(void)
     gAIScriptPtr += 3;
 }
 
-static void BattleAICmd_get_considered_move_power(void)
+static void Cmd_get_considered_move_power(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power;
     gAIScriptPtr += 1;
@@ -1408,7 +1408,7 @@ static bool32 CompareTwoMoves(u32 bestMove, u32 goodMove)
     return TRUE;
 }
 
-static void BattleAICmd_get_how_powerful_move_is(void)
+static void Cmd_get_how_powerful_move_is(void)
 {
     s32 i, checkedMove, bestId, currId, hp;
     s32 moveDmgs[MAX_MON_MOVES];
@@ -1467,7 +1467,7 @@ static void BattleAICmd_get_how_powerful_move_is(void)
     gAIScriptPtr++;
 }
 
-static void BattleAICmd_get_last_used_battler_move(void)
+static void Cmd_get_last_used_battler_move(void)
 {
     if (gAIScriptPtr[1] == AI_USER)
         AI_THINKING_STRUCT->funcResult = gLastMoves[sBattler_AI];
@@ -1477,7 +1477,7 @@ static void BattleAICmd_get_last_used_battler_move(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_if_equal_u32(void)
+static void Cmd_if_equal_u32(void)
 {
     if (T1_READ_32(&gAIScriptPtr[1]) == AI_THINKING_STRUCT->funcResult)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5);
@@ -1485,7 +1485,7 @@ static void BattleAICmd_if_equal_u32(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_not_equal_u32(void)
+static void Cmd_if_not_equal_u32(void)
 {
     if (T1_READ_32(&gAIScriptPtr[1]) != AI_THINKING_STRUCT->funcResult)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 5);
@@ -1493,7 +1493,7 @@ static void BattleAICmd_if_not_equal_u32(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_user_goes(void)
+static void Cmd_if_user_goes(void)
 {
     u32 fasterAI = 0, fasterPlayer = 0, i;
     s8 prioAI, prioPlayer;
@@ -1539,11 +1539,11 @@ static void BattleAICmd_if_user_goes(void)
     }
 }
 
-static void BattleAICmd_nullsub_2A(void)
+static void Cmd_nullsub_2A(void)
 {
 }
 
-static void BattleAICmd_nullsub_2B(void)
+static void Cmd_nullsub_2B(void)
 {
 }
 
@@ -1583,19 +1583,19 @@ static s32 CountUsablePartyMons(u8 battlerId)
     return ret;
 }
 
-static void BattleAICmd_count_usable_party_mons(void)
+static void Cmd_count_usable_party_mons(void)
 {
     AI_THINKING_STRUCT->funcResult = CountUsablePartyMons(BattleAI_GetWantedBattler(gAIScriptPtr[1]));
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_get_considered_move(void)
+static void Cmd_get_considered_move(void)
 {
     AI_THINKING_STRUCT->funcResult = AI_THINKING_STRUCT->moveConsidered;
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_considered_move_effect(void)
+static void Cmd_get_considered_move_effect(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect;
     gAIScriptPtr += 1;
@@ -1632,13 +1632,13 @@ static s32 AI_GetAbility(u32 battlerId, bool32 guess)
     return -1; // Unknown.
 }
 
-static void BattleAICmd_get_ability(void)
+static void Cmd_get_ability(void)
 {
     AI_THINKING_STRUCT->funcResult = AI_GetAbility(BattleAI_GetWantedBattler(gAIScriptPtr[1]), TRUE);
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_check_ability(void)
+static void Cmd_check_ability(void)
 {
     u32 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u32 ability = AI_GetAbility(battlerId, FALSE);
@@ -1653,7 +1653,7 @@ static void BattleAICmd_check_ability(void)
     gAIScriptPtr += 3;
 }
 
-static void BattleAICmd_get_highest_type_effectiveness(void)
+static void Cmd_get_highest_type_effectiveness(void)
 {
     s32 i;
     u8 *dynamicMoveType;
@@ -1700,7 +1700,7 @@ static void BattleAICmd_get_highest_type_effectiveness(void)
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_if_type_effectiveness(void)
+static void Cmd_if_type_effectiveness(void)
 {
     u8 damageVar;
     u32 effectivenessMultiplier;
@@ -1739,15 +1739,15 @@ static void BattleAICmd_if_type_effectiveness(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_nullsub_32(void)
+static void Cmd_nullsub_32(void)
 {
 }
 
-static void BattleAICmd_nullsub_33(void)
+static void Cmd_nullsub_33(void)
 {
 }
 
-static void BattleAICmd_if_status_in_party(void)
+static void Cmd_if_status_in_party(void)
 {
     struct Pokemon *party;
     s32 i;
@@ -1774,7 +1774,7 @@ static void BattleAICmd_if_status_in_party(void)
     gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_status_not_in_party(void)
+static void Cmd_if_status_not_in_party(void)
 {
     struct Pokemon *party;
     s32 i;
@@ -1801,7 +1801,7 @@ static void BattleAICmd_if_status_not_in_party(void)
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6);
 }
 
-static void BattleAICmd_get_weather(void)
+static void Cmd_get_weather(void)
 {
     if (gBattleWeather & WEATHER_RAIN_ANY)
         AI_THINKING_STRUCT->funcResult = AI_WEATHER_RAIN;
@@ -1817,7 +1817,7 @@ static void BattleAICmd_get_weather(void)
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_if_effect(void)
+static void Cmd_if_effect(void)
 {
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == T1_READ_16(gAIScriptPtr + 1))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -1825,7 +1825,7 @@ static void BattleAICmd_if_effect(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_not_effect(void)
+static void Cmd_if_not_effect(void)
 {
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect != T1_READ_16(gAIScriptPtr + 1))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -1833,7 +1833,7 @@ static void BattleAICmd_if_not_effect(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_stat_level_less_than(void)
+static void Cmd_if_stat_level_less_than(void)
 {
     u32 battlerId;
 
@@ -1848,7 +1848,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_stat_level_more_than(void)
+static void Cmd_if_stat_level_more_than(void)
 {
     u32 battlerId;
 
@@ -1863,7 +1863,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_stat_level_equal(void)
+static void Cmd_if_stat_level_equal(void)
 {
     u32 battlerId;
 
@@ -1878,7 +1878,7 @@ static void BattleAICmd_if_stat_level_equal(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_stat_level_not_equal(void)
+static void Cmd_if_stat_level_not_equal(void)
 {
     u32 battlerId;
 
@@ -1893,7 +1893,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_if_can_faint(void)
+static void Cmd_if_can_faint(void)
 {
     s32 dmg;
 
@@ -1910,7 +1910,7 @@ static void BattleAICmd_if_can_faint(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_cant_faint(void)
+static void Cmd_if_cant_faint(void)
 {
     s32 dmg;
 
@@ -1927,7 +1927,7 @@ static void BattleAICmd_if_cant_faint(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_has_move(void)
+static void Cmd_if_has_move(void)
 {
     s32 i;
     const u16 *movePtr = (u16 *)(gAIScriptPtr + 2);
@@ -1979,7 +1979,7 @@ static void BattleAICmd_if_has_move(void)
     }
 }
 
-static void BattleAICmd_if_doesnt_have_move(void)
+static void Cmd_if_doesnt_have_move(void)
 {
     s32 i;
     const u16 *movePtr = (u16 *)(gAIScriptPtr + 2);
@@ -2013,7 +2013,7 @@ static void BattleAICmd_if_doesnt_have_move(void)
     }
 }
 
-static void BattleAICmd_if_has_move_with_effect(void)
+static void Cmd_if_has_move_with_effect(void)
 {
     s32 i;
 
@@ -2046,7 +2046,7 @@ static void BattleAICmd_if_has_move_with_effect(void)
     }
 }
 
-static void BattleAICmd_if_doesnt_have_move_with_effect(void)
+static void Cmd_if_doesnt_have_move_with_effect(void)
 {
     s32 i;
 
@@ -2079,7 +2079,7 @@ static void BattleAICmd_if_doesnt_have_move_with_effect(void)
     }
 }
 
-static void BattleAICmd_if_any_move_disabled_or_encored(void)
+static void Cmd_if_any_move_disabled_or_encored(void)
 {
     u8 battlerId;
 
@@ -2108,7 +2108,7 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
     }
 }
 
-static void BattleAICmd_if_curr_move_disabled_or_encored(void)
+static void Cmd_if_curr_move_disabled_or_encored(void)
 {
     switch (gAIScriptPtr[1])
     {
@@ -2130,12 +2130,12 @@ static void BattleAICmd_if_curr_move_disabled_or_encored(void)
     }
 }
 
-static void BattleAICmd_flee(void)
+static void Cmd_flee(void)
 {
     AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_FLEE | AI_ACTION_DO_NOT_ATTACK);
 }
 
-static void BattleAICmd_if_random_safari_flee(void)
+static void Cmd_if_random_safari_flee(void)
 {
     u8 safariFleeRate = gBattleStruct->safariEscapeFactor * 5; // Safari flee rate, from 0-20.
 
@@ -2145,12 +2145,12 @@ static void BattleAICmd_if_random_safari_flee(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_watch(void)
+static void Cmd_watch(void)
 {
     AI_THINKING_STRUCT->aiAction |= (AI_ACTION_DONE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK);
 }
 
-static void BattleAICmd_get_hold_effect(void)
+static void Cmd_get_hold_effect(void)
 {
     u32 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2162,7 +2162,7 @@ static void BattleAICmd_get_hold_effect(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_if_holds_item(void)
+static void Cmd_if_holds_item(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u16 item;
@@ -2178,7 +2178,7 @@ static void BattleAICmd_if_holds_item(void)
         gAIScriptPtr += 8;
 }
 
-static void BattleAICmd_get_gender(void)
+static void Cmd_get_gender(void)
 {
     u8 battlerId;
 
@@ -2192,7 +2192,7 @@ static void BattleAICmd_get_gender(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_is_first_turn_for(void)
+static void Cmd_is_first_turn_for(void)
 {
     u8 battlerId;
 
@@ -2206,7 +2206,7 @@ static void BattleAICmd_is_first_turn_for(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_get_stockpile_count(void)
+static void Cmd_get_stockpile_count(void)
 {
     u8 battlerId;
 
@@ -2220,14 +2220,14 @@ static void BattleAICmd_get_stockpile_count(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_is_double_battle(void)
+static void Cmd_is_double_battle(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleTypeFlags & BATTLE_TYPE_DOUBLE;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_used_held_item(void)
+static void Cmd_get_used_held_item(void)
 {
     u8 battlerId;
 
@@ -2241,28 +2241,28 @@ static void BattleAICmd_get_used_held_item(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_get_move_type_from_result(void)
+static void Cmd_get_move_type_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].type;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_move_power_from_result(void)
+static void Cmd_get_move_power_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].power;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_move_effect_from_result(void)
+static void Cmd_get_move_effect_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].effect;
 
     gAIScriptPtr += 1;
 }
 
-static void BattleAICmd_get_protect_count(void)
+static void Cmd_get_protect_count(void)
 {
     u8 battlerId;
 
@@ -2276,7 +2276,7 @@ static void BattleAICmd_get_protect_count(void)
     gAIScriptPtr += 2;
 }
 
-static void BattleAICmd_if_move_flag(void)
+static void Cmd_if_move_flag(void)
 {
     u32 flag = T1_READ_32(gAIScriptPtr + 1);
 
@@ -2286,7 +2286,7 @@ static void BattleAICmd_if_move_flag(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_if_field_status(void)
+static void Cmd_if_field_status(void)
 {
     u32 fieldFlags = T1_READ_32(gAIScriptPtr + 1);
 
@@ -2296,14 +2296,14 @@ static void BattleAICmd_if_field_status(void)
         gAIScriptPtr += 9;
 }
 
-static void BattleAICmd_get_move_accuracy(void)
+static void Cmd_get_move_accuracy(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->moveConsidered].accuracy;
 
     gAIScriptPtr++;
 }
 
-static void BattleAICmd_call_if_eq(void)
+static void Cmd_call_if_eq(void)
 {
     if (AI_THINKING_STRUCT->funcResult == T1_READ_16(gAIScriptPtr + 1))
     {
@@ -2316,7 +2316,7 @@ static void BattleAICmd_call_if_eq(void)
     }
 }
 
-static void BattleAICmd_call_if_move_flag(void)
+static void Cmd_call_if_move_flag(void)
 {
     u32 flag = T1_READ_32(gAIScriptPtr + 1);
 
@@ -2331,28 +2331,28 @@ static void BattleAICmd_call_if_move_flag(void)
     }
 }
 
-static void BattleAICmd_nullsub_57(void)
+static void Cmd_nullsub_57(void)
 {
 }
 
-static void BattleAICmd_call(void)
+static void Cmd_call(void)
 {
     AIStackPushVar(gAIScriptPtr + 5);
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_goto(void)
+static void Cmd_goto(void)
 {
     gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
 }
 
-static void BattleAICmd_end(void)
+static void Cmd_end(void)
 {
     if (AIStackPop() == 0)
         AI_THINKING_STRUCT->aiAction |= AI_ACTION_DONE;
 }
 
-static void BattleAICmd_if_level_cond(void)
+static void Cmd_if_level_cond(void)
 {
     switch (gAIScriptPtr[1])
     {
@@ -2377,7 +2377,7 @@ static void BattleAICmd_if_level_cond(void)
     }
 }
 
-static void BattleAICmd_if_target_taunted(void)
+static void Cmd_if_target_taunted(void)
 {
     if (gDisableStructs[gBattlerTarget].tauntTimer != 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
@@ -2385,7 +2385,7 @@ static void BattleAICmd_if_target_taunted(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_target_not_taunted(void)
+static void Cmd_if_target_not_taunted(void)
 {
     if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
@@ -2393,7 +2393,7 @@ static void BattleAICmd_if_target_not_taunted(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_target_is_ally(void)
+static void Cmd_if_target_is_ally(void)
 {
     if ((sBattler_AI & BIT_SIDE) == (gBattlerTarget & BIT_SIDE))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1);
@@ -2401,7 +2401,7 @@ static void BattleAICmd_if_target_is_ally(void)
         gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_flash_fired(void)
+static void Cmd_if_flash_fired(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2435,7 +2435,7 @@ static bool8 AIStackPop(void)
     }
 }
 
-static void BattleAICmd_get_ally_chosen_move(void)
+static void Cmd_get_ally_chosen_move(void)
 {
     u8 partnerBattler = BATTLE_PARTNER(sBattler_AI);
     if (!IsBattlerAlive(partnerBattler) || !IsBattlerAIControlled(partnerBattler))
@@ -2448,7 +2448,7 @@ static void BattleAICmd_get_ally_chosen_move(void)
     gAIScriptPtr++;
 }
 
-static void BattleAICmd_if_has_no_attacking_moves(void)
+static void Cmd_if_has_no_attacking_moves(void)
 {
     s32 i;
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
@@ -2475,7 +2475,7 @@ static void BattleAICmd_if_has_no_attacking_moves(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_get_hazards_count(void)
+static void Cmd_get_hazards_count(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u8 side = GetBattlerSide(battlerId);
@@ -2493,7 +2493,7 @@ static void BattleAICmd_get_hazards_count(void)
     gAIScriptPtr += 4;
 }
 
-static void BattleAICmd_if_doesnt_hold_berry(void)
+static void Cmd_if_doesnt_hold_berry(void)
 {
     u8 battlerId = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u16 item;
@@ -2509,7 +2509,7 @@ static void BattleAICmd_if_doesnt_hold_berry(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
 }
 
-static void BattleAICmd_if_share_type(void)
+static void Cmd_if_share_type(void)
 {
     u8 battler1 = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u8 battler2 = BattleAI_GetWantedBattler(gAIScriptPtr[2]);
@@ -2520,7 +2520,7 @@ static void BattleAICmd_if_share_type(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_cant_use_last_resort(void)
+static void Cmd_if_cant_use_last_resort(void)
 {
     u8 battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2549,7 +2549,7 @@ static bool32 HasMoveWithSplit(u32 battler, u32 split)
     return FALSE;
 }
 
-static void BattleAICmd_if_has_move_with_split(void)
+static void Cmd_if_has_move_with_split(void)
 {
     if (HasMoveWithSplit(BattleAI_GetWantedBattler(gAIScriptPtr[1]), gAIScriptPtr[2]))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -2557,7 +2557,7 @@ static void BattleAICmd_if_has_move_with_split(void)
         gAIScriptPtr += 7;
 }
 
-static void BattleAICmd_if_has_no_move_with_split(void)
+static void Cmd_if_has_no_move_with_split(void)
 {
     if (!HasMoveWithSplit(BattleAI_GetWantedBattler(gAIScriptPtr[1]), gAIScriptPtr[2]))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -2596,7 +2596,7 @@ static bool32 MovesWithSplitUnusable(u32 attacker, u32 target, u32 split)
     return (usable == 0);
 }
 
-static void BattleAICmd_if_physical_moves_unusable(void)
+static void Cmd_if_physical_moves_unusable(void)
 {
     if (MovesWithSplitUnusable(BattleAI_GetWantedBattler(gAIScriptPtr[1]), BattleAI_GetWantedBattler(gAIScriptPtr[2]), SPLIT_PHYSICAL))
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
@@ -2605,7 +2605,7 @@ static void BattleAICmd_if_physical_moves_unusable(void)
 }
 
 // Check if target has means to faint ai mon.
-static void BattleAICmd_if_ai_can_go_down(void)
+static void Cmd_if_ai_can_go_down(void)
 {
     s32 i, dmg;
     u32 unusable = CheckMoveLimitations(gBattlerTarget, 0, 0xFF & ~MOVE_LIMITATION_PP);
@@ -2624,7 +2624,7 @@ static void BattleAICmd_if_ai_can_go_down(void)
     gAIScriptPtr += 5;
 }
 
-static void BattleAICmd_if_cant_use_belch(void)
+static void Cmd_if_cant_use_belch(void)
 {
     u32 battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2634,7 +2634,7 @@ static void BattleAICmd_if_cant_use_belch(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2);
 }
 
-static void BattleAICmd_if_has_move_with_type(void)
+static void Cmd_if_has_move_with_type(void)
 {
     u32 i, moveType, battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u16 *moves;
@@ -2661,7 +2661,7 @@ static void BattleAICmd_if_has_move_with_type(void)
         gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3);
 }
 
-static void BattleAICmd_if_has_move_with_flag(void)
+static void Cmd_if_has_move_with_flag(void)
 {
     u32 i, flag, battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
     u16 *moves;
@@ -2684,7 +2684,7 @@ static void BattleAICmd_if_has_move_with_flag(void)
     gAIScriptPtr += 10;
 }
 
-static void BattleAICmd_if_no_move_used(void)
+static void Cmd_if_no_move_used(void)
 {
     u32 i, battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2706,7 +2706,7 @@ static void BattleAICmd_if_no_move_used(void)
     }
 }
 
-static void BattleAICmd_if_battler_absent(void)
+static void Cmd_if_battler_absent(void)
 {
     u32 battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2716,7 +2716,7 @@ static void BattleAICmd_if_battler_absent(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_is_grounded(void)
+static void Cmd_is_grounded(void)
 {
     u32 battler = BattleAI_GetWantedBattler(gAIScriptPtr[1]);
 
@@ -2726,7 +2726,7 @@ static void BattleAICmd_is_grounded(void)
         gAIScriptPtr += 6;
 }
 
-static void BattleAICmd_get_best_dmg_hp_percent(void)
+static void Cmd_get_best_dmg_hp_percent(void)
 {
     int i, bestDmg;
 
@@ -2741,7 +2741,7 @@ static void BattleAICmd_get_best_dmg_hp_percent(void)
     gAIScriptPtr++;
 }
 
-static void BattleAICmd_get_curr_dmg_hp_percent(void)
+static void Cmd_get_curr_dmg_hp_percent(void)
 {
     int bestDmg = gBattleResources->ai->simulatedDmg[sBattler_AI][gBattlerTarget][AI_THINKING_STRUCT->movesetIndex];
 
@@ -2749,7 +2749,7 @@ static void BattleAICmd_get_curr_dmg_hp_percent(void)
     gAIScriptPtr++;
 }
 
-static void BattleAICmd_get_move_split_from_result(void)
+static void Cmd_get_move_split_from_result(void)
 {
     AI_THINKING_STRUCT->funcResult = gBattleMoves[AI_THINKING_STRUCT->funcResult].type;
 
diff --git a/src/battle_main.c b/src/battle_main.c
index 0c5fe3e3ff..277774d073 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -3544,7 +3544,7 @@ static void TryDoEventsBeforeFirstTurn(void)
     *(&gBattleStruct->turnEffectsBattlerId) = 0;
     *(&gBattleStruct->wishPerishSongState) = 0;
     *(&gBattleStruct->wishPerishSongBattlerId) = 0;
-    gBattleScripting.atk49_state = 0;
+    gBattleScripting.moveendState = 0;
     gBattleStruct->faintedActionsState = 0;
     gBattleStruct->turnCountersTracker = 0;
     gMoveResultFlags = 0;
@@ -3607,7 +3607,7 @@ void BattleTurnPassed(void)
     gHitMarker &= ~(HITMARKER_x100000);
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
-    gBattleScripting.atk49_state = 0;
+    gBattleScripting.moveendState = 0;
     gBattleMoveDamage = 0;
     gMoveResultFlags = 0;
 
@@ -5708,7 +5708,8 @@ static void HandleAction_ActionFinished(void)
     gLastLandedMoves[gBattlerAttacker] = 0;
     gLastHitByType[gBattlerAttacker] = 0;
     gBattleStruct->dynamicMoveType = 0;
-    gBattleScripting.atk49_state = 0;
+    gBattleScripting.moveendState = 0;
+    gBattleScripting.moveendState = 0;
     gBattleCommunication[3] = 0;
     gBattleCommunication[4] = 0;
     gBattleScripting.multihitMoveEffect = 0;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 81a5569e4d..60a7f13760 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -78,521 +78,521 @@ static void PutLevelAndGenderOnLvlUpBox(void);
 
 static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite);
 
-static void atk00_attackcanceler(void);
-static void atk01_accuracycheck(void);
-static void atk02_attackstring(void);
-static void atk03_ppreduce(void);
-static void atk04_critcalc(void);
-static void atk05_damagecalc(void);
-static void atk06_typecalc(void);
-static void atk07_adjustdamage(void);
-static void atk08_multihitresultmessage(void);
-static void atk09_attackanimation(void);
-static void atk0A_waitanimation(void);
-static void atk0B_healthbarupdate(void);
-static void atk0C_datahpupdate(void);
-static void atk0D_critmessage(void);
-static void atk0E_effectivenesssound(void);
-static void atk0F_resultmessage(void);
-static void atk10_printstring(void);
-static void atk11_printselectionstring(void);
-static void atk12_waitmessage(void);
-static void atk13_printfromtable(void);
-static void atk14_printselectionstringfromtable(void);
-static void atk15_seteffectwithchance(void);
-static void atk16_seteffectprimary(void);
-static void atk17_seteffectsecondary(void);
-static void atk18_clearstatusfromeffect(void);
-static void atk19_tryfaintmon(void);
-static void atk1A_dofaintanimation(void);
-static void atk1B_cleareffectsonfaint(void);
-static void atk1C_jumpifstatus(void);
-static void atk1D_jumpifstatus2(void);
-static void atk1E_jumpifability(void);
-static void atk1F_jumpifsideaffecting(void);
-static void atk20_jumpifstat(void);
-static void atk21_jumpifstatus3condition(void);
-static void atk22_jumpbasedontype(void);
-static void atk23_getexp(void);
+static void Cmd_attackcanceler(void);
+static void Cmd_accuracycheck(void);
+static void Cmd_attackstring(void);
+static void Cmd_ppreduce(void);
+static void Cmd_critcalc(void);
+static void Cmd_damagecalc(void);
+static void Cmd_typecalc(void);
+static void Cmd_adjustdamage(void);
+static void Cmd_multihitresultmessage(void);
+static void Cmd_attackanimation(void);
+static void Cmd_waitanimation(void);
+static void Cmd_healthbarupdate(void);
+static void Cmd_datahpupdate(void);
+static void Cmd_critmessage(void);
+static void Cmd_effectivenesssound(void);
+static void Cmd_resultmessage(void);
+static void Cmd_printstring(void);
+static void Cmd_printselectionstring(void);
+static void Cmd_waitmessage(void);
+static void Cmd_printfromtable(void);
+static void Cmd_printselectionstringfromtable(void);
+static void Cmd_seteffectwithchance(void);
+static void Cmd_seteffectprimary(void);
+static void Cmd_seteffectsecondary(void);
+static void Cmd_clearstatusfromeffect(void);
+static void Cmd_tryfaintmon(void);
+static void Cmd_dofaintanimation(void);
+static void Cmd_cleareffectsonfaint(void);
+static void Cmd_jumpifstatus(void);
+static void Cmd_jumpifstatus2(void);
+static void Cmd_jumpifability(void);
+static void Cmd_jumpifsideaffecting(void);
+static void Cmd_jumpifstat(void);
+static void Cmd_jumpifstatus3condition(void);
+static void Cmd_jumpbasedontype(void);
+static void Cmd_getexp(void);
 static void atk24(void);
-static void atk25_movevaluescleanup(void);
-static void atk26_setmultihit(void);
-static void atk27_decrementmultihit(void);
-static void atk28_goto(void);
-static void atk29_jumpifbyte(void);
-static void atk2A_jumpifhalfword(void);
-static void atk2B_jumpifword(void);
-static void atk2C_jumpifarrayequal(void);
-static void atk2D_jumpifarraynotequal(void);
-static void atk2E_setbyte(void);
-static void atk2F_addbyte(void);
-static void atk30_subbyte(void);
-static void atk31_copyarray(void);
-static void atk32_copyarraywithindex(void);
-static void atk33_orbyte(void);
-static void atk34_orhalfword(void);
-static void atk35_orword(void);
-static void atk36_bicbyte(void);
-static void atk37_bichalfword(void);
-static void atk38_bicword(void);
-static void atk39_pause(void);
-static void atk3A_waitstate(void);
-static void atk3B_healthbar_update(void);
-static void atk3C_return(void);
-static void atk3D_end(void);
-static void atk3E_end2(void);
-static void atk3F_end3(void);
-static void atk40_jumpifaffectedbyprotect(void);
-static void atk41_call(void);
-static void atk42_setroost(void);
-static void atk43_jumpifabilitypresent(void);
-static void atk44_endselectionscript(void);
-static void atk45_playanimation(void);
-static void atk46_playanimation2(void);
-static void atk47_setgraphicalstatchangevalues(void);
-static void atk48_playstatchangeanimation(void);
-static void atk49_moveend(void);
-static void atk4A_sethealblock(void);
-static void atk4B_returnatktoball(void);
-static void atk4C_getswitchedmondata(void);
-static void atk4D_switchindataupdate(void);
-static void atk4E_switchinanim(void);
-static void atk4F_jumpifcantswitch(void);
-static void atk50_openpartyscreen(void);
-static void atk51_switchhandleorder(void);
-static void atk52_switchineffects(void);
-static void atk53_trainerslidein(void);
-static void atk54_playse(void);
-static void atk55_fanfare(void);
-static void atk56_playfaintcry(void);
+static void Cmd_movevaluescleanup(void);
+static void Cmd_setmultihit(void);
+static void Cmd_decrementmultihit(void);
+static void Cmd_goto(void);
+static void Cmd_jumpifbyte(void);
+static void Cmd_jumpifhalfword(void);
+static void Cmd_jumpifword(void);
+static void Cmd_jumpifarrayequal(void);
+static void Cmd_jumpifarraynotequal(void);
+static void Cmd_setbyte(void);
+static void Cmd_addbyte(void);
+static void Cmd_subbyte(void);
+static void Cmd_copyarray(void);
+static void Cmd_copyarraywithindex(void);
+static void Cmd_orbyte(void);
+static void Cmd_orhalfword(void);
+static void Cmd_orword(void);
+static void Cmd_bicbyte(void);
+static void Cmd_bichalfword(void);
+static void Cmd_bicword(void);
+static void Cmd_pause(void);
+static void Cmd_waitstate(void);
+static void Cmd_update(void);
+static void Cmd_return(void);
+static void Cmd_end(void);
+static void Cmd_end2(void);
+static void Cmd_end3(void);
+static void Cmd_jumpifaffectedbyprotect(void);
+static void Cmd_call(void);
+static void Cmd_setroost(void);
+static void Cmd_jumpifabilitypresent(void);
+static void Cmd_endselectionscript(void);
+static void Cmd_playanimation(void);
+static void Cmd_playanimation2(void);
+static void Cmd_setgraphicalstatchangevalues(void);
+static void Cmd_playstatchangeanimation(void);
+static void Cmd_moveend(void);
+static void Cmd_sethealblock(void);
+static void Cmd_returnatktoball(void);
+static void Cmd_getswitchedmondata(void);
+static void Cmd_switchindataupdate(void);
+static void Cmd_switchinanim(void);
+static void Cmd_jumpifcantswitch(void);
+static void Cmd_openpartyscreen(void);
+static void Cmd_switchhandleorder(void);
+static void Cmd_switchineffects(void);
+static void Cmd_trainerslidein(void);
+static void Cmd_playse(void);
+static void Cmd_fanfare(void);
+static void Cmd_playfaintcry(void);
 static void atk57(void);
-static void atk58_returntoball(void);
-static void atk59_handlelearnnewmove(void);
-static void atk5A_yesnoboxlearnmove(void);
-static void atk5B_yesnoboxstoplearningmove(void);
-static void atk5C_hitanimation(void);
-static void atk5D_getmoneyreward(void);
+static void Cmd_returntoball(void);
+static void Cmd_handlelearnnewmove(void);
+static void Cmd_yesnoboxlearnmove(void);
+static void Cmd_yesnoboxstoplearningmove(void);
+static void Cmd_hitanimation(void);
+static void Cmd_getmoneyreward(void);
 static void atk5E(void);
-static void atk5F_swapattackerwithtarget(void);
-static void atk60_incrementgamestat(void);
-static void atk61_drawpartystatussummary(void);
-static void atk62_hidepartystatussummary(void);
-static void atk63_jumptocalledmove(void);
-static void atk64_statusanimation(void);
-static void atk65_status2animation(void);
-static void atk66_chosenstatusanimation(void);
-static void atk67_yesnobox(void);
-static void atk68_cancelallactions(void);
-static void atk69_setgravity(void);
-static void atk6A_removeitem(void);
-static void atk6B_atknameinbuff1(void);
-static void atk6C_drawlvlupbox(void);
-static void atk6D_resetsentmonsvalue(void);
-static void atk6E_setatktoplayer0(void);
-static void atk6F_makevisible(void);
-static void atk70_recordability(void);
-static void atk71_buffermovetolearn(void);
-static void atk72_jumpifplayerran(void);
-static void atk73_hpthresholds(void);
-static void atk74_hpthresholds2(void);
-static void atk75_useitemonopponent(void);
-static void atk76_various(void);
-static void atk77_setprotectlike(void);
-static void atk78_faintifabilitynotdamp(void);
-static void atk79_setatkhptozero(void);
-static void atk7A_jumpifnexttargetvalid(void);
-static void atk7B_tryhealhalfhealth(void);
-static void atk7C_trymirrormove(void);
-static void atk7D_setrain(void);
-static void atk7E_setreflect(void);
-static void atk7F_setseeded(void);
-static void atk80_manipulatedamage(void);
-static void atk81_trysetrest(void);
-static void atk82_jumpifnotfirstturn(void);
-static void atk83_setmiracleeye(void);
-static void atk84_jumpifcantmakeasleep(void);
-static void atk85_stockpile(void);
-static void atk86_stockpiletobasedamage(void);
-static void atk87_stockpiletohpheal(void);
-static void atk88_setdrainedhp(void);
-static void atk89_statbuffchange(void);
-static void atk8A_normalisebuffs(void);
-static void atk8B_setbide(void);
-static void atk8C_confuseifrepeatingattackends(void);
-static void atk8D_setmultihitcounter(void);
-static void atk8E_initmultihitstring(void);
-static void atk8F_forcerandomswitch(void);
-static void atk90_tryconversiontypechange(void);
-static void atk91_givepaydaymoney(void);
-static void atk92_setlightscreen(void);
-static void atk93_tryKO(void);
-static void atk94_damagetohalftargethp(void);
-static void atk95_setsandstorm(void);
-static void atk96_weatherdamage(void);
-static void atk97_tryinfatuating(void);
-static void atk98_updatestatusicon(void);
-static void atk99_setmist(void);
-static void atk9A_setfocusenergy(void);
-static void atk9B_transformdataexecution(void);
-static void atk9C_setsubstitute(void);
-static void atk9D_mimicattackcopy(void);
-static void atk9E_metronome(void);
-static void atk9F_dmgtolevel(void);
-static void atkA0_psywavedamageeffect(void);
-static void atkA1_counterdamagecalculator(void);
-static void atkA2_mirrorcoatdamagecalculator(void);
-static void atkA3_disablelastusedattack(void);
-static void atkA4_trysetencore(void);
-static void atkA5_painsplitdmgcalc(void);
-static void atkA6_settypetorandomresistance(void);
-static void atkA7_setalwayshitflag(void);
-static void atkA8_copymovepermanently(void);
-static void atkA9_trychoosesleeptalkmove(void);
-static void atkAA_setdestinybond(void);
-static void atkAB_trysetdestinybondtohappen(void);
-static void atkAC_settailwind(void);
-static void atkAD_tryspiteppreduce(void);
-static void atkAE_healpartystatus(void);
-static void atkAF_cursetarget(void);
-static void atkB0_trysetspikes(void);
-static void atkB1_setforesight(void);
-static void atkB2_trysetperishsong(void);
-static void atkB3_handlerollout(void);
-static void atkB4_jumpifconfusedandstatmaxed(void);
-static void atkB5_handlefurycutter(void);
-static void atkB6_setembargo(void);
-static void atkB7_presentdamagecalculation(void);
-static void atkB8_setsafeguard(void);
-static void atkB9_magnitudedamagecalculation(void);
-static void atkBA_jumpifnopursuitswitchdmg(void);
-static void atkBB_setsunny(void);
-static void atkBC_maxattackhalvehp(void);
-static void atkBD_copyfoestats(void);
-static void atkBE_rapidspinfree(void);
-static void atkBF_setdefensecurlbit(void);
-static void atkC0_recoverbasedonsunlight(void);
-static void atkC1_setstickyweb(void);
-static void atkC2_selectfirstvalidtarget(void);
-static void atkC3_trysetfutureattack(void);
-static void atkC4_trydobeatup(void);
-static void atkC5_setsemiinvulnerablebit(void);
-static void atkC6_clearsemiinvulnerablebit(void);
-static void atkC7_setminimize(void);
-static void atkC8_sethail(void);
-static void atkC9_jumpifattackandspecialattackcannotfall(void);
-static void atkCA_setforcedtarget(void);
-static void atkCB_setcharge(void);
-static void atkCC_callterrainattack(void);
-static void atkCD_cureifburnedparalysedorpoisoned(void);
-static void atkCE_settorment(void);
-static void atkCF_jumpifnodamage(void);
-static void atkD0_settaunt(void);
-static void atkD1_trysethelpinghand(void);
-static void atkD2_tryswapitems(void);
-static void atkD3_trycopyability(void);
-static void atkD4_trywish(void);
-static void atkD5_settoxicspikes(void);
-static void atkD6_setgastroacid(void);
-static void atkD7_setyawn(void);
-static void atkD8_setdamagetohealthdifference(void);
-static void atkD9_setroom(void);
-static void atkDA_tryswapabilities(void);
-static void atkDB_tryimprison(void);
-static void atkDC_setstealthrock(void);
-static void atkDD_setuserstatus3(void);
-static void atkDE_assistattackselect(void);
-static void atkDF_trysetmagiccoat(void);
-static void atkE0_trysetsnatch(void);
-static void atkE1_trygetintimidatetarget(void);
-static void atkE2_switchoutabilities(void);
-static void atkE3_jumpifhasnohp(void);
-static void atkE4_getsecretpowereffect(void);
-static void atkE5_pickup(void);
-static void atkE6_docastformchangeanimation(void);
-static void atkE7_trycastformdatachange(void);
-static void atkE8_settypebasedhalvers(void);
-static void atkE9_jumpifsubstituteblocks(void);
-static void atkEA_tryrecycleitem(void);
-static void atkEB_settypetoterrain(void);
-static void atkEC_pursuitrelated(void);
-static void atkEF_snatchsetbattlers(void);
-static void atkEE_removelightscreenreflect(void);
-static void atkEF_handleballthrow(void);
-static void atkF0_givecaughtmon(void);
-static void atkF1_trysetcaughtmondexflags(void);
-static void atkF2_displaydexinfo(void);
-static void atkF3_trygivecaughtmonnick(void);
-static void atkF4_subattackerhpbydmg(void);
-static void atkF5_removeattackerstatus1(void);
-static void atkF6_finishaction(void);
-static void atkF7_finishturn(void);
-static void atkF8_trainerslideout(void);
-static void atkF9_settelekinesis(void);
-static void atkFA_swapstatstages(void);
-static void atkFB_averagestats(void);
-static void atkFC_jumpifoppositegenders(void);
-static void atkFD_trygetbaddreamstarget(void);
-static void atkFE_tryworryseed(void);
-static void atkFF_metalburstdamagecalculator(void);
+static void Cmd_swapattackerwithtarget(void);
+static void Cmd_incrementgamestat(void);
+static void Cmd_drawpartystatussummary(void);
+static void Cmd_hidepartystatussummary(void);
+static void Cmd_jumptocalledmove(void);
+static void Cmd_statusanimation(void);
+static void Cmd_status2animation(void);
+static void Cmd_chosenstatusanimation(void);
+static void Cmd_yesnobox(void);
+static void Cmd_cancelallactions(void);
+static void Cmd_setgravity(void);
+static void Cmd_removeitem(void);
+static void Cmd_atknameinbuff1(void);
+static void Cmd_drawlvlupbox(void);
+static void Cmd_resetsentmonsvalue(void);
+static void Cmd_setatktoplayer0(void);
+static void Cmd_makevisible(void);
+static void Cmd_recordability(void);
+static void Cmd_buffermovetolearn(void);
+static void Cmd_jumpifplayerran(void);
+static void Cmd_hpthresholds(void);
+static void Cmd_hpthresholds2(void);
+static void Cmd_useitemonopponent(void);
+static void Cmd_various(void);
+static void Cmd_setprotectlike(void);
+static void Cmd_faintifabilitynotdamp(void);
+static void Cmd_setatkhptozero(void);
+static void Cmd_jumpifnexttargetvalid(void);
+static void Cmd_tryhealhalfhealth(void);
+static void Cmd_trymirrormove(void);
+static void Cmd_setrain(void);
+static void Cmd_setreflect(void);
+static void Cmd_setseeded(void);
+static void Cmd_manipulatedamage(void);
+static void Cmd_trysetrest(void);
+static void Cmd_jumpifnotfirstturn(void);
+static void Cmd_setmiracleeye(void);
+static void Cmd_jumpifcantmakeasleep(void);
+static void Cmd_stockpile(void);
+static void Cmd_stockpiletobasedamage(void);
+static void Cmd_stockpiletohpheal(void);
+static void Cmd_setdrainedhp(void);
+static void Cmd_statbuffchange(void);
+static void Cmd_normalisebuffs(void);
+static void Cmd_setbide(void);
+static void Cmd_confuseifrepeatingattackends(void);
+static void Cmd_setmultihitcounter(void);
+static void Cmd_initmultihitstring(void);
+static void Cmd_forcerandomswitch(void);
+static void Cmd_tryconversiontypechange(void);
+static void Cmd_givepaydaymoney(void);
+static void Cmd_setlightscreen(void);
+static void Cmd_tryKO(void);
+static void Cmd_damagetohalftargethp(void);
+static void Cmd_setsandstorm(void);
+static void Cmd_weatherdamage(void);
+static void Cmd_tryinfatuating(void);
+static void Cmd_updatestatusicon(void);
+static void Cmd_setmist(void);
+static void Cmd_setfocusenergy(void);
+static void Cmd_transformdataexecution(void);
+static void Cmd_setsubstitute(void);
+static void Cmd_mimicattackcopy(void);
+static void Cmd_metronome(void);
+static void Cmd_dmgtolevel(void);
+static void Cmd_psywavedamageeffect(void);
+static void Cmd_counterdamagecalculator(void);
+static void Cmd_mirrorcoatdamagecalculator(void);
+static void Cmd_disablelastusedattack(void);
+static void Cmd_trysetencore(void);
+static void Cmd_painsplitdmgcalc(void);
+static void Cmd_settypetorandomresistance(void);
+static void Cmd_setalwayshitflag(void);
+static void Cmd_copymovepermanently(void);
+static void Cmd_trychoosesleeptalkmove(void);
+static void Cmd_setdestinybond(void);
+static void Cmd_trysetdestinybondtohappen(void);
+static void Cmd_settailwind(void);
+static void Cmd_tryspiteppreduce(void);
+static void Cmd_healpartystatus(void);
+static void Cmd_cursetarget(void);
+static void Cmd_trysetspikes(void);
+static void Cmd_setforesight(void);
+static void Cmd_trysetperishsong(void);
+static void Cmd_handlerollout(void);
+static void Cmd_jumpifconfusedandstatmaxed(void);
+static void Cmd_handlefurycutter(void);
+static void Cmd_setembargo(void);
+static void Cmd_presentdamagecalculation(void);
+static void Cmd_setsafeguard(void);
+static void Cmd_magnitudedamagecalculation(void);
+static void Cmd_jumpifnopursuitswitchdmg(void);
+static void Cmd_setsunny(void);
+static void Cmd_maxattackhalvehp(void);
+static void Cmd_copyfoestats(void);
+static void Cmd_rapidspinfree(void);
+static void Cmd_setdefensecurlbit(void);
+static void Cmd_recoverbasedonsunlight(void);
+static void Cmd_setstickyweb(void);
+static void Cmd_selectfirstvalidtarget(void);
+static void Cmd_trysetfutureattack(void);
+static void Cmd_trydobeatup(void);
+static void Cmd_setsemiinvulnerablebit(void);
+static void Cmd_clearsemiinvulnerablebit(void);
+static void Cmd_setminimize(void);
+static void Cmd_sethail(void);
+static void Cmd_jumpifattackandspecialattackcannotfall(void);
+static void Cmd_setforcedtarget(void);
+static void Cmd_setcharge(void);
+static void Cmd_callterrainattack(void);
+static void Cmd_cureifburnedparalysedorpoisoned(void);
+static void Cmd_settorment(void);
+static void Cmd_jumpifnodamage(void);
+static void Cmd_settaunt(void);
+static void Cmd_trysethelpinghand(void);
+static void Cmd_tryswapitems(void);
+static void Cmd_trycopyability(void);
+static void Cmd_trywish(void);
+static void Cmd_settoxicspikes(void);
+static void Cmd_setgastroacid(void);
+static void Cmd_setyawn(void);
+static void Cmd_setdamagetohealthdifference(void);
+static void Cmd_setroom(void);
+static void Cmd_tryswapabilities(void);
+static void Cmd_tryimprison(void);
+static void Cmd_setstealthrock(void);
+static void Cmd_setuserstatus3(void);
+static void Cmd_assistattackselect(void);
+static void Cmd_trysetmagiccoat(void);
+static void Cmd_trysetsnatch(void);
+static void Cmd_trygetintimidatetarget(void);
+static void Cmd_switchoutabilities(void);
+static void Cmd_jumpifhasnohp(void);
+static void Cmd_getsecretpowereffect(void);
+static void Cmd_pickup(void);
+static void Cmd_docastformchangeanimation(void);
+static void Cmd_trycastformdatachange(void);
+static void Cmd_settypebasedhalvers(void);
+static void Cmd_jumpifsubstituteblocks(void);
+static void Cmd_tryrecycleitem(void);
+static void Cmd_settypetoterrain(void);
+static void Cmd_pursuitrelated(void);
+static void Cmd_snatchsetbattlers(void);
+static void Cmd_removelightscreenreflect(void);
+static void Cmd_handleballthrow(void);
+static void Cmd_givecaughtmon(void);
+static void Cmd_trysetcaughtmondexflags(void);
+static void Cmd_displaydexinfo(void);
+static void Cmd_trygivecaughtmonnick(void);
+static void Cmd_subattackerhpbydmg(void);
+static void Cmd_removeattackerstatus1(void);
+static void Cmd_finishaction(void);
+static void Cmd_finishturn(void);
+static void Cmd_trainerslideout(void);
+static void Cmd_settelekinesis(void);
+static void Cmd_swapstatstages(void);
+static void Cmd_averagestats(void);
+static void Cmd_jumpifoppositegenders(void);
+static void Cmd_trygetbaddreamstarget(void);
+static void Cmd_tryworryseed(void);
+static void Cmd_metalburstdamagecalculator(void);
 
 void (* const gBattleScriptingCommandsTable[])(void) =
 {
-    atk00_attackcanceler,
-    atk01_accuracycheck,
-    atk02_attackstring,
-    atk03_ppreduce,
-    atk04_critcalc,
-    atk05_damagecalc,
-    atk06_typecalc,
-    atk07_adjustdamage,
-    atk08_multihitresultmessage,
-    atk09_attackanimation,
-    atk0A_waitanimation,
-    atk0B_healthbarupdate,
-    atk0C_datahpupdate,
-    atk0D_critmessage,
-    atk0E_effectivenesssound,
-    atk0F_resultmessage,
-    atk10_printstring,
-    atk11_printselectionstring,
-    atk12_waitmessage,
-    atk13_printfromtable,
-    atk14_printselectionstringfromtable,
-    atk15_seteffectwithchance,
-    atk16_seteffectprimary,
-    atk17_seteffectsecondary,
-    atk18_clearstatusfromeffect,
-    atk19_tryfaintmon,
-    atk1A_dofaintanimation,
-    atk1B_cleareffectsonfaint,
-    atk1C_jumpifstatus,
-    atk1D_jumpifstatus2,
-    atk1E_jumpifability,
-    atk1F_jumpifsideaffecting,
-    atk20_jumpifstat,
-    atk21_jumpifstatus3condition,
-    atk22_jumpbasedontype,
-    atk23_getexp,
-    atk24,
-    atk25_movevaluescleanup,
-    atk26_setmultihit,
-    atk27_decrementmultihit,
-    atk28_goto,
-    atk29_jumpifbyte,
-    atk2A_jumpifhalfword,
-    atk2B_jumpifword,
-    atk2C_jumpifarrayequal,
-    atk2D_jumpifarraynotequal,
-    atk2E_setbyte,
-    atk2F_addbyte,
-    atk30_subbyte,
-    atk31_copyarray,
-    atk32_copyarraywithindex,
-    atk33_orbyte,
-    atk34_orhalfword,
-    atk35_orword,
-    atk36_bicbyte,
-    atk37_bichalfword,
-    atk38_bicword,
-    atk39_pause,
-    atk3A_waitstate,
-    atk3B_healthbar_update,
-    atk3C_return,
-    atk3D_end,
-    atk3E_end2,
-    atk3F_end3,
-    atk40_jumpifaffectedbyprotect,
-    atk41_call,
-    atk42_setroost,
-    atk43_jumpifabilitypresent,
-    atk44_endselectionscript,
-    atk45_playanimation,
-    atk46_playanimation2,
-    atk47_setgraphicalstatchangevalues,
-    atk48_playstatchangeanimation,
-    atk49_moveend,
-    atk4A_sethealblock,
-    atk4B_returnatktoball,
-    atk4C_getswitchedmondata,
-    atk4D_switchindataupdate,
-    atk4E_switchinanim,
-    atk4F_jumpifcantswitch,
-    atk50_openpartyscreen,
-    atk51_switchhandleorder,
-    atk52_switchineffects,
-    atk53_trainerslidein,
-    atk54_playse,
-    atk55_fanfare,
-    atk56_playfaintcry,
-    atk57,
-    atk58_returntoball,
-    atk59_handlelearnnewmove,
-    atk5A_yesnoboxlearnmove,
-    atk5B_yesnoboxstoplearningmove,
-    atk5C_hitanimation,
-    atk5D_getmoneyreward,
-    atk5E,
-    atk5F_swapattackerwithtarget,
-    atk60_incrementgamestat,
-    atk61_drawpartystatussummary,
-    atk62_hidepartystatussummary,
-    atk63_jumptocalledmove,
-    atk64_statusanimation,
-    atk65_status2animation,
-    atk66_chosenstatusanimation,
-    atk67_yesnobox,
-    atk68_cancelallactions,
-    atk69_setgravity,
-    atk6A_removeitem,
-    atk6B_atknameinbuff1,
-    atk6C_drawlvlupbox,
-    atk6D_resetsentmonsvalue,
-    atk6E_setatktoplayer0,
-    atk6F_makevisible,
-    atk70_recordability,
-    atk71_buffermovetolearn,
-    atk72_jumpifplayerran,
-    atk73_hpthresholds,
-    atk74_hpthresholds2,
-    atk75_useitemonopponent,
-    atk76_various,
-    atk77_setprotectlike,
-    atk78_faintifabilitynotdamp,
-    atk79_setatkhptozero,
-    atk7A_jumpifnexttargetvalid,
-    atk7B_tryhealhalfhealth,
-    atk7C_trymirrormove,
-    atk7D_setrain,
-    atk7E_setreflect,
-    atk7F_setseeded,
-    atk80_manipulatedamage,
-    atk81_trysetrest,
-    atk82_jumpifnotfirstturn,
-    atk83_setmiracleeye,
-    atk84_jumpifcantmakeasleep,
-    atk85_stockpile,
-    atk86_stockpiletobasedamage,
-    atk87_stockpiletohpheal,
-    atk88_setdrainedhp,
-    atk89_statbuffchange,
-    atk8A_normalisebuffs,
-    atk8B_setbide,
-    atk8C_confuseifrepeatingattackends,
-    atk8D_setmultihitcounter,
-    atk8E_initmultihitstring,
-    atk8F_forcerandomswitch,
-    atk90_tryconversiontypechange,
-    atk91_givepaydaymoney,
-    atk92_setlightscreen,
-    atk93_tryKO,
-    atk94_damagetohalftargethp,
-    atk95_setsandstorm,
-    atk96_weatherdamage,
-    atk97_tryinfatuating,
-    atk98_updatestatusicon,
-    atk99_setmist,
-    atk9A_setfocusenergy,
-    atk9B_transformdataexecution,
-    atk9C_setsubstitute,
-    atk9D_mimicattackcopy,
-    atk9E_metronome,
-    atk9F_dmgtolevel,
-    atkA0_psywavedamageeffect,
-    atkA1_counterdamagecalculator,
-    atkA2_mirrorcoatdamagecalculator,
-    atkA3_disablelastusedattack,
-    atkA4_trysetencore,
-    atkA5_painsplitdmgcalc,
-    atkA6_settypetorandomresistance,
-    atkA7_setalwayshitflag,
-    atkA8_copymovepermanently,
-    atkA9_trychoosesleeptalkmove,
-    atkAA_setdestinybond,
-    atkAB_trysetdestinybondtohappen,
-    atkAC_settailwind,
-    atkAD_tryspiteppreduce,
-    atkAE_healpartystatus,
-    atkAF_cursetarget,
-    atkB0_trysetspikes,
-    atkB1_setforesight,
-    atkB2_trysetperishsong,
-    atkB3_handlerollout,
-    atkB4_jumpifconfusedandstatmaxed,
-    atkB5_handlefurycutter,
-    atkB6_setembargo,
-    atkB7_presentdamagecalculation,
-    atkB8_setsafeguard,
-    atkB9_magnitudedamagecalculation,
-    atkBA_jumpifnopursuitswitchdmg,
-    atkBB_setsunny,
-    atkBC_maxattackhalvehp,
-    atkBD_copyfoestats,
-    atkBE_rapidspinfree,
-    atkBF_setdefensecurlbit,
-    atkC0_recoverbasedonsunlight,
-    atkC1_setstickyweb,
-    atkC2_selectfirstvalidtarget,
-    atkC3_trysetfutureattack,
-    atkC4_trydobeatup,
-    atkC5_setsemiinvulnerablebit,
-    atkC6_clearsemiinvulnerablebit,
-    atkC7_setminimize,
-    atkC8_sethail,
-    atkC9_jumpifattackandspecialattackcannotfall,
-    atkCA_setforcedtarget,
-    atkCB_setcharge,
-    atkCC_callterrainattack,
-    atkCD_cureifburnedparalysedorpoisoned,
-    atkCE_settorment,
-    atkCF_jumpifnodamage,
-    atkD0_settaunt,
-    atkD1_trysethelpinghand,
-    atkD2_tryswapitems,
-    atkD3_trycopyability,
-    atkD4_trywish,
-    atkD5_settoxicspikes,
-    atkD6_setgastroacid,
-    atkD7_setyawn,
-    atkD8_setdamagetohealthdifference,
-    atkD9_setroom,
-    atkDA_tryswapabilities,
-    atkDB_tryimprison,
-    atkDC_setstealthrock,
-    atkDD_setuserstatus3,
-    atkDE_assistattackselect,
-    atkDF_trysetmagiccoat,
-    atkE0_trysetsnatch,
-    atkE1_trygetintimidatetarget,
-    atkE2_switchoutabilities,
-    atkE3_jumpifhasnohp,
-    atkE4_getsecretpowereffect,
-    atkE5_pickup,
-    atkE6_docastformchangeanimation,
-    atkE7_trycastformdatachange,
-    atkE8_settypebasedhalvers,
-    atkE9_jumpifsubstituteblocks,
-    atkEA_tryrecycleitem,
-    atkEB_settypetoterrain,
-    atkEC_pursuitrelated,
-    atkEF_snatchsetbattlers,
-    atkEE_removelightscreenreflect,
-    atkEF_handleballthrow,
-    atkF0_givecaughtmon,
-    atkF1_trysetcaughtmondexflags,
-    atkF2_displaydexinfo,
-    atkF3_trygivecaughtmonnick,
-    atkF4_subattackerhpbydmg,
-    atkF5_removeattackerstatus1,
-    atkF6_finishaction,
-    atkF7_finishturn,
-    atkF8_trainerslideout,
-    atkF9_settelekinesis,
-    atkFA_swapstatstages,
-    atkFB_averagestats,
-    atkFC_jumpifoppositegenders,
-    atkFD_trygetbaddreamstarget,
-    atkFE_tryworryseed,
-    atkFF_metalburstdamagecalculator,
+	Cmd_attackcanceler, // 0x0
+	Cmd_accuracycheck, // 0x1
+	Cmd_attackstring, // 0x2
+	Cmd_ppreduce, // 0x3
+	Cmd_critcalc, // 0x4
+	Cmd_damagecalc, // 0x5
+	Cmd_typecalc, // 0x6
+	Cmd_adjustdamage, // 0x7
+	Cmd_multihitresultmessage, // 0x8
+	Cmd_attackanimation, // 0x9
+	Cmd_waitanimation, // 0xA
+	Cmd_healthbarupdate, // 0xB
+	Cmd_datahpupdate, // 0xC
+	Cmd_critmessage, // 0xD
+	Cmd_effectivenesssound, // 0xE
+	Cmd_resultmessage, // 0xF
+	Cmd_printstring, // 0x10
+	Cmd_printselectionstring, // 0x11
+	Cmd_waitmessage, // 0x12
+	Cmd_printfromtable, // 0x13
+	Cmd_printselectionstringfromtable, // 0x14
+	Cmd_seteffectwithchance, // 0x15
+	Cmd_seteffectprimary, // 0x16
+	Cmd_seteffectsecondary, // 0x17
+	Cmd_clearstatusfromeffect, // 0x18
+	Cmd_tryfaintmon, // 0x19
+	Cmd_dofaintanimation, // 0x1A
+	Cmd_cleareffectsonfaint, // 0x1B
+	Cmd_jumpifstatus, // 0x1C
+	Cmd_jumpifstatus2, // 0x1D
+	Cmd_jumpifability, // 0x1E
+	Cmd_jumpifsideaffecting, // 0x1F
+	Cmd_jumpifstat, // 0x20
+	Cmd_jumpifstatus3condition, // 0x21
+	Cmd_jumpbasedontype, // 0x22
+	Cmd_getexp, // 0x23
+	atk24, // 0x24
+	Cmd_movevaluescleanup, // 0x25
+	Cmd_setmultihit, // 0x26
+	Cmd_decrementmultihit, // 0x27
+	Cmd_goto, // 0x28
+	Cmd_jumpifbyte, // 0x29
+	Cmd_jumpifhalfword, // 0x2A
+	Cmd_jumpifword, // 0x2B
+	Cmd_jumpifarrayequal, // 0x2C
+	Cmd_jumpifarraynotequal, // 0x2D
+	Cmd_setbyte, // 0x2E
+	Cmd_addbyte, // 0x2F
+	Cmd_subbyte, // 0x30
+	Cmd_copyarray, // 0x31
+	Cmd_copyarraywithindex, // 0x32
+	Cmd_orbyte, // 0x33
+	Cmd_orhalfword, // 0x34
+	Cmd_orword, // 0x35
+	Cmd_bicbyte, // 0x36
+	Cmd_bichalfword, // 0x37
+	Cmd_bicword, // 0x38
+	Cmd_pause, // 0x39
+	Cmd_waitstate, // 0x3A
+	Cmd_update, // 0x3B
+	Cmd_return, // 0x3C
+	Cmd_end, // 0x3D
+	Cmd_end2, // 0x3E
+	Cmd_end3, // 0x3F
+	Cmd_jumpifaffectedbyprotect, // 0x40
+	Cmd_call, // 0x41
+	Cmd_setroost, // 0x42
+	Cmd_jumpifabilitypresent, // 0x43
+	Cmd_endselectionscript, // 0x44
+	Cmd_playanimation, // 0x45
+	Cmd_playanimation2, // 0x46
+	Cmd_setgraphicalstatchangevalues, // 0x47
+	Cmd_playstatchangeanimation, // 0x48
+	Cmd_moveend, // 0x49
+	Cmd_sethealblock, // 0x4A
+	Cmd_returnatktoball, // 0x4B
+	Cmd_getswitchedmondata, // 0x4C
+	Cmd_switchindataupdate, // 0x4D
+	Cmd_switchinanim, // 0x4E
+	Cmd_jumpifcantswitch, // 0x4F
+	Cmd_openpartyscreen, // 0x50
+	Cmd_switchhandleorder, // 0x51
+	Cmd_switchineffects, // 0x52
+	Cmd_trainerslidein, // 0x53
+	Cmd_playse, // 0x54
+	Cmd_fanfare, // 0x55
+	Cmd_playfaintcry, // 0x56
+	atk57, // 0x57
+	Cmd_returntoball, // 0x58
+	Cmd_handlelearnnewmove, // 0x59
+	Cmd_yesnoboxlearnmove, // 0x5A
+	Cmd_yesnoboxstoplearningmove, // 0x5B
+	Cmd_hitanimation, // 0x5C
+	Cmd_getmoneyreward, // 0x5D
+	atk5E, // 0x5E
+	Cmd_swapattackerwithtarget, // 0x5F
+	Cmd_incrementgamestat, // 0x60
+	Cmd_drawpartystatussummary, // 0x61
+	Cmd_hidepartystatussummary, // 0x62
+	Cmd_jumptocalledmove, // 0x63
+	Cmd_statusanimation, // 0x64
+	Cmd_status2animation, // 0x65
+	Cmd_chosenstatusanimation, // 0x66
+	Cmd_yesnobox, // 0x67
+	Cmd_cancelallactions, // 0x68
+	Cmd_setgravity, // 0x69
+	Cmd_removeitem, // 0x6A
+	Cmd_atknameinbuff1, // 0x6B
+	Cmd_drawlvlupbox, // 0x6C
+	Cmd_resetsentmonsvalue, // 0x6D
+	Cmd_setatktoplayer0, // 0x6E
+	Cmd_makevisible, // 0x6F
+	Cmd_recordability, // 0x70
+	Cmd_buffermovetolearn, // 0x71
+	Cmd_jumpifplayerran, // 0x72
+	Cmd_hpthresholds, // 0x73
+	Cmd_hpthresholds2, // 0x74
+	Cmd_useitemonopponent, // 0x75
+	Cmd_various, // 0x76
+	Cmd_setprotectlike, // 0x77
+	Cmd_faintifabilitynotdamp, // 0x78
+	Cmd_setatkhptozero, // 0x79
+	Cmd_jumpifnexttargetvalid, // 0x7A
+	Cmd_tryhealhalfhealth, // 0x7B
+	Cmd_trymirrormove, // 0x7C
+	Cmd_setrain, // 0x7D
+	Cmd_setreflect, // 0x7E
+	Cmd_setseeded, // 0x7F
+	Cmd_manipulatedamage, // 0x80
+	Cmd_trysetrest, // 0x81
+	Cmd_jumpifnotfirstturn, // 0x82
+	Cmd_setmiracleeye, // 0x83
+	Cmd_jumpifcantmakeasleep, // 0x84
+	Cmd_stockpile, // 0x85
+	Cmd_stockpiletobasedamage, // 0x86
+	Cmd_stockpiletohpheal, // 0x87
+	Cmd_setdrainedhp, // 0x88
+	Cmd_statbuffchange, // 0x89
+	Cmd_normalisebuffs, // 0x8A
+	Cmd_setbide, // 0x8B
+	Cmd_confuseifrepeatingattackends, // 0x8C
+	Cmd_setmultihitcounter, // 0x8D
+	Cmd_initmultihitstring, // 0x8E
+	Cmd_forcerandomswitch, // 0x8F
+	Cmd_tryconversiontypechange, // 0x90
+	Cmd_givepaydaymoney, // 0x91
+	Cmd_setlightscreen, // 0x92
+	Cmd_tryKO, // 0x93
+	Cmd_damagetohalftargethp, // 0x94
+	Cmd_setsandstorm, // 0x95
+	Cmd_weatherdamage, // 0x96
+	Cmd_tryinfatuating, // 0x97
+	Cmd_updatestatusicon, // 0x98
+	Cmd_setmist, // 0x99
+	Cmd_setfocusenergy, // 0x9A
+	Cmd_transformdataexecution, // 0x9B
+	Cmd_setsubstitute, // 0x9C
+	Cmd_mimicattackcopy, // 0x9D
+	Cmd_metronome, // 0x9E
+	Cmd_dmgtolevel, // 0x9F
+	Cmd_psywavedamageeffect, // 0xA0
+	Cmd_counterdamagecalculator, // 0xA1
+	Cmd_mirrorcoatdamagecalculator, // 0xA2
+	Cmd_disablelastusedattack, // 0xA3
+	Cmd_trysetencore, // 0xA4
+	Cmd_painsplitdmgcalc, // 0xA5
+	Cmd_settypetorandomresistance, // 0xA6
+	Cmd_setalwayshitflag, // 0xA7
+	Cmd_copymovepermanently, // 0xA8
+	Cmd_trychoosesleeptalkmove, // 0xA9
+	Cmd_setdestinybond, // 0xAA
+	Cmd_trysetdestinybondtohappen, // 0xAB
+	Cmd_settailwind, // 0xAC
+	Cmd_tryspiteppreduce, // 0xAD
+	Cmd_healpartystatus, // 0xAE
+	Cmd_cursetarget, // 0xAF
+	Cmd_trysetspikes, // 0xB0
+	Cmd_setforesight, // 0xB1
+	Cmd_trysetperishsong, // 0xB2
+	Cmd_handlerollout, // 0xB3
+	Cmd_jumpifconfusedandstatmaxed, // 0xB4
+	Cmd_handlefurycutter, // 0xB5
+	Cmd_setembargo, // 0xB6
+	Cmd_presentdamagecalculation, // 0xB7
+	Cmd_setsafeguard, // 0xB8
+	Cmd_magnitudedamagecalculation, // 0xB9
+	Cmd_jumpifnopursuitswitchdmg, // 0xBA
+	Cmd_setsunny, // 0xBB
+	Cmd_maxattackhalvehp, // 0xBC
+	Cmd_copyfoestats, // 0xBD
+	Cmd_rapidspinfree, // 0xBE
+	Cmd_setdefensecurlbit, // 0xBF
+	Cmd_recoverbasedonsunlight, // 0xC0
+	Cmd_setstickyweb, // 0xC1
+	Cmd_selectfirstvalidtarget, // 0xC2
+	Cmd_trysetfutureattack, // 0xC3
+	Cmd_trydobeatup, // 0xC4
+	Cmd_setsemiinvulnerablebit, // 0xC5
+	Cmd_clearsemiinvulnerablebit, // 0xC6
+	Cmd_setminimize, // 0xC7
+	Cmd_sethail, // 0xC8
+	Cmd_jumpifattackandspecialattackcannotfall, // 0xC9
+	Cmd_setforcedtarget, // 0xCA
+	Cmd_setcharge, // 0xCB
+	Cmd_callterrainattack, // 0xCC
+	Cmd_cureifburnedparalysedorpoisoned, // 0xCD
+	Cmd_settorment, // 0xCE
+	Cmd_jumpifnodamage, // 0xCF
+	Cmd_settaunt, // 0xD0
+	Cmd_trysethelpinghand, // 0xD1
+	Cmd_tryswapitems, // 0xD2
+	Cmd_trycopyability, // 0xD3
+	Cmd_trywish, // 0xD4
+	Cmd_settoxicspikes, // 0xD5
+	Cmd_setgastroacid, // 0xD6
+	Cmd_setyawn, // 0xD7
+	Cmd_setdamagetohealthdifference, // 0xD8
+	Cmd_setroom, // 0xD9
+	Cmd_tryswapabilities, // 0xDA
+	Cmd_tryimprison, // 0xDB
+	Cmd_setstealthrock, // 0xDC
+	Cmd_setuserstatus3, // 0xDD
+	Cmd_assistattackselect, // 0xDE
+	Cmd_trysetmagiccoat, // 0xDF
+	Cmd_trysetsnatch, // 0xE0
+	Cmd_trygetintimidatetarget, // 0xE1
+	Cmd_switchoutabilities, // 0xE2
+	Cmd_jumpifhasnohp, // 0xE3
+	Cmd_getsecretpowereffect, // 0xE4
+	Cmd_pickup, // 0xE5
+	Cmd_docastformchangeanimation, // 0xE6
+	Cmd_trycastformdatachange, // 0xE7
+	Cmd_settypebasedhalvers, // 0xE8
+	Cmd_jumpifsubstituteblocks, // 0xE9
+	Cmd_tryrecycleitem, // 0xEA
+	Cmd_settypetoterrain, // 0xEB
+	Cmd_pursuitrelated, // 0xEC
+	Cmd_snatchsetbattlers, // 0xED
+	Cmd_removelightscreenreflect, // 0xEE
+	Cmd_handleballthrow, // 0xEF
+	Cmd_givecaughtmon, // 0xF0
+	Cmd_trysetcaughtmondexflags, // 0xF1
+	Cmd_displaydexinfo, // 0xF2
+	Cmd_trygivecaughtmonnick, // 0xF3
+	Cmd_subattackerhpbydmg, // 0xF4
+	Cmd_removeattackerstatus1, // 0xF5
+	Cmd_finishaction, // 0xF6
+	Cmd_finishturn, // 0xF7
+	Cmd_trainerslideout, // 0xF8
+	Cmd_settelekinesis, // 0xF9
+	Cmd_swapstatstages, // 0xFA
+	Cmd_averagestats, // 0xFB
+	Cmd_jumpifoppositegenders, // 0xFC
+	Cmd_trygetbaddreamstarget, // 0xFD
+	Cmd_tryworryseed, // 0xFE
+	Cmd_metalburstdamagecalculator, // 0xFF
 };
 
 struct StatFractions
@@ -970,7 +970,7 @@ static bool32 NoTargetPresent(u32 move)
     return FALSE;
 }
 
-static void atk00_attackcanceler(void)
+static void Cmd_attackcanceler(void)
 {
     s32 i, moveType;
 
@@ -1128,7 +1128,7 @@ static bool32 JumpIfMoveFailed(u8 adder, u16 move)
     return FALSE;
 }
 
-static void atk40_jumpifaffectedbyprotect(void)
+static void Cmd_jumpifaffectedbyprotect(void)
 {
     if (IsBattlerProtected(gBattlerTarget, gCurrentMove))
     {
@@ -1224,7 +1224,7 @@ static bool32 AccuracyCalcHelper(u16 move)
     return FALSE;
 }
 
-static void atk01_accuracycheck(void)
+static void Cmd_accuracycheck(void)
 {
     u16 move = T2_READ_16(gBattlescriptCurrInstr + 5);
 
@@ -1335,7 +1335,7 @@ static void atk01_accuracycheck(void)
     }
 }
 
-static void atk02_attackstring(void)
+static void Cmd_attackstring(void)
 {
     if (gBattleControllerExecFlags)
          return;
@@ -1348,7 +1348,7 @@ static void atk02_attackstring(void)
     gBattleCommunication[MSG_DISPLAY] = 0;
 }
 
-static void atk03_ppreduce(void)
+static void Cmd_ppreduce(void)
 {
     s32 i, ppToDeduct = 1;
 
@@ -1453,7 +1453,7 @@ s32 CalcCritChanceStage(u8 battlerAtk, u8 battlerDef, u32 move, bool32 recordAbi
     return critChance;
 }
 
-static void atk04_critcalc(void)
+static void Cmd_critcalc(void)
 {
     s32 critChance = CalcCritChanceStage(gBattlerAttacker, gBattlerTarget, gCurrentMove, TRUE);
     gPotentialItemEffectBattler = gBattlerAttacker;
@@ -1472,7 +1472,7 @@ static void atk04_critcalc(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk05_damagecalc(void)
+static void Cmd_damagecalc(void)
 {
     u8 moveType;
 
@@ -1481,7 +1481,7 @@ static void atk05_damagecalc(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk06_typecalc(void)
+static void Cmd_typecalc(void)
 {
     u8 moveType;
 
@@ -1491,7 +1491,7 @@ static void atk06_typecalc(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk07_adjustdamage(void)
+static void Cmd_adjustdamage(void)
 {
     u8 holdEffect, param;
 
@@ -1571,7 +1571,7 @@ END:
     }
 }
 
-static void atk08_multihitresultmessage(void)
+static void Cmd_multihitresultmessage(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -1601,7 +1601,7 @@ static void atk08_multihitresultmessage(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk09_attackanimation(void)
+static void Cmd_attackanimation(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -1655,13 +1655,13 @@ static void atk09_attackanimation(void)
     }
 }
 
-static void atk0A_waitanimation(void)
+static void Cmd_waitanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
         gBattlescriptCurrInstr++;
 }
 
-static void atk0B_healthbarupdate(void)
+static void Cmd_healthbarupdate(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -1697,7 +1697,7 @@ static void atk0B_healthbarupdate(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk0C_datahpupdate(void)
+static void Cmd_datahpupdate(void)
 {
     u32 moveType;
 
@@ -1823,7 +1823,7 @@ static void atk0C_datahpupdate(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk0D_critmessage(void)
+static void Cmd_critmessage(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -1836,7 +1836,7 @@ static void atk0D_critmessage(void)
     }
 }
 
-static void atk0E_effectivenesssound(void)
+static void Cmd_effectivenesssound(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -1884,7 +1884,7 @@ static void atk0E_effectivenesssound(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk0F_resultmessage(void)
+static void Cmd_resultmessage(void)
 {
     u32 stringId = 0;
 
@@ -1990,7 +1990,7 @@ static void atk0F_resultmessage(void)
     }
 }
 
-static void atk10_printstring(void)
+static void Cmd_printstring(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2002,7 +2002,7 @@ static void atk10_printstring(void)
     }
 }
 
-static void atk11_printselectionstring(void)
+static void Cmd_printselectionstring(void)
 {
     gActiveBattler = gBattlerAttacker;
 
@@ -2013,7 +2013,7 @@ static void atk11_printselectionstring(void)
     gBattleCommunication[MSG_DISPLAY] = 1;
 }
 
-static void atk12_waitmessage(void)
+static void Cmd_waitmessage(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2034,7 +2034,7 @@ static void atk12_waitmessage(void)
     }
 }
 
-static void atk13_printfromtable(void)
+static void Cmd_printfromtable(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2047,7 +2047,7 @@ static void atk13_printfromtable(void)
     }
 }
 
-static void atk14_printselectionstringfromtable(void)
+static void Cmd_printselectionstringfromtable(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -2946,7 +2946,7 @@ void SetMoveEffect(bool32 primary, u32 certain)
     gBattleScripting.moveEffect = 0;
 }
 
-static void atk15_seteffectwithchance(void)
+static void Cmd_seteffectwithchance(void)
 {
     u32 percentChance;
 
@@ -2979,17 +2979,17 @@ static void atk15_seteffectwithchance(void)
     gBattleScripting.multihitMoveEffect = 0;
 }
 
-static void atk16_seteffectprimary(void)
+static void Cmd_seteffectprimary(void)
 {
     SetMoveEffect(TRUE, 0);
 }
 
-static void atk17_seteffectsecondary(void)
+static void Cmd_seteffectsecondary(void)
 {
     SetMoveEffect(FALSE, 0);
 }
 
-static void atk18_clearstatusfromeffect(void)
+static void Cmd_clearstatusfromeffect(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -3003,7 +3003,7 @@ static void atk18_clearstatusfromeffect(void)
     gBattleScripting.multihitMoveEffect = 0;
 }
 
-static void atk19_tryfaintmon(void)
+static void Cmd_tryfaintmon(void)
 {
     const u8 *BS_ptr;
 
@@ -3090,7 +3090,7 @@ static void atk19_tryfaintmon(void)
     }
 }
 
-static void atk1A_dofaintanimation(void)
+static void Cmd_dofaintanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -3101,7 +3101,7 @@ static void atk1A_dofaintanimation(void)
     }
 }
 
-static void atk1B_cleareffectsonfaint(void)
+static void Cmd_cleareffectsonfaint(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -3119,7 +3119,7 @@ static void atk1B_cleareffectsonfaint(void)
     }
 }
 
-static void atk1C_jumpifstatus(void)
+static void Cmd_jumpifstatus(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2);
@@ -3131,7 +3131,7 @@ static void atk1C_jumpifstatus(void)
         gBattlescriptCurrInstr += 10;
 }
 
-static void atk1D_jumpifstatus2(void)
+static void Cmd_jumpifstatus2(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2);
@@ -3143,7 +3143,7 @@ static void atk1D_jumpifstatus2(void)
         gBattlescriptCurrInstr += 10;
 }
 
-static void atk1E_jumpifability(void)
+static void Cmd_jumpifability(void)
 {
     u32 battlerId;
     bool32 hasAbility = FALSE;
@@ -3187,7 +3187,7 @@ static void atk1E_jumpifability(void)
     }
 }
 
-static void atk1F_jumpifsideaffecting(void)
+static void Cmd_jumpifsideaffecting(void)
 {
     u8 side;
     u32 flags;
@@ -3207,7 +3207,7 @@ static void atk1F_jumpifsideaffecting(void)
         gBattlescriptCurrInstr += 10;
 }
 
-static void atk20_jumpifstat(void)
+static void Cmd_jumpifstat(void)
 {
     bool32 ret = 0;
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
@@ -3264,7 +3264,7 @@ static void atk20_jumpifstat(void)
         gBattlescriptCurrInstr += 9;
 }
 
-static void atk21_jumpifstatus3condition(void)
+static void Cmd_jumpifstatus3condition(void)
 {
     u32 flags;
     const u8 *jumpPtr;
@@ -3289,7 +3289,7 @@ static void atk21_jumpifstatus3condition(void)
     }
 }
 
-static void atk22_jumpbasedontype(void)
+static void Cmd_jumpbasedontype(void)
 {
     u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     u8 type = gBattlescriptCurrInstr[2];
@@ -3313,7 +3313,7 @@ static void atk22_jumpbasedontype(void)
     }
 }
 
-static void atk23_getexp(void)
+static void Cmd_getexp(void)
 {
     u16 item;
     s32 i; // also used as stringId
@@ -3325,7 +3325,7 @@ static void atk23_getexp(void)
     gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1];
 
-    switch (gBattleScripting.atk23_state)
+    switch (gBattleScripting.getexpState)
     {
     case 0: // check if should receive exp at all
         if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT || (gBattleTypeFlags &
@@ -3337,11 +3337,11 @@ static void atk23_getexp(void)
               | BATTLE_TYPE_BATTLE_TOWER
               | BATTLE_TYPE_EREADER_TRAINER)))
         {
-            gBattleScripting.atk23_state = 6; // goto last case
+            gBattleScripting.getexpState = 6; // goto last case
         }
         else
         {
-            gBattleScripting.atk23_state++;
+            gBattleScripting.getexpState++;
             gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]];
         }
         break;
@@ -3388,7 +3388,7 @@ static void atk23_getexp(void)
                 gExpShareExp = 0;
             }
 
-            gBattleScripting.atk23_state++;
+            gBattleScripting.getexpState++;
             gBattleStruct->expGetterMonId = 0;
             gBattleStruct->sentInPokes = sentIn;
         }
@@ -3406,13 +3406,13 @@ static void atk23_getexp(void)
             if (holdEffect != HOLD_EFFECT_EXP_SHARE && !(gBattleStruct->sentInPokes & 1))
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
                 gBattleMoveDamage = 0; // used for exp
             }
             else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL)
             {
                 *(&gBattleStruct->sentInPokes) >>= 1;
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
                 gBattleMoveDamage = 0; // used for exp
             }
             else
@@ -3488,7 +3488,7 @@ static void atk23_getexp(void)
                     MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species);
                 }
                 gBattleStruct->sentInPokes >>= 1;
-                gBattleScripting.atk23_state++;
+                gBattleScripting.getexpState++;
             }
         }
         break;
@@ -3509,7 +3509,7 @@ static void atk23_getexp(void)
                 BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
-            gBattleScripting.atk23_state++;
+            gBattleScripting.getexpState++;
         }
         break;
     case 4: // lvl up if necessary
@@ -3552,27 +3552,27 @@ static void atk23_getexp(void)
                         SWAP(gBattleMons[battlerId].attack, gBattleMons[battlerId].defense, temp);
                 }
 
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
             }
             else
             {
                 gBattleMoveDamage = 0;
-                gBattleScripting.atk23_state = 5;
+                gBattleScripting.getexpState = 5;
             }
         }
         break;
     case 5: // looper increment
         if (gBattleMoveDamage) // there is exp to give, goto case 3 that gives exp
         {
-            gBattleScripting.atk23_state = 3;
+            gBattleScripting.getexpState = 3;
         }
         else
         {
             gBattleStruct->expGetterMonId++;
             if (gBattleStruct->expGetterMonId <= 5)
-                gBattleScripting.atk23_state = 2; // loop again
+                gBattleScripting.getexpState = 2; // loop again
             else
-                gBattleScripting.atk23_state = 6; // we're done
+                gBattleScripting.getexpState = 6; // we're done
         }
         break;
     case 6: // increment instruction
@@ -3697,19 +3697,19 @@ static void MoveValuesCleanUp(void)
     gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
 }
 
-static void atk25_movevaluescleanup(void)
+static void Cmd_movevaluescleanup(void)
 {
     MoveValuesCleanUp();
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk26_setmultihit(void)
+static void Cmd_setmultihit(void)
 {
     gMultiHitCounter = gBattlescriptCurrInstr[1];
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk27_decrementmultihit(void)
+static void Cmd_decrementmultihit(void)
 {
     if (--gMultiHitCounter == 0)
         gBattlescriptCurrInstr += 5;
@@ -3717,12 +3717,12 @@ static void atk27_decrementmultihit(void)
         gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk28_goto(void)
+static void Cmd_goto(void)
 {
     gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk29_jumpifbyte(void)
+static void Cmd_jumpifbyte(void)
 {
     u8 caseID = gBattlescriptCurrInstr[1];
     const u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -3760,7 +3760,7 @@ static void atk29_jumpifbyte(void)
     }
 }
 
-static void atk2A_jumpifhalfword(void)
+static void Cmd_jumpifhalfword(void)
 {
     u8 caseID = gBattlescriptCurrInstr[1];
     const u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -3798,7 +3798,7 @@ static void atk2A_jumpifhalfword(void)
     }
 }
 
-static void atk2B_jumpifword(void)
+static void Cmd_jumpifword(void)
 {
     u8 caseID = gBattlescriptCurrInstr[1];
     const u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -3836,7 +3836,7 @@ static void atk2B_jumpifword(void)
     }
 }
 
-static void atk2C_jumpifarrayequal(void)
+static void Cmd_jumpifarrayequal(void)
 {
     const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -3858,7 +3858,7 @@ static void atk2C_jumpifarrayequal(void)
         gBattlescriptCurrInstr = jumpPtr;
 }
 
-static void atk2D_jumpifarraynotequal(void)
+static void Cmd_jumpifarraynotequal(void)
 {
     u8 equalBytes = 0;
     const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -3882,7 +3882,7 @@ static void atk2D_jumpifarraynotequal(void)
         gBattlescriptCurrInstr += 14;
 }
 
-static void atk2E_setbyte(void)
+static void Cmd_setbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte = gBattlescriptCurrInstr[5];
@@ -3890,21 +3890,21 @@ static void atk2E_setbyte(void)
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk2F_addbyte(void)
+static void Cmd_addbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte += gBattlescriptCurrInstr[5];
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk30_subbyte(void)
+static void Cmd_subbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte -= gBattlescriptCurrInstr[5];
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk31_copyarray(void)
+static void Cmd_copyarray(void)
 {
     u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -3919,7 +3919,7 @@ static void atk31_copyarray(void)
     gBattlescriptCurrInstr += 10;
 }
 
-static void atk32_copyarraywithindex(void)
+static void Cmd_copyarraywithindex(void)
 {
     u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -3935,14 +3935,14 @@ static void atk32_copyarraywithindex(void)
     gBattlescriptCurrInstr += 14;
 }
 
-static void atk33_orbyte(void)
+static void Cmd_orbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte |= gBattlescriptCurrInstr[5];
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk34_orhalfword(void)
+static void Cmd_orhalfword(void)
 {
     u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u16 val = T2_READ_16(gBattlescriptCurrInstr + 5);
@@ -3951,7 +3951,7 @@ static void atk34_orhalfword(void)
     gBattlescriptCurrInstr += 7;
 }
 
-static void atk35_orword(void)
+static void Cmd_orword(void)
 {
     u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u32 val = T2_READ_32(gBattlescriptCurrInstr + 5);
@@ -3960,14 +3960,14 @@ static void atk35_orword(void)
     gBattlescriptCurrInstr += 9;
 }
 
-static void atk36_bicbyte(void)
+static void Cmd_bicbyte(void)
 {
     u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     *memByte &= ~(gBattlescriptCurrInstr[5]);
     gBattlescriptCurrInstr += 6;
 }
 
-static void atk37_bichalfword(void)
+static void Cmd_bichalfword(void)
 {
     u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u16 val = T2_READ_16(gBattlescriptCurrInstr + 5);
@@ -3976,7 +3976,7 @@ static void atk37_bichalfword(void)
     gBattlescriptCurrInstr += 7;
 }
 
-static void atk38_bicword(void)
+static void Cmd_bicword(void)
 {
     u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1);
     u32 val = T2_READ_32(gBattlescriptCurrInstr + 5);
@@ -3985,7 +3985,7 @@ static void atk38_bicword(void)
     gBattlescriptCurrInstr += 9;
 }
 
-static void atk39_pause(void)
+static void Cmd_pause(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -3998,13 +3998,13 @@ static void atk39_pause(void)
     }
 }
 
-static void atk3A_waitstate(void)
+static void Cmd_waitstate(void)
 {
     if (gBattleControllerExecFlags == 0)
         gBattlescriptCurrInstr++;
 }
 
-static void atk3B_healthbar_update(void)
+static void Cmd_update(void)
 {
     if (gBattlescriptCurrInstr[1] == BS_TARGET)
         gActiveBattler = gBattlerTarget;
@@ -4016,12 +4016,12 @@ static void atk3B_healthbar_update(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk3C_return(void)
+static void Cmd_return(void)
 {
     BattleScriptPop();
 }
 
-static void atk3D_end(void)
+static void Cmd_end(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
         BattleArena_AddSkillPoints(gBattlerAttacker);
@@ -4031,13 +4031,13 @@ static void atk3D_end(void)
     gCurrentActionFuncId = B_ACTION_TRY_FINISH;
 }
 
-static void atk3E_end2(void)
+static void Cmd_end2(void)
 {
     gActiveBattler = 0;
     gCurrentActionFuncId = B_ACTION_TRY_FINISH;
 }
 
-static void atk3F_end3(void) // pops the main function stack
+static void Cmd_end3(void) // pops the main function stack
 {
     BattleScriptPop();
     if (gBattleResources->battleCallbackStack->size != 0)
@@ -4045,13 +4045,13 @@ static void atk3F_end3(void) // pops the main function stack
     gBattleMainFunc = gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size];
 }
 
-static void atk41_call(void)
+static void Cmd_call(void)
 {
     BattleScriptPush(gBattlescriptCurrInstr + 5);
     gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atk42_setroost(void)
+static void Cmd_setroost(void)
 {
     gBattleResources->flags->flags[gBattlerAttacker] |= RESOURCE_FLAG_ROOST;
 
@@ -4084,7 +4084,7 @@ static void atk42_setroost(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk43_jumpifabilitypresent(void)
+static void Cmd_jumpifabilitypresent(void)
 {
     if (IsAbilityOnField(gBattlescriptCurrInstr[1]))
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2);
@@ -4092,12 +4092,12 @@ static void atk43_jumpifabilitypresent(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk44_endselectionscript(void)
+static void Cmd_endselectionscript(void)
 {
     *(gBattlerAttacker + gBattleStruct->selectionScriptFinished) = TRUE;
 }
 
-static void atk45_playanimation(void)
+static void Cmd_playanimation(void)
 {
     const u16* argumentPtr;
 
@@ -4140,7 +4140,7 @@ static void atk45_playanimation(void)
     }
 }
 
-static void atk46_playanimation2(void) // animation Id is stored in the first pointer
+static void Cmd_playanimation2(void) // animation Id is stored in the first pointer
 {
     const u16* argumentPtr;
     const u8* animationIdPtr;
@@ -4184,7 +4184,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po
     }
 }
 
-static void atk47_setgraphicalstatchangevalues(void)
+static void Cmd_setgraphicalstatchangevalues(void)
 {
     u8 value = GET_STAT_BUFF_VALUE_WITH_SIGN(gBattleScripting.statChanger);
 
@@ -4220,7 +4220,7 @@ static void atk47_setgraphicalstatchangevalues(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk48_playstatchangeanimation(void)
+static void Cmd_playstatchangeanimation(void)
 {
     u32 ability;
     u32 currStat = 0;
@@ -4236,13 +4236,13 @@ static void atk48_playstatchangeanimation(void)
 
     // Handle Contrary and Simple
     if (ability == ABILITY_CONTRARY)
-        flags ^= ATK48_STAT_NEGATIVE;
+        flags ^= STAT_CHANGE_NEGATIVE;
     else if (ability == ABILITY_SIMPLE)
-        flags |= ATK48_STAT_BY_TWO;
+        flags |= STAT_CHANGE_BY_TWO;
 
-    if (flags & ATK48_STAT_NEGATIVE) // goes down
+    if (flags & STAT_CHANGE_NEGATIVE) // goes down
     {
-        if (flags & ATK48_STAT_BY_TWO)
+        if (flags & STAT_CHANGE_BY_TWO)
             startingStatAnimId = STAT_ANIM_MINUS2 - 1;
         else
             startingStatAnimId = STAT_ANIM_MINUS1 - 1;
@@ -4251,7 +4251,7 @@ static void atk48_playstatchangeanimation(void)
         {
             if (statsToCheck & 1)
             {
-                if (flags & ATK48_DONT_CHECK_LOWER)
+                if (flags & STAT_CHANGE_CANT_PREVENT)
                 {
                     if (gBattleMons[gActiveBattler].statStages[currStat] > 0)
                     {
@@ -4277,7 +4277,7 @@ static void atk48_playstatchangeanimation(void)
 
         if (changeableStatsCount > 1) // more than one stat, so the color is gray
         {
-            if (flags & ATK48_STAT_BY_TWO)
+            if (flags & STAT_CHANGE_BY_TWO)
                 statAnimId = STAT_ANIM_MULTIPLE_MINUS2;
             else
                 statAnimId = STAT_ANIM_MULTIPLE_MINUS1;
@@ -4285,7 +4285,7 @@ static void atk48_playstatchangeanimation(void)
     }
     else // goes up
     {
-        if (flags & ATK48_STAT_BY_TWO)
+        if (flags & STAT_CHANGE_BY_TWO)
             startingStatAnimId = STAT_ANIM_PLUS2 - 1;
         else
             startingStatAnimId = STAT_ANIM_PLUS1 - 1;
@@ -4302,14 +4302,14 @@ static void atk48_playstatchangeanimation(void)
 
         if (changeableStatsCount > 1) // more than one stat, so the color is gray
         {
-            if (flags & ATK48_STAT_BY_TWO)
+            if (flags & STAT_CHANGE_BY_TWO)
                 statAnimId = STAT_ANIM_MULTIPLE_PLUS2;
             else
                 statAnimId = STAT_ANIM_MULTIPLE_PLUS1;
         }
     }
 
-    if (flags & ATK48_ONLY_MULTIPLE && changeableStatsCount < 2)
+    if (flags & STAT_CHANGE_ONLY_MULTIPLE && changeableStatsCount < 2)
     {
         gBattlescriptCurrInstr += 4;
     }
@@ -4317,7 +4317,7 @@ static void atk48_playstatchangeanimation(void)
     {
         BtlController_EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId);
         MarkBattlerForControllerExec(gActiveBattler);
-        if (flags & ATK48_ONLY_MULTIPLE && changeableStatsCount > 1)
+        if (flags & STAT_CHANGE_ONLY_MULTIPLE && changeableStatsCount > 1)
             gBattleScripting.statAnimPlayed = TRUE;
         gBattlescriptCurrInstr += 4;
     }
@@ -4327,7 +4327,7 @@ static void atk48_playstatchangeanimation(void)
     }
 }
 
-static void atk49_moveend(void)
+static void Cmd_moveend(void)
 {
     s32 i;
     bool32 effect = FALSE;
@@ -4351,9 +4351,9 @@ static void atk49_moveend(void)
 
     do
     {
-        switch (gBattleScripting.atk49_state)
+        switch (gBattleScripting.moveendState)
         {
-        case ATK49_PROTECT_LIKE_EFFECT:
+        case MOVEEND_PROTECT_LIKE_EFFECT:
             if (gBattleMoves[gCurrentMove].flags & FLAG_MAKES_CONTACT)
             {
                 if (gProtectStructs[gBattlerTarget].spikyShielded && GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD)
@@ -4385,9 +4385,9 @@ static void atk49_moveend(void)
                     effect = 1;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_RAGE: // rage check
+        case MOVEEND_RAGE: // rage check
             if (gBattleMons[gBattlerTarget].status2 & STATUS2_RAGE
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
                 && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget)
@@ -4399,9 +4399,9 @@ static void atk49_moveend(void)
                 gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
                 effect = TRUE;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_DEFROST: // defrosting check
+        case MOVEEND_DEFROST: // defrosting check
             if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE
                 && gBattleMons[gBattlerTarget].hp != 0 && gBattlerAttacker != gBattlerTarget
                 && gSpecialStatuses[gBattlerTarget].specialDmg
@@ -4415,30 +4415,30 @@ static void atk49_moveend(void)
                 gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
                 effect = TRUE;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_SYNCHRONIZE_TARGET: // target synchronize
+        case MOVEEND_SYNCHRONIZE_TARGET: // target synchronize
             if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattlerTarget, 0, 0, 0))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_MOVE_END_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.).
+        case MOVEEND_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.).
             if (AbilityBattleEffects(ABILITYEFFECT_MOVE_END, gBattlerTarget, 0, 0, 0))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_STATUS_IMMUNITY_ABILITIES: // status immunities
+        case MOVEEND_STATUS_IMMUNITY_ABILITIES: // status immunities
             if (AbilityBattleEffects(ABILITYEFFECT_IMMUNITY, 0, 0, 0, 0))
                 effect = TRUE; // it loops through all battlers, so we increment after its done with all battlers
             else
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
             break;
-        case ATK49_SYNCHRONIZE_ATTACKER: // attacker synchronize
+        case MOVEEND_SYNCHRONIZE_ATTACKER: // attacker synchronize
             if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattlerAttacker, 0, 0, 0))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_CHOICE_MOVE: // update choice band move
+        case MOVEEND_CHOICE_MOVE: // update choice band move
             if (gHitMarker & HITMARKER_OBEYS
              && HOLD_EFFECT_CHOICE(holdEffectAtk)
              && gChosenMove != MOVE_STRUGGLE
@@ -4449,7 +4449,7 @@ static void atk49_moveend(void)
                  || gBattleMoves[gChosenMove].effect == EFFECT_HIT_ESCAPE)
                     && !(gMoveResultFlags & MOVE_RESULT_FAILED))
                 {
-                    ++gBattleScripting.atk49_state;
+                    ++gBattleScripting.moveendState;
                     break;
                 }
                 *choicedMoveAtk = gChosenMove;
@@ -4461,9 +4461,9 @@ static void atk49_moveend(void)
             }
             if (i == MAX_MON_MOVES)
                 *choicedMoveAtk = 0;
-            ++gBattleScripting.atk49_state;
+            ++gBattleScripting.moveendState;
             break;
-        case ATK49_CHANGED_ITEMS: // changed held items
+        case MOVEEND_CHANGED_ITEMS: // changed held items
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (gBattleStruct->changedItems[i] != 0)
@@ -4472,37 +4472,37 @@ static void atk49_moveend(void)
                     gBattleStruct->changedItems[i] = 0;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ITEM_EFFECTS_TARGET:
+        case MOVEEND_ITEM_EFFECTS_TARGET:
             if (ItemBattleEffects(ITEMEFFECT_TARGET, gBattlerTarget, FALSE))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ITEM_EFFECTS_ALL: // item effects for all battlers
+        case MOVEEND_ITEM_EFFECTS_ALL: // item effects for all battlers
             if (ItemBattleEffects(ITEMEFFECT_MOVE_END, 0, FALSE))
                 effect = TRUE;
             else
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
             break;
-        case ATK49_KINGSROCK_SHELLBELL: // king's rock and shell bell
+        case MOVEEND_KINGSROCK_SHELLBELL: // king's rock and shell bell
             if (ItemBattleEffects(ITEMEFFECT_KINGSROCK_SHELLBELL, 0, FALSE))
                 effect = TRUE;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ATTACKER_INVISIBLE: // make attacker sprite invisible
+        case MOVEEND_ATTACKER_INVISIBLE: // make attacker sprite invisible
             if (gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE)
                 && gHitMarker & HITMARKER_NO_ANIMATIONS)
             {
                 gActiveBattler = gBattlerAttacker;
                 BtlController_EmitSpriteInvisibility(0, TRUE);
                 MarkBattlerForControllerExec(gActiveBattler);
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
                 return;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_ATTACKER_VISIBLE: // make attacker sprite visible
+        case MOVEEND_ATTACKER_VISIBLE: // make attacker sprite visible
             if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT
                 || !(gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE))
                 || WasUnableToUseMove(gBattlerAttacker))
@@ -4512,12 +4512,12 @@ static void atk49_moveend(void)
                 MarkBattlerForControllerExec(gActiveBattler);
                 gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
                 gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1;
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
                 return;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_TARGET_VISIBLE: // make target sprite visible
+        case MOVEEND_TARGET_VISIBLE: // make target sprite visible
             if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite && gBattlerTarget < gBattlersCount
                 && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE))
             {
@@ -4525,20 +4525,20 @@ static void atk49_moveend(void)
                 BtlController_EmitSpriteInvisibility(0, FALSE);
                 MarkBattlerForControllerExec(gActiveBattler);
                 gStatuses3[gBattlerTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
-                gBattleScripting.atk49_state++;
+                gBattleScripting.moveendState++;
                 return;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_SUBSTITUTE: // update substitute
+        case MOVEEND_SUBSTITUTE: // update substitute
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (gDisableStructs[i].substituteHP == 0)
                     gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE);
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_UPDATE_LAST_MOVES:
+        case MOVEEND_UPDATE_LAST_MOVES:
             gDisableStructs[gBattlerAttacker].usedMoves |= gBitTable[gCurrMovePos];
             gBattleStruct->lastMoveTarget[gBattlerAttacker] = gBattlerTarget;
             if (gMoveResultFlags & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE))
@@ -4594,9 +4594,9 @@ static void atk49_moveend(void)
                     gLastLandedMoves[gBattlerTarget] = 0xFFFF;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_MIRROR_MOVE: // mirror move
+        case MOVEEND_MIRROR_MOVE: // mirror move
             if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) && !(gBattleStruct->field_91 & gBitTable[gBattlerAttacker])
                 && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED && gHitMarker & HITMARKER_OBEYS
                 && gBattlerAttacker != gBattlerTarget && !(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))
@@ -4605,9 +4605,9 @@ static void atk49_moveend(void)
                 gBattleStruct->lastTakenMove[gBattlerTarget] = gChosenMove;
                 gBattleStruct->lastTakenMoveFrom[gBattlerTarget][gBattlerAttacker] = gChosenMove;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_NEXT_TARGET: // For moves hitting two opposing Pokemon.
+        case MOVEEND_NEXT_TARGET: // For moves hitting two opposing Pokemon.
             if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE)
                 && gBattleTypeFlags & BATTLE_TYPE_DOUBLE
                 && !gProtectStructs[gBattlerAttacker].chargingTurn
@@ -4635,7 +4635,7 @@ static void atk49_moveend(void)
                 if (IsBattlerAlive(battlerId))
                 {
                     gBattlerTarget = battlerId;
-                    gBattleScripting.atk49_state = 0;
+                    gBattleScripting.moveendState = 0;
                     MoveValuesCleanUp();
                     gBattleScripting.moveEffect = gBattleScripting.savedMoveEffect;
                     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
@@ -4647,9 +4647,9 @@ static void atk49_moveend(void)
                     gHitMarker |= HITMARKER_NO_ATTACKSTRING;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_LIFE_ORB:
+        case MOVEEND_LIFE_ORB:
             if (GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_LIFE_ORB
                 && !(GetBattlerAbility(gBattlerAttacker) == ABILITY_SHEER_FORCE && gBattleMoves[gCurrentMove].flags & FLAG_SHEER_FORCE_BOOST)
                 && GetBattlerAbility(gBattlerAttacker) != ABILITY_MAGIC_GUARD
@@ -4663,9 +4663,9 @@ static void atk49_moveend(void)
                 gBattlescriptCurrInstr = BattleScript_ItemHurtRet;
                 gLastUsedItem = gBattleMons[gBattlerAttacker].item;
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_CLEAR_BITS: // Clear bits active while using a move for all targets and all hits.
+        case MOVEEND_CLEAR_BITS: // Clear bits active while using a move for all targets and all hits.
             if (gSpecialStatuses[gBattlerAttacker].instructedChosenTarget)
                 *(gBattleStruct->moveTarget + gBattlerAttacker) = gSpecialStatuses[gBattlerAttacker].instructedChosenTarget & 0x3;
             gProtectStructs[gBattlerAttacker].usesBouncedMove = 0;
@@ -4674,24 +4674,24 @@ static void atk49_moveend(void)
             gSpecialStatuses[gBattlerAttacker].gemBoost = 0;
             gSpecialStatuses[gBattlerAttacker].damagedMons = 0;
             gSpecialStatuses[gBattlerTarget].berryReduced = 0;
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
-        case ATK49_COUNT:
+        case MOVEEND_COUNT:
             break;
         }
 
         if (arg1 == 1 && effect == FALSE)
-            gBattleScripting.atk49_state = ATK49_COUNT;
-        if (arg1 == 2 && arg2 == gBattleScripting.atk49_state)
-            gBattleScripting.atk49_state = ATK49_COUNT;
+            gBattleScripting.moveendState = MOVEEND_COUNT;
+        if (arg1 == 2 && arg2 == gBattleScripting.moveendState)
+            gBattleScripting.moveendState = MOVEEND_COUNT;
 
-    } while (gBattleScripting.atk49_state != ATK49_COUNT && effect == FALSE);
+    } while (gBattleScripting.moveendState != MOVEEND_COUNT && effect == FALSE);
 
-    if (gBattleScripting.atk49_state == ATK49_COUNT && effect == FALSE)
+    if (gBattleScripting.moveendState == MOVEEND_COUNT && effect == FALSE)
         gBattlescriptCurrInstr += 3;
 }
 
-static void atk4A_sethealblock(void)
+static void Cmd_sethealblock(void)
 {
     if (gStatuses3[gBattlerTarget] & STATUS3_HEAL_BLOCK)
     {
@@ -4705,7 +4705,7 @@ static void atk4A_sethealblock(void)
     }
 }
 
-static void atk4B_returnatktoball(void)
+static void Cmd_returnatktoball(void)
 {
     gActiveBattler = gBattlerAttacker;
     if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler)))
@@ -4716,7 +4716,7 @@ static void atk4B_returnatktoball(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk4C_getswitchedmondata(void)
+static void Cmd_getswitchedmondata(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -4731,7 +4731,7 @@ static void atk4C_getswitchedmondata(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk4D_switchindataupdate(void)
+static void Cmd_switchindataupdate(void)
 {
     struct BattlePokemon oldData;
     s32 i;
@@ -4785,7 +4785,7 @@ static void atk4D_switchindataupdate(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk4E_switchinanim(void)
+static void Cmd_switchinanim(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -4811,16 +4811,16 @@ static void atk4E_switchinanim(void)
         BattleArena_InitPoints();
 }
 
-static void atk4F_jumpifcantswitch(void)
+static void Cmd_jumpifcantswitch(void)
 {
     s32 i;
     s32 lastMonId;
     u8 battlerIn1, battlerIn2;
     struct Pokemon *party;
 
-    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES));
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION));
 
-    if (!(gBattlescriptCurrInstr[1] & ATK4F_DONT_CHECK_STATUSES)
+    if (!(gBattlescriptCurrInstr[1] & SWITCH_IGNORE_ESCAPE_PREVENTION)
         && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
             || (gStatuses3[gActiveBattler] & STATUS3_ROOTED)))
     {
@@ -4992,7 +4992,7 @@ static void sub_804CF10(u8 slotId)
     MarkBattlerForControllerExec(gActiveBattler);
 }
 
-static void atk50_openpartyscreen(void)
+static void Cmd_openpartyscreen(void)
 {
     u32 flags;
     u8 hitmarkerFaintBits;
@@ -5282,7 +5282,7 @@ static void atk50_openpartyscreen(void)
     }
 }
 
-static void atk51_switchhandleorder(void)
+static void Cmd_switchhandleorder(void)
 {
     s32 i;
     if (gBattleControllerExecFlags)
@@ -5364,7 +5364,7 @@ static void SetDmgHazardsBattlescript(u8 battlerId, u8 multistringId)
         gBattlescriptCurrInstr = BattleScript_DmgHazardsOnFaintedBattler;
 }
 
-static void atk52_switchineffects(void)
+static void Cmd_switchineffects(void)
 {
     s32 i;
 
@@ -5484,7 +5484,7 @@ static void atk52_switchineffects(void)
     }
 }
 
-static void atk53_trainerslidein(void)
+static void Cmd_trainerslidein(void)
 {
     gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
     BtlController_EmitTrainerSlide(0);
@@ -5493,7 +5493,7 @@ static void atk53_trainerslidein(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk54_playse(void)
+static void Cmd_playse(void)
 {
     gActiveBattler = gBattlerAttacker;
     BtlController_EmitPlaySE(0, T2_READ_16(gBattlescriptCurrInstr + 1));
@@ -5502,7 +5502,7 @@ static void atk54_playse(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk55_fanfare(void)
+static void Cmd_fanfare(void)
 {
     gActiveBattler = gBattlerAttacker;
     BtlController_EmitPlayFanfareOrBGM(0, T2_READ_16(gBattlescriptCurrInstr + 1), FALSE);
@@ -5511,7 +5511,7 @@ static void atk55_fanfare(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk56_playfaintcry(void)
+static void Cmd_playfaintcry(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitFaintingCry(0);
@@ -5529,7 +5529,7 @@ static void atk57(void)
     gBattlescriptCurrInstr += 1;
 }
 
-static void atk58_returntoball(void)
+static void Cmd_returntoball(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitReturnMonToBall(0, 1);
@@ -5538,7 +5538,7 @@ static void atk58_returntoball(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk59_handlelearnnewmove(void)
+static void Cmd_handlelearnnewmove(void)
 {
     const u8 *jumpPtr1 = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     const u8 *jumpPtr2 = T1_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -5578,7 +5578,7 @@ static void atk59_handlelearnnewmove(void)
     }
 }
 
-static void atk5A_yesnoboxlearnmove(void)
+static void Cmd_yesnoboxlearnmove(void)
 {
     gActiveBattler = 0;
 
@@ -5697,7 +5697,7 @@ static void atk5A_yesnoboxlearnmove(void)
     }
 }
 
-static void atk5B_yesnoboxstoplearningmove(void)
+static void Cmd_yesnoboxstoplearningmove(void)
 {
     switch (gBattleScripting.learnMoveState)
     {
@@ -5745,7 +5745,7 @@ static void atk5B_yesnoboxstoplearningmove(void)
     }
 }
 
-static void atk5C_hitanimation(void)
+static void Cmd_hitanimation(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -5822,7 +5822,7 @@ static u32 GetTrainerMoneyToGive(u16 trainerId)
     return moneyReward;
 }
 
-static void atk5D_getmoneyreward(void)
+static void Cmd_getmoneyreward(void)
 {
     u32 moneyReward = GetTrainerMoneyToGive(gTrainerBattleOpponent_A);
     if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
@@ -5861,7 +5861,7 @@ static void atk5E(void)
     }
 }
 
-static void atk5F_swapattackerwithtarget(void)
+static void Cmd_swapattackerwithtarget(void)
 {
     gActiveBattler = gBattlerAttacker;
     gBattlerAttacker = gBattlerTarget;
@@ -5875,7 +5875,7 @@ static void atk5F_swapattackerwithtarget(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk60_incrementgamestat(void)
+static void Cmd_incrementgamestat(void)
 {
     if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
         IncrementGameStat(gBattlescriptCurrInstr[1]);
@@ -5883,7 +5883,7 @@ static void atk60_incrementgamestat(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk61_drawpartystatussummary(void)
+static void Cmd_drawpartystatussummary(void)
 {
     s32 i;
     struct Pokemon *party;
@@ -5920,7 +5920,7 @@ static void atk61_drawpartystatussummary(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk62_hidepartystatussummary(void)
+static void Cmd_hidepartystatussummary(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     BtlController_EmitHidePartyStatusSummary(0);
@@ -5929,7 +5929,7 @@ static void atk62_hidepartystatussummary(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk63_jumptocalledmove(void)
+static void Cmd_jumptocalledmove(void)
 {
     if (gBattlescriptCurrInstr[1])
         gCurrentMove = gCalledMove;
@@ -5939,7 +5939,7 @@ static void atk63_jumptocalledmove(void)
     gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
 }
 
-static void atk64_statusanimation(void)
+static void Cmd_statusanimation(void)
 {
     if (gBattleControllerExecFlags == 0)
     {
@@ -5955,7 +5955,7 @@ static void atk64_statusanimation(void)
     }
 }
 
-static void atk65_status2animation(void)
+static void Cmd_status2animation(void)
 {
     u32 wantedToAnimate;
 
@@ -5974,7 +5974,7 @@ static void atk65_status2animation(void)
     }
 }
 
-static void atk66_chosenstatusanimation(void)
+static void Cmd_chosenstatusanimation(void)
 {
     u32 wantedStatus;
 
@@ -5993,7 +5993,7 @@ static void atk66_chosenstatusanimation(void)
     }
 }
 
-static void atk67_yesnobox(void)
+static void Cmd_yesnobox(void)
 {
     switch (gBattleCommunication[0])
     {
@@ -6036,7 +6036,7 @@ static void atk67_yesnobox(void)
     }
 }
 
-static void atk68_cancelallactions(void)
+static void Cmd_cancelallactions(void)
 {
     s32 i;
 
@@ -6046,7 +6046,7 @@ static void atk68_cancelallactions(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk69_setgravity(void)
+static void Cmd_setgravity(void)
 {
     if (gFieldStatuses & STATUS_FIELD_GRAVITY)
     {
@@ -6062,7 +6062,7 @@ static void atk69_setgravity(void)
     }
 }
 
-static void atk6A_removeitem(void)
+static void Cmd_removeitem(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -6080,35 +6080,35 @@ static void atk6A_removeitem(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk6B_atknameinbuff1(void)
+static void Cmd_atknameinbuff1(void)
 {
     PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker]);
 
     gBattlescriptCurrInstr++;
 }
 
-static void atk6C_drawlvlupbox(void)
+static void Cmd_drawlvlupbox(void)
 {
-    if (gBattleScripting.atk6C_state == 0)
+    if (gBattleScripting.drawlvlupboxState == 0)
     {
         if (IsMonGettingExpSentOut())
-            gBattleScripting.atk6C_state = 3;
+            gBattleScripting.drawlvlupboxState = 3;
         else
-            gBattleScripting.atk6C_state = 1;
+            gBattleScripting.drawlvlupboxState = 1;
     }
 
-    switch (gBattleScripting.atk6C_state)
+    switch (gBattleScripting.drawlvlupboxState)
     {
     case 1:
         gBattle_BG2_Y = 0x60;
         SetBgAttribute(2, BG_ATTR_PRIORITY, 0);
         ShowBg(2);
         sub_804F17C();
-        gBattleScripting.atk6C_state = 2;
+        gBattleScripting.drawlvlupboxState = 2;
         break;
     case 2:
         if (!sub_804F1CC())
-            gBattleScripting.atk6C_state = 3;
+            gBattleScripting.drawlvlupboxState = 3;
         break;
     case 3:
         gBattle_BG1_X = 0;
@@ -6118,20 +6118,20 @@ static void atk6C_drawlvlupbox(void)
         ShowBg(0);
         ShowBg(1);
         HandleBattleWindow(0x12, 7, 0x1D, 0x13, WINDOW_x80);
-        gBattleScripting.atk6C_state = 4;
+        gBattleScripting.drawlvlupboxState = 4;
         break;
     case 4:
         DrawLevelUpWindow1();
         PutWindowTilemap(13);
         CopyWindowToVram(13, 3);
-        gBattleScripting.atk6C_state++;
+        gBattleScripting.drawlvlupboxState++;
         break;
     case 5:
     case 7:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             gBattle_BG1_Y = 0;
-            gBattleScripting.atk6C_state++;
+            gBattleScripting.drawlvlupboxState++;
         }
         break;
     case 6:
@@ -6140,7 +6140,7 @@ static void atk6C_drawlvlupbox(void)
             PlaySE(SE_SELECT);
             DrawLevelUpWindow2();
             CopyWindowToVram(13, 2);
-            gBattleScripting.atk6C_state++;
+            gBattleScripting.drawlvlupboxState++;
         }
         break;
     case 8:
@@ -6148,7 +6148,7 @@ static void atk6C_drawlvlupbox(void)
         {
             PlaySE(SE_SELECT);
             HandleBattleWindow(0x12, 7, 0x1D, 0x13, WINDOW_x80 | WINDOW_CLEAR);
-            gBattleScripting.atk6C_state++;
+            gBattleScripting.drawlvlupboxState++;
         }
         break;
     case 9:
@@ -6163,7 +6163,7 @@ static void atk6C_drawlvlupbox(void)
             SetBgAttribute(2, BG_ATTR_PRIORITY, 2);
             ShowBg(2);
 
-            gBattleScripting.atk6C_state = 10;
+            gBattleScripting.drawlvlupboxState = 10;
         }
         break;
     case 10:
@@ -6361,19 +6361,19 @@ static bool32 IsMonGettingExpSentOut(void)
     return FALSE;
 }
 
-static void atk6D_resetsentmonsvalue(void)
+static void Cmd_resetsentmonsvalue(void)
 {
     ResetSentPokesToOpponentValue();
     gBattlescriptCurrInstr++;
 }
 
-static void atk6E_setatktoplayer0(void)
+static void Cmd_setatktoplayer0(void)
 {
     gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
     gBattlescriptCurrInstr++;
 }
 
-static void atk6F_makevisible(void)
+static void Cmd_makevisible(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -6385,7 +6385,7 @@ static void atk6F_makevisible(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk70_recordability(void)
+static void Cmd_recordability(void)
 {
     u8 battler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     RecordAbilityBattle(battler, gBattleMons[battler].ability);
@@ -6397,13 +6397,13 @@ void BufferMoveToLearnIntoBattleTextBuff2(void)
     PREPARE_MOVE_BUFFER(gBattleTextBuff2, gMoveToLearn);
 }
 
-static void atk71_buffermovetolearn(void)
+static void Cmd_buffermovetolearn(void)
 {
     BufferMoveToLearnIntoBattleTextBuff2();
     gBattlescriptCurrInstr++;
 }
 
-static void atk72_jumpifplayerran(void)
+static void Cmd_jumpifplayerran(void)
 {
     if (TryRunFromBattle(gBattlerFainted))
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -6411,7 +6411,7 @@ static void atk72_jumpifplayerran(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atk73_hpthresholds(void)
+static void Cmd_hpthresholds(void)
 {
     u8 opposingBank;
     s32 result;
@@ -6438,7 +6438,7 @@ static void atk73_hpthresholds(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk74_hpthresholds2(void)
+static void Cmd_hpthresholds2(void)
 {
     u8 opposingBank;
     s32 result;
@@ -6464,7 +6464,7 @@ static void atk74_hpthresholds2(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk75_useitemonopponent(void)
+static void Cmd_useitemonopponent(void)
 {
     gBattlerInMenuId = gBattlerAttacker;
     PokemonUseItemEffects(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1);
@@ -6596,7 +6596,7 @@ u32 IsFlowerVeilProtected(u32 battler)
         return 0;
 }
 
-static void atk76_various(void)
+static void Cmd_various(void)
 {
     struct Pokemon *mon;
     s32 i, j;
@@ -7621,7 +7621,7 @@ static void atk76_various(void)
     gBattlescriptCurrInstr += 3;
 }
 
-static void atk77_setprotectlike(void)
+static void Cmd_setprotectlike(void)
 {
     bool32 fail = TRUE;
     bool32 notLastTurn = TRUE;
@@ -7708,7 +7708,7 @@ static void atk77_setprotectlike(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk78_faintifabilitynotdamp(void)
+static void Cmd_faintifabilitynotdamp(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -7743,7 +7743,7 @@ static void atk78_faintifabilitynotdamp(void)
     }
 }
 
-static void atk79_setatkhptozero(void)
+static void Cmd_setatkhptozero(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -7756,7 +7756,7 @@ static void atk79_setatkhptozero(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7A_jumpifnexttargetvalid(void)
+static void Cmd_jumpifnexttargetvalid(void)
 {
     const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -7774,7 +7774,7 @@ static void atk7A_jumpifnexttargetvalid(void)
         gBattlescriptCurrInstr = jumpPtr;
 }
 
-static void atk7B_tryhealhalfhealth(void)
+static void Cmd_tryhealhalfhealth(void)
 {
     const u8 *failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -7792,7 +7792,7 @@ static void atk7B_tryhealhalfhealth(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atk7C_trymirrormove(void)
+static void Cmd_trymirrormove(void)
 {
     s32 validMovesCount;
     s32 i;
@@ -7835,7 +7835,7 @@ static void atk7C_trymirrormove(void)
     }
 }
 
-static void atk7D_setrain(void)
+static void Cmd_setrain(void)
 {
     if (!TryChangeBattleWeather(gBattlerAttacker, ENUM_WEATHER_RAIN, FALSE))
     {
@@ -7849,7 +7849,7 @@ static void atk7D_setrain(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7E_setreflect(void)
+static void Cmd_setreflect(void)
 {
     if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_REFLECT)
     {
@@ -7873,7 +7873,7 @@ static void atk7E_setreflect(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk7F_setseeded(void)
+static void Cmd_setseeded(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattlerTarget] & STATUS3_LEECHSEED)
     {
@@ -7895,32 +7895,32 @@ static void atk7F_setseeded(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk80_manipulatedamage(void)
+static void Cmd_manipulatedamage(void)
 {
     switch (gBattlescriptCurrInstr[1])
     {
-    case ATK80_DMG_CHANGE_SIGN:
+    case DMG_CHANGE_SIGN:
         gBattleMoveDamage *= -1;
         break;
-    case ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP:
+    case DMG_RECOIL_FROM_MISS:
         gBattleMoveDamage /= 2;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         if ((gBattleMons[gBattlerTarget].maxHP / 2) < gBattleMoveDamage)
             gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2;
         break;
-    case ATK80_DMG_DOUBLED:
+    case DMG_DOUBLED:
         gBattleMoveDamage *= 2;
         break;
-    case ATK80_1_8_TARGET_HP:
+    case DMG_1_8_TARGET_HP:
         gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 8;
         if (gBattleMoveDamage == 0)
             gBattleMoveDamage = 1;
         break;
-    case ATK80_FULL_ATTACKER_HP:
+    case DMG_FULL_ATTACKER_HP:
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP;
         break;
-    case ATK80_CURR_ATTACKER_HP:
+    case DMG_CURR_ATTACKER_HP:
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp;
         break;
     }
@@ -7928,7 +7928,7 @@ static void atk80_manipulatedamage(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk81_trysetrest(void)
+static void Cmd_trysetrest(void)
 {
     const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     gActiveBattler = gBattlerTarget = gBattlerAttacker;
@@ -7952,7 +7952,7 @@ static void atk81_trysetrest(void)
     }
 }
 
-static void atk82_jumpifnotfirstturn(void)
+static void Cmd_jumpifnotfirstturn(void)
 {
     const u8* failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -7962,7 +7962,7 @@ static void atk82_jumpifnotfirstturn(void)
         gBattlescriptCurrInstr = failJump;
 }
 
-static void atk83_setmiracleeye(void)
+static void Cmd_setmiracleeye(void)
 {
     if (!(gStatuses3[gBattlerTarget] & STATUS3_MIRACLE_EYED))
     {
@@ -8002,7 +8002,7 @@ bool8 UproarWakeUpCheck(u8 battlerId)
         return TRUE;
 }
 
-static void atk84_jumpifcantmakeasleep(void)
+static void Cmd_jumpifcantmakeasleep(void)
 {
     const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     u32 ability = GetBattlerAbility(gBattlerTarget);
@@ -8024,7 +8024,7 @@ static void atk84_jumpifcantmakeasleep(void)
     }
 }
 
-static void atk85_stockpile(void)
+static void Cmd_stockpile(void)
 {
     switch (gBattlescriptCurrInstr[1])
     {
@@ -8055,7 +8055,7 @@ static void atk85_stockpile(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk86_stockpiletobasedamage(void)
+static void Cmd_stockpiletobasedamage(void)
 {
     const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0)
@@ -8075,7 +8075,7 @@ static void atk86_stockpiletobasedamage(void)
     }
 }
 
-static void atk87_stockpiletohpheal(void)
+static void Cmd_stockpiletohpheal(void)
 {
     const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 
@@ -8113,7 +8113,7 @@ static void atk87_stockpiletohpheal(void)
     }
 }
 
-static void atk88_setdrainedhp(void)
+static void Cmd_setdrainedhp(void)
 {
     if (gBattleMoves[gCurrentMove].argument != 0)
         gBattleMoveDamage = -(gHpDealt * gBattleMoves[gCurrentMove].argument / 100);
@@ -8145,9 +8145,9 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
         certain++;
     flags &= ~(MOVE_EFFECT_CERTAIN);
 
-    if (flags & STAT_CHANGE_NOT_PROTECT_AFFECTED)
+    if (flags & STAT_BUFF_NOT_PROTECT_AFFECTED)
         notProtectAffected++;
-    flags &= ~(STAT_CHANGE_NOT_PROTECT_AFFECTED);
+    flags &= ~(STAT_BUFF_NOT_PROTECT_AFFECTED);
 
     if (GetBattlerAbility(gActiveBattler) == ABILITY_CONTRARY)
     {
@@ -8166,7 +8166,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
         if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer
             && !certain && gCurrentMove != MOVE_CURSE)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
@@ -8192,7 +8192,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
                   || GetBattlerAbility(gActiveBattler) == ABILITY_WHITE_SMOKE)
                  && !certain && gCurrentMove != MOVE_CURSE)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
@@ -8213,7 +8213,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
         }
         else if ((index = IsFlowerVeilProtected(gActiveBattler)) && !certain)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 if (gSpecialStatuses[gActiveBattler].statLowered)
                 {
@@ -8234,7 +8234,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
         else if (GetBattlerAbility(gActiveBattler) == ABILITY_KEEN_EYE
                  && !certain && statId == STAT_ACC)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 BattleScriptPush(BS_ptr);
                 gBattleScripting.battler = gActiveBattler;
@@ -8248,7 +8248,7 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
         else if (GetBattlerAbility(gActiveBattler) == ABILITY_HYPER_CUTTER
                  && !certain && statId == STAT_ATK)
         {
-            if (flags == STAT_CHANGE_BS_PTR)
+            if (flags == STAT_BUFF_ALLOW_PTR)
             {
                 BattleScriptPush(BS_ptr);
                 gBattleScripting.battler = gActiveBattler;
@@ -8336,16 +8336,16 @@ static u32 ChangeStatBuffs(s8 statValue, u32 statId, u32 flags, const u8 *BS_ptr
     if (gBattleMons[gActiveBattler].statStages[statId] > 0xC)
         gBattleMons[gActiveBattler].statStages[statId] = 0xC;
 
-    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR)
+    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_BUFF_ALLOW_PTR)
         gMoveResultFlags |= MOVE_RESULT_MISSED;
 
-    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_BS_PTR))
+    if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_BUFF_ALLOW_PTR))
         return STAT_CHANGE_DIDNT_WORK;
 
     return STAT_CHANGE_WORKED;
 }
 
-static void atk89_statbuffchange(void)
+static void Cmd_statbuffchange(void)
 {
     u16 flags = T1_READ_16(gBattlescriptCurrInstr + 1);
     const u8 *ptrBefore = gBattlescriptCurrInstr;
@@ -8357,7 +8357,7 @@ static void atk89_statbuffchange(void)
         gBattlescriptCurrInstr = jumpPtr;
 }
 
-static void atk8A_normalisebuffs(void) // haze
+static void Cmd_normalisebuffs(void) // haze
 {
     s32 i, j;
 
@@ -8372,7 +8372,7 @@ static void atk8A_normalisebuffs(void) // haze
     gBattlescriptCurrInstr++;
 }
 
-static void atk8B_setbide(void)
+static void Cmd_setbide(void)
 {
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS;
     gLockedMoves[gBattlerAttacker] = gCurrentMove;
@@ -8382,7 +8382,7 @@ static void atk8B_setbide(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk8C_confuseifrepeatingattackends(void)
+static void Cmd_confuseifrepeatingattackends(void)
 {
     if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE))
         gBattleScripting.moveEffect = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER);
@@ -8390,7 +8390,7 @@ static void atk8C_confuseifrepeatingattackends(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk8D_setmultihitcounter(void)
+static void Cmd_setmultihitcounter(void)
 {
     if (gBattlescriptCurrInstr[1])
     {
@@ -8411,14 +8411,14 @@ static void atk8D_setmultihitcounter(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atk8E_initmultihitstring(void)
+static void Cmd_initmultihitstring(void)
 {
     PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
 
     gBattlescriptCurrInstr++;
 }
 
-static void atk8F_forcerandomswitch(void)
+static void Cmd_forcerandomswitch(void)
 {
     s32 i;
     s32 battler1PartyId = 0;
@@ -8599,7 +8599,7 @@ static void atk8F_forcerandomswitch(void)
     }
 }
 
-static void atk90_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type
+static void Cmd_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type
 {
     u8 validMoves = 0;
     u8 moveChecked;
@@ -8662,7 +8662,7 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type
     }
 }
 
-static void atk91_givepaydaymoney(void)
+static void Cmd_givepaydaymoney(void)
 {
     if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && gPaydayMoney != 0)
     {
@@ -8680,7 +8680,7 @@ static void atk91_givepaydaymoney(void)
     }
 }
 
-static void atk92_setlightscreen(void)
+static void Cmd_setlightscreen(void)
 {
     if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_LIGHTSCREEN)
     {
@@ -8705,7 +8705,7 @@ static void atk92_setlightscreen(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk93_tryKO(void)
+static void Cmd_tryKO(void)
 {
     u8 holdEffect, param;
 
@@ -8791,7 +8791,7 @@ static void atk93_tryKO(void)
     }
 }
 
-static void atk94_damagetohalftargethp(void) // super fang
+static void Cmd_damagetohalftargethp(void) // super fang
 {
     gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2;
     if (gBattleMoveDamage == 0)
@@ -8800,7 +8800,7 @@ static void atk94_damagetohalftargethp(void) // super fang
     gBattlescriptCurrInstr++;
 }
 
-static void atk95_setsandstorm(void)
+static void Cmd_setsandstorm(void)
 {
     if (!TryChangeBattleWeather(gBattlerAttacker, ENUM_WEATHER_SANDSTORM, FALSE))
     {
@@ -8814,7 +8814,7 @@ static void atk95_setsandstorm(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk96_weatherdamage(void)
+static void Cmd_weatherdamage(void)
 {
     if (!IsBattlerAlive(gBattlerAttacker) || !WEATHER_HAS_EFFECT)
     {
@@ -8880,7 +8880,7 @@ static void atk96_weatherdamage(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk97_tryinfatuating(void)
+static void Cmd_tryinfatuating(void)
 {
     struct Pokemon *monAttacker, *monTarget;
     u16 speciesAttacker, speciesTarget;
@@ -8925,7 +8925,7 @@ static void atk97_tryinfatuating(void)
     }
 }
 
-static void atk98_updatestatusicon(void)
+static void Cmd_updatestatusicon(void)
 {
     if (gBattleControllerExecFlags)
         return;
@@ -8958,7 +8958,7 @@ static void atk98_updatestatusicon(void)
     }
 }
 
-static void atk99_setmist(void)
+static void Cmd_setmist(void)
 {
     if (gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer)
     {
@@ -8975,7 +8975,7 @@ static void atk99_setmist(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk9A_setfocusenergy(void)
+static void Cmd_setfocusenergy(void)
 {
     if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY)
     {
@@ -8990,7 +8990,7 @@ static void atk9A_setfocusenergy(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atk9B_transformdataexecution(void)
+static void Cmd_transformdataexecution(void)
 {
     gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
@@ -9035,7 +9035,7 @@ static void atk9B_transformdataexecution(void)
     }
 }
 
-static void atk9C_setsubstitute(void)
+static void Cmd_setsubstitute(void)
 {
     u32 hp = gBattleMons[gBattlerAttacker].maxHP / 4;
     if (gBattleMons[gBattlerAttacker].maxHP / 4 == 0)
@@ -9071,7 +9071,7 @@ static bool8 IsMoveUncopyableByMimic(u16 move)
     return (sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END);
 }
 
-static void atk9D_mimicattackcopy(void)
+static void Cmd_mimicattackcopy(void)
 {
     gChosenMove = 0xFFFF;
 
@@ -9113,7 +9113,7 @@ static void atk9D_mimicattackcopy(void)
     }
 }
 
-static void atk9E_metronome(void)
+static void Cmd_metronome(void)
 {
     while (1)
     {
@@ -9143,13 +9143,13 @@ static void atk9E_metronome(void)
     }
 }
 
-static void atk9F_dmgtolevel(void)
+static void Cmd_dmgtolevel(void)
 {
     gBattleMoveDamage = gBattleMons[gBattlerAttacker].level;
     gBattlescriptCurrInstr++;
 }
 
-static void atkA0_psywavedamageeffect(void)
+static void Cmd_psywavedamageeffect(void)
 {
     s32 randDamage;
 
@@ -9160,7 +9160,7 @@ static void atkA0_psywavedamageeffect(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkA1_counterdamagecalculator(void)
+static void Cmd_counterdamagecalculator(void)
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
     u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].physicalBattlerId);
@@ -9185,7 +9185,7 @@ static void atkA1_counterdamagecalculator(void)
     }
 }
 
-static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
+static void Cmd_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the physical -> special field changes
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
     u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBattlerId);
@@ -9208,7 +9208,7 @@ static void atkA2_mirrorcoatdamagecalculator(void) // a copy of atkA1 with the p
     }
 }
 
-static void atkA3_disablelastusedattack(void)
+static void Cmd_disablelastusedattack(void)
 {
     s32 i;
 
@@ -9233,7 +9233,7 @@ static void atkA3_disablelastusedattack(void)
     }
 }
 
-static void atkA4_trysetencore(void)
+static void Cmd_trysetencore(void)
 {
     s32 i;
 
@@ -9265,7 +9265,7 @@ static void atkA4_trysetencore(void)
     }
 }
 
-static void atkA5_painsplitdmgcalc(void)
+static void Cmd_painsplitdmgcalc(void)
 {
     if (!(DoesSubstituteBlockMove(gBattlerAttacker, gBattlerTarget, gCurrentMove)))
     {
@@ -9289,7 +9289,7 @@ static void atkA5_painsplitdmgcalc(void)
     }
 }
 
-static void atkA6_settypetorandomresistance(void) // conversion 2
+static void Cmd_settypetorandomresistance(void) // conversion 2
 {
     if (gLastLandedMoves[gBattlerAttacker] == 0
         || gLastLandedMoves[gBattlerAttacker] == 0xFFFF)
@@ -9340,7 +9340,7 @@ static void atkA6_settypetorandomresistance(void) // conversion 2
     }
 }
 
-static void atkA7_setalwayshitflag(void)
+static void Cmd_setalwayshitflag(void)
 {
     gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS);
     gStatuses3[gBattlerTarget] |= 0x10;
@@ -9348,7 +9348,7 @@ static void atkA7_setalwayshitflag(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkA8_copymovepermanently(void) // sketch
+static void Cmd_copymovepermanently(void) // sketch
 {
     gChosenMove = 0xFFFF;
 
@@ -9441,7 +9441,7 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a c
     return 2;
 }
 
-static void atkA9_trychoosesleeptalkmove(void)
+static void Cmd_trychoosesleeptalkmove(void)
 {
     s32 i;
     u8 unusableMovesBits = 0;
@@ -9480,7 +9480,7 @@ static void atkA9_trychoosesleeptalkmove(void)
     }
 }
 
-static void atkAA_setdestinybond(void)
+static void Cmd_setdestinybond(void)
 {
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_DESTINY_BOND;
     gBattlescriptCurrInstr++;
@@ -9498,13 +9498,13 @@ static void TrySetDestinyBondToHappen(void)
     }
 }
 
-static void atkAB_trysetdestinybondtohappen(void)
+static void Cmd_trysetdestinybondtohappen(void)
 {
     TrySetDestinyBondToHappen();
     gBattlescriptCurrInstr++;
 }
 
-static void atkAC_settailwind(void)
+static void Cmd_settailwind(void)
 {
     u8 side = GetBattlerSide(gBattlerAttacker);
 
@@ -9521,7 +9521,7 @@ static void atkAC_settailwind(void)
     }
 }
 
-static void atkAD_tryspiteppreduce(void)
+static void Cmd_tryspiteppreduce(void)
 {
     if (gLastMoves[gBattlerTarget] != 0
         && gLastMoves[gBattlerTarget] != 0xFFFF)
@@ -9572,7 +9572,7 @@ static void atkAD_tryspiteppreduce(void)
     }
 }
 
-static void atkAE_healpartystatus(void)
+static void Cmd_healpartystatus(void)
 {
     u32 zero = 0;
     u8 toHeal = 0;
@@ -9668,7 +9668,7 @@ static void atkAE_healpartystatus(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkAF_cursetarget(void)
+static void Cmd_cursetarget(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_CURSED)
     {
@@ -9685,7 +9685,7 @@ static void atkAF_cursetarget(void)
     }
 }
 
-static void atkB0_trysetspikes(void)
+static void Cmd_trysetspikes(void)
 {
     u8 targetSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
 
@@ -9702,13 +9702,13 @@ static void atkB0_trysetspikes(void)
     }
 }
 
-static void atkB1_setforesight(void)
+static void Cmd_setforesight(void)
 {
     gBattleMons[gBattlerTarget].status2 |= STATUS2_FORESIGHT;
     gBattlescriptCurrInstr++;
 }
 
-static void atkB2_trysetperishsong(void)
+static void Cmd_trysetperishsong(void)
 {
     s32 i;
     s32 notAffectedCount = 0;
@@ -9736,7 +9736,7 @@ static void atkB2_trysetperishsong(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkB3_handlerollout(void)
+static void Cmd_handlerollout(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
@@ -9761,7 +9761,7 @@ static void atkB3_handlerollout(void)
     }
 }
 
-static void atkB4_jumpifconfusedandstatmaxed(void)
+static void Cmd_jumpifconfusedandstatmaxed(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION
         && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == 0xC)
@@ -9770,7 +9770,7 @@ static void atkB4_jumpifconfusedandstatmaxed(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atkB5_handlefurycutter(void)
+static void Cmd_handlefurycutter(void)
 {
     if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
     {
@@ -9786,7 +9786,7 @@ static void atkB5_handlefurycutter(void)
     }
 }
 
-static void atkB6_setembargo(void)
+static void Cmd_setembargo(void)
 {
     if (gStatuses3[gBattlerTarget] & STATUS3_EMBARGO)
     {
@@ -9800,7 +9800,7 @@ static void atkB6_setembargo(void)
     }
 }
 
-static void atkB7_presentdamagecalculation(void)
+static void Cmd_presentdamagecalculation(void)
 {
     u32 rand = Random() & 0xFF;
 
@@ -9839,7 +9839,7 @@ static void atkB7_presentdamagecalculation(void)
     }
 }
 
-static void atkB8_setsafeguard(void)
+static void Cmd_setsafeguard(void)
 {
     if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_SAFEGUARD)
     {
@@ -9857,7 +9857,7 @@ static void atkB8_setsafeguard(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkB9_magnitudedamagecalculation(void)
+static void Cmd_magnitudedamagecalculation(void)
 {
     u32 magnitude = Random() % 100;
 
@@ -9911,7 +9911,7 @@ static void atkB9_magnitudedamagecalculation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkBA_jumpifnopursuitswitchdmg(void)
+static void Cmd_jumpifnopursuitswitchdmg(void)
 {
     if (gMultiHitCounter == 1)
     {
@@ -9955,7 +9955,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void)
     }
 }
 
-static void atkBB_setsunny(void)
+static void Cmd_setsunny(void)
 {
     if (!TryChangeBattleWeather(gBattlerAttacker, ENUM_WEATHER_SUN, FALSE))
     {
@@ -9970,7 +9970,7 @@ static void atkBB_setsunny(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkBC_maxattackhalvehp(void) // belly drum
+static void Cmd_maxattackhalvehp(void) // belly drum
 {
     u32 halfHp = gBattleMons[gBattlerAttacker].maxHP / 2;
 
@@ -9993,7 +9993,7 @@ static void atkBC_maxattackhalvehp(void) // belly drum
     }
 }
 
-static void atkBD_copyfoestats(void) // psych up
+static void Cmd_copyfoestats(void) // psych up
 {
     s32 i;
 
@@ -10005,7 +10005,7 @@ static void atkBD_copyfoestats(void) // psych up
     gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter.
 }
 
-static void atkBE_rapidspinfree(void)
+static void Cmd_rapidspinfree(void)
 {
     u8 atkSide = GetBattlerSide(gBattlerAttacker);
 
@@ -10059,13 +10059,13 @@ static void atkBE_rapidspinfree(void)
     }
 }
 
-static void atkBF_setdefensecurlbit(void)
+static void Cmd_setdefensecurlbit(void)
 {
     gBattleMons[gBattlerAttacker].status2 |= STATUS2_DEFENSE_CURL;
     gBattlescriptCurrInstr++;
 }
 
-static void atkC0_recoverbasedonsunlight(void)
+static void Cmd_recoverbasedonsunlight(void)
 {
     gBattlerTarget = gBattlerAttacker;
 
@@ -10090,7 +10090,7 @@ static void atkC0_recoverbasedonsunlight(void)
     }
 }
 
-static void atkC1_setstickyweb(void)
+static void Cmd_setstickyweb(void)
 {
     u8 targetSide = GetBattlerSide(gBattlerTarget);
     if (gSideStatuses[targetSide] & SIDE_STATUS_STICKY_WEB)
@@ -10105,7 +10105,7 @@ static void atkC1_setstickyweb(void)
     }
 }
 
-static void atkC2_selectfirstvalidtarget(void)
+static void Cmd_selectfirstvalidtarget(void)
 {
     for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++)
     {
@@ -10117,7 +10117,7 @@ static void atkC2_selectfirstvalidtarget(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC3_trysetfutureattack(void)
+static void Cmd_trysetfutureattack(void)
 {
     if (gWishFutureKnock.futureSightCounter[gBattlerTarget] != 0)
     {
@@ -10139,7 +10139,7 @@ static void atkC3_trysetfutureattack(void)
     }
 }
 
-static void atkC4_trydobeatup(void)
+static void Cmd_trydobeatup(void)
 {
     struct Pokemon *party;
 
@@ -10186,7 +10186,7 @@ static void atkC4_trydobeatup(void)
     }
 }
 
-static void atkC5_setsemiinvulnerablebit(void)
+static void Cmd_setsemiinvulnerablebit(void)
 {
     switch (gCurrentMove)
     {
@@ -10209,13 +10209,13 @@ static void atkC5_setsemiinvulnerablebit(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC6_clearsemiinvulnerablebit(void)
+static void Cmd_clearsemiinvulnerablebit(void)
 {
     gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
     gBattlescriptCurrInstr++;
 }
 
-static void atkC7_setminimize(void)
+static void Cmd_setminimize(void)
 {
     if (gHitMarker & HITMARKER_OBEYS)
         gStatuses3[gBattlerAttacker] |= STATUS3_MINIMIZED;
@@ -10223,7 +10223,7 @@ static void atkC7_setminimize(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC8_sethail(void)
+static void Cmd_sethail(void)
 {
     if (!TryChangeBattleWeather(gBattlerAttacker, ENUM_WEATHER_HAIL, FALSE))
     {
@@ -10238,7 +10238,7 @@ static void atkC8_sethail(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
+static void Cmd_jumpifattackandspecialattackcannotfall(void) // memento
 {
     if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == 0
         && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == 0
@@ -10256,14 +10256,14 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento
     }
 }
 
-static void atkCA_setforcedtarget(void) // follow me
+static void Cmd_setforcedtarget(void) // follow me
 {
     gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1;
     gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTarget = gBattlerAttacker;
     gBattlescriptCurrInstr++;
 }
 
-static void atkCB_setcharge(void)
+static void Cmd_setcharge(void)
 {
     gStatuses3[gBattlerAttacker] |= STATUS3_CHARGED_UP;
     gDisableStructs[gBattlerAttacker].chargeTimer = 2;
@@ -10271,7 +10271,7 @@ static void atkCB_setcharge(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkCC_callterrainattack(void) // nature power
+static void Cmd_callterrainattack(void) // nature power
 {
     gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
@@ -10280,7 +10280,7 @@ static void atkCC_callterrainattack(void) // nature power
     gBattlescriptCurrInstr++;
 }
 
-static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
+static void Cmd_cureifburnedparalysedorpoisoned(void) // refresh
 {
     if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON))
     {
@@ -10296,7 +10296,7 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh
     }
 }
 
-static void atkCE_settorment(void)
+static void Cmd_settorment(void)
 {
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_TORMENT)
     {
@@ -10309,7 +10309,7 @@ static void atkCE_settorment(void)
     }
 }
 
-static void atkCF_jumpifnodamage(void)
+static void Cmd_jumpifnodamage(void)
 {
     if (gProtectStructs[gBattlerAttacker].physicalDmg || gProtectStructs[gBattlerAttacker].specialDmg)
         gBattlescriptCurrInstr += 5;
@@ -10317,7 +10317,7 @@ static void atkCF_jumpifnodamage(void)
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
 }
 
-static void atkD0_settaunt(void)
+static void Cmd_settaunt(void)
 {
     if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
     {
@@ -10334,7 +10334,7 @@ static void atkD0_settaunt(void)
     }
 }
 
-static void atkD1_trysethelpinghand(void)
+static void Cmd_trysethelpinghand(void)
 {
     gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
@@ -10352,7 +10352,7 @@ static void atkD1_trysethelpinghand(void)
     }
 }
 
-static void atkD2_tryswapitems(void) // trick
+static void Cmd_tryswapitems(void) // trick
 {
     // opponent can't swap items with player in regular battles
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL
@@ -10436,7 +10436,7 @@ static void atkD2_tryswapitems(void) // trick
     }
 }
 
-static void atkD3_trycopyability(void) // role play
+static void Cmd_trycopyability(void) // role play
 {
     if (gBattleMons[gBattlerTarget].ability != 0
         && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD)
@@ -10451,7 +10451,7 @@ static void atkD3_trycopyability(void) // role play
     }
 }
 
-static void atkD4_trywish(void)
+static void Cmd_trywish(void)
 {
     switch (gBattlescriptCurrInstr[1])
     {
@@ -10484,7 +10484,7 @@ static void atkD4_trywish(void)
     }
 }
 
-static void atkD5_settoxicspikes(void)
+static void Cmd_settoxicspikes(void)
 {
     u8 targetSide = GetBattlerSide(gBattlerTarget);
     if (gSideTimers[targetSide].toxicSpikesAmount >= 2)
@@ -10499,7 +10499,7 @@ static void atkD5_settoxicspikes(void)
     }
 }
 
-static void atkD6_setgastroacid(void)
+static void Cmd_setgastroacid(void)
 {
     switch (gBattleMons[gBattlerTarget].ability)
     {
@@ -10521,7 +10521,7 @@ static void atkD6_setgastroacid(void)
     }
 }
 
-static void atkD7_setyawn(void)
+static void Cmd_setyawn(void)
 {
     if (gStatuses3[gBattlerTarget] & STATUS3_YAWN
         || gBattleMons[gBattlerTarget].status1 & STATUS1_ANY)
@@ -10535,7 +10535,7 @@ static void atkD7_setyawn(void)
     }
 }
 
-static void atkD8_setdamagetohealthdifference(void)
+static void Cmd_setdamagetohealthdifference(void)
 {
     if (gBattleMons[gBattlerTarget].hp <= gBattleMons[gBattlerAttacker].hp)
     {
@@ -10564,7 +10564,7 @@ static void HandleRoomMove(u32 statusFlag, u8 *timer, u8 stringId)
     }
 }
 
-static void atkD9_setroom(void)
+static void Cmd_setroom(void)
 {
     switch (gBattleMoves[gCurrentMove].effect)
     {
@@ -10584,7 +10584,7 @@ static void atkD9_setroom(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkDA_tryswapabilities(void) // skill swap
+static void Cmd_tryswapabilities(void) // skill swap
 {
     if ((gBattleMons[gBattlerAttacker].ability == 0
          && gBattleMons[gBattlerTarget].ability == 0)
@@ -10604,7 +10604,7 @@ static void atkDA_tryswapabilities(void) // skill swap
     }
 }
 
-static void atkDB_tryimprison(void)
+static void Cmd_tryimprison(void)
 {
     if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS))
     {
@@ -10646,7 +10646,7 @@ static void atkDB_tryimprison(void)
     }
 }
 
-static void atkDC_setstealthrock(void)
+static void Cmd_setstealthrock(void)
 {
     u8 targetSide = GetBattlerSide(gBattlerTarget);
     if (gSideStatuses[targetSide] & SIDE_STATUS_STEALTH_ROCK)
@@ -10661,7 +10661,7 @@ static void atkDC_setstealthrock(void)
     }
 }
 
-static void atkDD_setuserstatus3(void)
+static void Cmd_setuserstatus3(void)
 {
     u32 flags = T1_READ_32(gBattlescriptCurrInstr + 1);
 
@@ -10680,7 +10680,7 @@ static void atkDD_setuserstatus3(void)
     }
 }
 
-static void atkDE_assistattackselect(void)
+static void Cmd_assistattackselect(void)
 {
     s32 chooseableMovesNo = 0;
     struct Pokemon* party;
@@ -10733,7 +10733,7 @@ static void atkDE_assistattackselect(void)
     }
 }
 
-static void atkDF_trysetmagiccoat(void)
+static void Cmd_trysetmagiccoat(void)
 {
     gBattlerTarget = gBattlerAttacker;
     gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1;
@@ -10748,7 +10748,7 @@ static void atkDF_trysetmagiccoat(void)
     }
 }
 
-static void atkE0_trysetsnatch(void) // snatch
+static void Cmd_trysetsnatch(void) // snatch
 {
     gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1;
     if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn
@@ -10762,7 +10762,7 @@ static void atkE0_trysetsnatch(void) // snatch
     }
 }
 
-static void atkE1_trygetintimidatetarget(void)
+static void Cmd_trygetintimidatetarget(void)
 {
     u8 side;
 
@@ -10785,7 +10785,7 @@ static void atkE1_trygetintimidatetarget(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkE2_switchoutabilities(void)
+static void Cmd_switchoutabilities(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -10809,7 +10809,7 @@ static void atkE2_switchoutabilities(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atkE3_jumpifhasnohp(void)
+static void Cmd_jumpifhasnohp(void)
 {
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
 
@@ -10819,7 +10819,7 @@ static void atkE3_jumpifhasnohp(void)
         gBattlescriptCurrInstr += 6;
 }
 
-static void atkE4_getsecretpowereffect(void)
+static void Cmd_getsecretpowereffect(void)
 {
     switch (gBattleTerrain)
     {
@@ -10854,7 +10854,7 @@ static void atkE4_getsecretpowereffect(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE5_pickup(void)
+static void Cmd_pickup(void)
 {
     s32 i;
     u16 species, heldItem;
@@ -10932,7 +10932,7 @@ static void atkE5_pickup(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE6_docastformchangeanimation(void)
+static void Cmd_docastformchangeanimation(void)
 {
     gActiveBattler = gBattleScripting.battler;
 
@@ -10945,7 +10945,7 @@ static void atkE6_docastformchangeanimation(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkE7_trycastformdatachange(void)
+static void Cmd_trycastformdatachange(void)
 {
     u8 form;
 
@@ -10958,7 +10958,7 @@ static void atkE7_trycastformdatachange(void)
     }
 }
 
-static void atkE8_settypebasedhalvers(void) // water and mud sport
+static void Cmd_settypebasedhalvers(void) // water and mud sport
 {
     bool8 worked = FALSE;
 
@@ -11001,7 +11001,7 @@ bool32 DoesSubstituteBlockMove(u8 battlerAtk, u8 battlerDef, u32 move)
         return TRUE;
 }
 
-static void atkE9_jumpifsubstituteblocks(void)
+static void Cmd_jumpifsubstituteblocks(void)
 {
     if (DoesSubstituteBlockMove(gBattlerAttacker, gBattlerTarget, gCurrentMove))
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -11009,7 +11009,7 @@ static void atkE9_jumpifsubstituteblocks(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkEA_tryrecycleitem(void)
+static void Cmd_tryrecycleitem(void)
 {
     u16 *usedHeldItem;
 
@@ -11032,7 +11032,7 @@ static void atkEA_tryrecycleitem(void)
     }
 }
 
-static void atkEB_settypetoterrain(void)
+static void Cmd_settypetoterrain(void)
 {
     if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, sTerrainToType[gBattleTerrain]))
     {
@@ -11047,7 +11047,7 @@ static void atkEB_settypetoterrain(void)
     }
 }
 
-static void atkEC_pursuitrelated(void)
+static void Cmd_pursuitrelated(void)
 {
     gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
 
@@ -11069,7 +11069,7 @@ static void atkEC_pursuitrelated(void)
     }
 }
 
-static void atkEF_snatchsetbattlers(void)
+static void Cmd_snatchsetbattlers(void)
 {
     gEffectBattler = gBattlerAttacker;
 
@@ -11082,7 +11082,7 @@ static void atkEF_snatchsetbattlers(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkEE_removelightscreenreflect(void) // brick break
+static void Cmd_removelightscreenreflect(void) // brick break
 {
     u8 opposingSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE;
 
@@ -11112,7 +11112,7 @@ static u8 GetCatchingBattler(void)
         return GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
 }
 
-static void atkEF_handleballthrow(void)
+static void Cmd_handleballthrow(void)
 {
     u8 ballMultiplier = 0;
 
@@ -11260,7 +11260,7 @@ static void atkEF_handleballthrow(void)
     }
 }
 
-static void atkF0_givecaughtmon(void)
+static void Cmd_givecaughtmon(void)
 {
     if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[GetCatchingBattler()]]) != MON_GIVEN_TO_PARTY)
     {
@@ -11289,7 +11289,7 @@ static void atkF0_givecaughtmon(void)
     gBattlescriptCurrInstr++;
 }
 
-static void atkF1_trysetcaughtmondexflags(void)
+static void Cmd_trysetcaughtmondexflags(void)
 {
     u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetCatchingBattler()]], MON_DATA_SPECIES, NULL);
     u32 personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetCatchingBattler()]], MON_DATA_PERSONALITY, NULL);
@@ -11305,7 +11305,7 @@ static void atkF1_trysetcaughtmondexflags(void)
     }
 }
 
-static void atkF2_displaydexinfo(void)
+static void Cmd_displaydexinfo(void)
 {
     u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[GetCatchingBattler()]], MON_DATA_SPECIES, NULL);
 
@@ -11422,7 +11422,7 @@ void BattleDestroyYesNoCursorAt(u8 cursorPosition)
     CopyBgTilemapBufferToVram(0);
 }
 
-static void atkF3_trygivecaughtmonnick(void)
+static void Cmd_trygivecaughtmonnick(void)
 {
     switch (gBattleCommunication[MULTIUSE_STATE])
     {
@@ -11498,30 +11498,30 @@ static void atkF3_trygivecaughtmonnick(void)
     }
 }
 
-static void atkF4_subattackerhpbydmg(void)
+static void Cmd_subattackerhpbydmg(void)
 {
     gBattleMons[gBattlerAttacker].hp -= gBattleMoveDamage;
     gBattlescriptCurrInstr++;
 }
 
-static void atkF5_removeattackerstatus1(void)
+static void Cmd_removeattackerstatus1(void)
 {
     gBattleMons[gBattlerAttacker].status1 = 0;
     gBattlescriptCurrInstr++;
 }
 
-static void atkF6_finishaction(void)
+static void Cmd_finishaction(void)
 {
     gCurrentActionFuncId = B_ACTION_FINISHED;
 }
 
-static void atkF7_finishturn(void)
+static void Cmd_finishturn(void)
 {
     gCurrentActionFuncId = B_ACTION_FINISHED;
     gCurrentTurnActionNumber = gBattlersCount;
 }
 
-static void atkF8_trainerslideout(void)
+static void Cmd_trainerslideout(void)
 {
     gActiveBattler = GetBattlerAtPosition(gBattlescriptCurrInstr[1]);
     BtlController_EmitTrainerSlideBack(0);
@@ -11530,7 +11530,7 @@ static void atkF8_trainerslideout(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atkF9_settelekinesis(void)
+static void Cmd_settelekinesis(void)
 {
     if (gStatuses3[gBattlerTarget] & (STATUS3_TELEKINESIS | STATUS3_ROOTED | STATUS3_SMACKED_DOWN)
         || gFieldStatuses & STATUS_FIELD_GRAVITY
@@ -11546,7 +11546,7 @@ static void atkF9_settelekinesis(void)
     }
 }
 
-static void atkFA_swapstatstages(void)
+static void Cmd_swapstatstages(void)
 {
     u8 statId = T1_READ_8(gBattlescriptCurrInstr + 1);
     s8 atkStatStage = gBattleMons[gBattlerAttacker].statStages[statId];
@@ -11558,7 +11558,7 @@ static void atkFA_swapstatstages(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atkFB_averagestats(void)
+static void Cmd_averagestats(void)
 {
     u8 statId = T1_READ_8(gBattlescriptCurrInstr + 1);
     u16 atkStat = *(u16*)((&gBattleMons[gBattlerAttacker].attack) + (statId - 1));
@@ -11571,7 +11571,7 @@ static void atkFB_averagestats(void)
     gBattlescriptCurrInstr += 2;
 }
 
-static void atkFC_jumpifoppositegenders(void)
+static void Cmd_jumpifoppositegenders(void)
 {
     u32 atkGender = GetGenderFromSpeciesAndPersonality(gBattleMons[gBattlerAttacker].species, gBattleMons[gBattlerAttacker].personality);
     u32 defGender = GetGenderFromSpeciesAndPersonality(gBattleMons[gBattlerTarget].species, gBattleMons[gBattlerTarget].personality);
@@ -11582,7 +11582,7 @@ static void atkFC_jumpifoppositegenders(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkFD_trygetbaddreamstarget(void)
+static void Cmd_trygetbaddreamstarget(void)
 {
     u8 badDreamsMonSide = GetBattlerSide(gBattlerAttacker);
     for (;gBattlerTarget < gBattlersCount; gBattlerTarget++)
@@ -11599,7 +11599,7 @@ static void atkFD_trygetbaddreamstarget(void)
         gBattlescriptCurrInstr += 5;
 }
 
-static void atkFE_tryworryseed(void)
+static void Cmd_tryworryseed(void)
 {
     switch (gBattleMons[gBattlerTarget].ability)
     {
@@ -11616,7 +11616,7 @@ static void atkFE_tryworryseed(void)
     }
 }
 
-static void atkFF_metalburstdamagecalculator(void)
+static void Cmd_metalburstdamagecalculator(void)
 {
     u8 sideAttacker = GetBattlerSide(gBattlerAttacker);
     u8 sideTarget = 0;
diff --git a/src/credits.c b/src/credits.c
index e2c125d3fa..323146f1ed 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -128,16 +128,17 @@ enum
     TDE_TASK_A_ID = 2,
 };
 
-struct Unk201C000
+#define NUM_MON_SLIDES 71
+struct CreditsData
 {
-    u16 unk0[71];
-    u16 unk8E;
-    u16 unk90;
-    u16 unk92;
-    u16 unk94;
-    u16 unk96[NATIONAL_DEX_COUNT];
-    u16 unk39A;
-    u16 unk39C[7];
+    u16 monToShow[NUM_MON_SLIDES]; // List of Pokemon species ids that will show during the credits
+    u16 imgCounter; //how many mon images have been shown
+    u16 nextImgPos; //if the next image spawns left/center/right
+    u16 currShownMon; //index into monToShow
+    u16 numMonToShow; //number of pokemon to show, always NUM_MON_SLIDES after determine function
+    u16 caughtMonIds[NATIONAL_DEX_COUNT]; //temporary location to hold a condensed array of all caught pokemon
+    u16 numCaughtMon; //count of filled spaces in caughtMonIds
+    u16 unk39C[7]; // unused padding?
 };
 
 struct CreditsEntry
@@ -151,7 +152,7 @@ static EWRAM_DATA s16 gUnknown_0203BCE0 = 0;
 static EWRAM_DATA u16 gUnknown_0203BCE2 = 0; // TASK A
 EWRAM_DATA bool8 gHasHallOfFameRecords = 0;
 static EWRAM_DATA u8 gUnknown_0203BCE5 = 0;
-static EWRAM_DATA struct Unk201C000 *gUnknown_0203BCE8 = {0};
+static EWRAM_DATA struct CreditsData *sCreditsData = {0};
 
 static const u16 gUnknown_085E56F0[][16] =
 {
@@ -959,7 +960,7 @@ static const struct WindowTemplate sWindowTemplates[] =
     },
     DUMMY_WIN_TEMPLATE,
 };
-static const u8 gUnknown_085E6F7C[][2] =
+static const u8 sMonSpritePos[][2] =
 {
     {104, 36},
     {120, 36},
@@ -1127,8 +1128,8 @@ static void LoadTheEndScreen(u16, u16, u16);
 static void sub_8176E40(u16 arg0, u16 palette);
 static void sub_8176EE8(struct Sprite *sprite);
 static void sub_8176F90(struct Sprite *sprite);
-static u8 sub_8177224(u16 species, s16 x, s16 y, u16 position);
-static void sub_8177388(void);
+static u8 MakeMonSprite(u16 species, s16 x, s16 y, u16 position);
+static void DeterminePokemonToShow(void);
 
 static void CreditsVBlankCallback(void)
 {
@@ -1241,13 +1242,13 @@ void CB2_StartCreditsSequence(void)
     m4aSongNumStart(MUS_THANKFOR);
     SetMainCallback2(CB2_RunCreditsSequence);
     gUnknown_0203BCE5 = 0;
-    gUnknown_0203BCE8 = AllocZeroed(sizeof(struct Unk201C000));
+    sCreditsData = AllocZeroed(sizeof(struct CreditsData));
 
-    sub_8177388();
+    DeterminePokemonToShow();
 
-    gUnknown_0203BCE8->unk8E = 0;
-    gUnknown_0203BCE8->unk90 = 0;
-    gUnknown_0203BCE8->unk92 = 0;
+    sCreditsData->imgCounter = 0;
+    sCreditsData->nextImgPos = 0;
+    sCreditsData->currShownMon = 0;
 
     gUnknown_0203BCE2 = taskIdA;
 }
@@ -1604,7 +1605,7 @@ static void sub_8175DA0(u8 taskIdB)
         gTasks[gTasks[taskIdB].data[TDB_TASK_A_ID]].data[TDA_4] = 1;
         DestroyTask(taskIdB);
         sub_81755A4();
-        FREE_AND_SET_NULL(gUnknown_0203BCE8);
+        FREE_AND_SET_NULL(sCreditsData);
         return;
     }
 }
@@ -1683,29 +1684,29 @@ static void sub_81760FC(u8 taskIdD)
     case 0:
         break;
     case 1:
-        if (gUnknown_0203BCE8->unk90 == 0 && gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].data[TDA_14] == 0)
+        if (sCreditsData->nextImgPos == 0 && gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].data[TDA_14] == 0)
             break;
         gTasks[taskIdD].data[TDD_STATE]++;
         break;
     case 2:
-        if (gUnknown_0203BCE8->unk8E == 71 || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != Task_ProgressCreditTasks)
+        if (sCreditsData->imgCounter == NUM_MON_SLIDES || gTasks[gTasks[taskIdD].data[TDD_TASK_A_ID]].func != Task_ProgressCreditTasks)
             break;
-        r2 = sub_8177224(gUnknown_0203BCE8->unk0[gUnknown_0203BCE8->unk92], gUnknown_085E6F7C[gUnknown_0203BCE8->unk90][0], gUnknown_085E6F7C[gUnknown_0203BCE8->unk90][1], gUnknown_0203BCE8->unk90);
-        if (gUnknown_0203BCE8->unk92 < gUnknown_0203BCE8->unk94 - 1)
+        r2 = MakeMonSprite(sCreditsData->monToShow[sCreditsData->currShownMon], sMonSpritePos[sCreditsData->nextImgPos][0], sMonSpritePos[sCreditsData->nextImgPos][1], sCreditsData->nextImgPos);
+        if (sCreditsData->currShownMon < sCreditsData->numMonToShow - 1)
         {
-            gUnknown_0203BCE8->unk92++;
+            sCreditsData->currShownMon++;
             gSprites[r2].data[3] = 50;
         }
         else
         {
-            gUnknown_0203BCE8->unk92 = 0;
+            sCreditsData->currShownMon = 0;
             gSprites[r2].data[3] = 512;
         }
-        gUnknown_0203BCE8->unk8E++;
-        if (gUnknown_0203BCE8->unk90 == 2)
-            gUnknown_0203BCE8->unk90 = 0;
+        sCreditsData->imgCounter++;
+        if (sCreditsData->nextImgPos == 2)
+            sCreditsData->nextImgPos = 0;
         else
-            gUnknown_0203BCE8->unk90++;
+            sCreditsData->nextImgPos++;
         gTasks[taskIdD].data[TDD_3] = 50;
         gTasks[taskIdD].data[TDD_STATE]++;
         break;
@@ -2256,7 +2257,7 @@ static void sub_8177050(struct Sprite *sprite)
     }
 }
 
-static u8 sub_8177224(u16 nationalDexNum, s16 x, s16 y, u16 position)
+static u8 MakeMonSprite(u16 nationalDexNum, s16 x, s16 y, u16 position)
 {
     u8 spriteId;
     u8 spriteId2;
@@ -2292,73 +2293,86 @@ static void sub_81772B8(struct Sprite *sprite)
     sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
 }
 
-static void sub_8177388(void)
+static void DeterminePokemonToShow(void)
 {
     u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON)));
     u16 page;
     u16 dexNum;
     u16 j;
-
+    
+    // Go through the Pokedex, and anything that has gotten caught we put into our massive array.
+    // This basically packs all of the caught pokemon into the front of the array
     for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++)
     {
         if (GetSetPokedexFlag(dexNum, FLAG_GET_CAUGHT))
         {
-            gUnknown_0203BCE8->unk96[j] = dexNum;
+            sCreditsData->caughtMonIds[j] = dexNum;
             j++;
         }
     }
 
+    // Fill the rest of the array with zeroes
     for (dexNum = j; dexNum < NATIONAL_DEX_COUNT; dexNum++)
-        gUnknown_0203BCE8->unk96[dexNum] = 0;
+        sCreditsData->caughtMonIds[dexNum] = 0;
 
-    gUnknown_0203BCE8->unk39A = j;
-    if (gUnknown_0203BCE8->unk39A < 71)
-        gUnknown_0203BCE8->unk94 = j;
+    // Cap the number of pokemon we care about to NUM_MON_SLIDES, the max we show in the credits scene (-1 for the starter)
+    sCreditsData->numCaughtMon = j;
+    if (sCreditsData->numCaughtMon < NUM_MON_SLIDES)
+        sCreditsData->numMonToShow = j;
     else
-        gUnknown_0203BCE8->unk94 = 71;
+        sCreditsData->numMonToShow = NUM_MON_SLIDES;
 
+    // Loop through our list of caught pokemon and select randomly from it to fill the images to show
     j = 0;
     do
     {
-        page = Random() % gUnknown_0203BCE8->unk39A;
-        gUnknown_0203BCE8->unk0[j] = gUnknown_0203BCE8->unk96[page];
-
+        // Select a random mon, insert into array
+        page = Random() % sCreditsData->numCaughtMon;
+        sCreditsData->monToShow[j] = sCreditsData->caughtMonIds[page];
+        
+        // Remove the select mon from the array, and condense array entries
         j++;
-        gUnknown_0203BCE8->unk96[page] = 0;
-        gUnknown_0203BCE8->unk39A--;
-        if (page != gUnknown_0203BCE8->unk39A)
+        sCreditsData->caughtMonIds[page] = 0;
+        sCreditsData->numCaughtMon--;
+        if (page != sCreditsData->numCaughtMon)
         {
-            gUnknown_0203BCE8->unk96[page] = gUnknown_0203BCE8->unk96[gUnknown_0203BCE8->unk39A];
-            gUnknown_0203BCE8->unk96[gUnknown_0203BCE8->unk39A] = 0;
+            // Instead of looping through and moving everything down, just take from the end. Order doesn't matter after all.
+            sCreditsData->caughtMonIds[page] = sCreditsData->caughtMonIds[sCreditsData->numCaughtMon];
+            sCreditsData->caughtMonIds[sCreditsData->numCaughtMon] = 0;
         }
     }
-    while (gUnknown_0203BCE8->unk39A != 0 && j < 71);
+    while (sCreditsData->numCaughtMon != 0 && j < NUM_MON_SLIDES);
 
-    if (gUnknown_0203BCE8->unk94 < 71)
+    // If we don't have enough pokemon in the dex to fill everything, copy the selected mon into the end of the array, so it loops
+    if (sCreditsData->numMonToShow < NUM_MON_SLIDES)
     {
-        for (j = gUnknown_0203BCE8->unk94, page = 0; j < 71; j++)
+        for (j = sCreditsData->numMonToShow, page = 0; j < NUM_MON_SLIDES; j++)
         {
-            gUnknown_0203BCE8->unk0[j] = gUnknown_0203BCE8->unk0[page];
+            sCreditsData->monToShow[j] = sCreditsData->monToShow[page];
 
             page++;
-            if (page == gUnknown_0203BCE8->unk94)
+            if (page == sCreditsData->numMonToShow)
                 page = 0;
         }
-        gUnknown_0203BCE8->unk0[70] = starter;
+        // Ensure the last pokemon is our starter
+        sCreditsData->monToShow[NUM_MON_SLIDES-1] = starter;
     }
     else
     {
-        for (dexNum = 0; gUnknown_0203BCE8->unk0[dexNum] != starter && dexNum < 71; dexNum++);
+        // Check to see if our starter has already appeared in this list, break if it has
+        for (dexNum = 0; sCreditsData->monToShow[dexNum] != starter && dexNum < NUM_MON_SLIDES; dexNum++);
 
-        if (dexNum < gUnknown_0203BCE8->unk94 - 1)
+        // If it has, swap it with the last pokemon, to ensure our starter is the last image
+        if (dexNum < sCreditsData->numMonToShow - 1)
         {
-            gUnknown_0203BCE8->unk0[dexNum] = gUnknown_0203BCE8->unk0[70];
-            gUnknown_0203BCE8->unk0[70] = starter;
+            sCreditsData->monToShow[dexNum] = sCreditsData->monToShow[NUM_MON_SLIDES-1];
+            sCreditsData->monToShow[NUM_MON_SLIDES-1] = starter;
         }
         else
         {
-            gUnknown_0203BCE8->unk0[70] = starter;
+            // Ensure the last pokemon is our starter
+            sCreditsData->monToShow[NUM_MON_SLIDES-1] = starter;
         }
     }
-    gUnknown_0203BCE8->unk94 = 71;
+    sCreditsData->numMonToShow = NUM_MON_SLIDES;
 }
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 252eed760d..477967b95a 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -6,7 +6,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -14,7 +14,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout2[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -27,7 +27,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt2[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout3[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -35,7 +35,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt3[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -43,7 +43,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt4[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern1[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -51,7 +51,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt5[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern2[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -59,7 +59,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt6[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt7[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern3[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -100,7 +100,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Gabrielle1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt8[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntPetalburgWoods[] = {
     {
     .iv = 0,
     .lvl = 9,
@@ -147,7 +147,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ed[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt9[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern4[] = {
     {
     .iv = 0,
     .lvl = 36,
@@ -163,7 +163,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Declan[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntRusturfTunnel[] = {
     {
     .iv = 0,
     .lvl = 11,
@@ -171,7 +171,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt10[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst1[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -184,7 +184,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt11[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst2[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -197,7 +197,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt12[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst3[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -215,7 +215,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt13[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum1[] = {
     {
     .iv = 0,
     .lvl = 15,
@@ -223,7 +223,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt14[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMuseum2[] = {
     {
     .iv = 0,
     .lvl = 14,
@@ -236,7 +236,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt15[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -244,7 +244,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt16[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre1[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -252,7 +252,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt17[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre2[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -260,7 +260,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt18[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre3[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -273,7 +273,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt19[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -281,7 +281,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt20[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -289,7 +289,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt21[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt22[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -1474,7 +1474,7 @@ static const struct TrainerMonItemCustomMoves sParty_Daphne[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt23[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter2[] = {
     {
     .iv = 0,
     .lvl = 26,
@@ -1803,7 +1803,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Mark[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt24[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney1[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -2312,7 +2312,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Kirk[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout7[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -2325,7 +2325,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt25[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt26[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntAquaHideout8[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7594,7 +7594,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Julio[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSeafloorCavern5[] = {
     {
     .iv = 50,
     .lvl = 35,
@@ -7607,7 +7607,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt27[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntUnused[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7620,7 +7620,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt28[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtPyre4[] = {
     {
     .iv = 0,
     .lvl = 30,
@@ -7633,7 +7633,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt29[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt30[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntJaggedPass[] = {
     {
     .iv = 50,
     .lvl = 22,
@@ -7724,7 +7724,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Harrison[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt31[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMtChimney2[] = {
     {
     .iv = 0,
     .lvl = 20,
@@ -7780,7 +7780,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Nicholas[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter3[] = {
     {
     .iv = 0,
     .lvl = 31,
@@ -7793,7 +7793,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt32[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter4[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7801,7 +7801,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt33[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter5[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7809,7 +7809,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt34[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter6[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7817,7 +7817,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt35[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt36[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntSpaceCenter7[] = {
     {
     .iv = 0,
     .lvl = 32,
@@ -7880,7 +7880,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Isabella[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt37[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
     {
     .iv = 0,
     .lvl = 27,
@@ -9645,7 +9645,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Deandre[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout1[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9653,7 +9653,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt38[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout2[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9661,7 +9661,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt39[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout3[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9669,7 +9669,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt40[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout4[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9682,7 +9682,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt41[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout5[] = {
     {
     .iv = 0,
     .lvl = 28,
@@ -9695,7 +9695,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt42[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout6[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9703,7 +9703,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt43[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout7[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9711,7 +9711,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt44[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout8[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9719,7 +9719,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt45[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout9[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9727,7 +9727,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt46[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout10[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9735,7 +9735,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt47[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout11[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9743,7 +9743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt48[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout12[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9751,7 +9751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt49[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout13[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9759,7 +9759,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt50[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout14[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9767,7 +9767,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt51[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout15[] = {
     {
     .iv = 0,
     .lvl = 29,
@@ -9775,7 +9775,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Grunt52[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_Grunt53[] = {
+static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] = {
     {
     .iv = 0,
     .lvl = 29,
diff --git a/src/data/trainers.h b/src/data/trainers.h
index c30d21afd1..327107007a 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -27,7 +27,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Sawyer1},
     },
 
-    [TRAINER_GRUNT_1] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -37,11 +37,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt1),
-        .party = {.NoItemDefaultMoves = sParty_Grunt1},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout1),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout1},
     },
 
-    [TRAINER_GRUNT_2] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -51,11 +51,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt2),
-        .party = {.NoItemDefaultMoves = sParty_Grunt2},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout2),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout2},
     },
 
-    [TRAINER_GRUNT_3] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -65,11 +65,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt3),
-        .party = {.NoItemDefaultMoves = sParty_Grunt3},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout3),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout3},
     },
 
-    [TRAINER_GRUNT_4] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -79,11 +79,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt4),
-        .party = {.NoItemDefaultMoves = sParty_Grunt4},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout4),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout4},
     },
 
-    [TRAINER_GRUNT_5] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -93,11 +93,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt5),
-        .party = {.NoItemDefaultMoves = sParty_Grunt5},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern1),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern1},
     },
 
-    [TRAINER_GRUNT_6] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -107,11 +107,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt6),
-        .party = {.NoItemDefaultMoves = sParty_Grunt6},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern2),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern2},
     },
 
-    [TRAINER_GRUNT_7] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -121,8 +121,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt7),
-        .party = {.NoItemDefaultMoves = sParty_Grunt7},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern3),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern3},
     },
 
     [TRAINER_GABRIELLE_1] =
@@ -139,7 +139,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Gabrielle1},
     },
 
-    [TRAINER_GRUNT_8] =
+    [TRAINER_GRUNT_PETALBURG_WOODS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -149,8 +149,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt8),
-        .party = {.NoItemDefaultMoves = sParty_Grunt8},
+        .partySize = ARRAY_COUNT(sParty_GruntPetalburgWoods),
+        .party = {.NoItemDefaultMoves = sParty_GruntPetalburgWoods},
     },
 
     [TRAINER_MARCEL] =
@@ -195,7 +195,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Ed},
     },
 
-    [TRAINER_GRUNT_9] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -205,8 +205,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt9),
-        .party = {.NoItemDefaultMoves = sParty_Grunt9},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern4),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern4},
     },
 
     [TRAINER_DECLAN] =
@@ -223,7 +223,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Declan},
     },
 
-    [TRAINER_GRUNT_10] =
+    [TRAINER_GRUNT_RUSTURF_TUNNEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -233,11 +233,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt10),
-        .party = {.NoItemDefaultMoves = sParty_Grunt10},
+        .partySize = ARRAY_COUNT(sParty_GruntRusturfTunnel),
+        .party = {.NoItemDefaultMoves = sParty_GruntRusturfTunnel},
     },
 
-    [TRAINER_GRUNT_11] =
+    [TRAINER_GRUNT_WEATHER_INST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -247,11 +247,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt11),
-        .party = {.NoItemDefaultMoves = sParty_Grunt11},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst1),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst1},
     },
 
-    [TRAINER_GRUNT_12] =
+    [TRAINER_GRUNT_WEATHER_INST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -261,11 +261,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt12),
-        .party = {.NoItemDefaultMoves = sParty_Grunt12},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst2),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst2},
     },
 
-    [TRAINER_GRUNT_13] =
+    [TRAINER_GRUNT_WEATHER_INST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -275,11 +275,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt13),
-        .party = {.NoItemDefaultMoves = sParty_Grunt13},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst3),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst3},
     },
 
-    [TRAINER_GRUNT_14] =
+    [TRAINER_GRUNT_MUSEUM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -289,11 +289,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt14),
-        .party = {.NoItemDefaultMoves = sParty_Grunt14},
+        .partySize = ARRAY_COUNT(sParty_GruntMuseum1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMuseum1},
     },
 
-    [TRAINER_GRUNT_15] =
+    [TRAINER_GRUNT_MUSEUM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -303,11 +303,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt15),
-        .party = {.NoItemDefaultMoves = sParty_Grunt15},
+        .partySize = ARRAY_COUNT(sParty_GruntMuseum2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMuseum2},
     },
 
-    [TRAINER_GRUNT_16] =
+    [TRAINER_GRUNT_SPACE_CENTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -317,11 +317,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt16),
-        .party = {.NoItemDefaultMoves = sParty_Grunt16},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter1),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter1},
     },
 
-    [TRAINER_GRUNT_17] =
+    [TRAINER_GRUNT_MT_PYRE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -331,11 +331,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt17),
-        .party = {.NoItemDefaultMoves = sParty_Grunt17},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre1},
     },
 
-    [TRAINER_GRUNT_18] =
+    [TRAINER_GRUNT_MT_PYRE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -345,11 +345,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt18),
-        .party = {.NoItemDefaultMoves = sParty_Grunt18},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre2},
     },
 
-    [TRAINER_GRUNT_19] =
+    [TRAINER_GRUNT_MT_PYRE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -359,11 +359,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt19),
-        .party = {.NoItemDefaultMoves = sParty_Grunt19},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre3),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre3},
     },
 
-    [TRAINER_GRUNT_20] =
+    [TRAINER_GRUNT_WEATHER_INST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -373,11 +373,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt20),
-        .party = {.NoItemDefaultMoves = sParty_Grunt20},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst4),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst4},
     },
 
-    [TRAINER_GRUNT_21] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -387,11 +387,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt21),
-        .party = {.NoItemDefaultMoves = sParty_Grunt21},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout5),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout5},
     },
 
-    [TRAINER_GRUNT_22] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -401,8 +401,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt22),
-        .party = {.NoItemDefaultMoves = sParty_Grunt22},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout6),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout6},
     },
 
     [TRAINER_FREDRICK] =
@@ -1623,7 +1623,7 @@ const struct Trainer gTrainers[] = {
         .party = {.ItemCustomMoves = sParty_Daphne},
     },
 
-    [TRAINER_GRUNT_23] =
+    [TRAINER_GRUNT_SPACE_CENTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -1633,8 +1633,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt23),
-        .party = {.NoItemDefaultMoves = sParty_Grunt23},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter2),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter2},
     },
 
     [TRAINER_CINDY_2] =
@@ -2043,7 +2043,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Mark},
     },
 
-    [TRAINER_GRUNT_24] =
+    [TRAINER_GRUNT_MT_CHIMNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -2053,8 +2053,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt24),
-        .party = {.NoItemDefaultMoves = sParty_Grunt24},
+        .partySize = ARRAY_COUNT(sParty_GruntMtChimney1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtChimney1},
     },
 
     [TRAINER_STEVE_2] =
@@ -2687,7 +2687,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemCustomMoves = sParty_Kirk},
     },
 
-    [TRAINER_GRUNT_25] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -2697,11 +2697,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt25),
-        .party = {.NoItemDefaultMoves = sParty_Grunt25},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout7),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout7},
     },
 
-    [TRAINER_GRUNT_26] =
+    [TRAINER_GRUNT_AQUA_HIDEOUT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -2711,8 +2711,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt26),
-        .party = {.NoItemDefaultMoves = sParty_Grunt26},
+        .partySize = ARRAY_COUNT(sParty_GruntAquaHideout8),
+        .party = {.NoItemDefaultMoves = sParty_GruntAquaHideout8},
     },
 
     [TRAINER_SHAWN] =
@@ -7937,7 +7937,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Julio},
     },
 
-    [TRAINER_GRUNT_27] =
+    [TRAINER_GRUNT_SEAFLOOR_CAVERN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -7947,11 +7947,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt27),
-        .party = {.NoItemDefaultMoves = sParty_Grunt27},
+        .partySize = ARRAY_COUNT(sParty_GruntSeafloorCavern5),
+        .party = {.NoItemDefaultMoves = sParty_GruntSeafloorCavern5},
     },
 
-    [TRAINER_GRUNT_28] =
+    [TRAINER_GRUNT_UNUSED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7961,11 +7961,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt28),
-        .party = {.NoItemDefaultMoves = sParty_Grunt28},
+        .partySize = ARRAY_COUNT(sParty_GruntUnused),
+        .party = {.NoItemDefaultMoves = sParty_GruntUnused},
     },
 
-    [TRAINER_GRUNT_29] =
+    [TRAINER_GRUNT_MT_PYRE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -7975,11 +7975,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt29),
-        .party = {.NoItemDefaultMoves = sParty_Grunt29},
+        .partySize = ARRAY_COUNT(sParty_GruntMtPyre4),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtPyre4},
     },
 
-    [TRAINER_GRUNT_30] =
+    [TRAINER_GRUNT_JAGGED_PASS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7989,8 +7989,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt30),
-        .party = {.NoItemDefaultMoves = sParty_Grunt30},
+        .partySize = ARRAY_COUNT(sParty_GruntJaggedPass),
+        .party = {.NoItemDefaultMoves = sParty_GruntJaggedPass},
     },
 
     [TRAINER_MARC] =
@@ -8105,7 +8105,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Harrison},
     },
 
-    [TRAINER_GRUNT_31] =
+    [TRAINER_GRUNT_MT_CHIMNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8115,8 +8115,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt31),
-        .party = {.NoItemDefaultMoves = sParty_Grunt31},
+        .partySize = ARRAY_COUNT(sParty_GruntMtChimney2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMtChimney2},
     },
 
     [TRAINER_CLARENCE] =
@@ -8203,7 +8203,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Nicholas},
     },
 
-    [TRAINER_GRUNT_32] =
+    [TRAINER_GRUNT_SPACE_CENTER_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8213,11 +8213,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt32),
-        .party = {.NoItemDefaultMoves = sParty_Grunt32},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter3),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter3},
     },
 
-    [TRAINER_GRUNT_33] =
+    [TRAINER_GRUNT_SPACE_CENTER_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8227,11 +8227,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt33),
-        .party = {.NoItemDefaultMoves = sParty_Grunt33},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter4),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter4},
     },
 
-    [TRAINER_GRUNT_34] =
+    [TRAINER_GRUNT_SPACE_CENTER_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8241,11 +8241,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt34),
-        .party = {.NoItemDefaultMoves = sParty_Grunt34},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter5),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter5},
     },
 
-    [TRAINER_GRUNT_35] =
+    [TRAINER_GRUNT_SPACE_CENTER_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8255,11 +8255,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt35),
-        .party = {.NoItemDefaultMoves = sParty_Grunt35},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter6),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter6},
     },
 
-    [TRAINER_GRUNT_36] =
+    [TRAINER_GRUNT_SPACE_CENTER_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8269,8 +8269,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt36),
-        .party = {.NoItemDefaultMoves = sParty_Grunt36},
+        .partySize = ARRAY_COUNT(sParty_GruntSpaceCenter7),
+        .party = {.NoItemDefaultMoves = sParty_GruntSpaceCenter7},
     },
 
     [TRAINER_MACEY] =
@@ -8343,7 +8343,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Isabella},
     },
 
-    [TRAINER_GRUNT_37] =
+    [TRAINER_GRUNT_WEATHER_INST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -8353,8 +8353,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt37),
-        .party = {.NoItemDefaultMoves = sParty_Grunt37},
+        .partySize = ARRAY_COUNT(sParty_GruntWeatherInst5),
+        .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5},
     },
 
     [TRAINER_TABITHA_2] =
@@ -10023,7 +10023,7 @@ const struct Trainer gTrainers[] = {
         .party = {.NoItemDefaultMoves = sParty_Deandre},
     },
 
-    [TRAINER_GRUNT_38] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10033,11 +10033,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt38),
-        .party = {.NoItemDefaultMoves = sParty_Grunt38},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout1),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout1},
     },
 
-    [TRAINER_GRUNT_39] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10047,11 +10047,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt39),
-        .party = {.NoItemDefaultMoves = sParty_Grunt39},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout2),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout2},
     },
 
-    [TRAINER_GRUNT_40] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10061,11 +10061,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt40),
-        .party = {.NoItemDefaultMoves = sParty_Grunt40},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout3),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout3},
     },
 
-    [TRAINER_GRUNT_41] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10075,11 +10075,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt41),
-        .party = {.NoItemDefaultMoves = sParty_Grunt41},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout4),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout4},
     },
 
-    [TRAINER_GRUNT_42] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10089,11 +10089,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt42),
-        .party = {.NoItemDefaultMoves = sParty_Grunt42},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout5),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout5},
     },
 
-    [TRAINER_GRUNT_43] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10103,11 +10103,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt43),
-        .party = {.NoItemDefaultMoves = sParty_Grunt43},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout6),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout6},
     },
 
-    [TRAINER_GRUNT_44] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10117,11 +10117,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt44),
-        .party = {.NoItemDefaultMoves = sParty_Grunt44},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout7),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout7},
     },
 
-    [TRAINER_GRUNT_45] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10131,11 +10131,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt45),
-        .party = {.NoItemDefaultMoves = sParty_Grunt45},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout8),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout8},
     },
 
-    [TRAINER_GRUNT_46] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10145,11 +10145,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt46),
-        .party = {.NoItemDefaultMoves = sParty_Grunt46},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout9),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout9},
     },
 
-    [TRAINER_GRUNT_47] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10159,11 +10159,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt47),
-        .party = {.NoItemDefaultMoves = sParty_Grunt47},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout10),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout10},
     },
 
-    [TRAINER_GRUNT_48] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10173,11 +10173,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt48),
-        .party = {.NoItemDefaultMoves = sParty_Grunt48},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout11),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout11},
     },
 
-    [TRAINER_GRUNT_49] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10187,11 +10187,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt49),
-        .party = {.NoItemDefaultMoves = sParty_Grunt49},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout12),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout12},
     },
 
-    [TRAINER_GRUNT_50] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10201,11 +10201,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt50),
-        .party = {.NoItemDefaultMoves = sParty_Grunt50},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout13),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout13},
     },
 
-    [TRAINER_GRUNT_51] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10215,11 +10215,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt51),
-        .party = {.NoItemDefaultMoves = sParty_Grunt51},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout14),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout14},
     },
 
-    [TRAINER_GRUNT_52] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10229,11 +10229,11 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt52),
-        .party = {.NoItemDefaultMoves = sParty_Grunt52},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout15),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout15},
     },
 
-    [TRAINER_GRUNT_53] =
+    [TRAINER_GRUNT_MAGMA_HIDEOUT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -10243,8 +10243,8 @@ const struct Trainer gTrainers[] = {
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
-        .partySize = ARRAY_COUNT(sParty_Grunt53),
-        .party = {.NoItemDefaultMoves = sParty_Grunt53},
+        .partySize = ARRAY_COUNT(sParty_GruntMagmaHideout16),
+        .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16},
     },
 
     [TRAINER_TABITHA_3] =
diff --git a/src/tv.c b/src/tv.c
index 5cc6e6626e..4cb6df16f2 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2298,7 +2298,7 @@ void sub_80EE184(void)
     }
 }
 
-void sub_80EE2CC(void)
+void TryPutLotteryWinnerReportOnAir(void)
 {
     TVShow *show;