diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-07-31 22:11:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 22:11:13 -0400 |
| commit | a6a74b11ea65f8915d1254615ff7741329d237d3 (patch) | |
| tree | f6eace5794378b3d4cc5adff0da772f132c5639d /data/items | |
| parent | a586811e197d2a28d3a08dff03548fb69342da96 (diff) | |
| parent | b67fc88e007f20318ecab18515c9e8b66470a81e (diff) | |
Merge pull request #40 from Pokeglitch/master
Full dump of Bank 1
Diffstat (limited to 'data/items')
| -rw-r--r-- | data/items/attributes.asm | 4 | ||||
| -rw-r--r-- | data/items/names.asm | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 1e54451..9975dc2 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -517,4 +517,6 @@ ItemAttributes:: ; 68f3 ; ITEM_HM06 item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ITEM_HM07 - item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY
\ No newline at end of file + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_PARTY +; ITEM_FF + item_attribute 0, HELD_NONE, 0, NO_LIMITS, 0, ITEMMENU_NOUSE, ITEMMENU_NOUSE diff --git a/data/items/names.asm b/data/items/names.asm index 0036cd6..3ae826d 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -261,4 +261,4 @@ ItemNames:: db "ひでんマシン０５@" ; HM05 db "ひでんマシン０６@" ; HM06 db "ひでんマシン０７@" ; HM07 - db "しようきんし@" ; FF
\ No newline at end of file + db "しようきんし@" ; FF |