summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--charmap.txt2
-rw-r--r--data/data3.s420
-rw-r--r--data/data3_a1.s420
-rw-r--r--ld_script.txt2
-rw-r--r--src/berry.c835
5 files changed, 1258 insertions, 421 deletions
diff --git a/charmap.txt b/charmap.txt
index f698701c4..b3e876a87 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -143,7 +143,7 @@ RIGHT_ARROW = 7C
'Ü' = F3
'ä' = F4
'ö' = F5
-'ü' = F6
+'ü' = F6
TALL_PLUS = FC 0C FB
'$' = FF
diff --git a/data/data3.s b/data/data3.s
index 8e223c9f6..9e326ea81 100644
--- a/data/data3.s
+++ b/data/data3.s
@@ -2617,423 +2617,3 @@ gUnknown_08589AD8:: @ 8589AD8
gUnknown_08589ADE:: @ 8589ADE
.incbin "baserom.gba", 0x589ade, 0x6
-
-@ 8589AE4
- .include "data/text/berry_descriptions.inc"
-
-@ 858A670
- .include "data/berries.inc"
-
-gUnknown_0858AB24:: @ 858AB24
- .incbin "baserom.gba", 0x58ab24, 0xac
-
-gUnknown_0858ABD0:: @ 858ABD0
- .incbin "baserom.gba", 0x58abd0, 0xb90
-
-gUnknown_0858B760:: @ 858B760
- .incbin "baserom.gba", 0x58b760, 0x390
-
-gUnknown_0858BAF0:: @ 858BAF0
- .incbin "baserom.gba", 0x58baf0, 0x78
-
-gUnknown_0858BB68:: @ 858BB68
- .incbin "baserom.gba", 0x58bb68, 0x8
-
-gUnknown_0858BB70:: @ 858BB70
- .incbin "baserom.gba", 0x58bb70, 0x10
-
-gUnknown_0858BB80:: @ 858BB80
- .incbin "baserom.gba", 0x58bb80, 0x1c
-
-gUnknown_0858BB9C:: @ 858BB9C
- .incbin "baserom.gba", 0x58bb9c, 0x10
-
-gUnknown_0858BBAC:: @ 858BBAC
- .incbin "baserom.gba", 0x58bbac, 0x10
-
-gUnknown_0858BBBC:: @ 858BBBC
- .incbin "baserom.gba", 0x58bbbc, 0x10
-
-gUnknown_0858BBCC:: @ 858BBCC
- .incbin "baserom.gba", 0x58bbcc, 0x14
-
-gUnknown_0858BBE0:: @ 858BBE0
- .incbin "baserom.gba", 0x58bbe0, 0xc
-
-gUnknown_0858BBEC:: @ 858BBEC
- .incbin "baserom.gba", 0x58bbec, 0x18c
-
-gUnknown_0858BD78:: @ 858BD78
- .incbin "baserom.gba", 0x58bd78, 0x40
-
-gUnknown_0858BDB8:: @ 858BDB8
- .incbin "baserom.gba", 0x58bdb8, 0x10
-
-gUnknown_0858BDC8:: @ 858BDC8
- .incbin "baserom.gba", 0x58bdc8, 0x38
-
-gUnknown_0858BE00:: @ 858BE00
- .incbin "baserom.gba", 0x58be00, 0x10
-
-gUnknown_0858BE10:: @ 858BE10
- .incbin "baserom.gba", 0x58be10, 0x30
-
-gUnknown_0858BE40:: @ 858BE40
- .incbin "baserom.gba", 0x58be40, 0x60
-
-gUnknown_0858BEA0:: @ 858BEA0
- .incbin "baserom.gba", 0x58bea0, 0x3
-
-gUnknown_0858BEA3:: @ 858BEA3
- .incbin "baserom.gba", 0x58bea3, 0x18
-
-gUnknown_0858BEBB:: @ 858BEBB
- .incbin "baserom.gba", 0x58bebb, 0x3
-
-gUnknown_0858BEBE:: @ 858BEBE
- .incbin "baserom.gba", 0x58bebe, 0x3
-
-gUnknown_0858BEC1:: @ 858BEC1
- .incbin "baserom.gba", 0x58bec1, 0x3
-
-gUnknown_0858BEC4:: @ 858BEC4
- .incbin "baserom.gba", 0x58bec4, 0x10
-
-gUnknown_0858BED4:: @ 858BED4
- .incbin "baserom.gba", 0x58bed4, 0x8
-
-gUnknown_0858BEDC:: @ 858BEDC
- .incbin "baserom.gba", 0x58bedc, 0x8
-
-gUnknown_0858BEE4:: @ 858BEE4
- .incbin "baserom.gba", 0x58bee4, 0x4
-
-gUnknown_0858BEE8:: @ 858BEE8
- .incbin "baserom.gba", 0x58bee8, 0x10
-
-gUnknown_0858BEF8:: @ 858BEF8
- .incbin "baserom.gba", 0x58bef8, 0x6
-
-gUnknown_0858BEFE:: @ 858BEFE
- .incbin "baserom.gba", 0x58befe, 0x6
-
-gUnknown_0858BF04:: @ 858BF04
- .incbin "baserom.gba", 0x58bf04, 0x14
-
-gUnknown_0858BF18:: @ 858BF18
- .incbin "baserom.gba", 0x58bf18, 0x10
-
-gUnknown_0858BF28:: @ 858BF28
- .incbin "baserom.gba", 0x58bf28, 0xc
-
-gUnknown_0858BF34:: @ 858BF34
- .incbin "baserom.gba", 0x58bf34, 0xa
-
-gUnknown_0858BF3E:: @ 858BF3E
- .incbin "baserom.gba", 0x58bf3e, 0xa
-
-gUnknown_0858BF48:: @ 858BF48
- .incbin "baserom.gba", 0x58bf48, 0x8
-
-gUnknown_0858BF50:: @ 858BF50
- .incbin "baserom.gba", 0x58bf50, 0x8
-
-gUnknown_0858BF58:: @ 858BF58
- .incbin "baserom.gba", 0x58bf58, 0x14
-
-gUnknown_0858BF6C:: @ 858BF6C
- .incbin "baserom.gba", 0x58bf6c, 0x8
-
-gUnknown_0858BF74:: @ 858BF74
- .incbin "baserom.gba", 0x58bf74, 0x14
-
-gUnknown_0858BF88:: @ 858BF88
- .incbin "baserom.gba", 0x58bf88, 0x4
-
-gUnknown_0858BF8C:: @ 858BF8C
- .incbin "baserom.gba", 0x58bf8c, 0xc
-
-gUnknown_0858BF98:: @ 858BF98
- .incbin "baserom.gba", 0x58bf98, 0xc
-
-gUnknown_0858BFA4:: @ 858BFA4
- .incbin "baserom.gba", 0x58bfa4, 0x34
-
-gUnknown_0858BFD8:: @ 858BFD8
- .incbin "baserom.gba", 0x58bfd8, 0x78
-
-gUnknown_0858C050:: @ 858C050
- .incbin "baserom.gba", 0x58c050, 0x8
-
-gUnknown_0858C058:: @ 858C058
- .incbin "baserom.gba", 0x58c058, 0x18
-
-gUnknown_0858C070:: @ 858C070
- .incbin "baserom.gba", 0x58c070, 0x8
-
-gUnknown_0858C078:: @ 858C078
- .incbin "baserom.gba", 0x58c078, 0x48
-
-gUnknown_0858C0C0:: @ 858C0C0
- .incbin "baserom.gba", 0x58c0c0, 0x18
-
-gUnknown_0858C0D8:: @ 858C0D8
- .incbin "baserom.gba", 0x58c0d8, 0x18
-
-gUnknown_0858C0F0:: @ 858C0F0
- .incbin "baserom.gba", 0x58c0f0, 0x18
-
-gUnknown_0858C108:: @ 858C108
- .incbin "baserom.gba", 0x58c108, 0x18
-
-gUnknown_0858C120:: @ 858C120
- .incbin "baserom.gba", 0x58c120, 0x18
-
-gUnknown_0858C138:: @ 858C138
- .incbin "baserom.gba", 0x58c138, 0x18
-
-gUnknown_0858C150:: @ 858C150
- .incbin "baserom.gba", 0x58c150, 0x18
-
-gUnknown_0858C168:: @ 858C168
- .incbin "baserom.gba", 0x58c168, 0x18
-
-gUnknown_0858C180:: @ 858C180
- .incbin "baserom.gba", 0x58c180, 0x18
-
-gUnknown_0858C198:: @ 858C198
- .incbin "baserom.gba", 0x58c198, 0x30
-
-gUnknown_0858C1C8:: @ 858C1C8
- .incbin "baserom.gba", 0x58c1c8, 0x68
-
-gUnknown_0858C230:: @ 858C230
- .incbin "baserom.gba", 0x58c230, 0x5c
-
-gUnknown_0858C28C:: @ 858C28C
- .incbin "baserom.gba", 0x58c28c, 0x18
-
-gUnknown_0858C2A4:: @ 858C2A4
- .incbin "baserom.gba", 0x58c2a4, 0x8
-
-gUnknown_0858C2AC:: @ 858C2AC
- .incbin "baserom.gba", 0x58c2ac, 0x8
-
-@ 858C2B4
- .include "data/contest_moves.inc"
-
-@ 858CDCC
- .include "data/contest_effects.inc"
-
-@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
-@ which means "not a combo starter move".
-gComboStarterLookupTable:: @ 858CE8C
- .byte 0
- .rept 62
- .byte 1
- .endr
-
- .align 2
-@ 858CECC
- .include "data/contest_effect_function_table.inc"
-
-gUnknown_0858CF8C:: @ 858CF8C
- .incbin "baserom.gba", 0x58cf8c, 0x2
-
-gUnknown_0858CF8E:: @ 858CF8E
- .incbin "baserom.gba", 0x58cf8e, 0x6
-
-gUnknown_0858CF94:: @ 858CF94
- .incbin "baserom.gba", 0x58cf94, 0x24
-
-gUnknown_0858CFB8:: @ 858CFB8
- .incbin "baserom.gba", 0x58cfb8, 0x6
-
-gUnknown_0858CFBE:: @ 858CFBE
- .incbin "baserom.gba", 0x58cfbe, 0xe
-
-gUnknown_0858CFCC:: @ 858CFCC
- .incbin "baserom.gba", 0x58cfcc, 0x1c
-
-gUnknown_0858CFE8:: @ 858CFE8
- .incbin "baserom.gba", 0x58cfe8, 0x60
-
-gUnknown_0858D048:: @ 858D048
- .incbin "baserom.gba", 0x58d048, 0x10
-
-gUnknown_0858D058:: @ 858D058
- .incbin "baserom.gba", 0x58d058, 0x8
-
-gUnknown_0858D060:: @ 858D060
- .incbin "baserom.gba", 0x58d060, 0xc
-
-gUnknown_0858D06C:: @ 858D06C
- .incbin "baserom.gba", 0x58d06c, 0x10
-
-gUnknown_0858D07C:: @ 858D07C
- .incbin "baserom.gba", 0x58d07c, 0x18
-
-gUnknown_0858D094:: @ 858D094
- .incbin "baserom.gba", 0x58d094, 0x3c
-
-gUnknown_0858D0D0:: @ 858D0D0
- .incbin "baserom.gba", 0x58d0d0, 0xe
-
-gUnknown_0858D0DE:: @ 858D0DE
- .incbin "baserom.gba", 0x58d0de, 0xe
-
-gUnknown_0858D0EC:: @ 858D0EC
- .incbin "baserom.gba", 0x58d0ec, 0x1c
-
-gUnknown_0858D108:: @ 858D108
- .incbin "baserom.gba", 0x58d108, 0x14
-
-gUnknown_0858D11C:: @ 858D11C
- .incbin "baserom.gba", 0x58d11c, 0x14
-
-gUnknown_0858D130:: @ 858D130
- .incbin "baserom.gba", 0x58d130, 0x14
-
-gUnknown_0858D144:: @ 858D144
- .incbin "baserom.gba", 0x58d144, 0xc
-
-gUnknown_0858D150:: @ 858D150
- .incbin "baserom.gba", 0x58d150, 0x20
-
-gUnknown_0858D170:: @ 858D170
- .incbin "baserom.gba", 0x58d170, 0x18
-
-gUnknown_0858D188:: @ 858D188
- .incbin "baserom.gba", 0x58d188, 0x14
-
-gUnknown_0858D19C:: @ 858D19C
- .incbin "baserom.gba", 0x58d19c, 0x4
-
-gUnknown_0858D1A0:: @ 858D1A0
- .incbin "baserom.gba", 0x58d1a0, 0x30
-
-gUnknown_0858D1D0:: @ 858D1D0
- .incbin "baserom.gba", 0x58d1d0, 0x34
-
-gUnknown_0858D204:: @ 858D204
- .incbin "baserom.gba", 0x58d204, 0x24
-
-gUnknown_0858D228:: @ 858D228
- .incbin "baserom.gba", 0x58d228, 0x18
-
-gUnknown_0858D240:: @ 858D240
- .incbin "baserom.gba", 0x58d240, 0x3c
-
-gUnknown_0858D27C:: @ 858D27C
- .incbin "baserom.gba", 0x58d27c, 0x84
-
-gUnknown_0858D300:: @ 858D300
- .incbin "baserom.gba", 0x58d300, 0x20
-
-gUnknown_0858D320:: @ 858D320
- .incbin "baserom.gba", 0x58d320, 0x18
-
-gUnknown_0858D338:: @ 858D338
- .incbin "baserom.gba", 0x58d338, 0x4c
-
-gUnknown_0858D384:: @ 858D384
- .incbin "baserom.gba", 0x58d384, 0x10
-
-gUnknown_0858D394:: @ 858D394
- .incbin "baserom.gba", 0x58d394, 0x1c
-
-gUnknown_0858D3B0:: @ 858D3B0
- .incbin "baserom.gba", 0x58d3b0, 0x8
-
-gUnknown_0858D3B8:: @ 858D3B8
- .incbin "baserom.gba", 0x58d3b8, 0xc
-
-gUnknown_0858D3C4:: @ 858D3C4
- .incbin "baserom.gba", 0x58d3c4, 0x2c
-
-gUnknown_0858D3F0:: @ 858D3F0
- .incbin "baserom.gba", 0x58d3f0, 0x1c
-
-gUnknown_0858D40C:: @ 858D40C
- .incbin "baserom.gba", 0x58d40c, 0xc
-
-gUnknown_0858D418:: @ 858D418
- .incbin "baserom.gba", 0x58d418, 0x10
-
-gUnknown_0858D428:: @ 858D428
- .incbin "baserom.gba", 0x58d428, 0x34
-
-gUnknown_0858D45C:: @ 858D45C
- .incbin "baserom.gba", 0x58d45c, 0x38
-
-gUnknown_0858D494:: @ 858D494
- .incbin "baserom.gba", 0x58d494, 0x4
-
-gUnknown_0858D498:: @ 858D498
- .incbin "baserom.gba", 0x58d498, 0x1c
-
-gUnknown_0858D4B4:: @ 858D4B4
- .incbin "baserom.gba", 0x58d4b4, 0x30
-
-gUnknown_0858D4E4:: @ 858D4E4
- .incbin "baserom.gba", 0x58d4e4, 0x40
-
-gUnknown_0858D524:: @ 858D524
- .incbin "baserom.gba", 0x58d524, 0x4c
-
-gUnknown_0858D570:: @ 858D570
- .incbin "baserom.gba", 0x58d570, 0x24
-
-gUnknown_0858D594:: @ 858D594
- .incbin "baserom.gba", 0x58d594, 0xac
-
-gUnknown_0858D640:: @ 858D640
- .incbin "baserom.gba", 0x58d640, 0x2c
-
-gUnknown_0858D66C:: @ 858D66C
- .incbin "baserom.gba", 0x58d66c, 0x24
-
-gUnknown_0858D690:: @ 858D690
- .incbin "baserom.gba", 0x58d690, 0x20
-
-gUnknown_0858D6B0:: @ 858D6B0
- .incbin "baserom.gba", 0x58d6b0, 0x20
-
-gUnknown_0858D6D0:: @ 858D6D0
- .incbin "baserom.gba", 0x58d6d0, 0x128
-
-gUnknown_0858D7F8:: @ 858D7F8
- .incbin "baserom.gba", 0x58d7f8, 0x18
-
-gUnknown_0858D810:: @ 858D810
- .incbin "baserom.gba", 0x58d810, 0x40
-
-gUnknown_0858D850:: @ 858D850
- .incbin "baserom.gba", 0x58d850, 0x10
-
-gUnknown_0858D860:: @ 858D860
- .incbin "baserom.gba", 0x58d860, 0x18
-
-gUnknown_0858D878:: @ 858D878
- .incbin "baserom.gba", 0x58d878, 0x8
-
-gUnknown_0858D880:: @ 858D880
- .incbin "baserom.gba", 0x58d880, 0x8
-
-gUnknown_0858D888:: @ 858D888
- .incbin "baserom.gba", 0x58d888, 0x10
-
-gUnknown_0858D898:: @ 858D898
- .incbin "baserom.gba", 0x58d898, 0x30
-
-gUnknown_0858D8C8:: @ 858D8C8
- .incbin "baserom.gba", 0x58d8c8, 0x18
-
-gUnknown_0858D8E0:: @ 858D8E0
- .incbin "baserom.gba", 0x58d8e0, 0x8
-
-gUnknown_0858D8E8:: @ 858D8E8
- .incbin "baserom.gba", 0x58d8e8, 0x4
-
-gUnknown_0858D8EC:: @ 858D8EC
- .incbin "baserom.gba", 0x58d8ec, 0x4
diff --git a/data/data3_a1.s b/data/data3_a1.s
new file mode 100644
index 000000000..6532e6da3
--- /dev/null
+++ b/data/data3_a1.s
@@ -0,0 +1,420 @@
+@ the third big chunk of data
+
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+
+gUnknown_0858AB24:: @ 858AB24
+ .incbin "baserom.gba", 0x58ab24, 0xac
+
+gUnknown_0858ABD0:: @ 858ABD0
+ .incbin "baserom.gba", 0x58abd0, 0xb90
+
+gUnknown_0858B760:: @ 858B760
+ .incbin "baserom.gba", 0x58b760, 0x390
+
+gUnknown_0858BAF0:: @ 858BAF0
+ .incbin "baserom.gba", 0x58baf0, 0x78
+
+gUnknown_0858BB68:: @ 858BB68
+ .incbin "baserom.gba", 0x58bb68, 0x8
+
+gUnknown_0858BB70:: @ 858BB70
+ .incbin "baserom.gba", 0x58bb70, 0x10
+
+gUnknown_0858BB80:: @ 858BB80
+ .incbin "baserom.gba", 0x58bb80, 0x1c
+
+gUnknown_0858BB9C:: @ 858BB9C
+ .incbin "baserom.gba", 0x58bb9c, 0x10
+
+gUnknown_0858BBAC:: @ 858BBAC
+ .incbin "baserom.gba", 0x58bbac, 0x10
+
+gUnknown_0858BBBC:: @ 858BBBC
+ .incbin "baserom.gba", 0x58bbbc, 0x10
+
+gUnknown_0858BBCC:: @ 858BBCC
+ .incbin "baserom.gba", 0x58bbcc, 0x14
+
+gUnknown_0858BBE0:: @ 858BBE0
+ .incbin "baserom.gba", 0x58bbe0, 0xc
+
+gUnknown_0858BBEC:: @ 858BBEC
+ .incbin "baserom.gba", 0x58bbec, 0x18c
+
+gUnknown_0858BD78:: @ 858BD78
+ .incbin "baserom.gba", 0x58bd78, 0x40
+
+gUnknown_0858BDB8:: @ 858BDB8
+ .incbin "baserom.gba", 0x58bdb8, 0x10
+
+gUnknown_0858BDC8:: @ 858BDC8
+ .incbin "baserom.gba", 0x58bdc8, 0x38
+
+gUnknown_0858BE00:: @ 858BE00
+ .incbin "baserom.gba", 0x58be00, 0x10
+
+gUnknown_0858BE10:: @ 858BE10
+ .incbin "baserom.gba", 0x58be10, 0x30
+
+gUnknown_0858BE40:: @ 858BE40
+ .incbin "baserom.gba", 0x58be40, 0x60
+
+gUnknown_0858BEA0:: @ 858BEA0
+ .incbin "baserom.gba", 0x58bea0, 0x3
+
+gUnknown_0858BEA3:: @ 858BEA3
+ .incbin "baserom.gba", 0x58bea3, 0x18
+
+gUnknown_0858BEBB:: @ 858BEBB
+ .incbin "baserom.gba", 0x58bebb, 0x3
+
+gUnknown_0858BEBE:: @ 858BEBE
+ .incbin "baserom.gba", 0x58bebe, 0x3
+
+gUnknown_0858BEC1:: @ 858BEC1
+ .incbin "baserom.gba", 0x58bec1, 0x3
+
+gUnknown_0858BEC4:: @ 858BEC4
+ .incbin "baserom.gba", 0x58bec4, 0x10
+
+gUnknown_0858BED4:: @ 858BED4
+ .incbin "baserom.gba", 0x58bed4, 0x8
+
+gUnknown_0858BEDC:: @ 858BEDC
+ .incbin "baserom.gba", 0x58bedc, 0x8
+
+gUnknown_0858BEE4:: @ 858BEE4
+ .incbin "baserom.gba", 0x58bee4, 0x4
+
+gUnknown_0858BEE8:: @ 858BEE8
+ .incbin "baserom.gba", 0x58bee8, 0x10
+
+gUnknown_0858BEF8:: @ 858BEF8
+ .incbin "baserom.gba", 0x58bef8, 0x6
+
+gUnknown_0858BEFE:: @ 858BEFE
+ .incbin "baserom.gba", 0x58befe, 0x6
+
+gUnknown_0858BF04:: @ 858BF04
+ .incbin "baserom.gba", 0x58bf04, 0x14
+
+gUnknown_0858BF18:: @ 858BF18
+ .incbin "baserom.gba", 0x58bf18, 0x10
+
+gUnknown_0858BF28:: @ 858BF28
+ .incbin "baserom.gba", 0x58bf28, 0xc
+
+gUnknown_0858BF34:: @ 858BF34
+ .incbin "baserom.gba", 0x58bf34, 0xa
+
+gUnknown_0858BF3E:: @ 858BF3E
+ .incbin "baserom.gba", 0x58bf3e, 0xa
+
+gUnknown_0858BF48:: @ 858BF48
+ .incbin "baserom.gba", 0x58bf48, 0x8
+
+gUnknown_0858BF50:: @ 858BF50
+ .incbin "baserom.gba", 0x58bf50, 0x8
+
+gUnknown_0858BF58:: @ 858BF58
+ .incbin "baserom.gba", 0x58bf58, 0x14
+
+gUnknown_0858BF6C:: @ 858BF6C
+ .incbin "baserom.gba", 0x58bf6c, 0x8
+
+gUnknown_0858BF74:: @ 858BF74
+ .incbin "baserom.gba", 0x58bf74, 0x14
+
+gUnknown_0858BF88:: @ 858BF88
+ .incbin "baserom.gba", 0x58bf88, 0x4
+
+gUnknown_0858BF8C:: @ 858BF8C
+ .incbin "baserom.gba", 0x58bf8c, 0xc
+
+gUnknown_0858BF98:: @ 858BF98
+ .incbin "baserom.gba", 0x58bf98, 0xc
+
+gUnknown_0858BFA4:: @ 858BFA4
+ .incbin "baserom.gba", 0x58bfa4, 0x34
+
+gUnknown_0858BFD8:: @ 858BFD8
+ .incbin "baserom.gba", 0x58bfd8, 0x78
+
+gUnknown_0858C050:: @ 858C050
+ .incbin "baserom.gba", 0x58c050, 0x8
+
+gUnknown_0858C058:: @ 858C058
+ .incbin "baserom.gba", 0x58c058, 0x18
+
+gUnknown_0858C070:: @ 858C070
+ .incbin "baserom.gba", 0x58c070, 0x8
+
+gUnknown_0858C078:: @ 858C078
+ .incbin "baserom.gba", 0x58c078, 0x48
+
+gUnknown_0858C0C0:: @ 858C0C0
+ .incbin "baserom.gba", 0x58c0c0, 0x18
+
+gUnknown_0858C0D8:: @ 858C0D8
+ .incbin "baserom.gba", 0x58c0d8, 0x18
+
+gUnknown_0858C0F0:: @ 858C0F0
+ .incbin "baserom.gba", 0x58c0f0, 0x18
+
+gUnknown_0858C108:: @ 858C108
+ .incbin "baserom.gba", 0x58c108, 0x18
+
+gUnknown_0858C120:: @ 858C120
+ .incbin "baserom.gba", 0x58c120, 0x18
+
+gUnknown_0858C138:: @ 858C138
+ .incbin "baserom.gba", 0x58c138, 0x18
+
+gUnknown_0858C150:: @ 858C150
+ .incbin "baserom.gba", 0x58c150, 0x18
+
+gUnknown_0858C168:: @ 858C168
+ .incbin "baserom.gba", 0x58c168, 0x18
+
+gUnknown_0858C180:: @ 858C180
+ .incbin "baserom.gba", 0x58c180, 0x18
+
+gUnknown_0858C198:: @ 858C198
+ .incbin "baserom.gba", 0x58c198, 0x30
+
+gUnknown_0858C1C8:: @ 858C1C8
+ .incbin "baserom.gba", 0x58c1c8, 0x68
+
+gUnknown_0858C230:: @ 858C230
+ .incbin "baserom.gba", 0x58c230, 0x5c
+
+gUnknown_0858C28C:: @ 858C28C
+ .incbin "baserom.gba", 0x58c28c, 0x18
+
+gUnknown_0858C2A4:: @ 858C2A4
+ .incbin "baserom.gba", 0x58c2a4, 0x8
+
+gUnknown_0858C2AC:: @ 858C2AC
+ .incbin "baserom.gba", 0x58c2ac, 0x8
+
+@ 858C2B4
+ .include "data/contest_moves.inc"
+
+@ 858CDCC
+ .include "data/contest_effects.inc"
+
+@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
+@ which means "not a combo starter move".
+gComboStarterLookupTable:: @ 858CE8C
+ .byte 0
+ .rept 62
+ .byte 1
+ .endr
+
+ .align 2
+@ 858CECC
+ .include "data/contest_effect_function_table.inc"
+
+gUnknown_0858CF8C:: @ 858CF8C
+ .incbin "baserom.gba", 0x58cf8c, 0x2
+
+gUnknown_0858CF8E:: @ 858CF8E
+ .incbin "baserom.gba", 0x58cf8e, 0x6
+
+gUnknown_0858CF94:: @ 858CF94
+ .incbin "baserom.gba", 0x58cf94, 0x24
+
+gUnknown_0858CFB8:: @ 858CFB8
+ .incbin "baserom.gba", 0x58cfb8, 0x6
+
+gUnknown_0858CFBE:: @ 858CFBE
+ .incbin "baserom.gba", 0x58cfbe, 0xe
+
+gUnknown_0858CFCC:: @ 858CFCC
+ .incbin "baserom.gba", 0x58cfcc, 0x1c
+
+gUnknown_0858CFE8:: @ 858CFE8
+ .incbin "baserom.gba", 0x58cfe8, 0x60
+
+gUnknown_0858D048:: @ 858D048
+ .incbin "baserom.gba", 0x58d048, 0x10
+
+gUnknown_0858D058:: @ 858D058
+ .incbin "baserom.gba", 0x58d058, 0x8
+
+gUnknown_0858D060:: @ 858D060
+ .incbin "baserom.gba", 0x58d060, 0xc
+
+gUnknown_0858D06C:: @ 858D06C
+ .incbin "baserom.gba", 0x58d06c, 0x10
+
+gUnknown_0858D07C:: @ 858D07C
+ .incbin "baserom.gba", 0x58d07c, 0x18
+
+gUnknown_0858D094:: @ 858D094
+ .incbin "baserom.gba", 0x58d094, 0x3c
+
+gUnknown_0858D0D0:: @ 858D0D0
+ .incbin "baserom.gba", 0x58d0d0, 0xe
+
+gUnknown_0858D0DE:: @ 858D0DE
+ .incbin "baserom.gba", 0x58d0de, 0xe
+
+gUnknown_0858D0EC:: @ 858D0EC
+ .incbin "baserom.gba", 0x58d0ec, 0x1c
+
+gUnknown_0858D108:: @ 858D108
+ .incbin "baserom.gba", 0x58d108, 0x14
+
+gUnknown_0858D11C:: @ 858D11C
+ .incbin "baserom.gba", 0x58d11c, 0x14
+
+gUnknown_0858D130:: @ 858D130
+ .incbin "baserom.gba", 0x58d130, 0x14
+
+gUnknown_0858D144:: @ 858D144
+ .incbin "baserom.gba", 0x58d144, 0xc
+
+gUnknown_0858D150:: @ 858D150
+ .incbin "baserom.gba", 0x58d150, 0x20
+
+gUnknown_0858D170:: @ 858D170
+ .incbin "baserom.gba", 0x58d170, 0x18
+
+gUnknown_0858D188:: @ 858D188
+ .incbin "baserom.gba", 0x58d188, 0x14
+
+gUnknown_0858D19C:: @ 858D19C
+ .incbin "baserom.gba", 0x58d19c, 0x4
+
+gUnknown_0858D1A0:: @ 858D1A0
+ .incbin "baserom.gba", 0x58d1a0, 0x30
+
+gUnknown_0858D1D0:: @ 858D1D0
+ .incbin "baserom.gba", 0x58d1d0, 0x34
+
+gUnknown_0858D204:: @ 858D204
+ .incbin "baserom.gba", 0x58d204, 0x24
+
+gUnknown_0858D228:: @ 858D228
+ .incbin "baserom.gba", 0x58d228, 0x18
+
+gUnknown_0858D240:: @ 858D240
+ .incbin "baserom.gba", 0x58d240, 0x3c
+
+gUnknown_0858D27C:: @ 858D27C
+ .incbin "baserom.gba", 0x58d27c, 0x84
+
+gUnknown_0858D300:: @ 858D300
+ .incbin "baserom.gba", 0x58d300, 0x20
+
+gUnknown_0858D320:: @ 858D320
+ .incbin "baserom.gba", 0x58d320, 0x18
+
+gUnknown_0858D338:: @ 858D338
+ .incbin "baserom.gba", 0x58d338, 0x4c
+
+gUnknown_0858D384:: @ 858D384
+ .incbin "baserom.gba", 0x58d384, 0x10
+
+gUnknown_0858D394:: @ 858D394
+ .incbin "baserom.gba", 0x58d394, 0x1c
+
+gUnknown_0858D3B0:: @ 858D3B0
+ .incbin "baserom.gba", 0x58d3b0, 0x8
+
+gUnknown_0858D3B8:: @ 858D3B8
+ .incbin "baserom.gba", 0x58d3b8, 0xc
+
+gUnknown_0858D3C4:: @ 858D3C4
+ .incbin "baserom.gba", 0x58d3c4, 0x2c
+
+gUnknown_0858D3F0:: @ 858D3F0
+ .incbin "baserom.gba", 0x58d3f0, 0x1c
+
+gUnknown_0858D40C:: @ 858D40C
+ .incbin "baserom.gba", 0x58d40c, 0xc
+
+gUnknown_0858D418:: @ 858D418
+ .incbin "baserom.gba", 0x58d418, 0x10
+
+gUnknown_0858D428:: @ 858D428
+ .incbin "baserom.gba", 0x58d428, 0x34
+
+gUnknown_0858D45C:: @ 858D45C
+ .incbin "baserom.gba", 0x58d45c, 0x38
+
+gUnknown_0858D494:: @ 858D494
+ .incbin "baserom.gba", 0x58d494, 0x4
+
+gUnknown_0858D498:: @ 858D498
+ .incbin "baserom.gba", 0x58d498, 0x1c
+
+gUnknown_0858D4B4:: @ 858D4B4
+ .incbin "baserom.gba", 0x58d4b4, 0x30
+
+gUnknown_0858D4E4:: @ 858D4E4
+ .incbin "baserom.gba", 0x58d4e4, 0x40
+
+gUnknown_0858D524:: @ 858D524
+ .incbin "baserom.gba", 0x58d524, 0x4c
+
+gUnknown_0858D570:: @ 858D570
+ .incbin "baserom.gba", 0x58d570, 0x24
+
+gUnknown_0858D594:: @ 858D594
+ .incbin "baserom.gba", 0x58d594, 0xac
+
+gUnknown_0858D640:: @ 858D640
+ .incbin "baserom.gba", 0x58d640, 0x2c
+
+gUnknown_0858D66C:: @ 858D66C
+ .incbin "baserom.gba", 0x58d66c, 0x24
+
+gUnknown_0858D690:: @ 858D690
+ .incbin "baserom.gba", 0x58d690, 0x20
+
+gUnknown_0858D6B0:: @ 858D6B0
+ .incbin "baserom.gba", 0x58d6b0, 0x20
+
+gUnknown_0858D6D0:: @ 858D6D0
+ .incbin "baserom.gba", 0x58d6d0, 0x128
+
+gUnknown_0858D7F8:: @ 858D7F8
+ .incbin "baserom.gba", 0x58d7f8, 0x18
+
+gUnknown_0858D810:: @ 858D810
+ .incbin "baserom.gba", 0x58d810, 0x40
+
+gUnknown_0858D850:: @ 858D850
+ .incbin "baserom.gba", 0x58d850, 0x10
+
+gUnknown_0858D860:: @ 858D860
+ .incbin "baserom.gba", 0x58d860, 0x18
+
+gUnknown_0858D878:: @ 858D878
+ .incbin "baserom.gba", 0x58d878, 0x8
+
+gUnknown_0858D880:: @ 858D880
+ .incbin "baserom.gba", 0x58d880, 0x8
+
+gUnknown_0858D888:: @ 858D888
+ .incbin "baserom.gba", 0x58d888, 0x10
+
+gUnknown_0858D898:: @ 858D898
+ .incbin "baserom.gba", 0x58d898, 0x30
+
+gUnknown_0858D8C8:: @ 858D8C8
+ .incbin "baserom.gba", 0x58d8c8, 0x18
+
+gUnknown_0858D8E0:: @ 858D8E0
+ .incbin "baserom.gba", 0x58d8e0, 0x8
+
+gUnknown_0858D8E8:: @ 858D8E8
+ .incbin "baserom.gba", 0x58d8e8, 0x4
+
+gUnknown_0858D8EC:: @ 858D8EC
+ .incbin "baserom.gba", 0x58d8ec, 0x4
diff --git a/ld_script.txt b/ld_script.txt
index 8ae46e18a..5f30c242e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -135,6 +135,7 @@ SECTIONS {
asm/item.o(.text);
asm/contest.o(.text);
asm/shop.o(.text);
+ src/berry.o(.text);
asm/berry.o(.text);
asm/script_menu.o(.text);
asm/naming_screen.o(.text);
@@ -304,6 +305,7 @@ SECTIONS {
data/data2c.o(.rodata);
src/trig.o(.rodata);
data/data3.o(.rodata);
+ data/data3_a1.o(.rodata);
src/pokemon_size_record.o(.rodata)
data/data3a.o(.rodata)
data/data3b.o(.rodata);
diff --git a/src/berry.c b/src/berry.c
new file mode 100644
index 000000000..9065261f0
--- /dev/null
+++ b/src/berry.c
@@ -0,0 +1,835 @@
+#include "global.h"
+#include "berry.h"
+
+#define BERRY_NAME_LENGTH 6
+
+#define FIRST_BERRY ITEM_CHERI_BERRY
+#define LAST_BERRY ITEM_ENIGMA_BERRY
+
+#ifdef ENGLISH
+#define NAME_CHERI_BERRY _("CHERI")
+#define NAME_CHESTO_BERRY _("CHESTO")
+#define NAME_PECHA_BERRY _("PECHA")
+#define NAME_RAWST_BERRY _("RAWST")
+#define NAME_ASPEAR_BERRY _("ASPEAR")
+#define NAME_LEPPA_BERRY _("LEPPA")
+#define NAME_ORAN_BERRY _("ORAN")
+#define NAME_PERSIM_BERRY _("PERSIM")
+#define NAME_LUM_BERRY _("LUM")
+#define NAME_SITRUS_BERRY _("SITRUS")
+#define NAME_FIGY_BERRY _("FIGY")
+#define NAME_WIKI_BERRY _("WIKI")
+#define NAME_MAGO_BERRY _("MAGO")
+#define NAME_AGUAV_BERRY _("AGUAV")
+#define NAME_IAPAPA_BERRY _("IAPAPA")
+#define NAME_RAZZ_BERRY _("RAZZ")
+#define NAME_BLUK_BERRY _("BLUK")
+#define NAME_NANAB_BERRY _("NANAB")
+#define NAME_WEPEAR_BERRY _("WEPEAR")
+#define NAME_PINAP_BERRY _("PINAP")
+#define NAME_POMEG_BERRY _("POMEG")
+#define NAME_KELPSY_BERRY _("KELPSY")
+#define NAME_QUALOT_BERRY _("QUALOT")
+#define NAME_HONDEW_BERRY _("HONDEW")
+#define NAME_GREPA_BERRY _("GREPA")
+#define NAME_TAMATO_BERRY _("TAMATO")
+#define NAME_CORNN_BERRY _("CORNN")
+#define NAME_MAGOST_BERRY _("MAGOST")
+#define NAME_RABUTA_BERRY _("RABUTA")
+#define NAME_NOMEL_BERRY _("NOMEL")
+#define NAME_SPELON_BERRY _("SPELON")
+#define NAME_PAMTRE_BERRY _("PAMTRE")
+#define NAME_WATMEL_BERRY _("WATMEL")
+#define NAME_DURIN_BERRY _("DURIN")
+#define NAME_BELUE_BERRY _("BELUE")
+#define NAME_LIECHI_BERRY _("LIECHI")
+#define NAME_GANLON_BERRY _("GANLON")
+#define NAME_SALAC_BERRY _("SALAC")
+#define NAME_PETAYA_BERRY _("PETAYA")
+#define NAME_APICOT_BERRY _("APICOT")
+#define NAME_LANSAT_BERRY _("LANSAT")
+#define NAME_STARF_BERRY _("STARF")
+#define NAME_ENIGMA_BERRY _("ENIGMA")
+
+#endif // ENGLISH
+
+const u8 gBerryDescriptionPart1_Cheri[] = _("Blooms with delicate pretty flowers.");
+const u8 gBerryDescriptionPart2_Cheri[] = _("The bright red BERRY is very spicy.");
+const u8 gBerryDescriptionPart1_Chesto[] = _("The BERRY’s thick skin and fruit are");
+const u8 gBerryDescriptionPart2_Chesto[] = _("very tough. It is dry-tasting all over.");
+const u8 gBerryDescriptionPart1_Pecha[] = _("Very sweet and delicious.");
+const u8 gBerryDescriptionPart2_Pecha[] = _("Also very tender - handle with care.");
+const u8 gBerryDescriptionPart1_Rawst[] = _("If the leaves grow long and curly,");
+const u8 gBerryDescriptionPart2_Rawst[] = _("the BERRY seems to grow very bitter.");
+const u8 gBerryDescriptionPart1_Aspear[] = _("The hard BERRY is dense with a rich");
+const u8 gBerryDescriptionPart2_Aspear[] = _("juice. It is quite sour.");
+const u8 gBerryDescriptionPart1_Leppa[] = _("Grows slower than CHERI and others.");
+const u8 gBerryDescriptionPart2_Leppa[] = _("The smaller the BERRY, the tastier.");
+const u8 gBerryDescriptionPart1_Oran[] = _("A peculiar BERRY with a mix of flavors.");
+const u8 gBerryDescriptionPart2_Oran[] = _("BERRIES grow in half a day.");
+const u8 gBerryDescriptionPart1_Persim[] = _("Loves sunlight. The BERRY’s color");
+const u8 gBerryDescriptionPart2_Persim[] = _("grows vivid when exposed to the sun.");
+const u8 gBerryDescriptionPart1_Lum[] = _("Slow to grow. If raised with loving");
+const u8 gBerryDescriptionPart2_Lum[] = _("care, it may grow two BERRIES.");
+const u8 gBerryDescriptionPart1_Sitrus[] = _("Closely related to ORAN. The large");
+const u8 gBerryDescriptionPart2_Sitrus[] = _("BERRY has a well-rounded flavor.");
+const u8 gBerryDescriptionPart1_Figy[] = _("The BERRY, which looks chewed up,");
+const u8 gBerryDescriptionPart2_Figy[] = _("brims with spicy substances.");
+const u8 gBerryDescriptionPart1_Wiki[] = _("The BERRY is said to have grown lumpy");
+const u8 gBerryDescriptionPart2_Wiki[] = _("to help POKéMON grip it.");
+const u8 gBerryDescriptionPart1_Mago[] = _("The BERRY turns curvy as it grows.");
+const u8 gBerryDescriptionPart2_Mago[] = _("The curvier, the sweeter and tastier.");
+const u8 gBerryDescriptionPart1_Aguav[] = _("The flower is dainty. It is rare in its");
+const u8 gBerryDescriptionPart2_Aguav[] = _("ability to grow without light.");
+const u8 gBerryDescriptionPart1_Iapapa[] = _("The BERRY is very big and sour.");
+const u8 gBerryDescriptionPart2_Iapapa[] = _("It takes at least a day to grow.");
+const u8 gBerryDescriptionPart1_Razz[] = _("The red BERRY tastes slightly spicy.");
+const u8 gBerryDescriptionPart2_Razz[] = _("It grows quickly in just four hours.");
+const u8 gBerryDescriptionPart1_Bluk[] = _("The BERRY is blue on the outside, but");
+const u8 gBerryDescriptionPart2_Bluk[] = _("it blackens the mouth when eaten.");
+const u8 gBerryDescriptionPart1_Nanab[] = _("This BERRY was the seventh");
+const u8 gBerryDescriptionPart2_Nanab[] = _("discovered in the world. It is sweet.");
+const u8 gBerryDescriptionPart1_Wepear[] = _("The flower is small and white. It has a");
+const u8 gBerryDescriptionPart2_Wepear[] = _("delicate balance of bitter and sour.");
+const u8 gBerryDescriptionPart1_Pinap[] = _("Weak against wind and cold.");
+const u8 gBerryDescriptionPart2_Pinap[] = _("The fruit is spicy and the skin, sour.");
+const u8 gBerryDescriptionPart1_Pomeg[] = _("However much it is watered,");
+const u8 gBerryDescriptionPart2_Pomeg[] = _("it only grows up to six BERRIES.");
+const u8 gBerryDescriptionPart1_Kelpsy[] = _("A rare variety shaped like a root.");
+const u8 gBerryDescriptionPart2_Kelpsy[] = _("Grows a very large flower.");
+const u8 gBerryDescriptionPart1_Qualot[] = _("Loves water. Grows strong even in");
+const u8 gBerryDescriptionPart2_Qualot[] = _("locations with constant rainfall.");
+const u8 gBerryDescriptionPart1_Hondew[] = _("A BERRY that is very valuable and");
+const u8 gBerryDescriptionPart2_Hondew[] = _("rarely seen. It is very delicious.");
+const u8 gBerryDescriptionPart1_Grepa[] = _("Despite its tenderness and round");
+const u8 gBerryDescriptionPart2_Grepa[] = _("shape, the BERRY is unimaginably sour.");
+const u8 gBerryDescriptionPart1_Tamato[] = _("The BERRY is lip-bendingly spicy.");
+const u8 gBerryDescriptionPart2_Tamato[] = _("It takes time to grow.");
+const u8 gBerryDescriptionPart1_Cornn[] = _("A BERRY from an ancient era. May not");
+const u8 gBerryDescriptionPart2_Cornn[] = _("grow unless planted in quantity.");
+const u8 gBerryDescriptionPart1_Magost[] = _("A BERRY that is widely said to have");
+const u8 gBerryDescriptionPart2_Magost[] = _("a finely balanced flavor.");
+const u8 gBerryDescriptionPart1_Rabuta[] = _("A rare variety that is overgrown with");
+const u8 gBerryDescriptionPart2_Rabuta[] = _("hair. It is quite bitter.");
+const u8 gBerryDescriptionPart1_Nomel[] = _("Quite sour. Just one bite makes it");
+const u8 gBerryDescriptionPart2_Nomel[] = _("impossible to taste for three days.");
+const u8 gBerryDescriptionPart1_Spelon[] = _("The vividly red BERRY is very spicy.");
+const u8 gBerryDescriptionPart2_Spelon[] = _("Its warts secrete a spicy substance.");
+const u8 gBerryDescriptionPart1_Pamtre[] = _("Drifts on the sea from somewhere.");
+const u8 gBerryDescriptionPart2_Pamtre[] = _("It is thought to grow elsewhere.");
+const u8 gBerryDescriptionPart1_Watmel[] = _("A huge BERRY, with some over 20");
+const u8 gBerryDescriptionPart2_Watmel[] = _("inches discovered. Exceedingly sweet.");
+const u8 gBerryDescriptionPart1_Durin[] = _("Bitter to even look at. It is so");
+const u8 gBerryDescriptionPart2_Durin[] = _("bitter, no one has ever eaten it as is.");
+const u8 gBerryDescriptionPart1_Belue[] = _("It is glossy and looks delicious, but");
+const u8 gBerryDescriptionPart2_Belue[] = _("it is awfully sour. Takes time to grow.");
+const u8 gBerryDescriptionPart1_Liechi[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Liechi[] = _("contain the power of the sea.");
+const u8 gBerryDescriptionPart1_Ganlon[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Ganlon[] = _("contain the power of the land.");
+const u8 gBerryDescriptionPart1_Salac[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Salac[] = _("contain the power of the sky.");
+const u8 gBerryDescriptionPart1_Petaya[] = _("A mysterious BERRY. It is rumored to");
+const u8 gBerryDescriptionPart2_Petaya[] = _("contain the power of all living things.");
+const u8 gBerryDescriptionPart1_Apicot[] = _("A very mystifying BERRY. No telling");
+const u8 gBerryDescriptionPart2_Apicot[] = _("what may happen or how it can be used.");
+const u8 gBerryDescriptionPart1_Lansat[] = _("Said to be a legendary BERRY.");
+const u8 gBerryDescriptionPart2_Lansat[] = _("Holding it supposedly brings joy.");
+const u8 gBerryDescriptionPart1_Starf[] = _("So strong, it was abandoned at the");
+const u8 gBerryDescriptionPart2_Starf[] = _("world’s edge. Considered a mirage.");
+const u8 gBerryDescriptionPart1_Enigma[] = _("A completely enigmatic BERRY.");
+const u8 gBerryDescriptionPart2_Enigma[] = _("Appears to have the power of stars.");
+
+
+const struct Berry gBerries[] =
+{
+ {
+ .name = NAME_CHERI_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 20,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Cheri,
+ .description2 = gBerryDescriptionPart2_Cheri,
+ .stageDuration = 3,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_CHESTO_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 80,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Chesto,
+ .description2 = gBerryDescriptionPart2_Chesto,
+ .stageDuration = 3,
+ .spicy = 0,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_PECHA_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_SOFT,
+ .size = 40,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Pecha,
+ .description2 = gBerryDescriptionPart2_Pecha,
+ .stageDuration = 3,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_RAWST_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 32,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Rawst,
+ .description2 = gBerryDescriptionPart2_Rawst,
+ .stageDuration = 3,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_ASPEAR_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 50,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Aspear,
+ .description2 = gBerryDescriptionPart2_Aspear,
+ .stageDuration = 3,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 10,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_LEPPA_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 28,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Leppa,
+ .description2 = gBerryDescriptionPart2_Leppa,
+ .stageDuration = 4,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_ORAN_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 35,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Oran,
+ .description2 = gBerryDescriptionPart2_Oran,
+ .stageDuration = 3,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_PERSIM_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 47,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Persim,
+ .description2 = gBerryDescriptionPart2_Persim,
+ .stageDuration = 3,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_LUM_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 34,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Lum,
+ .description2 = gBerryDescriptionPart2_Lum,
+ .stageDuration = 12,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_SITRUS_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 95,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Sitrus,
+ .description2 = gBerryDescriptionPart2_Sitrus,
+ .stageDuration = 6,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_FIGY_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 100,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Figy,
+ .description2 = gBerryDescriptionPart2_Figy,
+ .stageDuration = 6,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_WIKI_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 115,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Wiki,
+ .description2 = gBerryDescriptionPart2_Wiki,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_MAGO_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 126,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Mago,
+ .description2 = gBerryDescriptionPart2_Mago,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_AGUAV_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 64,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Aguav,
+ .description2 = gBerryDescriptionPart2_Aguav,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_IAPAPA_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 223,
+ .maxYield = 3,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Iapapa,
+ .description2 = gBerryDescriptionPart2_Iapapa,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 10,
+ .smoothness = 25,
+ },
+ {
+ .name = NAME_RAZZ_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 120,
+ .maxYield = 6,
+ .minYield = 3,
+ .description1 = gBerryDescriptionPart1_Razz,
+ .description2 = gBerryDescriptionPart2_Razz,
+ .stageDuration = 1,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_BLUK_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 108,
+ .maxYield = 6,
+ .minYield = 3,
+ .description1 = gBerryDescriptionPart1_Bluk,
+ .description2 = gBerryDescriptionPart2_Bluk,
+ .stageDuration = 1,
+ .spicy = 0,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_NANAB_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 77,
+ .maxYield = 6,
+ .minYield = 3,
+ .description1 = gBerryDescriptionPart1_Nanab,
+ .description2 = gBerryDescriptionPart2_Nanab,
+ .stageDuration = 1,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_WEPEAR_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 74,
+ .maxYield = 6,
+ .minYield = 3,
+ .description1 = gBerryDescriptionPart1_Wepear,
+ .description2 = gBerryDescriptionPart2_Wepear,
+ .stageDuration = 1,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_PINAP_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 80,
+ .maxYield = 6,
+ .minYield = 3,
+ .description1 = gBerryDescriptionPart1_Pinap,
+ .description2 = gBerryDescriptionPart2_Pinap,
+ .stageDuration = 1,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_POMEG_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 135,
+ .maxYield = 6,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Pomeg,
+ .description2 = gBerryDescriptionPart2_Pomeg,
+ .stageDuration = 3,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_KELPSY_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 150,
+ .maxYield = 6,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Kelpsy,
+ .description2 = gBerryDescriptionPart2_Kelpsy,
+ .stageDuration = 3,
+ .spicy = 0,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_QUALOT_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 110,
+ .maxYield = 6,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Qualot,
+ .description2 = gBerryDescriptionPart2_Qualot,
+ .stageDuration = 3,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_HONDEW_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 162,
+ .maxYield = 6,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Hondew,
+ .description2 = gBerryDescriptionPart2_Hondew,
+ .stageDuration = 3,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_GREPA_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 149,
+ .maxYield = 6,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Grepa,
+ .description2 = gBerryDescriptionPart2_Grepa,
+ .stageDuration = 3,
+ .spicy = 0,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 10,
+ .smoothness = 20,
+ },
+ {
+ .name = NAME_TAMATO_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 200,
+ .maxYield = 4,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Tamato,
+ .description2 = gBerryDescriptionPart2_Tamato,
+ .stageDuration = 6,
+ .spicy = 20,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_CORNN_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 75,
+ .maxYield = 4,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Cornn,
+ .description2 = gBerryDescriptionPart2_Cornn,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 20,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_MAGOST_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 140,
+ .maxYield = 4,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Magost,
+ .description2 = gBerryDescriptionPart2_Magost,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 20,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_RABUTA_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 226,
+ .maxYield = 4,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Rabuta,
+ .description2 = gBerryDescriptionPart2_Rabuta,
+ .stageDuration = 6,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 20,
+ .sour = 10,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_NOMEL_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 285,
+ .maxYield = 4,
+ .minYield = 2,
+ .description1 = gBerryDescriptionPart1_Nomel,
+ .description2 = gBerryDescriptionPart2_Nomel,
+ .stageDuration = 6,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 20,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_SPELON_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 133,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Spelon,
+ .description2 = gBerryDescriptionPart2_Spelon,
+ .stageDuration = 18,
+ .spicy = 40,
+ .dry = 10,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 70,
+ },
+ {
+ .name = NAME_PAMTRE_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_SOFT,
+ .size = 244,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Pamtre,
+ .description2 = gBerryDescriptionPart2_Pamtre,
+ .stageDuration = 18,
+ .spicy = 0,
+ .dry = 40,
+ .sweet = 10,
+ .bitter = 0,
+ .sour = 0,
+ .smoothness = 70,
+ },
+ {
+ .name = NAME_WATMEL_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 250,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Watmel,
+ .description2 = gBerryDescriptionPart2_Watmel,
+ .stageDuration = 18,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 40,
+ .bitter = 10,
+ .sour = 0,
+ .smoothness = 70,
+ },
+ {
+ .name = NAME_DURIN_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 280,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Durin,
+ .description2 = gBerryDescriptionPart2_Durin,
+ .stageDuration = 18,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 40,
+ .sour = 10,
+ .smoothness = 70,
+ },
+ {
+ .name = NAME_BELUE_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_SOFT,
+ .size = 300,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Belue,
+ .description2 = gBerryDescriptionPart2_Belue,
+ .stageDuration = 18,
+ .spicy = 10,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 40,
+ .smoothness = 70,
+ },
+ {
+ .name = NAME_LIECHI_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 111,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Liechi,
+ .description2 = gBerryDescriptionPart2_Liechi,
+ .stageDuration = 24,
+ .spicy = 40,
+ .dry = 0,
+ .sweet = 40,
+ .bitter = 0,
+ .sour = 10,
+ .smoothness = 80,
+ },
+ {
+ .name = NAME_GANLON_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 33,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Ganlon,
+ .description2 = gBerryDescriptionPart2_Ganlon,
+ .stageDuration = 24,
+ .spicy = 0,
+ .dry = 40,
+ .sweet = 0,
+ .bitter = 40,
+ .sour = 0,
+ .smoothness = 80,
+ },
+ {
+ .name = NAME_SALAC_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 95,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Salac,
+ .description2 = gBerryDescriptionPart2_Salac,
+ .stageDuration = 24,
+ .spicy = 0,
+ .dry = 0,
+ .sweet = 40,
+ .bitter = 0,
+ .sour = 40,
+ .smoothness = 80,
+ },
+ {
+ .name = NAME_PETAYA_BERRY,
+ .firmness = BERRY_FIRMNESS_VERY_HARD,
+ .size = 237,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Petaya,
+ .description2 = gBerryDescriptionPart2_Petaya,
+ .stageDuration = 24,
+ .spicy = 40,
+ .dry = 0,
+ .sweet = 0,
+ .bitter = 40,
+ .sour = 0,
+ .smoothness = 80,
+ },
+ {
+ .name = NAME_APICOT_BERRY,
+ .firmness = BERRY_FIRMNESS_HARD,
+ .size = 75,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Apicot,
+ .description2 = gBerryDescriptionPart2_Apicot,
+ .stageDuration = 24,
+ .spicy = 0,
+ .dry = 40,
+ .sweet = 0,
+ .bitter = 0,
+ .sour = 40,
+ .smoothness = 80,
+ },
+ {
+ .name = NAME_LANSAT_BERRY,
+ .firmness = BERRY_FIRMNESS_SOFT,
+ .size = 97,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Lansat,
+ .description2 = gBerryDescriptionPart2_Lansat,
+ .stageDuration = 24,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_STARF_BERRY,
+ .firmness = BERRY_FIRMNESS_SUPER_HARD,
+ .size = 153,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Starf,
+ .description2 = gBerryDescriptionPart2_Starf,
+ .stageDuration = 24,
+ .spicy = 10,
+ .dry = 10,
+ .sweet = 10,
+ .bitter = 10,
+ .sour = 10,
+ .smoothness = 30,
+ },
+ {
+ .name = NAME_ENIGMA_BERRY,
+ .firmness = BERRY_FIRMNESS_UNKNOWN,
+ .size = 0,
+ .maxYield = 2,
+ .minYield = 1,
+ .description1 = gBerryDescriptionPart1_Enigma,
+ .description2 = gBerryDescriptionPart2_Enigma,
+ .stageDuration = 24,
+ .spicy = 40,
+ .dry = 40,
+ .sweet = 40,
+ .bitter = 40,
+ .sour = 40,
+ .smoothness = 40,
+ },
+};
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 18:26:42 +0000