diff options
| author | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
| commit | 9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch) | |
| tree | 46c064628b3d8015da22d6396b3c711e80646745 /constants/script_constants.asm | |
| parent | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
merge with newest update
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) |