diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-05-04 17:45:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 17:45:50 -0400 |
| commit | 58200616d55798002046e67a656f5295834455ec (patch) | |
| tree | 7487b983c8205a97832831b6b6b06cf60534f65a /asm/pokemon_storage_system.s | |
| parent | 4acbcf5759cb2d5453631dd104e3a845931df66c (diff) | |
| parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) | |
Merge branch 'master' into trader
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rw-r--r-- | asm/pokemon_storage_system.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 21647dfdf..111093bee 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -14810,7 +14810,7 @@ _080CF020: beq _080CF0AC ldr r3, =0x00000d65 adds r4, r3 - bl ItemId_GetItem + bl ItemId_GetName adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 @@ -19057,7 +19057,7 @@ sub_80D12B8: @ 80D12B8 ldr r1, =0x00002234 adds r0, r1 ldrh r0, [r0] - bl ItemId_GetItem + bl ItemId_GetName pop {r1} bx r1 .pool |