diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /constants | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.inc | 1 | ||||
| -rw-r--r-- | constants/misc_constants.inc | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/constants/map_constants.inc b/constants/map_constants.inc index d7a8a323e..6d92c5e65 100644 --- a/constants/map_constants.inc +++ b/constants/map_constants.inc @@ -461,3 +461,4 @@ new_map_group map_group Route124_DivingTreasureHuntersHouse @ 33.0 + diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc index dcb3ab287..438fed6b6 100644 --- a/constants/misc_constants.inc +++ b/constants/misc_constants.inc @@ -33,3 +33,13 @@ .equiv FEMALE, 1 .equiv GAME_LANGUAGE, 2 + + .equiv ENEMY_TYPE1, 0 + .equiv ENEMY_TYPE2, 1 + .equiv PLAYER_TYPE1, 2 + .equiv PLAYER_TYPE2, 3 + .equiv CURRENT_MOVE, 4 + + .equiv LESS_THAN, 0 + .equiv GREATER_THAN, 1 + .equiv EQUAL, 2 |