diff options
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 4f29f2b3a..c44d77e3f 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -456,7 +456,7 @@ _0809C214: bl PlaySE _0809C244: adds r0, r4, 0 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 _0809C24C: pop {r4} @@ -689,7 +689,7 @@ _0809C442: adds r1, r0, 0 ldr r0, =gScriptLastTalked ldrb r0, [r0] - bl sub_8099188 + bl GetRamScript adds r1, r0, 0 _0809C44E: pop {r4-r7} @@ -1175,7 +1175,7 @@ sub_809C868: @ 809C868 cmp r0, 0x2 bne _0809C894 ldr r0, =gUnknown_08290B0F - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 b _0809C896 .pool @@ -1204,7 +1204,7 @@ sub_809C89C: @ 809C89C cmp r0, 0x1 bne _0809C8D4 ldr r0, =gUnknown_08290B5A - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 b _0809C8D6 .pool @@ -1278,7 +1278,7 @@ mapheader_trigger_activate_at__run_now: @ 809C938 bl mapheader_trigger_activate_at cmp r0, 0 beq _0809C964 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 b _0809C966 .pool @@ -1312,7 +1312,7 @@ _0809C988: beq _0809C9A4 ldr r0, =gUnknown_08252BE8 _0809C996: - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 b _0809C9EA .pool @@ -1366,7 +1366,7 @@ per_step_scripts: @ 809C9F4 b _0809CB24 _0809CA04: bl sub_80B215C - bl happiness_algorithm_step + bl AdjustFriendship_step bl sub_81D4998 ldr r0, =gPlayerAvatar ldrb r1, [r0] @@ -1386,7 +1386,7 @@ _0809CA04: cmp r0, 0x1 bne _0809CA48 ldr r0, =gUnknown_082736BC - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CA48: @@ -1397,7 +1397,7 @@ _0809CA48: movs r0, 0xD bl IncrementGameStat ldr r0, =gUnknown_08291FC0 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CA64: @@ -1407,7 +1407,7 @@ _0809CA64: cmp r0, 0x1 bne _0809CA7C ldr r0, =gUnknown_08273D1F - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CA7C: @@ -1417,7 +1417,7 @@ _0809CA7C: cmp r0, 0x1 bne _0809CA94 ldr r0, =gUnknown_08238EAF - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CA94: @@ -1425,7 +1425,7 @@ _0809CA94: cmp r0, 0x1 bne _0809CAA8 ldr r0, =gUnknown_081DF7BA - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CAA8: @@ -1433,7 +1433,7 @@ _0809CAA8: cmp r0, 0x1 bne _0809CABC ldr r0, =gUnknown_081F49EC - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CABC: @@ -1441,7 +1441,7 @@ _0809CABC: cmp r0, 0x1 bne _0809CAD0 ldr r0, =gUnknown_081FA4D6 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CAD0: @@ -1449,7 +1449,7 @@ _0809CAD0: cmp r0, 0x1 bne _0809CAE4 ldr r0, =gUnknown_0821307B - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CAE4: @@ -1457,11 +1457,11 @@ _0809CAE4: cmp r0, 0x1 bne _0809CAF8 ldr r0, =gUnknown_08224175 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CAF8: - bl safari_step + bl SafariZoneTakeStep lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1471,7 +1471,7 @@ _0809CAF8: cmp r0, 0x1 bne _0809CB1C ldr r0, =gUnknown_0823C050 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript b _0809CB28 .pool _0809CB1C: @@ -1500,8 +1500,8 @@ sub_809CB30: @ 809CB30 .pool thumb_func_end sub_809CB30 - thumb_func_start happiness_algorithm_step -happiness_algorithm_step: @ 809CB44 + thumb_func_start AdjustFriendship_step +AdjustFriendship_step: @ 809CB44 push {r4,r5,lr} ldr r0, =0x0000402a bl GetVarPointer @@ -1519,7 +1519,7 @@ happiness_algorithm_step: @ 809CB44 _0809CB62: adds r0, r5, 0 movs r1, 0x5 - bl happiness_algorithm + bl AdjustFriendship adds r5, 0x64 subs r4, 0x1 cmp r4, 0 @@ -1529,7 +1529,7 @@ _0809CB72: pop {r0} bx r0 .pool - thumb_func_end happiness_algorithm_step + thumb_func_end AdjustFriendship_step thumb_func_start overworld_poison_timer_set overworld_poison_timer_set: @ 809CB80 @@ -1765,7 +1765,7 @@ _0809CD50: cmp r0, 0x1 bne _0809CD6C ldr r0, =gUnknown_082A8350 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 b _0809CD8C .pool |