diff options
Diffstat (limited to 'battle-e/berries')
| -rw-r--r-- | battle-e/berries/Makefile | 19 | ||||
| -rw-r--r-- | battle-e/berries/chilan.asm | 33 | ||||
| -rw-r--r-- | battle-e/berries/drash.asm | 31 | ||||
| -rw-r--r-- | battle-e/berries/eggant.asm | 31 | ||||
| -rw-r--r-- | battle-e/berries/macros.asm | 33 | ||||
| -rw-r--r-- | battle-e/berries/nutpea.asm | 32 | ||||
| -rw-r--r-- | battle-e/berries/pumkin.asm | 31 | ||||
| -rw-r--r-- | battle-e/berries/strib.asm | 31 |
8 files changed, 124 insertions, 117 deletions
diff --git a/battle-e/berries/Makefile b/battle-e/berries/Makefile deleted file mode 100644 index 1c28d80..0000000 --- a/battle-e/berries/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -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 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 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 diff --git a/battle-e/berries/eggant.asm b/battle-e/berries/eggant.asm index 4e9fab3..c7b1eaa 100644 --- a/battle-e/berries/eggant.asm +++ b/battle-e/berries/eggant.asm @@ -1,24 +1,29 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "EGGANT" - db SOFT + Enigma_Berry + + Text_EN "EGGANT"7 + Firmness 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 + dd 0 + dd 0 + Growth_Stage_Hours 18 + Flavor 0, 40, 0, 0, 0 + Smoothness 65 BerrySprite: - INCBIN "../sprites/berries/eggant.4bpp" + INCBIN "sprites/berries/eggant.4bpp" BerryPalette: - INCLUDE "../sprites/berries/eggant.pal" + INCLUDE "sprites/berries/eggant.pal" + + Text_EN "Very dry tasting, especially the"45 + Text_EN "parts not exposed to the sun."45 - 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 + db 0,0,0 + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/macros.asm b/battle-e/berries/macros.asm index e58a1ca..472fec4 100644 --- a/battle-e/berries/macros.asm +++ b/battle-e/berries/macros.asm @@ -1,16 +1,17 @@ -RGB: MACRO - dw \1 | (\2 << 5) | (\3 << 10) - ENDM +INCLUDE "../macros.asm" -Berry: MACRO +Enigma_Berry: MACRO Section "berry",ROM0[$100] - db \1 - REPT 7 - STRLEN(\1) - db $FF - ENDR + db $01 + dd $02000000 + db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db $07 + dd $02000018 + db $02,$00 ENDM ; firmness +Firmness EQUS "db" VERY_SOFT EQU 1 SOFT EQU 2 HARD EQU 3 @@ -25,13 +26,11 @@ 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 +Growth_Stage_Hours EQUS "db" +Flavor EQUS "db" +Smoothness EQUS "dw" ; not sure if the second byte is significant on its own -Tag_Text EQUS "db"
\ No newline at end of file +End_Berry: MACRO + dd 0 ; placeholder for checksum + EOF + ENDM
\ No newline at end of file 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 diff --git a/battle-e/berries/pumkin.asm b/battle-e/berries/pumkin.asm index bb11372..8432140 100644 --- a/battle-e/berries/pumkin.asm +++ b/battle-e/berries/pumkin.asm @@ -1,24 +1,29 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "PUMKIN" - db SUPER_HARD + Enigma_Berry + + Text_EN "PUMKIN"7 + Firmness 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 + dd 0 + dd 0 + Growth_Stage_Hours 18 + Flavor 0, 0, 0, 0, 40 + Smoothness 65 BerrySprite: - INCBIN "../sprites/berries/pumkin.4bpp" + INCBIN "sprites/berries/pumkin.4bpp" BerryPalette: - INCLUDE "../sprites/berries/pumkin.pal" + INCLUDE "sprites/berries/pumkin.pal" + + Text_EN "This BERRY is amazingly sour."45 + Text_EN "It’s heavy due to its dense filling."45 - 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 + db 0,0,0 + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/strib.asm b/battle-e/berries/strib.asm index 362b2df..147f8c2 100644 --- a/battle-e/berries/strib.asm +++ b/battle-e/berries/strib.asm @@ -1,22 +1,27 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "STRIB" - db HARD + Enigma_Berry + + Text_EN "STRIB@@"7 + Firmness 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 + dd 0 + dd 0 + Growth_Stage_Hours 24 + Flavor 30, 0, 0, 30, 0 + Smoothness 85 BerrySprite: - INCBIN "../sprites/berries/strib.4bpp" + INCBIN "sprites/berries/strib.4bpp" BerryPalette: - INCLUDE "../sprites/berries/strib.pal" + INCLUDE "sprites/berries/strib.pal" + + Text_EN "It grows slowly, but abundantly."45 + Text_EN "Makes a soothing sound when shaken."45 - 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 + ENDR + + End_Berry
\ No newline at end of file |