diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /constants/status_constants.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'constants/status_constants.asm')
| -rwxr-xr-x | constants/status_constants.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/constants/status_constants.asm b/constants/status_constants.asm index 8dd99e1d..866ea03c 100755 --- a/constants/status_constants.asm +++ b/constants/status_constants.asm @@ -1,6 +1,6 @@ -; status ailments (masks)
-SLP EQU %00000111
-PSN EQU %00001000
-BRN EQU %00010000
-FRZ EQU %00100000
-PAR EQU %01000000
\ No newline at end of file +; status ailments
+SLP EQU %111 ; mask
+PSN EQU 3
+BRN EQU 4
+FRZ EQU 5
+PAR EQU 6
|