summaryrefslogtreecommitdiff
path: root/battle-e/berries/chilan.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/chilan.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/berries/chilan.asm')
-rw-r--r--battle-e/berries/chilan.asm33
1 files changed, 18 insertions, 15 deletions
diff --git a/battle-e/berries/chilan.asm b/battle-e/berries/chilan.asm
index 9803491..19f24cb 100644
--- a/battle-e/berries/chilan.asm
+++ b/battle-e/berries/chilan.asm
@@ -1,24 +1,27 @@
-INCLUDE "macros.asm"
+INCLUDE "berries/macros.asm"
+
+ Enigma_Berry
- Berry "CHILAN"
- db SOFT
+ Text_EN "CHILAN"7
+ Firmness SOFT
Size 27,2
Yield_Range 1, 2
- REPT 8
- db 0
- ENDR
- db 1 ; hours per growth stage
- db 30,0,30,0,0 ; flavor
- db 85 ; smoothness
- db 0
+ dd 0
+ dd 0
+ Growth_Stage_Hours 1
+ Flavor 30, 0, 30, 0, 0
+ Smoothness 85
BerrySprite:
- INCBIN "../sprites/berries/chilan.4bpp"
+ INCBIN "sprites/berries/chilan.4bpp"
BerryPalette:
- INCLUDE "../sprites/berries/chilan.pal"
+ INCLUDE "sprites/berries/chilan.pal"
+
+ Text_EN "This sparse BERRY grows quickly."45
+ Text_EN "Its skin is quite tough."45
- Tag_Text "This sparse BERRY grows quickly."
- Tag_Text "Its skin is quite tough."
REPT 22
db 0 ; Pokéblock ingredient only
- ENDR \ No newline at end of file
+ ENDR
+
+ End_Berry \ No newline at end of file