Initial commit

8 files changed, 197 insertions, 0 deletions

diff --git a/battle-e/berries/Makefile b/battle-e/berries/Makefile
new file mode 100644
index 0000000..1c28d80
--- /dev/null
+++ b/battle-e/berries/Makefile
@@ -0,0 +1,19 @@
+all: chilan.bin drash.bin eggant.bin nutpea.bin pumkin.bin strib.bin
+
+%.1: %.asm
+	python ../../scripts/charmap.py $< $@
+
+%.2: %.1
+	rgbasm -o $@ $<
+
+%.3: %.2
+	rgblink -o $@ $<
+
+%.4: %.3
+	dd if=$< of=$@ bs=1 skip=256 count=1324
+
+%.bin: %.4
+	python ../../scripts/berrychecksum.py $< $@
+
+clean:
+	rm -f *.bin
\ No newline at end of file
diff --git a/battle-e/berries/chilan.asm b/battle-e/berries/chilan.asm
new file mode 100644
index 0000000..9803491
--- /dev/null
+++ b/battle-e/berries/chilan.asm
@@ -0,0 +1,24 @@
+INCLUDE "macros.asm"
+
+	Berry "CHILAN"
+	db 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
+
+BerrySprite:
+	INCBIN "../sprites/berries/chilan.4bpp"
+BerryPalette:
+	INCLUDE "../sprites/berries/chilan.pal"
+
+	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
diff --git a/battle-e/berries/drash.asm b/battle-e/berries/drash.asm
new file mode 100644
index 0000000..a291536
--- /dev/null
+++ b/battle-e/berries/drash.asm
@@ -0,0 +1,24 @@
+INCLUDE "macros.asm"
+
+	Berry "DRASH"
+	db 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
+
+BerrySprite:
+	INCBIN "../sprites/berries/drash.4bpp"
+BerryPalette:
+	INCLUDE "../sprites/berries/drash.pal"
+
+	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
diff --git a/battle-e/berries/eggant.asm b/battle-e/berries/eggant.asm
new file mode 100644
index 0000000..4e9fab3
--- /dev/null
+++ b/battle-e/berries/eggant.asm
@@ -0,0 +1,24 @@
+INCLUDE "macros.asm"
+
+	Berry "EGGANT"
+	db SOFT
+	Size 4,1
+	Yield_Range 2, 3
+	db 0,0,0,0, 0,0,0,0
+	db 18 ; hours per growth stage
+	db 0,40,0,0,0 ; flavor
+	db 65  ; smoothness
+	db 0
+
+BerrySprite:
+	INCBIN "../sprites/berries/eggant.4bpp"
+BerryPalette:
+	INCLUDE "../sprites/berries/eggant.pal"
+
+	Tag_Text "Very dry tasting, especially the"
+	Tag_Text "parts not exposed to the sun."
+	db 0,0,0
+	db $00
+	db 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0
+	db $1C ; self-cure infatuation
+	db 0,0,0
\ No newline at end of file
diff --git a/battle-e/berries/macros.asm b/battle-e/berries/macros.asm
new file mode 100644
index 0000000..e58a1ca
--- /dev/null
+++ b/battle-e/berries/macros.asm
@@ -0,0 +1,37 @@
+RGB: MACRO
+	dw \1 | (\2 << 5) | (\3 << 10)
+	ENDM
+
+Berry: MACRO
+	Section "berry",ROM0[$100]
+	db \1
+	REPT 7 - STRLEN(\1)
+		db $FF
+	ENDR
+	ENDM
+
+; firmness
+VERY_SOFT  EQU 1
+SOFT       EQU 2
+HARD       EQU 3
+VERY_HARD  EQU 4
+SUPER_HARD EQU 5
+
+Yield_Range: MACRO
+	db \2, \1
+	ENDM
+
+Size: MACRO
+	dw \1 * 10 + \2
+	ENDM
+
+; this can’t be used because RGBDS has no reliable way of putting null bytes in strings
+;Tag_Text: MACRO
+;	db \1
+;	db $FF
+;	REPT 44 - STRLEN(\1)
+;		db 0
+;	ENDR
+;	ENDM
+
+Tag_Text EQUS "db"
\ No newline at end of file
diff --git a/battle-e/berries/nutpea.asm b/battle-e/berries/nutpea.asm
new file mode 100644
index 0000000..c45f320
--- /dev/null
+++ b/battle-e/berries/nutpea.asm
@@ -0,0 +1,23 @@
+INCLUDE "macros.asm"
+
+	Berry "NUTPEA"
+	db 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
+
+BerrySprite:
+	INCBIN "../sprites/berries/nutpea.4bpp"
+
+BerryPalette:
+	INCLUDE "../sprites/berries/nutpea.pal"
+
+	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
diff --git a/battle-e/berries/pumkin.asm b/battle-e/berries/pumkin.asm
new file mode 100644
index 0000000..bb11372
--- /dev/null
+++ b/battle-e/berries/pumkin.asm
@@ -0,0 +1,24 @@
+INCLUDE "macros.asm"
+
+	Berry "PUMKIN"
+	db SUPER_HARD
+	Size 4,8
+	Yield_Range 2, 3
+	db 0,0,0,0,0,0,0,0
+	db 18 ; hours per growth stage
+	db 0,0,0,0,40 ; flavor
+	db 65  ; smoothness
+	db 0
+
+BerrySprite:
+	INCBIN "../sprites/berries/pumkin.4bpp"
+BerryPalette:
+	INCLUDE "../sprites/berries/pumkin.pal"
+
+	Tag_Text "This BERRY is amazingly sour."
+	Tag_Text "It’s heavy due to its dense filling."
+	db 0,0,0
+	db $04 ; cures freeze
+	db 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0
+	db $06 ; self-cures freeze
+	db 0,0,0
\ No newline at end of file
diff --git a/battle-e/berries/strib.asm b/battle-e/berries/strib.asm
new file mode 100644
index 0000000..362b2df
--- /dev/null
+++ b/battle-e/berries/strib.asm
@@ -0,0 +1,22 @@
+INCLUDE "macros.asm"
+
+	Berry "STRIB"
+	db HARD
+	Size 12,2
+	Yield_Range 4, 12
+	db 0,0,0,0,0,0,0,0
+	db 24 ; hours per growth stage
+	db 30,0,0,30,0 ; flavor
+	db 85  ; smoothness
+	db 0
+
+BerrySprite:
+	INCBIN "../sprites/berries/strib.4bpp"
+BerryPalette:
+	INCLUDE "../sprites/berries/strib.pal"
+
+	Tag_Text "It grows slowly, but abundantly."
+	Tag_Text "Makes a soothing sound when shaken."
+	REPT 22
+		db 0 ; Pokéblock ingredient only
+	ENDR
\ No newline at end of file