diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-10 19:20:45 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-10 19:20:45 -0700 |
| commit | bc381abbbd7958bbcc147837beb8ac7bff33462a (patch) | |
| tree | 038bb2bd46a08c52a2cc6e157666ffad719d388d | |
| parent | 51dd8ca3c7c66cdef23a6bdf661588a859c690dd (diff) | |
pickup items
| -rw-r--r-- | asm/rom3.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 10f5983ef..4cef6e4f7 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -66510,7 +66510,7 @@ _0802AF7A: b _0802AFCA .align 2, 0 _0802AFB4: .4byte gBaseStats -_0802AFB8: .4byte gUnknown_081FAD5E +_0802AFB8: .4byte gPickupItems _0802AFBC: .4byte 0x03004360 _0802AFC0: lsls r0, r5, 3 diff --git a/data/data2.s b/data/data2.s index 4ce96c57d..e93cf60a9 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1307,8 +1307,18 @@ gUnknown_081FAD32:: @ 81FAD32 gUnknown_081FAD46:: @ 81FAD46 .incbin "baserom.gba", 0x001fad46, 0x18 -gUnknown_081FAD5E:: @ 81FAD5E - .incbin "baserom.gba", 0x001fad5e, 0x28 + .align 1 +gPickupItems:: @ 81FAD5E + .2byte ITEM_SUPER_POTION, 30 + .2byte ITEM_FULL_HEAL, 40 + .2byte ITEM_ULTRA_BALL, 50 + .2byte ITEM_RARE_CANDY, 60 + .2byte ITEM_FULL_RESTORE, 70 + .2byte ITEM_REVIVE, 80 + .2byte ITEM_NUGGET, 90 + .2byte ITEM_PROTEIN, 95 + .2byte ITEM_PP_UP, 99 + .2byte ITEM_KINGS_ROCK, 1 gUnknown_081FAD86:: @ 81FAD86 .incbin "baserom.gba", 0x001fad86, 0xa |