diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-25 20:48:44 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-25 20:48:44 -0400 |
| commit | 0d17d4a75866d053f5e0b48c66deb2508071d98b (patch) | |
| tree | 75bb638d39ab6b4d0bcd3167c22d275eb52ffdbd /constants/script_constants.asm | |
| parent | 6fcba7a28a0d3d7826603b54b187dc5fca853669 (diff) | |
| parent | 79ceca591b022673cb7fb2cc59e5175716743eb5 (diff) | |
Merge pull request #322 from PikalaxALT/master
Split out and comment phone and animation code.
Diffstat (limited to 'constants/script_constants.asm')
| -rw-r--r-- | constants/script_constants.asm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 484f00dba..191a9c024 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -5,7 +5,7 @@ LAST_TALKED EQU -2 const_def const VAR_STRINGBUFFER2 const VAR_PARTYCOUNT - const VAR_02 + const VAR_BATTLERESULT const VAR_BATTLETYPE const VAR_TIMEOFDAY const VAR_DEXCAUGHT @@ -23,11 +23,15 @@ LAST_TALKED EQU -2 const VAR_CONTESTMINUTES const VAR_XCOORD const VAR_YCOORD - const VAR_POKERUS + const VAR_SPECIALPHONECALL const VAR_15 - const VAR_16 + const VAR_KURT_APRICORNS const VAR_CALLERID const VAR_BLUECARDBALANCE - const VAR_19 + const VAR_BUENASPASSWORD const VAR_KENJI_BREAK NUM_VARS EQU const_value + +RETVAR_STRBUF2 EQU (0 << 6) +RETVAR_ADDR_DE EQU (1 << 6) +RETVAR_EXECUTE EQU (2 << 6) |