diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /constants/deco_constants.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'constants/deco_constants.asm')
| -rw-r--r-- | constants/deco_constants.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 84fcdb94d..3b0230965 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -121,8 +121,7 @@ __enum__ = 0 deco GEODUDE_DOLL deco MACHOP_DOLL deco TENTACOOL_DOLL +NUM_NON_TROPHY_DECOS = __enum__ deco GOLD_TROPHY_DOLL deco SILVER_TROPHY_DOLL - NUM_DECOS = __enum__ -NUM_NON_TROPHY_DECOS = NUM_DECOS +- 2 |