diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 17:18:05 +0100 |
| commit | 1e79d53d2f913c65295b2547549d2c4ed849122b (patch) | |
| tree | de6e74a23a65f5d7ebc7e4a7305742b08b6e71c0 /asm/pokemon_storage_system.s | |
| parent | 0310be30079c657f3a21da64683bdf9ac1d4d394 (diff) | |
| parent | 055a419830c0725a629f971b0299c89082c192fd (diff) | |
merge daycare with master
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rwxr-xr-x | 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 0d331e9a0..396fd3807 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -2252,7 +2252,7 @@ _080C8230: ldrb r0, [r0] cmp r0, 0x2 bne _080C825C - ldr r0, =gScriptItemId + ldr r0, =gSpecialVar_ItemId ldrh r0, [r0] cmp r0, 0 beq _080C825C @@ -5458,7 +5458,7 @@ _080C9F56: sub_80C9F6C: @ 80C9F6C push {lr} sub sp, 0x4 - ldr r0, =gScriptItemId + ldr r0, =gSpecialVar_ItemId ldrh r1, [r0] mov r0, sp strh r1, [r0] |