diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/misc_constants.asm | 12 | ||||
| -rw-r--r-- | constants/predef_constants.asm | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 527152fe..3f48b091 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -26,6 +26,16 @@ D_LEFT EQU %00100000 D_UP EQU %01000000 D_DOWN EQU %10000000 +const_value set 0 + const BIT_A_BUTTON + const BIT_B_BUTTON + const BIT_SELECT + const BIT_START + const BIT_D_RIGHT + const BIT_D_LEFT + const BIT_D_UP + const BIT_D_DOWN + SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 @@ -207,5 +217,5 @@ const_value set 1 const PIKAHAPPY_DEPOSITED const PIKAHAPPY_FAINTED const PIKAHAPPY_PSNFNT - const PIKAHAPPY_10 + const PIKAHAPPY_CARELESSTRAINER const PIKAHAPPY_TRADE diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm index 34b751e4..c4d0c208 100644 --- a/constants/predef_constants.asm +++ b/constants/predef_constants.asm @@ -2,7 +2,7 @@ const_value = 0 predef_const DrawPlayerHUDAndHPBar predef_const CopyUncompressedPicToTilemap - predef_const Func_3f073 + predef_const AnimateSendingOutMon predef_const ScaleSpriteByTwo predef_const LoadMonBackPic predef_const Func_79aba |