Merge pull request #482 from GriffinRichards/remove-old-asm-constants

Remove old asm constants

14 files changed, 8 insertions, 726 deletions

diff --git a/constants/battle.inc b/constants/battle.inc
deleted file mode 100644
index d3a7c6d58..000000000
--- a/constants/battle.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-@ status 1
-.equiv SLP, 0x07
-.equiv PSN, 0x08
-.equiv BRN, 0x10
-.equiv FRZ, 0x20
-.equiv PAR, 0x40
-.equiv TOX, 0x80
-
-@ status 2
-.equiv S_CONFUSED,     0x00000007
-.equiv S_CONTINUE,     0x00001000
-.equiv S_TEMP_TRAP,    0x0000E000 @ Wrap, Bind, etc.
-.equiv S_INFATUATED,   0x000F0000
-.equiv S_FOCUS_ENERGY, 0x00100000
-.equiv S_SUBSTITUTE,   0x01000000
-.equiv S_MEAN_LOOK,    0x04000000
-.equiv S_NIGHTMARE,    0x08000000
-.equiv S_CURSED,       0x10000000
-.equiv S_FORESIGHT,    0x20000000
-.equiv S_TORMENT,      0x80000000
-
-@ status 3
-.equiv S_LEECH_SEED,  0x00000004
-.equiv S_ALWAYS_HIT,  0x00000010
-.equiv S_PERISH_SONG, 0x00000020
-.equiv S_ROOTED,      0x00000400
-.equiv S_YAWN,        0x00001800
-.equiv S_IMPRISONED,  0x00002000
-.equiv S_MUD_SPORT,   0x00010000
-.equiv S_WATER_SPORT, 0x00020000
-
-@ status 4
-.equiv S_REFLECT,      0x0001
-.equiv S_LIGHT_SCREEN, 0x0002
-.equiv S_SPIKES,       0x0010
-.equiv S_SAFEGUARD,    0x0020
-.equiv S_FUTURE_SIGHT, 0x0040
-.equiv S_MIST,         0x0100
-
-.equiv TARGET, 0
-.equiv USER, 1
-
-.equiv BATTLE_WEATHER_SUNNY, 0
-.equiv BATTLE_WEATHER_RAIN, 1
-.equiv BATTLE_WEATHER_SANDSTORM, 2
-.equiv BATTLE_WEATHER_HAIL, 3
-
-	enum_start 1
-	enum ATTACK
-	enum DEFENSE
-	enum SPEED
-	enum SP_ATTACK
-	enum SP_DEFENSE
-	enum ACCURACY
-	enum EVASION
-
-@ status animation table
-.equiv B_ANIM_STATUS_PSN,              0x0
-.equiv B_ANIM_STATUS_CONFUSION,        0x1
-.equiv B_ANIM_STATUS_BRN,              0x2
-.equiv B_ANIM_STATUS_INFATUATION,      0x3
-.equiv B_ANIM_STATUS_SLP,              0x4
-.equiv B_ANIM_STATUS_PRZ,              0x5
-.equiv B_ANIM_STATUS_FRZ,              0x6
-.equiv B_ANIM_STATUS_CURSED,           0x7
-.equiv B_ANIM_STATUS_NIGHTMARE,        0x8
-.equiv B_ANIM_STATUS_WRAPPED,          0x9
-
-@ general animation table
-.equiv B_ANIM_CASTFORM_CHANGE,         0x0
-.equiv B_ANIM_STATS_CHANGE,            0x1
-.equiv B_ANIM_SUBSTITUTE_FADE,         0x2
-.equiv B_ANIM_SUBSTITUTE_APPEAR,       0x3
-.equiv B_ANIM_BAIT_THROW,         0x4
-.equiv B_ANIM_ITEM_KNOCKOFF,           0x5
-.equiv B_ANIM_TURN_TRAP,               0x6
-.equiv B_ANIM_ITEM_EFFECT,             0x7
-.equiv B_ANIM_SMOKEBALL_ESCAPE,        0x8
-.equiv B_ANIM_HANGED_ON,               0x9
-.equiv B_ANIM_RAIN_CONTINUES,          0xA
-.equiv B_ANIM_SUN_CONTINUES,           0xB
-.equiv B_ANIM_SANDSTORM_CONTINUES,     0xC
-.equiv B_ANIM_HAIL_CONTINUES,          0xD
-.equiv B_ANIM_LEECH_SEED_DRAIN,        0xE
-.equiv B_ANIM_MON_HIT,                 0xF
-.equiv B_ANIM_ITEM_STEAL,              0x10
-.equiv B_ANIM_SNATCH_MOVE,             0x11
-.equiv B_ANIM_FUTURE_SIGHT_HIT,        0x12
-.equiv B_ANIM_DOOM_DESIRE_HIT,         0x13
-.equiv B_ANIM_FOCUS_PUNCH_SET_UP,      0x14
-.equiv B_ANIM_INGRAIN_HEAL,            0x15
-.equiv B_ANIM_WISH_HEAL,               0x16
-
-@ special animation table
-.equiv B_ANIM_LVL_UP,                  0x0
-.equiv B_ANIM_SWITCH_OUT_PLAYER_MON,   0x1
-.equiv B_ANIM_SWITCH_OUT_OPPONENT_MON, 0x2
-.equiv B_ANIM_BALL_THROW,              0x3
-.equiv B_ANIM_SAFARI_BALL_THROW,       0x4
-.equiv B_ANIM_SUBSTITUTE_TO_MON,       0x5
-.equiv B_ANIM_MON_TO_SUBSTITUTE,       0x6
diff --git a/constants/battle_move_constants.inc b/constants/battle_move_constants.inc
deleted file mode 100644
index a05da3db3..000000000
--- a/constants/battle_move_constants.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-	.set TARGET_SELECTED_POKEMON, 0
-
-	.set F_TARGET_SPECIAL,         1 << 0
-	.set F_TARGET_RANDOM,          1 << 2
-	.set F_TARGET_BOTH_ENEMIES,    1 << 3
-	.set F_TARGET_USER,            1 << 4
-	.set F_TARGET_ALL_EXCEPT_USER, 1 << 5
-	.set F_TARGET_ENEMY_SIDE,      1 << 6
-
-	.set F_MAKES_CONTACT,          1 << 0
-	.set F_AFFECTED_BY_PROTECT,    1 << 1
-	.set F_AFFECTED_BY_MAGIC_COAT, 1 << 2
-	.set F_AFFECTED_BY_SNATCH,     1 << 3
-	.set F_MIRROR_MOVE_COMPATIBLE, 1 << 4
-	.set F_AFFECTED_BY_KINGS_ROCK, 1 << 5
diff --git a/constants/battle_text.inc b/constants/battle_text.inc
deleted file mode 100644
index f7025f68f..000000000
--- a/constants/battle_text.inc
+++ /dev/null
@@ -1,352 +0,0 @@
-	enum_start 12
-	enum BATTLE_TEXT_UnknownString
-	enum BATTLE_TEXT_GainExpPoints
-	enum BATTLE_TEXT_GrewLevel
-	enum BATTLE_TEXT_LearnedMove
-	enum BATTLE_TEXT_TryingToLearnMove
-	enum BATTLE_TEXT_CantLearnMore
-	enum BATTLE_TEXT_DeleteMove
-	enum BATTLE_TEXT_DeletedMove
-	enum BATTLE_TEXT_StopLearning
-	enum BATTLE_TEXT_DidNotLearn
-	enum BATTLE_TEXT_LearnedMove2
-	enum BATTLE_TEXT_AttackMissed
-	enum BATTLE_TEXT_ProtectedItself
-	enum BATTLE_TEXT_StatNoHigher
-	enum BATTLE_TEXT_AvoidedDamage
-	enum BATTLE_TEXT_DoesntAffect
-	enum BATTLE_TEXT_AttackingFainted
-	enum BATTLE_TEXT_DefendingFainted
-	enum BATTLE_TEXT_WinningPrize
-	enum BATTLE_TEXT_OutOfUsablePoke
-	enum BATTLE_TEXT_WhitedOut
-	enum BATTLE_TEXT_PreventEscape
-	enum BATTLE_TEXT_HitMulti
-	enum BATTLE_TEXT_FellAsleep
-	enum BATTLE_TEXT_MadeAsleep
-	enum BATTLE_TEXT_DefendingAsleep
-	enum BATTLE_TEXT_AttackingAsleep
-	enum BATTLE_TEXT_WasntAffected
-	enum BATTLE_TEXT_Poisoned
-	enum BATTLE_TEXT_Poisoned2
-	enum BATTLE_TEXT_PoisonHurt
-	enum BATTLE_TEXT_AlreadyPoisoned
-	enum BATTLE_TEXT_BadlyPoisoned
-	enum BATTLE_TEXT_EnergyDrained
-	enum BATTLE_TEXT_Burned
-	enum BATTLE_TEXT_Burned2
-	enum BATTLE_TEXT_BurnHurt
-	enum BATTLE_TEXT_Frozen
-	enum BATTLE_TEXT_Frozen2
-	enum BATTLE_TEXT_FrozenSolid
-	enum BATTLE_TEXT_DefendingDefrosted
-	enum BATTLE_TEXT_AttackingDefrosted
-	enum BATTLE_TEXT_Defrosted
-	enum BATTLE_TEXT_Paralyzed
-	enum BATTLE_TEXT_Paralyzed2
-	enum BATTLE_TEXT_Paralyzed3
-	enum BATTLE_TEXT_AlreadyParalyzed
-	enum BATTLE_TEXT_ParalysisHealed
-	enum BATTLE_TEXT_DreamEaten
-	enum BATTLE_TEXT_AttackingStatNoHigher
-	enum BATTLE_TEXT_DefendingStatNoHigher
-	enum BATTLE_TEXT_StoppedWorking
-	enum BATTLE_TEXT_StoppedWorking2
-	enum BATTLE_TEXT_Confused
-	enum BATTLE_TEXT_ConfusionSnapOut
-	enum BATTLE_TEXT_BecameConfused
-	enum BATTLE_TEXT_AlreadyConfused
-	enum BATTLE_TEXT_FellLove
-	enum BATTLE_TEXT_InLoveWith
-	enum BATTLE_TEXT_ImmobilizedBy
-	enum BATTLE_TEXT_BlownAway
-	enum BATTLE_TEXT_TypeTransform
-	enum BATTLE_TEXT_Flinched
-	enum BATTLE_TEXT_RegainedHealth
-	enum BATTLE_TEXT_HPFull
-	enum BATTLE_TEXT_RaisedSpDef
-	enum BATTLE_TEXT_RaisedDefense
-	enum BATTLE_TEXT_CoveredVeil
-	enum BATTLE_TEXT_SafeguardActive
-	enum BATTLE_TEXT_SafeguardFaded
-	enum BATTLE_TEXT_WentToSleep
-	enum BATTLE_TEXT_SpeltHealthy
-	enum BATTLE_TEXT_WhipWhirlwind
-	enum BATTLE_TEXT_TookSunlight
-	enum BATTLE_TEXT_LoweredHead
-	enum BATTLE_TEXT_IsGlowing
-	enum BATTLE_TEXT_FlewHigh
-	enum BATTLE_TEXT_DugHole
-	enum BATTLE_TEXT_SqueezedBind
-	enum BATTLE_TEXT_TrappedVortex
-	enum BATTLE_TEXT_Wrapped
-	enum BATTLE_TEXT_Clamped
-	enum BATTLE_TEXT_HurtBy
-	enum BATTLE_TEXT_FreedFrom
-	enum BATTLE_TEXT_KeptGoingCrash
-	enum BATTLE_TEXT_MistShroud
-	enum BATTLE_TEXT_MistProtect
-	enum BATTLE_TEXT_GetPumped
-	enum BATTLE_TEXT_HitRecoil
-	enum BATTLE_TEXT_ProtectedItself2
-	enum BATTLE_TEXT_SandBuffeted
-	enum BATTLE_TEXT_HailStricken
-	enum BATTLE_TEXT_WasSeeded
-	enum BATTLE_TEXT_EvadedAttack
-	enum BATTLE_TEXT_HealthSapped
-	enum BATTLE_TEXT_FastAsleep
-	enum BATTLE_TEXT_WokeUp
-	enum BATTLE_TEXT_UproarAwake
-	enum BATTLE_TEXT_UproarWoke
-	enum BATTLE_TEXT_UproarCaused
-	enum BATTLE_TEXT_UproarMaking
-	enum BATTLE_TEXT_CalmedDown
-	enum BATTLE_TEXT_UproarCantSleep
-	enum BATTLE_TEXT_Stockpiled
-	enum BATTLE_TEXT_StockpiledCant
-	enum BATTLE_TEXT_UproarCantSleep2
-	enum BATTLE_TEXT_UproarKeptAwake
-	enum BATTLE_TEXT_StayedAwake
-	enum BATTLE_TEXT_StoringEnergy
-	enum BATTLE_TEXT_UnleashedEnergy
-	enum BATTLE_TEXT_FatigueConfuse
-	enum BATTLE_TEXT_PickedUpYen
-	enum BATTLE_TEXT_Unaffected
-	enum BATTLE_TEXT_Transformed
-	enum BATTLE_TEXT_SubMade
-	enum BATTLE_TEXT_SubAlready
-	enum BATTLE_TEXT_SubTookDamage
-	enum BATTLE_TEXT_SubFaded
-	enum BATTLE_TEXT_MustRecharge
-	enum BATTLE_TEXT_RageBuilding
-	enum BATTLE_TEXT_MoveWasDisabled
-	enum BATTLE_TEXT_MoveIsDisabled
-	enum BATTLE_TEXT_DisabledNoMore
-	enum BATTLE_TEXT_EncoreGot
-	enum BATTLE_TEXT_EncoreEnded
-	enum BATTLE_TEXT_TookAim
-	enum BATTLE_TEXT_SketchedMove
-	enum BATTLE_TEXT_DestinyBondTake
-	enum BATTLE_TEXT_DestinyBondTaken
-	enum BATTLE_TEXT_ReducedBy
-	enum BATTLE_TEXT_StoleSomething
-	enum BATTLE_TEXT_CantEscapeNow
-	enum BATTLE_TEXT_NightmareStart
-	enum BATTLE_TEXT_NightmareLock
-	enum BATTLE_TEXT_CurseLay
-	enum BATTLE_TEXT_CurseAfflict
-	enum BATTLE_TEXT_SpikesScattered
-	enum BATTLE_TEXT_SpikesHurt
-	enum BATTLE_TEXT_IdentifiedPoke
-	enum BATTLE_TEXT_PerishSongFell
-	enum BATTLE_TEXT_BracedItself
-	enum BATTLE_TEXT_EnduredHit
-	enum BATTLE_TEXT_MagnitudeCount
-	enum BATTLE_TEXT_CutHPMaxATK
-	enum BATTLE_TEXT_CopyStatChanges
-	enum BATTLE_TEXT_GotFreeFrom
-	enum BATTLE_TEXT_LeechShed
-	enum BATTLE_TEXT_SpikesBlownAway
-	enum BATTLE_TEXT_FledBattle
-	enum BATTLE_TEXT_ForesawAttack
-	enum BATTLE_TEXT_TookAttack
-	enum BATTLE_TEXT_PokeAttack
-	enum BATTLE_TEXT_CenterAttention
-	enum BATTLE_TEXT_ChargingPower
-	enum BATTLE_TEXT_NaturePower
-	enum BATTLE_TEXT_StatusNormal
-	enum BATTLE_TEXT_NoMovesLeft
-	enum BATTLE_TEXT_TormentSubject
-	enum BATTLE_TEXT_TormentNoUse
-	enum BATTLE_TEXT_TightenFocus
-	enum BATTLE_TEXT_TauntFell
-	enum BATTLE_TEXT_TauntNoUse
-	enum BATTLE_TEXT_ReadyToHelp
-	enum BATTLE_TEXT_SwitchedItems
-	enum BATTLE_TEXT_CopiedObject
-	enum BATTLE_TEXT_WishMade
-	enum BATTLE_TEXT_WishTrue
-	enum BATTLE_TEXT_PlantedRoots
-	enum BATTLE_TEXT_AbsorbNutrients
-	enum BATTLE_TEXT_AnchoredItself
-	enum BATTLE_TEXT_DrowsyMade
-	enum BATTLE_TEXT_KnockedOffItem
-	enum BATTLE_TEXT_AbilitySwap
-	enum BATTLE_TEXT_SealedMove
-	enum BATTLE_TEXT_SealedNoUse
-	enum BATTLE_TEXT_GrudgeBear
-	enum BATTLE_TEXT_GrudgeLosePP
-	enum BATTLE_TEXT_ShroudedItself
-	enum BATTLE_TEXT_MagicCoatBounce
-	enum BATTLE_TEXT_AwaitMove
-	enum BATTLE_TEXT_SnatchedMove
-	enum BATTLE_TEXT_RainMade
-	enum BATTLE_TEXT_SpeedRisen
-	enum BATTLE_TEXT_ProtectedBy
-	enum BATTLE_TEXT_PreventedBy
-	enum BATTLE_TEXT_HPRestoredUsing
-	enum BATTLE_TEXT_MadeType
-	enum BATTLE_TEXT_PreventedPara
-	enum BATTLE_TEXT_PreventedRomance
-	enum BATTLE_TEXT_PreventedPoison
-	enum BATTLE_TEXT_PreventedConfusion
-	enum BATTLE_TEXT_RaisedFirePower
-	enum BATTLE_TEXT_AnchorsItself
-	enum BATTLE_TEXT_CutsAttack
-	enum BATTLE_TEXT_PreventedStatLoss
-	enum BATTLE_TEXT_HurtOther
-	enum BATTLE_TEXT_Traced
-	enum BATTLE_TEXT_Sharply
-	enum BATTLE_TEXT_Rose
-	enum BATTLE_TEXT_Harshly
-	enum BATTLE_TEXT_Fell
-	enum BATTLE_TEXT_UnknownString7
-	enum BATTLE_TEXT_UnknownString3
-	enum BATTLE_TEXT_UnknownString5
-	enum BATTLE_TEXT_UnknownString6
-	enum BATTLE_TEXT_Critical
-	enum BATTLE_TEXT_GrandSlam
-	enum BATTLE_TEXT_MoveForget123
-	enum BATTLE_TEXT_MoveForgetAnd
-	enum BATTLE_TEXT_NotEffective
-	enum BATTLE_TEXT_SuperEffective
-	enum BATTLE_TEXT_GotAwaySafely
-	enum BATTLE_TEXT_FledWild
-	enum BATTLE_TEXT_NoRunning
-	enum BATTLE_TEXT_CantEscape2
-	enum BATTLE_TEXT_BirchDontLeaveMe
-	enum BATTLE_TEXT_Nothing
-	enum BATTLE_TEXT_Failed
-	enum BATTLE_TEXT_HurtItself
-	enum BATTLE_TEXT_MirrorFail
-	enum BATTLE_TEXT_RainStart
-	enum BATTLE_TEXT_PourStart
-	enum BATTLE_TEXT_RainCont1
-	enum BATTLE_TEXT_PourCont
-	enum BATTLE_TEXT_RainStop
-	enum BATTLE_TEXT_SandBrewed
-	enum BATTLE_TEXT_SandRages
-	enum BATTLE_TEXT_SandSubsided
-	enum BATTLE_TEXT_SunBright
-	enum BATTLE_TEXT_SunStrong
-	enum BATTLE_TEXT_SunFaded
-	enum BATTLE_TEXT_HailStart
-	enum BATTLE_TEXT_HailCont
-	enum BATTLE_TEXT_HailStop
-	enum BATTLE_TEXT_SpitUpFail
-	enum BATTLE_TEXT_SwallowFail
-	enum BATTLE_TEXT_WindHeatWave
-	enum BATTLE_TEXT_StatElim
-	enum BATTLE_TEXT_CoinScatter
-	enum BATTLE_TEXT_SubWeak
-	enum BATTLE_TEXT_PainSplit
-	enum BATTLE_TEXT_BellChime
-	enum BATTLE_TEXT_PerishSong
-	enum BATTLE_TEXT_NoPP1
-	enum BATTLE_TEXT_NoPP2
-	enum BATTLE_TEXT_Used1
-	enum BATTLE_TEXT_TutorialUsed
-	enum BATTLE_TEXT_BlockBall
-	enum BATTLE_TEXT_DontBeAThief
-	enum BATTLE_TEXT_DodgeBall
-	enum BATTLE_TEXT_MissPoke
-	enum BATTLE_TEXT_BallBrokeOhNo
-	enum BATTLE_TEXT_BallBrokeAppeared
-	enum BATTLE_TEXT_BallBrokeAlmost
-	enum BATTLE_TEXT_BallBrokeSoClose
-	enum BATTLE_TEXT_BallCaught1
-	enum BATTLE_TEXT_BallCaught2
-	enum BATTLE_TEXT_GiveNickname
-	enum BATTLE_TEXT_SentToPC
-	enum BATTLE_TEXT_AddedToDex
-	enum BATTLE_TEXT_Raining
-	enum BATTLE_TEXT_Sandstorm
-	enum BATTLE_TEXT_CantEscape
-	enum BATTLE_TEXT_IgnoredOrdersSLP
-	enum BATTLE_TEXT_IgnoredOrders
-	enum BATTLE_TEXT_BeganNap
-	enum BATTLE_TEXT_LoafingAround
-	enum BATTLE_TEXT_WontObey
-	enum BATTLE_TEXT_TurnedAway
-	enum BATTLE_TEXT_NotNotice
-	enum BATTLE_TEXT_WillSwitch
-	enum BATTLE_TEXT_CreptCloser
-	enum BATTLE_TEXT_CantGetCloser
-	enum BATTLE_TEXT_WatchingCarefully
-	enum BATTLE_TEXT_CuriousAbout
-	enum BATTLE_TEXT_EnthralledBy
-	enum BATTLE_TEXT_IgnoredThing
-	enum BATTLE_TEXT_ThrewBlock
-	enum BATTLE_TEXT_SafariOver
-	enum BATTLE_TEXT_CuredParalysis
-	enum BATTLE_TEXT_CuredPoison
-	enum BATTLE_TEXT_CuredBurn
-	enum BATTLE_TEXT_CuredFreeze
-	enum BATTLE_TEXT_CuredSleep
-	enum BATTLE_TEXT_CuredConfusion
-	enum BATTLE_TEXT_CuredStatus
-	enum BATTLE_TEXT_RestoredHealth
-	enum BATTLE_TEXT_RestoredPP
-	enum BATTLE_TEXT_RestoredStatus
-	enum BATTLE_TEXT_RestoredHPLittle
-	enum BATTLE_TEXT_ChoiceBand
-	enum BATTLE_TEXT_FocusSash
-	enum BATTLE_TEXT_Terminator2 @ terminator?
-	enum BATTLE_TEXT_PreventedBurn
-	enum BATTLE_TEXT_BlocksOther
-	enum BATTLE_TEXT_RestoredHPByItem
-	enum BATTLE_TEXT_WhipSandstorm
-	enum BATTLE_TEXT_PreventedLoss
-	enum BATTLE_TEXT_InfatuatedPoke
-	enum BATTLE_TEXT_MadeIneffective
-	enum BATTLE_TEXT_CuredProblem
-	enum BATTLE_TEXT_OozeSuckup
-	enum BATTLE_TEXT_Transformed2
-	enum BATTLE_TEXT_ElecWeakened
-	enum BATTLE_TEXT_FireWeakened
-	enum BATTLE_TEXT_HidUnderwater
-	enum BATTLE_TEXT_SprangUp
-	enum BATTLE_TEXT_CantForgetHM
-	enum BATTLE_TEXT_FoundOne
-	enum BATTLE_TEXT_PlayerDefeatedTrainer2
-	enum BATTLE_TEXT_SoothingAroma
-	enum BATTLE_TEXT_CantUseItems
-	enum BATTLE_TEXT_UnknownString2
-	enum BATTLE_TEXT_UnknownString4
-	enum BATTLE_TEXT_HustleUse
-	enum BATTLE_TEXT_MadeUseless
-	enum BATTLE_TEXT_SandTombTrapped @ sand tomb
-	enum BATTLE_TEXT_Terminator
-	enum BATTLE_TEXT_BoostedExp
-	enum BATTLE_TEXT_SunIntensified
-	enum BATTLE_TEXT_GroundMoveNegate
-	enum BATTLE_TEXT_WallyBall
-	enum BATTLE_TEXT_TookAttack2
-	enum BATTLE_TEXT_ChoseDestiny
-	enum BATTLE_TEXT_LostFocus
-	enum BATTLE_TEXT_UseNext
-	enum BATTLE_TEXT_FledUsingItem
-	enum BATTLE_TEXT_FledUsingOther
-	enum BATTLE_TEXT_DraggedOut
-	enum BATTLE_TEXT_PreventedOther
-	enum BATTLE_TEXT_NormalizedStatus
-	enum BATTLE_TEXT_Used2
-	enum BATTLE_TEXT_BoxFull
-	enum BATTLE_TEXT_AvoidedAttack
-	enum BATTLE_TEXT_MadeIneffective2
-	enum BATTLE_TEXT_PreventedFlinching
-	enum BATTLE_TEXT_AlreadyBurned
-	enum BATTLE_TEXT_StatNoLower
-	enum BATTLE_TEXT_BlocksOther2
-	enum BATTLE_TEXT_WoreOff
-	enum BATTLE_TEXT_RaisedDefenseLittle
-	enum BATTLE_TEXT_RaisedSpDefLittle
-	enum BATTLE_TEXT_BrokeWall
-	enum BATTLE_TEXT_PreventedOther2
-	enum BATTLE_TEXT_CuredOfProblem
-	enum BATTLE_TEXT_AttackingCantEscape
-	enum BATTLE_TEXT_Obtained1
-	enum BATTLE_TEXT_Obtained2
-	enum BATTLE_TEXT_Obtained3
-	enum BATTLE_TEXT_NoEffect
-	enum BATTLE_TEXT_NoEffectOn
diff --git a/constants/berry_constants.inc b/constants/berry_constants.inc
deleted file mode 100644
index 2ecd7ac36..000000000
--- a/constants/berry_constants.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-	.set BERRY_FIRMNESS_UNKNOWN,    0
-	.set BERRY_FIRMNESS_VERY_SOFT,  1
-	.set BERRY_FIRMNESS_SOFT,       2
-	.set BERRY_FIRMNESS_HARD,       3
-	.set BERRY_FIRMNESS_VERY_HARD,  4
-	.set BERRY_FIRMNESS_SUPER_HARD, 5
diff --git a/constants/constants.inc b/constants/constants.inc
index 4a513c355..fd9715170 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -1,12 +1,3 @@
 	.include "constants/gba_constants.inc"
 	.include "constants/misc_constants.inc"
