summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-04-13 21:42:29 -0700
committeryenatch <yenatch@gmail.com>2015-04-13 21:42:29 -0700
commit11b02eb09b1e541b7d44ec089b3c116cb8e95049 (patch)
tree72f9c8cba8cd53ed8e0f049fa04748d6a458812f /main.asm
parentee98f7b48998e6aa77c67ecae60e9376eae180f7 (diff)
parentd54725c28e06edd002141608b208c5d9b58b5806 (diff)
Merge remote-tracking branch 'kanzure/master'
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm9
1 files changed, 5 insertions, 4 deletions
diff --git a/main.asm b/main.asm
index 89a0d1f61..4de4b7031 100644
--- a/main.asm
+++ b/main.asm
@@ -30552,7 +30552,7 @@ Function28771: ; 28771
and a
ret z
push hl
- ld hl, Unknown_28785
+ ld hl, .TimeCapsuleAlt
.asm_28778
ld a, [hli]
and a
@@ -30568,10 +30568,11 @@ Function28771: ; 28771
.asm_28783
pop hl
ret
-; 28785
-Unknown_28785: ; 28785
-; Alternate mappings for unused items.
+.TimeCapsuleAlt ; 28785
+; Pokémon traded from RBY do not have held items, so GSC usually interprets the
+; catch rate as an item. However, if the catch rate appears in this table, the
+; item associated with the table entry is used instead.
db ITEM_19, LEFTOVERS
db ITEM_2D, BITTER_BERRY
db ITEM_32, GOLD_BERRY