diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-02-25 19:18:24 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-02-25 19:18:24 -0500 |
| commit | a73ced3b692f100a347bf1785d670ff410ad3657 (patch) | |
| tree | 7c4020c8e03836d39cfa8299f0c5533b38f0afb8 /constants/collision_constants.asm | |
| parent | ee622d6ba18b9bf3f0f336fc5c22b5e9817dba8a (diff) | |
unused_dark_cave -> unused_johto (goes with the beta Johto town+city maps)
Diffstat (limited to 'constants/collision_constants.asm')
| -rw-r--r-- | constants/collision_constants.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index a03f4a0bb..c7f00861a 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -20,14 +20,14 @@ COLL_TALL_GRASS EQU $18 COLL_CUT_TREE_1A EQU $1a ; unused COLL_LONG_GRASS_1C EQU $1c ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused -COLL_WATER_21 EQU $21 ; ??? +COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 COLL_BUOY EQU $27 COLL_CUT_28 EQU $28 ; garbage COLL_WATER EQU $29 -COLL_ICE_2B EQU $2b ; unused -COLL_WHIRLPOOL_2C EQU $2c ; unused +COLL_ICE_2B EQU $2b ; +COLL_WHIRLPOOL_2C EQU $2c ; COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_UP EQU $32 ; unused |