-	.include "constants/type_constants.inc"
-	.include "constants/contest_constants.inc"
-@	.include "constants/item_data_constants.inc"
-	.include "constants/battle_move_constants.inc"
-@	.include "constants/trainer_constants.inc"
-	.include "constants/berry_constants.inc"
 	.include "constants/version.inc"
-	.include "constants/battle.inc"
-	.include "constants/battle_text.inc"
-	.include "constants/contest_move_effects.inc"
diff --git a/constants/contest_constants.inc b/constants/contest_constants.inc
deleted file mode 100644
index e971764d6..000000000
--- a/constants/contest_constants.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-	.set CONTEST_COOL,   0x00
-	.set CONTEST_BEAUTY, 0x01
-	.set CONTEST_CUTE,   0x02
-	.set CONTEST_SMART,  0x03
-	.set CONTEST_TOUGH,  0x04
-
-	.set COMBO_STARTER_RAIN_DANCE,    0x01
-	.set COMBO_STARTER_RAGE,          0x02
-	.set COMBO_STARTER_FOCUS_ENERGY,  0x03
-	.set COMBO_STARTER_HYPNOSIS,      0x04
-	.set COMBO_STARTER_ENDURE,        0x05
-	.set COMBO_STARTER_HORN_ATTACK,   0x06
-	.set COMBO_STARTER_SWORDS_DANCE,  0x07
-	.set COMBO_STARTER_STOCKPILE,     0x08
-	.set COMBO_STARTER_SUNNY_DAY,     0x09
-	.set COMBO_STARTER_REST,          0x0A
-	.set COMBO_STARTER_VICE_GRIP,     0x0B
-	.set COMBO_STARTER_DEFENSE_CURL,  0x0C
-	.set COMBO_STARTER_CHARGE,        0x0D
-	.set COMBO_STARTER_ROCK_THROW,    0x0E
-	.set COMBO_STARTER_YAWN,          0x0F
-	.set COMBO_STARTER_SCARY_FACE,    0x10
-	.set COMBO_STARTER_POWDER_SNOW,   0x11
-	.set COMBO_STARTER_LOCK_ON,       0x12
-	.set COMBO_STARTER_SOFT_BOILED,   0x13
-	.set COMBO_STARTER_MEAN_LOOK,     0x14
-	.set COMBO_STARTER_SCRATCH,       0x15
-	.set COMBO_STARTER_GROWTH,        0x16
-	.set COMBO_STARTER_HAIL,          0x17
-	.set COMBO_STARTER_SANDSTORM,     0x18
-	.set COMBO_STARTER_BELLY_DRUM,    0x19
-	.set COMBO_STARTER_MIND_READER,   0x1A
-	.set COMBO_STARTER_DRAGON_BREATH, 0x1B
-	.set COMBO_STARTER_DRAGON_RAGE,   0x1C
-	.set COMBO_STARTER_DRAGON_DANCE,  0x1D
-	.set COMBO_STARTER_SURF,          0x1E
-	.set COMBO_STARTER_DIVE,          0x1F
-	.set COMBO_STARTER_STRING_SHOT,   0x20
-	.set COMBO_STARTER_LEER,          0x21
-	.set COMBO_STARTER_TAUNT,         0x22
-	.set COMBO_STARTER_CHARM,         0x23
-	.set COMBO_STARTER_HARDEN,        0x24
-	.set COMBO_STARTER_SING,          0x25
-	.set COMBO_STARTER_EARTHQUAKE,    0x26
-	.set COMBO_STARTER_DOUBLE_TEAM,   0x27
-	.set COMBO_STARTER_CURSE,         0x28
-	.set COMBO_STARTER_SWEET_SCENT,   0x29
-	.set COMBO_STARTER_SLUDGE,        0x2A
-	.set COMBO_STARTER_SLUDGE_BOMB,   0x2B
-	.set COMBO_STARTER_THUNDER_PUNCH, 0x2C
-	.set COMBO_STARTER_FIRE_PUNCH,    0x2D
-	.set COMBO_STARTER_ICE_PUNCH,     0x2E
-	.set COMBO_STARTER_PECK,          0x2F
-	.set COMBO_STARTER_METAL_SOUND,   0x30
-	.set COMBO_STARTER_MUD_SPORT,     0x31
-	.set COMBO_STARTER_WATER_SPORT,   0x32
-	.set COMBO_STARTER_BONE_CLUB,     0x33
-	.set COMBO_STARTER_BONEMERANG,    0x34
-	.set COMBO_STARTER_BONE_RUSH,     0x35
-	.set COMBO_STARTER_SAND_ATTACK,   0x36
-	.set COMBO_STARTER_MUD_SLAP,      0x37
-	.set COMBO_STARTER_FAKE_OUT,      0x38
-	.set COMBO_STARTER_PSYCHIC,       0x39
-	.set COMBO_STARTER_KINESIS,       0x3A
-	.set COMBO_STARTER_CONFUSION,     0x3B
-	.set COMBO_STARTER_POUND,         0x3C
-	.set COMBO_STARTER_SMOG,          0x3D
-	.set COMBO_STARTER_CALM_MIND,     0x3E
diff --git a/constants/contest_move_effects.inc b/constants/contest_move_effects.inc
deleted file mode 100644
index b19e05004..000000000
--- a/constants/contest_move_effects.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-	enum_start
-	enum CONTEST_EFFECT_HIGHLY_APPEALING                      @  0
-	enum CONTEST_EFFECT_USER_MORE_EASILY_STARTLED             @  1
-	enum CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES        @  2
-	enum CONTEST_EFFECT_REPETITION_NOT_BORING                 @  3
-	enum CONTEST_EFFECT_AVOID_STARTLE_ONCE                    @  4
-	enum CONTEST_EFFECT_AVOID_STARTLE                         @  5
-	enum CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY                @  6
-	enum CONTEST_EFFECT_USER_LESS_EASILY_STARTLED             @  7
-	enum CONTEST_EFFECT_STARTLE_FRONT_MON                     @  8
-	enum CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS            @  9
-	enum CONTEST_EFFECT_STARTLE_PREV_MON                      @ 10
-	enum CONTEST_EFFECT_STARTLE_PREV_MONS                     @ 11
-	enum CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON               @ 12
-	enum CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS               @ 13
-	enum CONTEST_EFFECT_STARTLE_PREV_MON_2                    @ 14
-	enum CONTEST_EFFECT_STARTLE_PREV_MONS_2                   @ 15
-	enum CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION                 @ 16
-	enum CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION     @ 17
-	enum CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN         @ 18
-	enum CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL         @ 19
-	enum CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL              @ 20
-	enum CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL            @ 21
-	enum CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL              @ 22
-	enum CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL             @ 23
-	enum CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL             @ 24
-	enum CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS            @ 25
-	enum CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS           @ 26
-	enum CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS         @ 27
-	enum CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION @ 28
-	enum CONTEST_EFFECT_BETTER_IF_FIRST                       @ 29
-	enum CONTEST_EFFECT_BETTER_IF_LAST                        @ 30
-	enum CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES           @ 31
-	enum CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE            @ 32
-	enum CONTEST_EFFECT_BETTER_WHEN_LATER                     @ 33
-	enum CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING             @ 34
-	enum CONTEST_EFFECT_BETTER_IF_SAME_TYPE                   @ 35
-	enum CONTEST_EFFECT_BETTER_IF_DIFF_TYPE                   @ 36
-	enum CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL               @ 37
-	enum CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS @ 38
-	enum CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION            @ 39
-	enum CONTEST_EFFECT_NEXT_APPEAL_EARLIER                   @ 40
-	enum CONTEST_EFFECT_NEXT_APPEAL_LATER                     @ 41
-	enum CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER     @ 42
-	enum CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER              @ 43
-	enum CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST        @ 44
-	enum CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS  @ 45
-	enum CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED          @ 46
-	enum CONTEST_EFFECT_DONT_EXCITE_AUDIENCE                  @ 47
diff --git a/constants/item_data_constants.inc b/constants/item_data_constants.inc
deleted file mode 100644
index cfeb9c1c4..000000000
--- a/constants/item_data_constants.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-	.set POCKET_ITEMS,       0x01
-	.set POCKET_KEY_ITEMS,   0x02
-	.set POCKET_POKE_BALLS,  0x03
-	.set POCKET_TM_CASE,     0x04
-	.set POCKET_BERRY_POUCH, 0x05
diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc
index 1f4a6a23a..621ba2af8 100644
--- a/constants/misc_constants.inc
+++ b/constants/misc_constants.inc
@@ -20,21 +20,3 @@
 
 	.set OBJ_IMAGE_ANIM_H_FLIP, 1 << 6
 	.set OBJ_IMAGE_ANIM_V_FLIP, 1 << 7
