diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 10 | ||||
| -rw-r--r-- | data/pickup_items.s | 47 |
2 files changed, 49 insertions, 8 deletions
diff --git a/data/data2.s b/data/data2.s index 481833ca3..7ae045e6d 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1579,14 +1579,8 @@ gUnknown_0831C414: ; 831C414 gUnknown_0831C428: ; 831C428 .incbin "base_emerald.gba", 0x31c428, 0x18 -gUnknown_0831C440: ; 831C440 - .incbin "base_emerald.gba", 0x31c440, 0x24 - -gUnknown_0831C464: ; 831C464 - .incbin "base_emerald.gba", 0x31c464, 0x16 - -gUnknown_0831C47A: ; 831C47A - .incbin "base_emerald.gba", 0x31c47a, 0x9 +; 831C440 + .include "data/pickup_items.s" gUnknown_0831C483: ; 831C483 .incbin "base_emerald.gba", 0x31c483, 0xa diff --git a/data/pickup_items.s b/data/pickup_items.s new file mode 100644 index 000000000..09c040665 --- /dev/null +++ b/data/pickup_items.s @@ -0,0 +1,47 @@ + .align 1, 0 + +gPickupItems: ; 831C440 + .2byte ITEM_POTION + .2byte ITEM_ANTIDOTE + .2byte ITEM_SUPER_POTION + .2byte ITEM_GREAT_BALL + .2byte ITEM_REPEL + .2byte ITEM_ESCAPE_ROPE + .2byte ITEM_X_ATTACK + .2byte ITEM_FULL_HEAL + .2byte ITEM_ULTRA_BALL + .2byte ITEM_HYPER_POTION + .2byte ITEM_RARE_CANDY + .2byte ITEM_PROTEIN + .2byte ITEM_REVIVE + .2byte ITEM_HP_UP + .2byte ITEM_FULL_RESTORE + .2byte ITEM_MAX_REVIVE + .2byte ITEM_PP_UP + .2byte ITEM_MAX_ELIXIR + + .align 1, 0 + +gRarePickupItems: ; 831C464 + .2byte ITEM_HYPER_POTION + .2byte ITEM_NUGGET + .2byte ITEM_KINGS_ROCK + .2byte ITEM_FULL_RESTORE + .2byte ITEM_ETHER + .2byte ITEM_WHITE_HERB + .2byte ITEM_TM44 + .2byte ITEM_ELIXIR + .2byte ITEM_TM01 + .2byte ITEM_LEFTOVERS + .2byte ITEM_TM26 + +gPickupProbabilities: ; 831C47A + .byte 30 + .byte 40 + .byte 50 + .byte 60 + .byte 70 + .byte 80 + .byte 90 + .byte 94 + .byte 98 |