diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /constants | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/item_constants.asm | 1 | ||||
| -rwxr-xr-x | constants/status_constants.asm | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index be251e62..bc73a20b 100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -78,7 +78,6 @@ EXP__ALL EQU $4B OLD_ROD EQU $4C GOOD_ROD EQU $4D SUPER_ROD EQU $4E -; XXX todo: compare this to $32 PP_UP EQU $4F ETHER EQU $50 MAX_ETHER EQU $51 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 |