diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-18 02:17:47 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-18 02:17:47 -0700 |
| commit | b948fcbb0d092e1034857415330ef68416a47224 (patch) | |
| tree | 51a97c6081c5c71e087a157e495838e669d47629 | |
| parent | d17f3b97467f3890b43739ad3b26a352d2afa07f (diff) | |
pickup items
| -rw-r--r-- | asm/emerald.s | 6 | ||||
| -rw-r--r-- | data/data2.s | 10 | ||||
| -rw-r--r-- | data/pickup_items.s | 47 |
3 files changed, 52 insertions, 11 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index c3b0386fe..320f4f322 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -149798,7 +149798,7 @@ sub_8055C00: ; 8055C00 adds r2, 0x63 subs r2, r4 lsls r2, 1 - ldr r1, =gUnknown_0831C464 + ldr r1, =gRarePickupItems adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -149869,7 +149869,7 @@ sub_8055C00: ; 8055C00 @08055DAE: cmp r2, 0x8 bgt @08055DD0 - ldr r0, =gUnknown_0831C47A + ldr r0, =gPickupProbabilities adds r0, r2, r0 ldrb r0, [r0] cmp r0, r4 @@ -149879,7 +149879,7 @@ sub_8055C00: ; 8055C00 adds r0, r7 adds r2, r1, r2 lsls r2, 1 - ldr r1, =gUnknown_0831C440 + ldr r1, =gPickupItems adds r2, r1 movs r1, 0xC bl pokemon_setattr 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 |