diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:20:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:20:01 -0400 |
| commit | 4d8f66774e791bd6d30023b41fed7f2e00b0edac (patch) | |
| tree | 57c1ce5af4a512e2f24be3a363b406a3b61938ed /asm/field_control_avatar.s | |
| parent | a7b278ac2ddc0bb87530064585b47bbcabb3a157 (diff) | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
Merge branch 'master' into trainers
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index c1825ba58..2caa5a7fd 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 @ =gUnknown_81C555B + ldr r0, _0806D11C @ =EventScript_1C555B b _0806D1E6 .align 2, 0 _0806D118: .4byte gMapHeader -_0806D11C: .4byte gUnknown_81C555B +_0806D11C: .4byte EventScript_1C555B _0806D120: adds r0, r7, 0 adds r1, r6, 0 @@ -1330,10 +1330,10 @@ _0806D2F0: lsrs r0, 24 cmp r0, 0x1 bne _0806D308 - ldr r0, _0806D304 @ =gUnknown_81C549C + ldr r0, _0806D304 @ =EventScript_1C549C b _0806D53E .align 2, 0 -_0806D304: .4byte gUnknown_81C549C +_0806D304: .4byte EventScript_1C549C _0806D308: adds r0, r4, 0 adds r1, r5, 0 @@ -1641,11 +1641,11 @@ _0806D570: lsrs r0, 24 cmp r0, 0x1 bne _0806D5A4 - ldr r0, _0806D5A0 @ =gUnknown_81A6AC8 + ldr r0, _0806D5A0 @ =EventScript_1A6AC8 b _0806D5E2 .align 2, 0 _0806D59C: .4byte 0x00000824 -_0806D5A0: .4byte gUnknown_81A6AC8 +_0806D5A0: .4byte EventScript_1A6AC8 _0806D5A4: adds r0, r4, 0 bl MetatileBehavior_IsWaterfall @@ -1670,10 +1670,10 @@ _0806D5A4: _0806D5D0: .4byte 0x00000826 _0806D5D4: .4byte gUnknown_81BE2B7 _0806D5D8: - ldr r0, _0806D5DC @ =gUnknown_81BE2FF + ldr r0, _0806D5DC @ =EventScript_81BE2FF b _0806D5E2 .align 2, 0 -_0806D5DC: .4byte gUnknown_81BE2FF +_0806D5DC: .4byte EventScript_81BE2FF _0806D5E0: movs r0, 0 _0806D5E2: @@ -1834,11 +1834,11 @@ _0806D704: beq _0806D720 movs r0, 0xD bl IncrementGameStat - ldr r0, _0806D71C @ =gUnknown_81BF546 + ldr r0, _0806D71C @ =EventScript_81BF546 bl ScriptContext1_SetupScript b _0806D730 .align 2, 0 -_0806D71C: .4byte gUnknown_81BF546 +_0806D71C: .4byte EventScript_81BF546 _0806D720: bl SafariZoneTakeStep lsls r0, 24 @@ -2150,13 +2150,13 @@ _0806D950: ldr r0, [r0, 0x8] cmp r0, 0 bne _0806D958 - ldr r0, _0806D960 @ =gUnknown_81C555B + ldr r0, _0806D960 @ =EventScript_1C555B _0806D958: pop {r4} pop {r1} bx r1 .align 2, 0 -_0806D960: .4byte gUnknown_81C555B +_0806D960: .4byte EventScript_1C555B thumb_func_end sub_806D928 thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally @@ -2332,12 +2332,12 @@ _0806DAC4: cmp r0, 0x1 bne _0806DAE4 bl ResetInitialPlayerAvatarState - ldr r0, _0806DAE0 @ =gUnknown_81C1361 + ldr r0, _0806DAE0 @ =EventScript_1C1361 bl ScriptContext1_SetupScript movs r0, 0x1 b _0806DAEE .align 2, 0 -_0806DAE0: .4byte gUnknown_81C1361 +_0806DAE0: .4byte EventScript_1C1361 _0806DAE4: bl DoWarp movs r0, 0x1 |