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 /data/data2.s | |
| parent | 4028e7e7bdb82f27b57f613e41dac69fc60ab3e8 (diff) | |
berry data
Diffstat (limited to 'data/data2.s')
| -rw-r--r-- | data/data2.s | 10 |
1 files changed, 5 insertions, 5 deletions
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 |