diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 14:11:36 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 14:32:48 -0400 |
| commit | fda549a27af144cdb601bbd85dba439fce533afc (patch) | |
| tree | 5ce70c4d925ac6a377026875b57d1e1a733ebad6 /constants/collision_constants.asm | |
| parent | 011f795ea7ed47779a04e9d6e0a617309b33cecc (diff) | |
[in progress] Harmonize more constant and data files with pokecrystal
Diffstat (limited to 'constants/collision_constants.asm')
| -rw-r--r-- | constants/collision_constants.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 420122ac..c965b2f5 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -20,8 +20,8 @@ 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_1E EQU $1e ; ? -COLL_1F EQU $1f ; ? +COLL_1E EQU $1e ; garbage +COLL_1F EQU $1f ; garbage COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 @@ -34,7 +34,7 @@ COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_UP EQU $32 ; unused COLL_WATERFALL EQU $33 -COLL_36 EQU $36 ; ? +COLL_36 EQU $36 ; garbage COLL_CURRENT_RIGHT EQU $38 ; unused COLL_CURRENT_LEFT EQU $39 ; unused COLL_CURRENT_UP EQU $3a ; unused @@ -47,8 +47,8 @@ COLL_WALK_DOWN EQU $44 ; unused COLL_BRAKE_45 EQU $45 ; garbage COLL_BRAKE_46 EQU $46 ; unused COLL_BRAKE_47 EQU $47 ; unused -COLL_GRASS_48 EQU $48 -COLL_GRASS_49 EQU $49 +COLL_GRASS_48 EQU $48 ; garbage +COLL_GRASS_49 EQU $49 ; garbage COLL_GRASS_4A EQU $4a ; garbage COLL_GRASS_4B EQU $4b ; garbage COLL_GRASS_4C EQU $4c ; unused @@ -63,7 +63,7 @@ COLL_BRAKE_57 EQU $57 ; unused COLL_5B EQU $5b ; garbage COLL_PIT EQU $60 COLL_VIRTUAL_BOY EQU $61 ; garbage -COLL_63 EQU $63 ; ? +COLL_63 EQU $63 ; garbage COLL_64 EQU $64 ; garbage COLL_65 EQU $65 ; garbage COLL_PIT_68 EQU $68 ; unused @@ -83,8 +83,8 @@ COLL_WARP_PANEL EQU $7c COLL_DOOR_7D EQU $7d ; unused COLL_WARP_CARPET_RIGHT EQU $7e COLL_WARP_7F EQU $7f ; unused -COLL_88 EQU $88 ; ? -COLL_89 EQU $89 ; ? +COLL_88 EQU $88 ; garbage +COLL_89 EQU $89 ; garbage COLL_COUNTER EQU $90 COLL_BOOKSHELF EQU $91 COLL_PC EQU $93 |