diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:33:13 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:35:35 -0400 |
| commit | 70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch) | |
| tree | 202f65e4131709331ae62cbe5eace4d6f8b6aa58 /data | |
| parent | 75cf425d30db6a036743cf85c483c1b537063605 (diff) | |
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'data')
| -rw-r--r-- | data/items/attributes.asm | 2 | ||||
| -rw-r--r-- | data/maps/attributes.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 90316996..d8977b47 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -301,7 +301,7 @@ Item2Attributes: ; WHT APRICORN item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; BLACKBELT +; BLACKBELT_I item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLK APRICORN diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 2f9c0d05..d16b1c61 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -38,7 +38,7 @@ _tgt = 0 endc if "\1" == "north" -_blk = \3_WIDTH * (\3_HEIGHT + -3) + _src +_blk = \3_WIDTH * (\3_HEIGHT - 3) + _src _map = _tgt _win = (\3_WIDTH + 6) * \3_HEIGHT + 1 _y = \3_HEIGHT * 2 - 1 @@ -60,9 +60,9 @@ _len = \3_WIDTH endc elif "\1" == "west" -_blk = (\3_WIDTH * _src) + \3_WIDTH + -3 +_blk = (\3_WIDTH * _src) + \3_WIDTH - 3 _map = (CURRENT_MAP_WIDTH + 6) * _tgt -_win = (\3_WIDTH + 6) * 2 + -6 +_win = (\3_WIDTH + 6) * 2 - 6 _y = (\4) * -2 _x = \3_WIDTH * 2 - 1 _len = CURRENT_MAP_HEIGHT + 3 - (\4) |