diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-13 10:03:07 +0200 |
| commit | a83d07e1b3134ff7c23a3ac39552f8285a0c09b4 (patch) | |
| tree | 0feb901cc447f2b76c006e54affa906977be8ab9 /asm/item_use.s | |
| parent | 625b1b69493313224277dcfd957269cc9945eb84 (diff) | |
| parent | 0918cadae3c2ab22993099bd474d40f93a893d5d (diff) | |
Merge branch 'master' into decomp_berry
Diffstat (limited to 'asm/item_use.s')
| -rw-r--r-- | asm/item_use.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/item_use.s b/asm/item_use.s index 3f97bb2d1..733b24470 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -218,7 +218,7 @@ CleanUpAfterFailingToUseRegisteredKeyItemOnField: @ 80FD1F8 adds r0, r4, 0 bl DestroyTask bl sub_80984F4 - bl script_env_2_disable + bl ScriptContext2_Disable pop {r4} pop {r0} bx r0 @@ -396,7 +396,7 @@ _080FD378: bl GetOnOffBike _080FD37E: bl sub_80984F4 - bl script_env_2_disable + bl ScriptContext2_Disable adds r0, r4, 0 bl DestroyTask pop {r4} @@ -687,7 +687,7 @@ sub_80FD5CC: @ 80FD5CC movs r1, 0x1 bl sub_8197434 bl sub_80984F4 - bl script_env_2_disable + bl ScriptContext2_Disable adds r0, r4, 0 bl DestroyTask pop {r4} @@ -1665,7 +1665,7 @@ sub_80FDD74: @ 80FDD74 ldrh r0, [r0] movs r1, 0x1 bl RemoveBagItem - bl script_env_2_enable + bl ScriptContext2_Enable ldr r0, =gUnknown_08274482 bl ScriptContext1_SetupScript adds r0, r4, 0 @@ -1727,7 +1727,7 @@ sub_80FDE08: @ 80FDE08 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl script_env_2_enable + bl ScriptContext2_Enable ldr r0, =gUnknown_082744C0 bl ScriptContext1_SetupScript adds r0, r4, 0 @@ -1786,7 +1786,7 @@ sub_80FDE7C: @ 80FDE7C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl script_env_2_enable + bl ScriptContext2_Enable ldr r0, =gUnknown_08242CFC bl ScriptContext1_SetupScript adds r0, r4, 0 |