diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 00:19:11 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-03-02 00:19:11 -0500 |
| commit | 62100376b71f54d6ca4b6f020c860e69368c2720 (patch) | |
| tree | fd6e0f08f2987023a7bd0b33c4c5896d7f44c532 /asm | |
| parent | 43f66fce5574592ac1c37b9452fe858e482156bb (diff) | |
Split/label some common event scripts
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_control_avatar.s | 8 | ||||
| -rw-r--r-- | asm/overworld.s | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index d036f25e2..7d5432f8e 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1530,10 +1530,10 @@ _0806D4A0: lsrs r0, 24 cmp r0, 0x1 bne _0806D4B8 - ldr r0, _0806D4B4 @ =gUnknown_81A7702 + ldr r0, _0806D4B4 @ =EventScript_Questionnaire b _0806D53E .align 2, 0 -_0806D4B4: .4byte gUnknown_81A7702 +_0806D4B4: .4byte EventScript_Questionnaire _0806D4B8: adds r0, r4, 0 adds r1, r5, 0 @@ -1822,11 +1822,11 @@ _0806D6EC: lsrs r0, 24 cmp r0, 0x1 bne _0806D704 - ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut + ldr r0, _0806D700 @ =EventScript_FieldPoison bl ScriptContext1_SetupScript b _0806D730 .align 2, 0 -_0806D700: .4byte EventScript_PoisonWhiteOut +_0806D700: .4byte EventScript_FieldPoison _0806D704: bl ShouldEggHatch lsls r0, 24 diff --git a/asm/overworld.s b/asm/overworld.s index f18086650..e16709d54 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -8,7 +8,7 @@ thumb_func_start sub_8054BC8 sub_8054BC8: @ 8054BC8 push {r4,lr} - ldr r0, _08054BFC @ =gUnknown_81A654B + ldr r0, _08054BFC @ =EventScript_ResetEliteFourEnd bl ScriptContext2_RunNewScript ldr r0, _08054C00 @ =gSaveBlock1Ptr ldr r4, [r0] @@ -27,7 +27,7 @@ sub_8054BC8: @ 8054BC8 pop {r0} bx r0 .align 2, 0 -_08054BFC: .4byte gUnknown_81A654B +_08054BFC: .4byte EventScript_ResetEliteFourEnd _08054C00: .4byte gSaveBlock1Ptr thumb_func_end sub_8054BC8 |