summaryrefslogtreecommitdiff
path: root/items
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-12-29 16:44:37 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-12-29 16:44:37 -0500
commit2a263629a40e201b1702e2f4e65f1c61360cc2b2 (patch)
treefd05f8f0ad49d88b032dc9e10af85a42dfa0e402 /items
parent9bbb65166e4f7674bbdec7b1314b0cf42b43a923 (diff)
Item effects, post-battle, and decoration flags
Diffstat (limited to 'items')
-rw-r--r--items/item_effects.asm19
1 files changed, 9 insertions, 10 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm
index e68e81d4f..8cabdc7e8 100644
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -2811,29 +2811,27 @@ SacredAsh: ; f753
NormalBox: ; f763
- ld c, $2c
- jr Function_0xf769
+ ld c, DECOFLAG_SILVER_TROPHY_DOLL
+ jr OpenBox
; f767
GorgeousBox: ; f767
- ld c, $2b
-; f769
-
-Function_0xf769: ; f769
+ ld c, DECOFLAG_GOLD_TROPHY_DOLL
+OpenBox: ; f769
callba SetSpecificDecorationFlag
- ld hl, UnknownText_0xf778
+ ld hl, .text
call PrintText
jp UseDisposableItem
; f778
-UnknownText_0xf778: ; 0xf778
+.text: ; 0xf778
+ ; There was a trophy inside!
text_jump UnknownText_0x1c5d03
db "@"
; 0xf77d
-
Brightpowder:
Item19:
LuckyPunch:
@@ -2923,7 +2921,8 @@ ItemAB:
UpGrade:
ItemB0:
RainbowWing:
-ItemB3: ; f77d
+ItemB3:
+TeruSama: ; f77d
jp IsntTheTimeMessage
; f780