diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /constants/status_constants.asm | |
| parent | 3394d8320f35f524231aa13bd9cae34e22246a6d (diff) | |
| parent | 1a987d1e1ab96ca9553d4253c72858057332a03a (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'constants/status_constants.asm')
| -rwxr-xr-x | constants/status_constants.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/status_constants.asm b/constants/status_constants.asm index e19973a0..d9be6250 100755 --- a/constants/status_constants.asm +++ b/constants/status_constants.asm @@ -1,4 +1,4 @@ -; non-volatile statuses +; non-volatile statuses SLP EQU %111 ; sleep counter PSN EQU 3 BRN EQU 4 @@ -13,7 +13,7 @@ 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 +Confused EQU 7 ; volatile statuses 2 UsingXAccuracy EQU 0 @@ -26,7 +26,7 @@ UsingRage EQU 6 Seeded EQU 7 ; volatile statuses 3 -BadlyPoisoned EQU 0 +BadlyPoisoned EQU 0 HasLightScreenUp EQU 1 HasReflectUp EQU 2 Transformed EQU 3 |