diff --git a/asm/emerald.s b/asm/emerald.s index f4e1f692b..03d80c155 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -50094,7 +50094,7 @@ sub_8021A28: ; 8021A28 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, =gUnknown_0858A670 + ldr r0, =gBerries adds r1, r0 ldr r0, =0x02021cc4 bl gf_strcpy @@ -428226,7 +428226,7 @@ sub_80E167C: ; 80E167C lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, =gUnknown_0858A654 + ldr r1, =gBerries - 0x1c ; 1-based array @080E16B4: adds r0, r1 pop {r4} diff --git a/constants/berry_constants.s b/constants/berry_constants.s new file mode 100644 index 000000000..2ecd7ac36 --- /dev/null +++ b/constants/berry_constants.s @@ -0,0 +1,6 @@ + .set BERRY_FIRMNESS_UNKNOWN, 0 + .set BERRY_FIRMNESS_VERY_SOFT, 1 + .set BERRY_FIRMNESS_SOFT, 2 + .set BERRY_FIRMNESS_HARD, 3 + .set BERRY_FIRMNESS_VERY_HARD, 4 + .set BERRY_FIRMNESS_SUPER_HARD, 5 diff --git a/constants/constants.s b/constants/constants.s index 16d61aa89..e6c855323 100644 --- a/constants/constants.s +++ b/constants/constants.s @@ -13,3 +13,4 @@ .include "constants/trainer_class_constants.s" .include "constants/battle_frontier_constants.s" .include "constants/map_constants.s" + .include "constants/berry_constants.s" diff --git a/data/berries.s b/data/berries.s new file mode 100644 index 000000000..e6bda4d70 --- /dev/null +++ b/data/berries.s @@ -0,0 +1,690 @@ + .align 2, 0 + +gBerries: ; 858A670 + .charmapstr "CHERI$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 20 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Cheri + .4byte gBerryDescriptionPart2_Cheri + .byte 3 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "CHESTO$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 80 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Chesto + .4byte gBerryDescriptionPart2_Chesto + .byte 3 ; stage duration (in hours) + .byte 0 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "PECHA$", 7 + .byte BERRY_FIRMNESS_VERY_SOFT + .2byte 40 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Pecha + .4byte gBerryDescriptionPart2_Pecha + .byte 3 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "RAWST$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 32 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Rawst + .4byte gBerryDescriptionPart2_Rawst + .byte 3 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "ASPEAR$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 50 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Aspear + .4byte gBerryDescriptionPart2_Aspear + .byte 3 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 10 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "LEPPA$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 28 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Leppa + .4byte gBerryDescriptionPart2_Leppa + .byte 4 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "ORAN$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 35 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Oran + .4byte gBerryDescriptionPart2_Oran + .byte 3 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "PERSIM$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 47 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Persim + .4byte gBerryDescriptionPart2_Persim + .byte 3 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "LUM$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 34 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Lum + .4byte gBerryDescriptionPart2_Lum + .byte 12 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "SITRUS$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 95 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Sitrus + .4byte gBerryDescriptionPart2_Sitrus + .byte 6 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "FIGY$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 100 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Figy + .4byte gBerryDescriptionPart2_Figy + .byte 6 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "WIKI$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 115 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Wiki + .4byte gBerryDescriptionPart2_Wiki + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "MAGO$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 126 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Mago + .4byte gBerryDescriptionPart2_Mago + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "AGUAV$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 64 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Aguav + .4byte gBerryDescriptionPart2_Aguav + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "IAPAPA$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 223 ; size (in millimeters) + .byte 3 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Iapapa + .4byte gBerryDescriptionPart2_Iapapa + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 10 ; sour + .byte 25 ; smoothness + .byte 0 ; padding + + .charmapstr "RAZZ$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 120 ; size (in millimeters) + .byte 6 ; max yield + .byte 3 ; min yield + .4byte gBerryDescriptionPart1_Razz + .4byte gBerryDescriptionPart2_Razz + .byte 1 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "BLUK$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 108 ; size (in millimeters) + .byte 6 ; max yield + .byte 3 ; min yield + .4byte gBerryDescriptionPart1_Bluk + .4byte gBerryDescriptionPart2_Bluk + .byte 1 ; stage duration (in hours) + .byte 0 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "NANAB$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 77 ; size (in millimeters) + .byte 6 ; max yield + .byte 3 ; min yield + .4byte gBerryDescriptionPart1_Nanab + .4byte gBerryDescriptionPart2_Nanab + .byte 1 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "WEPEAR$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 74 ; size (in millimeters) + .byte 6 ; max yield + .byte 3 ; min yield + .4byte gBerryDescriptionPart1_Wepear + .4byte gBerryDescriptionPart2_Wepear + .byte 1 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "PINAP$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 80 ; size (in millimeters) + .byte 6 ; max yield + .byte 3 ; min yield + .4byte gBerryDescriptionPart1_Pinap + .4byte gBerryDescriptionPart2_Pinap + .byte 1 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "POMEG$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 135 ; size (in millimeters) + .byte 6 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Pomeg + .4byte gBerryDescriptionPart2_Pomeg + .byte 3 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "KELPSY$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 150 ; size (in millimeters) + .byte 6 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Kelpsy + .4byte gBerryDescriptionPart2_Kelpsy + .byte 3 ; stage duration (in hours) + .byte 0 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "QUALOT$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 110 ; size (in millimeters) + .byte 6 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Qualot + .4byte gBerryDescriptionPart2_Qualot + .byte 3 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "HONDEW$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 162 ; size (in millimeters) + .byte 6 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Hondew + .4byte gBerryDescriptionPart2_Hondew + .byte 3 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "GREPA$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 149 ; size (in millimeters) + .byte 6 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Grepa + .4byte gBerryDescriptionPart2_Grepa + .byte 3 ; stage duration (in hours) + .byte 0 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 10 ; sour + .byte 20 ; smoothness + .byte 0 ; padding + + .charmapstr "TAMATO$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 200 ; size (in millimeters) + .byte 4 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Tamato + .4byte gBerryDescriptionPart2_Tamato + .byte 6 ; stage duration (in hours) + .byte 20 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "CORNN$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 75 ; size (in millimeters) + .byte 4 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Cornn + .4byte gBerryDescriptionPart2_Cornn + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 20 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "MAGOST$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 140 ; size (in millimeters) + .byte 4 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Magost + .4byte gBerryDescriptionPart2_Magost + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 20 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "RABUTA$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 226 ; size (in millimeters) + .byte 4 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Rabuta + .4byte gBerryDescriptionPart2_Rabuta + .byte 6 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 20 ; bitter + .byte 10 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "NOMEL$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 285 ; size (in millimeters) + .byte 4 ; max yield + .byte 2 ; min yield + .4byte gBerryDescriptionPart1_Nomel + .4byte gBerryDescriptionPart2_Nomel + .byte 6 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 20 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "SPELON$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 133 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Spelon + .4byte gBerryDescriptionPart2_Spelon + .byte 18 ; stage duration (in hours) + .byte 40 ; spicy + .byte 10 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 70 ; smoothness + .byte 0 ; padding + + .charmapstr "PAMTRE$", 7 + .byte BERRY_FIRMNESS_VERY_SOFT + .2byte 244 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Pamtre + .4byte gBerryDescriptionPart2_Pamtre + .byte 18 ; stage duration (in hours) + .byte 0 ; spicy + .byte 40 ; dry + .byte 10 ; sweet + .byte 0 ; bitter + .byte 0 ; sour + .byte 70 ; smoothness + .byte 0 ; padding + + .charmapstr "WATMEL$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 250 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Watmel + .4byte gBerryDescriptionPart2_Watmel + .byte 18 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 40 ; sweet + .byte 10 ; bitter + .byte 0 ; sour + .byte 70 ; smoothness + .byte 0 ; padding + + .charmapstr "DURIN$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 280 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Durin + .4byte gBerryDescriptionPart2_Durin + .byte 18 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 40 ; bitter + .byte 10 ; sour + .byte 70 ; smoothness + .byte 0 ; padding + + .charmapstr "BELUE$", 7 + .byte BERRY_FIRMNESS_VERY_SOFT + .2byte 300 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Belue + .4byte gBerryDescriptionPart2_Belue + .byte 18 ; stage duration (in hours) + .byte 10 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 40 ; sour + .byte 70 ; smoothness + .byte 0 ; padding + + .charmapstr "LIECHI$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 111 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Liechi + .4byte gBerryDescriptionPart2_Liechi + .byte 24 ; stage duration (in hours) + .byte 40 ; spicy + .byte 0 ; dry + .byte 40 ; sweet + .byte 0 ; bitter + .byte 10 ; sour + .byte 80 ; smoothness + .byte 0 ; padding + + .charmapstr "GANLON$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 33 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Ganlon + .4byte gBerryDescriptionPart2_Ganlon + .byte 24 ; stage duration (in hours) + .byte 0 ; spicy + .byte 40 ; dry + .byte 0 ; sweet + .byte 40 ; bitter + .byte 0 ; sour + .byte 80 ; smoothness + .byte 0 ; padding + + .charmapstr "SALAC$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 95 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Salac + .4byte gBerryDescriptionPart2_Salac + .byte 24 ; stage duration (in hours) + .byte 0 ; spicy + .byte 0 ; dry + .byte 40 ; sweet + .byte 0 ; bitter + .byte 40 ; sour + .byte 80 ; smoothness + .byte 0 ; padding + + .charmapstr "PETAYA$", 7 + .byte BERRY_FIRMNESS_VERY_HARD + .2byte 237 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Petaya + .4byte gBerryDescriptionPart2_Petaya + .byte 24 ; stage duration (in hours) + .byte 40 ; spicy + .byte 0 ; dry + .byte 0 ; sweet + .byte 40 ; bitter + .byte 0 ; sour + .byte 80 ; smoothness + .byte 0 ; padding + + .charmapstr "APICOT$", 7 + .byte BERRY_FIRMNESS_HARD + .2byte 75 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Apicot + .4byte gBerryDescriptionPart2_Apicot + .byte 24 ; stage duration (in hours) + .byte 0 ; spicy + .byte 40 ; dry + .byte 0 ; sweet + .byte 0 ; bitter + .byte 40 ; sour + .byte 80 ; smoothness + .byte 0 ; padding + + .charmapstr "LANSAT$", 7 + .byte BERRY_FIRMNESS_SOFT + .2byte 97 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Lansat + .4byte gBerryDescriptionPart2_Lansat + .byte 24 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "STARF$", 7 + .byte BERRY_FIRMNESS_SUPER_HARD + .2byte 153 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Starf + .4byte gBerryDescriptionPart2_Starf + .byte 24 ; stage duration (in hours) + .byte 10 ; spicy + .byte 10 ; dry + .byte 10 ; sweet + .byte 10 ; bitter + .byte 10 ; sour + .byte 30 ; smoothness + .byte 0 ; padding + + .charmapstr "ENIGMA$", 7 + .byte BERRY_FIRMNESS_UNKNOWN + .2byte 0 ; size (in millimeters) + .byte 2 ; max yield + .byte 1 ; min yield + .4byte gBerryDescriptionPart1_Enigma + .4byte gBerryDescriptionPart2_Enigma + .byte 24 ; stage duration (in hours) + .byte 40 ; spicy + .byte 40 ; dry + .byte 40 ; sweet + .byte 40 ; bitter + .byte 40 ; sour + .byte 40 ; smoothness + .byte 0 ; padding diff --git a/data/data2.s b/data/data2.s index f1ec1a7bd..aa4183397 100644 --- a/data/data2.s +++ b/data/data2.s @@ -4271,13 +4271,13 @@ gUnknown_08589AD8: ; 8589AD8 .incbin "base_emerald.gba", 0x589ad8, 0x6 gUnknown_08589ADE: ; 8589ADE - .incbin "base_emerald.gba", 0x589ade, 0xb76 + .incbin "base_emerald.gba", 0x589ade, 0x6 -gUnknown_0858A654: ; 858A654 - .incbin "base_emerald.gba", 0x58a654, 0x1c +; 8589AE4 + .include "data/text/berry_descriptions.s" -gUnknown_0858A670: ; 858A670 - .incbin "base_emerald.gba", 0x58a670, 0x4b4 +; 858A670 + .include "data/berries.s" gUnknown_0858AB24: ; 858AB24 .incbin "base_emerald.gba", 0x58ab24, 0xac diff --git a/data/text/berry_descriptions.s b/data/text/berry_descriptions.s new file mode 100644 index 000000000..0b5742869 --- /dev/null +++ b/data/text/berry_descriptions.s @@ -0,0 +1,258 @@ +gBerryDescriptionPart1_Cheri: ; 8589AE4 + .charmapstr "Blooms with delicate pretty flowers.$" + +gBerryDescriptionPart2_Cheri: ; 8589B09 + .charmapstr "The bright red BERRY is very spicy.$" + +gBerryDescriptionPart1_Chesto: ; 8589B2D + .charmapstr "The BERRY’s thick skin and fruit are$" + +gBerryDescriptionPart2_Chesto: ; 8589B52 + .charmapstr "very tough. It is dry-tasting all over.$" + +gBerryDescriptionPart1_Pecha: ; 8589B7A + .charmapstr "Very sweet and delicious.$" + +gBerryDescriptionPart2_Pecha: ; 8589B94 + .charmapstr "Also very tender - handle with care.$" + +gBerryDescriptionPart1_Rawst: ; 8589BB9 + .charmapstr "If the leaves grow long and curly,$" + +gBerryDescriptionPart2_Rawst: ; 8589BDC + .charmapstr "the BERRY seems to grow very bitter.$" + +gBerryDescriptionPart1_Aspear: ; 8589C01 + .charmapstr "The hard BERRY is dense with a rich$" + +gBerryDescriptionPart2_Aspear: ; 8589C25 + .charmapstr "juice. It is quite sour.$" + +gBerryDescriptionPart1_Leppa: ; 8589C3E + .charmapstr "Grows slower than CHERI and others.$" + +gBerryDescriptionPart2_Leppa: ; 8589C62 + .charmapstr "The smaller the BERRY, the tastier.$" + +gBerryDescriptionPart1_Oran: ; 8589C86 + .charmapstr "A peculiar BERRY with a mix of flavors.$" + +gBerryDescriptionPart2_Oran: ; 8589CAE + .charmapstr "BERRIES grow in half a day.$" + +gBerryDescriptionPart1_Persim: ; 8589CCA + .charmapstr "Loves sunlight. The BERRY’s color$" + +gBerryDescriptionPart2_Persim: ; 8589CEC + .charmapstr "grows vivid when exposed to the sun.$" + +gBerryDescriptionPart1_Lum: ; 8589D11 + .charmapstr "Slow to grow. If raised with loving$" + +gBerryDescriptionPart2_Lum: ; 8589D35 + .charmapstr "care, it may grow two BERRIES.$" + +gBerryDescriptionPart1_Sitrus: ; 8589D54 + .charmapstr "Closely related to ORAN. The large$" + +gBerryDescriptionPart2_Sitrus: ; 8589D77 + .charmapstr "BERRY has a well-rounded flavor.$" + +gBerryDescriptionPart1_Figy: ; 8589D98 + .charmapstr "The BERRY, which looks chewed up,$" + +gBerryDescriptionPart2_Figy: ; 8589DBA + .charmapstr "brims with spicy substances.$" + +gBerryDescriptionPart1_Wiki: ; 8589DD7 + .charmapstr "The BERRY is said to have grown lumpy$" + +gBerryDescriptionPart2_Wiki: ; 8589DFD + .charmapstr "to help POKéMON grip it.$" + +gBerryDescriptionPart1_Mago: ; 8589E16 + .charmapstr "The BERRY turns curvy as it grows.$" + +gBerryDescriptionPart2_Mago: ; 8589E39 + .charmapstr "The curvier, the sweeter and tastier.$" + +gBerryDescriptionPart1_Aguav: ; 8589E5F + .charmapstr "The flower is dainty. It is rare in its$" + +gBerryDescriptionPart2_Aguav: ; 8589E87 + .charmapstr "ability to grow without light.$" + +gBerryDescriptionPart1_Iapapa: ; 8589EA6 + .charmapstr "The BERRY is very big and sour.$" + +gBerryDescriptionPart2_Iapapa: ; 8589EC6 + .charmapstr "It takes at least a day to grow.$" + +gBerryDescriptionPart1_Razz: ; 8589EE7 + .charmapstr "The red BERRY tastes slightly spicy.$" + +gBerryDescriptionPart2_Razz: ; 8589F0C + .charmapstr "It grows quickly in just four hours.$" + +gBerryDescriptionPart1_Bluk: ; 8589F31 + .charmapstr "The BERRY is blue on the outside, but$" + +gBerryDescriptionPart2_Bluk: ; 8589F57 + .charmapstr "it blackens the mouth when eaten.$" + +gBerryDescriptionPart1_Nanab: ; 8589F79 + .charmapstr "This BERRY was the seventh$" + +gBerryDescriptionPart2_Nanab: ; 8589F94 + .charmapstr "discovered in the world. It is sweet.$" + +gBerryDescriptionPart1_Wepear: ; 8589FBA + .charmapstr "The flower is small and white. It has a$" + +gBerryDescriptionPart2_Wepear: ; 8589FE2 + .charmapstr "delicate balance of bitter and sour.$" + +gBerryDescriptionPart1_Pinap: ; 858A007 + .charmapstr "Weak against wind and cold.$" + +gBerryDescriptionPart2_Pinap: ; 858A023 + .charmapstr "The fruit is spicy and the skin, sour.$" + +gBerryDescriptionPart1_Pomeg: ; 858A04A + .charmapstr "However much it is watered,$" + +gBerryDescriptionPart2_Pomeg: ; 858A066 + .charmapstr "it only grows up to six BERRIES.$" + +gBerryDescriptionPart1_Kelpsy: ; 858A087 + .charmapstr "A rare variety shaped like a root.$" + +gBerryDescriptionPart2_Kelpsy: ; 858A0AA + .charmapstr "Grows a very large flower.$" + +gBerryDescriptionPart1_Qualot: ; 858A0C5 + .charmapstr "Loves water. Grows strong even in$" + +gBerryDescriptionPart2_Qualot: ; 858A0E7 + .charmapstr "locations with constant rainfall.$" + +gBerryDescriptionPart1_Hondew: ; 858A109 + .charmapstr "A BERRY that is very valuable and$" + +gBerryDescriptionPart2_Hondew: ; 858A12B + .charmapstr "rarely seen. It is very delicious.$" + +gBerryDescriptionPart1_Grepa: ; 858A14E + .charmapstr "Despite its tenderness and round$" + +gBerryDescriptionPart2_Grepa: ; 858A16F + .charmapstr "shape, the BERRY is unimaginably sour.$" + +gBerryDescriptionPart1_Tamato: ; 858A196 + .charmapstr "The BERRY is lip-bendingly spicy.$" + +gBerryDescriptionPart2_Tamato: ; 858A1B8 + .charmapstr "It takes time to grow.$" + +gBerryDescriptionPart1_Cornn: ; 858A1CF + .charmapstr "A BERRY from an ancient era. May not$" + +gBerryDescriptionPart2_Cornn: ; 858A1F4 + .charmapstr "grow unless planted in quantity.$" + +gBerryDescriptionPart1_Magost: ; 858A215 + .charmapstr "A BERRY that is widely said to have$" + +gBerryDescriptionPart2_Magost: ; 858A239 + .charmapstr "a finely balanced flavor.$" + +gBerryDescriptionPart1_Rabuta: ; 858A253 + .charmapstr "A rare variety that is overgrown with$" + +gBerryDescriptionPart2_Rabuta: ; 858A279 + .charmapstr "hair. It is quite bitter.$" + +gBerryDescriptionPart1_Nomel: ; 858A293 + .charmapstr "Quite sour. Just one bite makes it$" + +gBerryDescriptionPart2_Nomel: ; 858A2B6 + .charmapstr "impossible to taste for three days.$" + +gBerryDescriptionPart1_Spelon: ; 858A2DA + .charmapstr "The vividly red BERRY is very spicy.$" + +gBerryDescriptionPart2_Spelon: ; 858A2FF + .charmapstr "Its warts secrete a spicy substance.$" + +gBerryDescriptionPart1_Pamtre: ; 858A324 + .charmapstr "Drifts on the sea from somewhere.$" + +gBerryDescriptionPart2_Pamtre: ; 858A346 + .charmapstr "It is thought to grow elsewhere.$" + +gBerryDescriptionPart1_Watmel: ; 858A367 + .charmapstr "A huge BERRY, with some over 20$" + +gBerryDescriptionPart2_Watmel: ; 858A387 + .charmapstr "inches discovered. Exceedingly sweet.$" + +gBerryDescriptionPart1_Durin: ; 858A3AD + .charmapstr "Bitter to even look at. It is so$" + +gBerryDescriptionPart2_Durin: ; 858A3CE + .charmapstr "bitter, no one has ever eaten it as is.$" + +gBerryDescriptionPart1_Belue: ; 858A3F6 + .charmapstr "It is glossy and looks delicious, but$" + +gBerryDescriptionPart2_Belue: ; 858A41C + .charmapstr "it is awfully sour. Takes time to grow.$" + +gBerryDescriptionPart1_Liechi: ; 858A444 + .charmapstr "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Liechi: ; 858A469 + .charmapstr "contain the power of the sea.$" + +gBerryDescriptionPart1_Ganlon: ; 858A487 + .charmapstr "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Ganlon: ; 858A4AC + .charmapstr "contain the power of the land.$" + +gBerryDescriptionPart1_Salac: ; 858A4CB + .charmapstr "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Salac: ; 858A4F0 + .charmapstr "contain the power of the sky.$" + +gBerryDescriptionPart1_Petaya: ; 858A50E + .charmapstr "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Petaya: ; 858A533 + .charmapstr "contain the power of all living things.$" + +gBerryDescriptionPart1_Apicot: ; 858A55B + .charmapstr "A very mystifying BERRY. No telling$" + +gBerryDescriptionPart2_Apicot: ; 858A57F + .charmapstr "what may happen or how it can be used.$" + +gBerryDescriptionPart1_Lansat: ; 858A5A6 + .charmapstr "Said to be a legendary BERRY.$" + +gBerryDescriptionPart2_Lansat: ; 858A5C4 + .charmapstr "Holding it supposedly brings joy.$" + +gBerryDescriptionPart1_Starf: ; 858A5E6 + .charmapstr "So strong, it was abandoned at the$" + +gBerryDescriptionPart2_Starf: ; 858A609 + .charmapstr "world’s edge. Considered a mirage.$" + +gBerryDescriptionPart1_Enigma: ; 858A62C + .charmapstr "A completely enigmatic BERRY.$" + +gBerryDescriptionPart2_Enigma: ; 858A64A + .charmapstr "Appears to have the power of stars.$" +