diff options
author | YamaArashi <shadow962@live.com> | 2016-01-28 15:21:07 -0800 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-01-28 15:21:07 -0800 |
commit | c226f6cd4d8fc36052d59043f7c25eacb3c2ee1a (patch) | |
tree | bf406bf51e343affdcc00647f2a93aa96afa2305 | |
parent | 4028e7e7bdb82f27b57f613e41dac69fc60ab3e8 (diff) |
berry data
-rw-r--r-- | asm/rom.s | 4 | ||||
-rw-r--r-- | data/berries.s | 690 | ||||
-rw-r--r-- | data/data2.s | 10 | ||||
-rw-r--r-- | data/text/berry_descriptions.s | 258 |
4 files changed, 955 insertions, 7 deletions
@@ -165179,7 +165179,7 @@ _0805259E: .align 2 _080525C8: .4byte gUnknown_082165FA _080525CC: .4byte 0x03000560 -_080525D0: .4byte gUnknown_083CD2CC +_080525D0: .4byte gBerries _080525D4: .4byte gUnknown_082165F8 _080525D8: mov r0, r8 @@ -370622,7 +370622,7 @@ _080B49BE: pop {r1} bx r1 .align 2 -_080B49C4: .4byte gUnknown_083CD2B0 +_080B49C4: .4byte gBerries - 0x1C thumb_func_end GetBerryInfo thumb_func_start GetBerryTreeInfo diff --git a/data/berries.s b/data/berries.s new file mode 100644 index 000000000..e0865e9f4 --- /dev/null +++ b/data/berries.s @@ -0,0 +1,690 @@ + .align 2 + +gBerries: ; 83CD2CC + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 + + .string "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 a076f4913..016a91d0d 100644 --- a/data/data2.s +++ b/data/data2.s @@ -3218,13 +3218,13 @@ gUnknown_083CC732: ; 83CC732 .incbin "baserom.gba", 0x003cc732, 0x6 gUnknown_083CC738: ; 83CC738 - .incbin "baserom.gba", 0x003cc738, 0xb78 + .incbin "baserom.gba", 0x003cc738, 0x8 -gUnknown_083CD2B0: ; 83CD2B0 - .incbin "baserom.gba", 0x003cd2b0, 0x1c +; 83CC740 + .include "data/text/berry_descriptions.s" -gUnknown_083CD2CC: ; 83CD2CC - .incbin "baserom.gba", 0x003cd2cc, 0x4b4 +; 83CD2CC + .include "data/berries.s" gUnknown_083CD780: ; 83CD780 .incbin "baserom.gba", 0x003cd780, 0x680 diff --git a/data/text/berry_descriptions.s b/data/text/berry_descriptions.s new file mode 100644 index 000000000..2303cc488 --- /dev/null +++ b/data/text/berry_descriptions.s @@ -0,0 +1,258 @@ +gBerryDescriptionPart1_Cheri: ; 83CC740 + .string "Blooms with delicate pretty flowers.$" + +gBerryDescriptionPart2_Cheri: ; 83CC765 + .string "The bright red BERRY is very spicy.$" + +gBerryDescriptionPart1_Chesto: ; 83CC789 + .string "The BERRY’s thick skin and fruit are$" + +gBerryDescriptionPart2_Chesto: ; 83CC7AE + .string "very tough. It is dry-tasting all over.$" + +gBerryDescriptionPart1_Pecha: ; 83CC7D6 + .string "Very sweet and delicious.$" + +gBerryDescriptionPart2_Pecha: ; 83CC7F0 + .string "Also very tender - handle with care.$" + +gBerryDescriptionPart1_Rawst: ; 83CC815 + .string "If the leaves grow long and curly,$" + +gBerryDescriptionPart2_Rawst: ; 83CC838 + .string "the BERRY seems to grow very bitter.$" + +gBerryDescriptionPart1_Aspear: ; 83CC85D + .string "The hard BERRY is dense with a rich$" + +gBerryDescriptionPart2_Aspear: ; 83CC881 + .string "juice. It is quite sour.$" + +gBerryDescriptionPart1_Leppa: ; 83CC89A + .string "Grows slower than CHERI and others.$" + +gBerryDescriptionPart2_Leppa: ; 83CC8BE + .string "The smaller the BERRY, the tastier.$" + +gBerryDescriptionPart1_Oran: ; 83CC8E2 + .string "A peculiar BERRY with a mix of flavors.$" + +gBerryDescriptionPart2_Oran: ; 83CC90A + .string "BERRIES grow in half a day.$" + +gBerryDescriptionPart1_Persim: ; 83CC926 + .string "Loves sunlight. The BERRY’s color$" + +gBerryDescriptionPart2_Persim: ; 83CC948 + .string "grows vivid when exposed to the sun.$" + +gBerryDescriptionPart1_Lum: ; 83CC96D + .string "Slow to grow. If raised with loving$" + +gBerryDescriptionPart2_Lum: ; 83CC991 + .string "care, it may grow two BERRIES.$" + +gBerryDescriptionPart1_Sitrus: ; 83CC9B0 + .string "Closely related to ORAN. The large$" + +gBerryDescriptionPart2_Sitrus: ; 83CC9D3 + .string "BERRY has a well-rounded flavor.$" + +gBerryDescriptionPart1_Figy: ; 83CC9F4 + .string "The BERRY, which looks chewed up,$" + +gBerryDescriptionPart2_Figy: ; 83CCA16 + .string "brims with spicy substances.$" + +gBerryDescriptionPart1_Wiki: ; 83CCA33 + .string "The BERRY is said to have grown lumpy$" + +gBerryDescriptionPart2_Wiki: ; 83CCA59 + .string "to help POKéMON grip it.$" + +gBerryDescriptionPart1_Mago: ; 83CCA72 + .string "The BERRY turns curvy as it grows.$" + +gBerryDescriptionPart2_Mago: ; 83CCA95 + .string "The curvier, the sweeter and tastier.$" + +gBerryDescriptionPart1_Aguav: ; 83CCABB + .string "The flower is dainty. It is rare in its$" + +gBerryDescriptionPart2_Aguav: ; 83CCAE3 + .string "ability to grow without light.$" + +gBerryDescriptionPart1_Iapapa: ; 83CCB02 + .string "The BERRY is very big and sour.$" + +gBerryDescriptionPart2_Iapapa: ; 83CCB22 + .string "It takes at least a day to grow.$" + +gBerryDescriptionPart1_Razz: ; 83CCB43 + .string "The red BERRY tastes slightly spicy.$" + +gBerryDescriptionPart2_Razz: ; 83CCB68 + .string "It grows quickly in just four hours.$" + +gBerryDescriptionPart1_Bluk: ; 83CCB8D + .string "The BERRY is blue on the outside, but$" + +gBerryDescriptionPart2_Bluk: ; 83CCBB3 + .string "it blackens the mouth when eaten.$" + +gBerryDescriptionPart1_Nanab: ; 83CCBD5 + .string "This BERRY was the seventh$" + +gBerryDescriptionPart2_Nanab: ; 83CCBF0 + .string "discovered in the world. It is sweet.$" + +gBerryDescriptionPart1_Wepear: ; 83CCC16 + .string "The flower is small and white. It has a$" + +gBerryDescriptionPart2_Wepear: ; 83CCC3E + .string "delicate balance of bitter and sour.$" + +gBerryDescriptionPart1_Pinap: ; 83CCC63 + .string "Weak against wind and cold.$" + +gBerryDescriptionPart2_Pinap: ; 83CCC7F + .string "The fruit is spicy and the skin, sour.$" + +gBerryDescriptionPart1_Pomeg: ; 83CCCA6 + .string "However much it is watered,$" + +gBerryDescriptionPart2_Pomeg: ; 83CCCC2 + .string "it only grows up to six BERRIES.$" + +gBerryDescriptionPart1_Kelpsy: ; 83CCCE3 + .string "A rare variety shaped like a root.$" + +gBerryDescriptionPart2_Kelpsy: ; 83CCD06 + .string "Grows a very large flower.$" + +gBerryDescriptionPart1_Qualot: ; 83CCD21 + .string "Loves water. Grows strong even in$" + +gBerryDescriptionPart2_Qualot: ; 83CCD43 + .string "locations with constant rainfall.$" + +gBerryDescriptionPart1_Hondew: ; 83CCD65 + .string "A BERRY that is very valuable and$" + +gBerryDescriptionPart2_Hondew: ; 83CCD87 + .string "rarely seen. It is very delicious.$" + +gBerryDescriptionPart1_Grepa: ; 83CCDAA + .string "Despite its tenderness and round$" + +gBerryDescriptionPart2_Grepa: ; 83CCDCB + .string "shape, the BERRY is unimaginably sour.$" + +gBerryDescriptionPart1_Tamato: ; 83CCDF2 + .string "The BERRY is lip-bendingly spicy.$" + +gBerryDescriptionPart2_Tamato: ; 83CCE14 + .string "It takes time to grow.$" + +gBerryDescriptionPart1_Cornn: ; 83CCE2B + .string "A BERRY from an ancient era. May not$" + +gBerryDescriptionPart2_Cornn: ; 83CCE50 + .string "grow unless planted in quantity.$" + +gBerryDescriptionPart1_Magost: ; 83CCE71 + .string "A BERRY that is widely said to have$" + +gBerryDescriptionPart2_Magost: ; 83CCE95 + .string "a finely balanced flavor.$" + +gBerryDescriptionPart1_Rabuta: ; 83CCEAF + .string "A rare variety that is overgrown with$" + +gBerryDescriptionPart2_Rabuta: ; 83CCED5 + .string "hair. It is quite bitter.$" + +gBerryDescriptionPart1_Nomel: ; 83CCEEF + .string "Quite sour. Just one bite makes it$" + +gBerryDescriptionPart2_Nomel: ; 83CCF12 + .string "impossible to taste for three days.$" + +gBerryDescriptionPart1_Spelon: ; 83CCF36 + .string "The vividly red BERRY is very spicy.$" + +gBerryDescriptionPart2_Spelon: ; 83CCF5B + .string "Its warts secrete a spicy substance.$" + +gBerryDescriptionPart1_Pamtre: ; 83CCF80 + .string "Drifts on the sea from somewhere.$" + +gBerryDescriptionPart2_Pamtre: ; 83CCFA2 + .string "It is thought to grow elsewhere.$" + +gBerryDescriptionPart1_Watmel: ; 83CCFC3 + .string "A huge BERRY, with some over 20$" + +gBerryDescriptionPart2_Watmel: ; 83CCFE3 + .string "inches discovered. Exceedingly sweet.$" + +gBerryDescriptionPart1_Durin: ; 83CD009 + .string "Bitter to even look at. It is so$" + +gBerryDescriptionPart2_Durin: ; 83CD02A + .string "bitter, no one has ever eaten it as is.$" + +gBerryDescriptionPart1_Belue: ; 83CD052 + .string "It is glossy and looks delicious, but$" + +gBerryDescriptionPart2_Belue: ; 83CD078 + .string "it is awfully sour. Takes time to grow.$" + +gBerryDescriptionPart1_Liechi: ; 83CD0A0 + .string "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Liechi: ; 83CD0C5 + .string "contain the power of the sea.$" + +gBerryDescriptionPart1_Ganlon: ; 83CD0E3 + .string "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Ganlon: ; 83CD108 + .string "contain the power of the land.$" + +gBerryDescriptionPart1_Salac: ; 83CD127 + .string "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Salac: ; 83CD14C + .string "contain the power of the sky.$" + +gBerryDescriptionPart1_Petaya: ; 83CD16A + .string "A mysterious BERRY. It is rumored to$" + +gBerryDescriptionPart2_Petaya: ; 83CD18F + .string "contain the power of all living things.$" + +gBerryDescriptionPart1_Apicot: ; 83CD1B7 + .string "A very mystifying BERRY. No telling$" + +gBerryDescriptionPart2_Apicot: ; 83CD1DB + .string "what may happen or how it can be used.$" + +gBerryDescriptionPart1_Lansat: ; 83CD202 + .string "Said to be a legendary BERRY.$" + +gBerryDescriptionPart2_Lansat: ; 83CD220 + .string "Holding it supposedly brings joy.$" + +gBerryDescriptionPart1_Starf: ; 83CD242 + .string "So strong, it was abandoned at the$" + +gBerryDescriptionPart2_Starf: ; 83CD265 + .string "world’s edge. Considered a mirage.$" + +gBerryDescriptionPart1_Enigma: ; 83CD288 + .string "A completely enigmatic BERRY.$" + +gBerryDescriptionPart2_Enigma: ; 83CD2A6 + .string "Appears to have the power of stars.$" + |