diff options
| author | yenatch <yenatch@gmail.com> | 2018-03-10 16:16:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 16:16:03 -0500 |
| commit | 12070ca50067d3abe36a730190f88ee43f2cace9 (patch) | |
| tree | f835c3df3454c3d10f88d46eb7dfe40827362c35 /constants | |
| parent | b2f5362ec3582a94269212e26676d81ddbf47cdf (diff) | |
| parent | 4e4d9c908362a7c69f7c2839c3c678da797373d5 (diff) | |
Merge pull request #496 from Rangi42/master
Label more map scripts; document more bugs [ready to merge]
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/item_constants.asm | 3 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 455af6d12..426f28bd0 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -283,13 +283,14 @@ NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC add_hm WHIRLPOOL ; f8 add_hm WATERFALL ; f9 NUM_HMS = const_value - HM01 - const ITEM_FA ; fa add_mt FLAMETHROWER add_mt THUNDERBOLT add_mt ICE_BEAM NUM_TM_HM_TUTOR = __enum__ + -1 + const ITEM_FA ; fa + USE_SCRIPT_VAR EQU $00 ITEM_FROM_MEM EQU $ff diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index d1423eae0..03911c50a 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -37,6 +37,9 @@ MAX_LINK_RECORD EQU 9999 ; day-care 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 |