diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/item_constants.asm | 11 | ||||
| -rw-r--r-- | constants/map_setup_constants.asm | 13 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 3 | ||||
| -rw-r--r-- | constants/phone_constants.asm | 33 | ||||
| -rw-r--r-- | constants/script_constants.asm | 12 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 30 |
6 files changed, 88 insertions, 14 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 376a3696d..4bcff52a9 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -352,7 +352,7 @@ const_value SET 70 const HELD_TRADE_EVOLVE const HELD_AMULET_COIN const HELD_BRIGHTPOWDER - const HELD_4E + const HELD_78 const HELD_FOCUS_BAND const_def @@ -364,3 +364,12 @@ const_value SET 70 const ITEMATTR_POCKET const ITEMATTR_HELP NUM_ITEMATTRS EQU const_value + +ITEMMENU_NOUSE EQU 0 +ITEMMENU_CURRENT EQU 4 +ITEMMENU_PARTY EQU 5 +ITEMMENU_FIELD EQU 6 + +ITEMCONTEXT_NOTINBATTLE EQU 0 +ITEMCONTEXT_BATTLEANDFIELD EQU 5 +ITEMCONTEXT_BATTLEONLY EQU 6 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm new file mode 100644 index 000000000..ac4741ed6 --- /dev/null +++ b/constants/map_setup_constants.asm @@ -0,0 +1,13 @@ + const_def + const MAPSETUP_00 + const MAPSETUP_01 + const MAPSETUP_02 + const MAPSETUP_03 + const MAPSETUP_04 + const MAPSETUP_05 + const MAPSETUP_06 + const MAPSETUP_07 + const MAPSETUP_08 + const MAPSETUP_09 + const MAPSETUP_10 + const MAPSETUP_11 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 8509907be..833c84377 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -156,3 +156,6 @@ const_value = 1 const LINK_TRADECENTER const LINK_COLOSSEUM const LINK_MOBILE + +HMENURETURN_SCRIPT EQU %10000000 +HMENURETURN_ASM EQU %11111111 diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm index d49afb253..1eb2b2d23 100644 --- a/constants/phone_constants.asm +++ b/constants/phone_constants.asm @@ -40,13 +40,28 @@ const PHONE_BUENA const_def - const ELMCALL_NONE - const ELMCALL_POKERUS - const ELMCALL_ROBBED - const ELMCALL_ASSISTANT - const ELMCALL_WEIRDBROADCAST - const ELMCALL_SSTICKET - const ELMCALL_UNKNOWN - const MOMCALL_WORRIED - const ELMCALL_MASTERBALL + const SPECIALCALL_NONE + const SPECIALCALL_POKERUS + const SPECIALCALL_ROBBED + const SPECIALCALL_ASSISTANT + const SPECIALCALL_WEIRDBROADCAST + const SPECIALCALL_SSTICKET + const SPECIALCALL_BIKESHOP + const SPECIALCALL_WORRIED + const SPECIALCALL_MASTERBALL + const_def + const PHONE_CONTACT_TRAINER_CLASS + const PHONE_CONTACT_TRAINER_NUMBER + const PHONE_CONTACT_MAP_GROUP + const PHONE_CONTACT_MAP_NUMBER + const PHONE_CONTACT_SCRIPT1_TIME + const PHONE_CONTACT_SCRIPT1_BANK + const PHONE_CONTACT_SCRIPT1_ADDR_LO + const PHONE_CONTACT_SCRIPT1_ADDR_HI + const PHONE_CONTACT_SCRIPT2_TIME + const PHONE_CONTACT_SCRIPT2_BANK + const PHONE_CONTACT_SCRIPT2_ADDR_LO + const PHONE_CONTACT_SCRIPT2_ADDR_HI +PHONE_TABLE_WIDTH EQU const_value +CONTACT_LIST_SIZE EQU 10 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) diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 7113e3dec..be46783e5 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -614,3 +614,33 @@ const EUSINE NUM_TRAINER_CLASSES EQU __enum__ + + const_def + const NO_AI +const_value = 0 + shift_const AI_BASIC + shift_const AI_SETUP + shift_const AI_TYPES + shift_const AI_OFFENSIVE + shift_const AI_SMART + shift_const AI_OPPORTUNIST + shift_const AI_AGGRESSIVE + shift_const AI_CAUTIOUS + shift_const AI_STATUS + shift_const AI_RISKY + shift_const AI_10 + shift_const AI_11 + shift_const AI_12 + shift_const AI_13 + shift_const AI_14 + shift_const AI_15 + + const_def + const TRNATTR_ITEM1 + const TRNATTR_ITEM2 + const TRNATTR_BASEMONEY + const TRNATTR_AI1 + const TRNATTR_AI2 + const TRNATTR_AI3 + const TRNATTR_AI4 +NUM_TRAINER_ATTRIBUTES EQU const_value |