diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-22 11:38:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 11:38:44 -0500 |
| commit | fbf0c4616c397bf7d9d5a8d2dfda5c647fa18af7 (patch) | |
| tree | 2b6aa4f2f870d0262f29dc5ff275b124eb70412e /asm | |
| parent | 84c198ac76902385170fd0df90117411b930abe1 (diff) | |
| parent | c75296640d9c42897eecf229bc7fc294f60a65eb (diff) | |
Merge branch 'master' into doc-cinnabar
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_control_avatar.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 673c8bfc3..83f9a5700 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1100,11 +1100,11 @@ sub_806D0E4: @ 806D0E4 ldr r0, [r5, 0x8] cmp r0, 0 bne _0806D120 - ldr r0, _0806D11C @ =EventScript_1C555B + ldr r0, _0806D11C @ =Test_EventScript_Sign b _0806D1E6 .align 2, 0 _0806D118: .4byte gMapHeader -_0806D11C: .4byte EventScript_1C555B +_0806D11C: .4byte Test_EventScript_Sign _0806D120: adds r0, r7, 0 adds r1, r6, 0 @@ -1834,11 +1834,11 @@ _0806D704: beq _0806D720 movs r0, 0xD bl IncrementGameStat - ldr r0, _0806D71C @ =EventScript_81BF546 + ldr r0, _0806D71C @ =EventScript_EggHatch bl ScriptContext1_SetupScript b _0806D730 .align 2, 0 -_0806D71C: .4byte EventScript_81BF546 +_0806D71C: .4byte EventScript_EggHatch _0806D720: bl SafariZoneTakeStep lsls r0, 24 @@ -2150,13 +2150,13 @@ _0806D950: ldr r0, [r0, 0x8] cmp r0, 0 bne _0806D958 - ldr r0, _0806D960 @ =EventScript_1C555B + ldr r0, _0806D960 @ =Test_EventScript_Sign _0806D958: pop {r4} pop {r1} bx r1 .align 2, 0 -_0806D960: .4byte EventScript_1C555B +_0806D960: .4byte Test_EventScript_Sign thumb_func_end sub_806D928 thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally |