diff options
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 db60113a..b52ea69f 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -51,10 +51,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 34459a3c..777bde16 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -273,6 +273,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 |