diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /constants | |
| parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/hide_show_constants.asm | 2 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 5a517afc..1a44b1e7 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -2,7 +2,7 @@ ; sprites marked with an X are constants that are never used ; because those sprites are not (de)activated in a map's script ; (they are either items or sprites that deactivate after battle -; and are detected in W_MISSABLEOBJECTLIST) +; and are detected in wMissableObjectList) const_value = 0 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index f85ca3bf..527152fe 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -208,4 +208,4 @@ const_value set 1 const PIKAHAPPY_FAINTED const PIKAHAPPY_PSNFNT const PIKAHAPPY_10 - const PIKAHAPPY_11 + const PIKAHAPPY_TRADE |