diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-30 10:34:16 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-30 10:34:16 -0700 |
| commit | 72f13c0b510c55edde5764adea1e007b6455e5aa (patch) | |
| tree | f5d94316ba8e5e87da518b78d4d96599e8118d90 | |
| parent | 832b0b525f9d142b6280f93ca8d511b54fe12880 (diff) | |
berry firmness strings
| -rw-r--r-- | asm/emerald.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 13 | ||||
| -rw-r--r-- | data/text/berry_firmness_strings.s | 14 |
3 files changed, 25 insertions, 4 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 76045f4c6..f4e1f692b 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -725441,7 +725441,7 @@ itemid_copy_name: ; 8178250 ldrb r0, [r6, 0x7] cmp r0, 0 beq @081782B0 - ldr r0, =gUnknown_085EFD50 + ldr r0, =gBerryFirmnessStringPointers ldrb r1, [r6, 0x7] subs r1, 0x1 lsls r1, 2 diff --git a/data/data2.s b/data/data2.s index dfafefe0d..f1ec1a7bd 100644 --- a/data/data2.s +++ b/data/data2.s @@ -7905,7 +7905,10 @@ gUnknown_085E922C: ; 85E922C .incbin "base_emerald.gba", 0x5e922c, 0x7 gUnknown_085E9233: ; 85E9233 - .incbin "base_emerald.gba", 0x5e9233, 0x30 + .incbin "base_emerald.gba", 0x5e9233, 0x7 + +; 85E923A + .include "data/text/berry_firmness_strings.s" gUnknown_085E9263: ; 85E9263 .incbin "base_emerald.gba", 0x5e9263, 0x8 @@ -9767,8 +9770,12 @@ gUnknown_085EFD20: ; 85EFD20 gUnknown_085EFD28: ; 85EFD28 .incbin "base_emerald.gba", 0x5efd28, 0x28 -gUnknown_085EFD50: ; 85EFD50 - .incbin "base_emerald.gba", 0x5efd50, 0x14 +gBerryFirmnessStringPointers: ; 85EFD50 + .4byte gBerryFirmnessString_VerySoft + .4byte gBerryFirmnessString_Soft + .4byte gBerryFirmnessString_Hard + .4byte gBerryFirmnessString_VeryHard + .4byte gBerryFirmnessString_SuperHard gUnknown_085EFD64: ; 85EFD64 .incbin "base_emerald.gba", 0x5efd64, 0x4 diff --git a/data/text/berry_firmness_strings.s b/data/text/berry_firmness_strings.s new file mode 100644 index 000000000..179350b44 --- /dev/null +++ b/data/text/berry_firmness_strings.s @@ -0,0 +1,14 @@ +gBerryFirmnessString_VerySoft: ; 85E923A + .charmapstr "Very soft$" + +gBerryFirmnessString_Soft: ; 85E9244 + .charmapstr "Soft$" + +gBerryFirmnessString_Hard: ; 85E9249 + .charmapstr "Hard$" + +gBerryFirmnessString_VeryHard: ; 85E924E + .charmapstr "Very hard$" + +gBerryFirmnessString_SuperHard: ; 85E9258 + .charmapstr "Super hard$" |