-
-	.ifdef ENGLISH
-	.equiv GAME_LANGUAGE, 2
-	.else
-	.ifdef GERMAN
-	.equiv GAME_LANGUAGE, 5
-	.endif
-	.endif
-
-	.equiv ENEMY_TYPE1,  0
-	.equiv ENEMY_TYPE2,  1
-	.equiv PLAYER_TYPE1,  2
-	.equiv PLAYER_TYPE2,  3
-	.equiv CURRENT_MOVE,  4
-	
-	.equiv LESS_THAN, 0
-	.equiv GREATER_THAN, 1
-	.equiv EQUAL, 2
diff --git a/constants/pokemon_data_constants.inc b/constants/pokemon_data_constants.inc
deleted file mode 100644
index cf5d4df41..000000000
--- a/constants/pokemon_data_constants.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-	.set NATURE_HARDY,   0
-	.set NATURE_LONELY,  1
-	.set NATURE_BRAVE,   2
-	.set NATURE_ADAMANT, 3
-	.set NATURE_NAUGHTY, 4
-	.set NATURE_BOLD,    5
-	.set NATURE_DOCILE,  6
-	.set NATURE_RELAXED, 7
-	.set NATURE_IMPISH,  8
-	.set NATURE_LAX,     9
-	.set NATURE_TIMID,   10
-	.set NATURE_HASTY,   11
-	.set NATURE_SERIOUS, 12
-	.set NATURE_JOLLY,   13
-	.set NATURE_NAIVE,   14
-	.set NATURE_MODEST,  15
-	.set NATURE_MILD,    16
-	.set NATURE_QUIET,   17
-	.set NATURE_BASHFUL, 18
-	.set NATURE_RASH,    19
-	.set NATURE_CALM,    20
-	.set NATURE_GENTLE,  21
-	.set NATURE_SASSY,   22
-	.set NATURE_CAREFUL, 23
-	.set NATURE_QUIRKY,  24
-
-	.set GROWTH_MEDIUM_FAST, 0x00
-	.set GROWTH_ERRATIC,     0x01
-	.set GROWTH_FLUCTUATING, 0x02
-	.set GROWTH_MEDIUM_SLOW, 0x03
-	.set GROWTH_FAST,        0x04
-	.set GROWTH_SLOW,        0x05
-
-	.set EGG_GROUP_NONE,         0x00
-	.set EGG_GROUP_MONSTER,      0x01
-	.set EGG_GROUP_WATER_1,      0x02
-	.set EGG_GROUP_BUG,          0x03
-	.set EGG_GROUP_FLYING,       0x04
-	.set EGG_GROUP_FIELD,        0x05
-	.set EGG_GROUP_FAIRY,        0x06
-	.set EGG_GROUP_GRASS,        0x07
-	.set EGG_GROUP_HUMAN_LIKE,   0x08
-	.set EGG_GROUP_WATER_3,      0x09
-	.set EGG_GROUP_MINERAL,      0x0a
-	.set EGG_GROUP_AMORPHOUS,    0x0b
-	.set EGG_GROUP_WATER_2,      0x0c
-	.set EGG_GROUP_DITTO,        0x0d
-	.set EGG_GROUP_DRAGON,       0x0e
-	.set EGG_GROUP_UNDISCOVERED, 0x0f
-
-	.set BODY_COLOR_RED,    0x00
-	.set BODY_COLOR_BLUE,   0x01
-	.set BODY_COLOR_YELLOW, 0x02
-	.set BODY_COLOR_GREEN,  0x03
-	.set BODY_COLOR_BLACK,  0x04
-	.set BODY_COLOR_BROWN,  0x05
-	.set BODY_COLOR_PURPLE, 0x06
-	.set BODY_COLOR_GRAY,   0x07
-	.set BODY_COLOR_WHITE,  0x08
-	.set BODY_COLOR_PINK,   0x09
-
-	.set F_SUMMARY_SCREEN_FLIP_SPRITE, 0x80
-
-	.set EVO_FRIENDSHIP,       0x0001 @ Pokémon levels up with friendship ≥ 220
-	.set EVO_FRIENDSHIP_DAY,   0x0002 @ Pokémon levels up during the day with friendship ≥ 220
-	.set EVO_FRIENDSHIP_NIGHT, 0x0003 @ Pokémon levels up at night with friendship ≥ 220
-	.set EVO_LEVEL,            0x0004 @ Pokémon reaches the specified level
-	.set EVO_TRADE,            0x0005 @ Pokémon is traded
-	.set EVO_TRADE_ITEM,       0x0006 @ Pokémon is traded while it's holding the specified item
-	.set EVO_ITEM,             0x0007 @ specified item is used on Pokémon
-	.set EVO_LEVEL_ATK_GT_DEF, 0x0008 @ Pokémon reaches the specified level with attack > defense
-	.set EVO_LEVEL_ATK_EQ_DEF, 0x0009 @ Pokémon reaches the specified level with attack = defense
-	.set EVO_LEVEL_ATK_LT_DEF, 0x000a @ Pokémon reaches the specified level with attack < defense
-	.set EVO_LEVEL_SILCOON,    0x000b @ Pokémon reaches the specified level with a Silcoon personality value
-	.set EVO_LEVEL_CASCOON,    0x000c @ Pokémon reaches the specified level with a Cascoon personality value
-	.set EVO_LEVEL_NINJASK,    0x000d @ Pokémon reaches the specified level (special value for Ninjask)
-	.set EVO_LEVEL_SHEDINJA,   0x000e @ Pokémon reaches the specified level (special value for Shedinja)
-	.set EVO_BEAUTY,           0x000f @ Pokémon levels up with beauty ≥ specified value
diff --git a/constants/type_constants.inc b/constants/type_constants.inc
deleted file mode 100644
index c6611bd8a..000000000
--- a/constants/type_constants.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-	.set TYPE_NORMAL,   0x00
-	.set TYPE_FIGHTING, 0x01
-	.set TYPE_FLYING,   0x02
-	.set TYPE_POISON,   0x03
-	.set TYPE_GROUND,   0x04
-	.set TYPE_ROCK,     0x05
-	.set TYPE_BUG,      0x06
-	.set TYPE_GHOST,    0x07
-	.set TYPE_STEEL,    0x08
-	.set TYPE_MYSTERY,  0x09
-	.set TYPE_FIRE,     0x0a
-	.set TYPE_WATER,    0x0b
-	.set TYPE_GRASS,    0x0c
-	.set TYPE_ELECTRIC, 0x0d
-	.set TYPE_PSYCHIC,  0x0e
-	.set TYPE_ICE,      0x0f
-	.set TYPE_DRAGON,   0x10
-	.set TYPE_DARK,     0x11
diff --git a/constants/variables.inc b/constants/variables.inc
deleted file mode 100644
index ab488a97e..000000000
--- a/constants/variables.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-	.equiv FACING,           0x800C
-	.equiv RESULT,           0x800D
-	.equiv ITEM_ID,          0x800E
-	.equiv LAST_TALKED,      0x800F
-	.equiv CONTEST_RANK,     0x8010
-	.equiv CONTEST_CATEGORY, 0x8011
diff --git a/constants/version.inc b/constants/version.inc
index 07c3bfa29..c5bef93d8 100644
--- a/constants/version.inc
+++ b/constants/version.inc
@@ -3,3 +3,11 @@
 	.else
 	.equiv GAME_VERSION, 5
 	.endif
+
+	.ifdef ENGLISH
+	.equiv GAME_LANGUAGE, 2
+	.else
+	.ifdef GERMAN
+	.equiv GAME_LANGUAGE, 5
+	.endif
+	.endif
diff --git a/data/map_events.s b/data/map_events.s
index 5fd6a9331..1607ef982 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -11,7 +11,6 @@
 #include "constants/weather.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"
-    .include "constants/item_data_constants.inc"
 
     .section .rodata