summaryrefslogtreecommitdiff
path: root/battle-e/berries/nutpea.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/nutpea.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/berries/nutpea.asm')
-rw-r--r--battle-e/berries/nutpea.asm32
1 files changed, 18 insertions, 14 deletions
diff --git a/battle-e/berries/nutpea.asm b/battle-e/berries/nutpea.asm
index c45f320..0f3e530 100644
--- a/battle-e/berries/nutpea.asm
+++ b/battle-e/berries/nutpea.asm
@@ -1,23 +1,27 @@
-INCLUDE "macros.asm"
+INCLUDE "berries/macros.asm"
- Berry "NUTPEA"
- db SUPER_HARD
+ Enigma_Berry
+
+ Text_EN "NUTPEA"7
+ Firmness SUPER_HARD
Size 12,4
Yield_Range 1, 3
- db 0,0,0,0,0,0,0,0
- db 18 ; hours per growth stage
- db 10,10,10,10,10 ; flavor
- db 5 ; smoothness
- db 0
+ dd 0
+ dd 0
+ Growth_Stage_Hours 18
+ Flavor 10, 10, 10, 10, 10
+ Smoothness 5
BerrySprite:
- INCBIN "../sprites/berries/nutpea.4bpp"
-
+ INCBIN "sprites/berries/nutpea.4bpp"
BerryPalette:
- INCLUDE "../sprites/berries/nutpea.pal"
+ INCLUDE "sprites/berries/nutpea.pal"
+
+ Text_EN "This BERRY is rigid and cracks open"45
+ Text_EN "when the center is squeezed."45
- Tag_Text "This BERRY is rigid and cracks open"
- Tag_Text "when the center is squeezed."
REPT 22
db 0 ; Pokéblock ingredient only
- ENDR \ No newline at end of file
+ ENDR
+
+ End_Berry \ No newline at end of file