diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 03:21:42 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 03:21:42 -0500 |
| commit | 6ba1dc8169f148adc9f7f68fec0490dc017c892a (patch) | |
| tree | 7dfe1cc18efed9adff4c24f279586b369554b434 /asm/item_use.s | |
| parent | 448497dfbbc1157c640bc09745454b3c97dc947e (diff) | |
| parent | 78009a835f840864b3d30af00c65a745f75b80fa (diff) | |
Merge remote-tracking branch 'pret/master'
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 ca84557d5..f693f7411 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 |