diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-21 18:14:31 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-21 18:14:31 -0400 |
| commit | 90ce12613935999ec0675317e73725521925d32e (patch) | |
| tree | 32c068970a55ef3da8273b310c68af59edc16612 /constants | |
| parent | 0506e5b1b9d755aad006a52d9f9c9c9baea710fb (diff) | |
Use numeric constants in text strings with "{d:interpolation}"
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/misc_constants.asm | 7 | ||||
| -rw-r--r-- | constants/script_constants.asm | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 7ed9587b4..171b16e39 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -47,10 +47,3 @@ MAX_DAY_CARE_EXP EQU $500000 ; hall of fame HOF_MASTER_COUNT EQU 200 - -; bug-catching contest -BUG_CONTEST_MINUTES EQU 20 -BUG_CONTEST_SECONDS EQU 0 -BUG_CONTEST_PLAYER EQU 1 -NUM_BUG_CONTESTANTS EQU 10 ; not counting the player -BUG_CONTESTANT_SIZE EQU 4 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index c4d9fe314..7e1de6a7c 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -283,6 +283,14 @@ NUM_DECODESCS EQU const_value const BUGCONTEST_BOXED_MON ; 1 const BUGCONTEST_NO_CATCH ; 2 +; Bug-Catching Contest values +BUG_CONTEST_BALLS EQU 20 +BUG_CONTEST_MINUTES EQU 20 +BUG_CONTEST_SECONDS EQU 0 +BUG_CONTEST_PLAYER EQU 1 +NUM_BUG_CONTESTANTS EQU 10 ; not counting the player +BUG_CONTESTANT_SIZE EQU 4 + ; HealMachineAnim setval arguments ; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm) const_def |