diff options
Diffstat (limited to 'asm/item_use.s')
| -rw-r--r-- | asm/item_use.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/item_use.s b/asm/item_use.s index 4f9e9e65a..3f97bb2d1 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -553,7 +553,7 @@ ItemUseOnFieldCB_Itemfinder: @ 80FD4B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0, 0x4] adds r1, r4, 0 bl ItemfinderCheckForHiddenItems @@ -906,7 +906,7 @@ _080FD76C: subs r0, r5, r0 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] ldr r0, [r0, 0x4] b _080FD79E @@ -918,7 +918,7 @@ _080FD784: adds r0, r5 b _080FD798 _080FD78E: - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r0, [r0] ldr r0, [r0] adds r0, 0x7 @@ -964,7 +964,7 @@ sub_80FD7C8: @ 80FD7C8 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r1, [r0] ldr r0, [r1] adds r0, 0x7 @@ -1667,7 +1667,7 @@ sub_80FDD74: @ 80FDD74 bl RemoveBagItem bl script_env_2_enable ldr r0, =gUnknown_08274482 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript adds r0, r4, 0 bl DestroyTask pop {r4} @@ -1729,7 +1729,7 @@ sub_80FDE08: @ 80FDE08 lsrs r4, 24 bl script_env_2_enable ldr r0, =gUnknown_082744C0 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript adds r0, r4, 0 bl DestroyTask pop {r4} @@ -1788,7 +1788,7 @@ sub_80FDE7C: @ 80FDE7C lsrs r4, 24 bl script_env_2_enable ldr r0, =gUnknown_08242CFC - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript adds r0, r4, 0 bl DestroyTask pop {r4} @@ -2288,7 +2288,7 @@ re_escape_rope: @ 80FE2D8 thumb_func_start sub_80FE314 sub_80FE314: @ 80FE314 push {lr} - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldrb r1, [r0, 0x1A] movs r0, 0x2 ands r0, r1 @@ -2357,7 +2357,7 @@ ItemUseInBattle_PokeBall: @ 80FE394 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - bl sub_806B8B0 + bl PlayerPartyAndPokemonStorageFull lsls r0, 24 cmp r0, 0 bne _080FE3D0 |