diff options
Diffstat (limited to 'battle-e/berries/macros.asm')
| -rw-r--r-- | battle-e/berries/macros.asm | 33 |
1 files changed, 16 insertions, 17 deletions
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 |