diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/misc_constants.asm | 9 | ||||
| -rw-r--r-- | constants/predef_constants.asm | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 3f48b091..5bc12b88 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -52,6 +52,14 @@ NPC_MOVEMENT_UP EQU $40 NPC_MOVEMENT_LEFT EQU $80 NPC_MOVEMENT_RIGHT EQU $C0 +; battle types +const_value set $0 + const NORMAL_BATTLE ; $0 + const OLD_MAN_BATTLE ; $1 + const SAFARI_BATTLE ; $2 + const HURRY_RUN_AWAY_BATTLE ; $3 + const STARTER_PIKACHU_BATTLE ; $4 + ; text box IDs MESSAGE_BOX EQU $01 FIELD_MOVE_MON_MENU EQU $04 @@ -207,6 +215,7 @@ LINK_STATE_BATTLING EQU $04 ; in a link battle LINK_STATE_RESET EQU $05 ; reset game (unused) LINK_STATE_TRADING EQU $32 ; in a link trade +; pikachu happiness modifiers const_value set 1 const PIKAHAPPY_LEVELUP const PIKAHAPPY_USEDITEM diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm index c4d0c208..2f1834d5 100644 --- a/constants/predef_constants.asm +++ b/constants/predef_constants.asm @@ -5,7 +5,7 @@ const_value = 0 predef_const AnimateSendingOutMon predef_const ScaleSpriteByTwo predef_const LoadMonBackPic - predef_const Func_79aba + predef_const CopyDownscaledMonTiles predef_const LoadMissableObjects predef_const HealParty predef_const MoveAnimation; 08 play move animation |