diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-04 23:17:30 -0500 |
| commit | b0b1f88b9466f0414e4a6c782b5348f46768c8c4 (patch) | |
| tree | 3ed8d12b5328b4f655d96351b3959f262fb2d72a /constants/status_constants.asm | |
| parent | EOL Windows->UNIX (diff) | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| download | pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.gz pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.tar.xz pokeyellow-b0b1f88b9466f0414e4a6c782b5348f46768c8c4.zip | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
wram.asm
Diffstat (limited to 'constants/status_constants.asm')
| -rwxr-xr-x | constants/status_constants.asm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/constants/status_constants.asm b/constants/status_constants.asm index 3b5aee06..e19973a0 100755 --- a/constants/status_constants.asm +++ b/constants/status_constants.asm @@ -1,32 +1,32 @@ -; non-volatile statuses
-SLP EQU %111 ; sleep counter
-PSN EQU 3
-BRN EQU 4
-FRZ EQU 5
-PAR EQU 6
-
-; volatile statuses 1
-StoringEnergy EQU 0 ; Bide
-ThrashingAbout EQU 1 ; e.g. Thrash
-AttackingMultipleTimes EQU 2 ; e.g. Double Kick, Fury Attack
-Flinched EQU 3
-ChargingUp EQU 4 ; e.g. Solar Beam, Fly
-UsingTrappingMove EQU 5 ; e.g. Wrap
-Invulnerable EQU 6 ; charging up Fly/Dig
-Confused EQU 7
-
-; volatile statuses 2
-UsingXAccuracy EQU 0
-ProtectedByMist EQU 1
-GettingPumped EQU 2 ; Focus Energy
-; EQU 3 ; unused?
-HasSubstituteUp EQU 4
-NeedsToRecharge EQU 5 ; Hyper Beam
-UsingRage EQU 6
-Seeded EQU 7
-
-; volatile statuses 3
-BadlyPoisoned EQU 0
-HasLightScreenUp EQU 1
-HasReflectUp EQU 2
-Transformed EQU 3
+; non-volatile statuses +SLP EQU %111 ; sleep counter +PSN EQU 3 +BRN EQU 4 +FRZ EQU 5 +PAR EQU 6 + +; volatile statuses 1 +StoringEnergy EQU 0 ; Bide +ThrashingAbout EQU 1 ; e.g. Thrash +AttackingMultipleTimes EQU 2 ; e.g. Double Kick, Fury Attack +Flinched EQU 3 +ChargingUp EQU 4 ; e.g. Solar Beam, Fly +UsingTrappingMove EQU 5 ; e.g. Wrap +Invulnerable EQU 6 ; charging up Fly/Dig +Confused EQU 7 + +; volatile statuses 2 +UsingXAccuracy EQU 0 +ProtectedByMist EQU 1 +GettingPumped EQU 2 ; Focus Energy +; EQU 3 ; unused? +HasSubstituteUp EQU 4 +NeedsToRecharge EQU 5 ; Hyper Beam +UsingRage EQU 6 +Seeded EQU 7 + +; volatile statuses 3 +BadlyPoisoned EQU 0 +HasLightScreenUp EQU 1 +HasReflectUp EQU 2 +Transformed EQU 3 |