diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 17:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 17:00:57 -0400 |
| commit | d44c7c305c3f94b59e3e2c008408779836a0020a (patch) | |
| tree | 2cdc51be4a22992701038b959d6c964e9ee8fc58 /constants | |
| parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
| parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) | |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 4 | ||||
| -rw-r--r-- | constants/input_constants.asm | 1 | ||||
| -rw-r--r-- | constants/script_constants.asm | 19 | ||||
| -rw-r--r-- | constants/sprite_data_constants.asm | 2 |
4 files changed, 26 insertions, 0 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 6ae2215f..4a113ca0 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -39,6 +39,10 @@ SLP EQU %111 ; sleep counter MAX_STAT_VALUE EQU 999 +; trainer dvs +ATKDEFDV_TRAINER EQU $98 +SPDSPCDV_TRAINER EQU $88 + ; volatile statuses 1 const_def const STORING_ENERGY ; 0 ; Bide diff --git a/constants/input_constants.asm b/constants/input_constants.asm index 1f10cc46..e5bc2a7b 100644 --- a/constants/input_constants.asm +++ b/constants/input_constants.asm @@ -8,6 +8,7 @@ const BIT_D_UP const BIT_D_DOWN +NO_INPUT EQU 0 A_BUTTON EQU 1 << BIT_A_BUTTON B_BUTTON EQU 1 << BIT_B_BUTTON SELECT EQU 1 << BIT_SELECT diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 9b2ab740..018fb7f2 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -12,6 +12,19 @@ SLOTSFISH EQU $0E0C SLOTSBIRD EQU $1210 SLOTSMOUSE EQU $1614 +; in game trades + const_def + const TRADE_FOR_TERRY + const TRADE_FOR_MARCEL + const TRADE_FOR_CHIKUCHIKU + const TRADE_FOR_SAILOR + const TRADE_FOR_DUX + const TRADE_FOR_MARC + const TRADE_FOR_LOLA + const TRADE_FOR_DORIS + const TRADE_FOR_CRINKLES + const TRADE_FOR_SPOT + ; in game trade dialog sets const_def const TRADE_DIALOGSET_CASUAL @@ -30,3 +43,9 @@ SLOTSMOUSE EQU $1614 const BIT_VOLCANOBADGE ; 6 const BIT_EARTHBADGE ; 7 NUM_BADGES EQU const_value + +; OaksAideScript results +OAKS_AIDE_BAG_FULL EQU $00 +OAKS_AIDE_GOT_ITEM EQU $01 +OAKS_AIDE_NOT_ENOUGH_MONS EQU $80 +OAKS_AIDE_REFUSED EQU $ff diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 1639b8fa..e1104262 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -11,6 +11,8 @@ const NPC_MOVEMENT_LEFT ; $80 const NPC_MOVEMENT_RIGHT ; $C0 +NPC_CHANGE_FACING EQU $E0 + ; player direction constants const_def const PLAYER_DIR_BIT_RIGHT ; 0 |