summaryrefslogtreecommitdiff
path: root/battle-e/berries/drash.asm
diff options
context:
space:
mode:
authorHáčky <hatschky@gmail.com>2014-11-27 07:15:45 +0000
committerHáčky <hatschky@gmail.com>2014-11-27 07:15:45 +0000
commit319ed6d0e0266f5f6174a5acd929914db8cfae1d (patch)
tree76408d9cadcbed1e702efa8c44f4cf5e364b0a4d /battle-e/berries/drash.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/berries/drash.asm')
-rw-r--r--battle-e/berries/drash.asm31
1 files changed, 18 insertions, 13 deletions
diff --git a/battle-e/berries/drash.asm b/battle-e/berries/drash.asm
index a291536..62825cc 100644
--- a/battle-e/berries/drash.asm
+++ b/battle-e/berries/drash.asm
@@ -1,24 +1,29 @@
-INCLUDE "macros.asm"
+INCLUDE "berries/macros.asm"
- Berry "DRASH"
- db VERY_HARD
+ Enigma_Berry
+
+ Text_EN "DRASH@@"7
+ Firmness VERY_HARD
Size 13,4
Yield_Range 2, 3
- db 0,0,0,0,0,0,0,0
- db 18 ; hours per growth stage
- db 0,0,40,0,0 ; flavor
- db 65 ; smoothness
- db 0
+ dd 0
+ dd 0
+ Growth_Stage_Hours 18
+ Flavor 0, 0, 40, 0, 0
+ Smoothness 65
BerrySprite:
- INCBIN "../sprites/berries/drash.4bpp"
+ INCBIN "sprites/berries/drash.4bpp"
BerryPalette:
- INCLUDE "../sprites/berries/drash.pal"
+ INCLUDE "sprites/berries/drash.pal"
+
+ Text_EN "When it ripens, this sweet BERRY"45
+ Text_EN "falls and sticks into the ground."45
- Tag_Text "When it ripens, this sweet BERRY"
- Tag_Text "falls and sticks into the ground."
db 0,0,0
db $10 ; cures poison
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0
db $04 ; self-cures poison
- db 0,0,0 \ No newline at end of file
+ db 0,0,0
+
+ End_Berry \ No newline at end of file