diff options
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/constants.asm b/constants.asm index ed3ca4f93..7d73f4232 100644 --- a/constants.asm +++ b/constants.asm @@ -36,6 +36,10 @@ TX_FAR: MACRO db BANK(\1) ENDM +RGB: MACRO + dw ((\3 << 10) | (\2 << 5) | (\1)) + ENDM + ; eventually replace with python macro note: MACRO db \1 @@ -1604,6 +1608,12 @@ THURSDAY EQU $04 FRIDAY EQU $05 SATURDAY EQU $06 +; times of day +MORN EQU 0 +DAY EQU 1 +NITE EQU 2 +DARKNESS EQU 3 + ; trainer groups FALKNER EQU $01 WHITNEY EQU $02 @@ -3252,17 +3262,15 @@ SPECIAL_DRATINI EQU $0094 SPECIAL_BEASTSCHECK EQU $0096 SPECIAL_MONCHECK EQU $0097 -; battle scripts -BATTLE_FILLPP EQU $05 -BATTLE_FILLSTATS EQU $0C +; predefs +PREDEF_FILLPP EQU $05 +PREDEF_FILLSTATS EQU $0C +PREDEF_FILLMOVES EQU $1B +PREDEF_GETUNOWNLETTER EQU $2D -BATTLE_FILLMOVES EQU $1B -BATTLE_GETUNOWNLETTER EQU $2D - - -; vars +; script vars NUM_VARS EQU $1b VAR_MOVEMENT EQU $08 @@ -3288,6 +3296,7 @@ MOVE_ACC EQU 4 MOVE_PP EQU 5 MOVE_CHANCE EQU 6 + ; stat constants NUM_STATS EQU 6 STAT_HP EQU 1 |