diff options
author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
---|---|---|
committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-05-05 18:50:26 +0100 |
commit | 22ec43a6eddfc63bbb1f9a883c7b1cdda05f0d64 (patch) | |
tree | b5d33877dbe736022815a40c6ff2af3977e36d77 /asm/pokemon_storage_system.s | |
parent | 39fd42faeadeb73bf57018f69a6d69463635847a (diff) | |
parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) |
resolve merge conflicts
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 |