berry firmness strings
This commit is contained in:
+1
-1
@@ -725441,7 +725441,7 @@ itemid_copy_name: ; 8178250
|
|||||||
ldrb r0, [r6, 0x7]
|
ldrb r0, [r6, 0x7]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
beq @081782B0
|
beq @081782B0
|
||||||
ldr r0, =gUnknown_085EFD50
|
ldr r0, =gBerryFirmnessStringPointers
|
||||||
ldrb r1, [r6, 0x7]
|
ldrb r1, [r6, 0x7]
|
||||||
subs r1, 0x1
|
subs r1, 0x1
|
||||||
lsls r1, 2
|
lsls r1, 2
|
||||||
|
|||||||
+10
-3
@@ -7905,7 +7905,10 @@ gUnknown_085E922C: ; 85E922C
|
|||||||
.incbin "base_emerald.gba", 0x5e922c, 0x7
|
.incbin "base_emerald.gba", 0x5e922c, 0x7
|
||||||
|
|
||||||
gUnknown_085E9233: ; 85E9233
|
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
|
gUnknown_085E9263: ; 85E9263
|
||||||
.incbin "base_emerald.gba", 0x5e9263, 0x8
|
.incbin "base_emerald.gba", 0x5e9263, 0x8
|
||||||
@@ -9767,8 +9770,12 @@ gUnknown_085EFD20: ; 85EFD20
|
|||||||
gUnknown_085EFD28: ; 85EFD28
|
gUnknown_085EFD28: ; 85EFD28
|
||||||
.incbin "base_emerald.gba", 0x5efd28, 0x28
|
.incbin "base_emerald.gba", 0x5efd28, 0x28
|
||||||
|
|
||||||
gUnknown_085EFD50: ; 85EFD50
|
gBerryFirmnessStringPointers: ; 85EFD50
|
||||||
.incbin "base_emerald.gba", 0x5efd50, 0x14
|
.4byte gBerryFirmnessString_VerySoft
|
||||||
|
.4byte gBerryFirmnessString_Soft
|
||||||
|
.4byte gBerryFirmnessString_Hard
|
||||||
|
.4byte gBerryFirmnessString_VeryHard
|
||||||
|
.4byte gBerryFirmnessString_SuperHard
|
||||||
|
|
||||||
gUnknown_085EFD64: ; 85EFD64
|
gUnknown_085EFD64: ; 85EFD64
|
||||||
.incbin "base_emerald.gba", 0x5efd64, 0x4
|
.incbin "base_emerald.gba", 0x5efd64, 0x4
|
||||||
|
|||||||
@@ -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$"
|
||||||
Reference in New Issue
Block a user