PikalaxALT 6b2d0ae841 Fix merge conflicts

2015-11-01 18:19:52 -05:00

..

item_attributes.asm

ITEMMENU_CLOSE is now ITEMMENU_FIELD

2015-10-25 20:43:39 -04:00

item_descriptions.asm

Reverted ld_hl_pointer macro

2015-07-20 22:18:18 -04:00

item_effects.asm

Fix merge conflicts

2015-11-01 18:19:52 -05:00

item_names.asm

Remove trailing newlines.

2015-06-23 12:24:51 -06:00

marts.asm

- Renamed "Functiond283" to "GetPocketCapacity" and updated the pointers and constants to better reflect their hypothesized purposes.

2015-07-03 13:46:38 -04:00