diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_setup.s | 8 | ||||
| -rw-r--r-- | asm/field_control_avatar.s | 28 | ||||
| -rw-r--r-- | asm/fldeff_flash.s | 4 | ||||
| -rw-r--r-- | asm/macros/movement.inc | 2 | ||||
| -rw-r--r-- | asm/overworld.s | 4 | ||||
| -rw-r--r-- | asm/wild_encounter.s | 4 |
6 files changed, 26 insertions, 24 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 5a9797056..ce7600ab3 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -1999,13 +1999,13 @@ BattleSetup_GetScriptAddrAfterBattle: @ 80805E8 ldr r0, [r0] cmp r0, 0 bne _080805F4 - ldr r0, _080805FC @ =gUnknown_81C555B + ldr r0, _080805FC @ =EventScript_1C555B _080805F4: pop {r1} bx r1 .align 2, 0 _080805F8: .4byte gUnknown_20386C4 -_080805FC: .4byte gUnknown_81C555B +_080805FC: .4byte EventScript_1C555B thumb_func_end BattleSetup_GetScriptAddrAfterBattle thumb_func_start BattleSetup_GetTrainerPostBattleScript @@ -2015,13 +2015,13 @@ BattleSetup_GetTrainerPostBattleScript: @ 8080600 ldr r0, [r0] cmp r0, 0 bne _0808060C - ldr r0, _08080614 @ =gUnknown_81C555B + ldr r0, _08080614 @ =EventScript_1C555B _0808060C: pop {r1} bx r1 .align 2, 0 _08080610: .4byte gUnknown_20386C8 -_08080614: .4byte gUnknown_81C555B +_08080614: .4byte EventScript_1C555B thumb_func_end BattleSetup_GetTrainerPostBattleScript thumb_func_start sub_8080618 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 diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 4ce45b5c7..63067bb03 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0 bl PlaySE ldr r0, _080C9BC8 @ =0x00000806 bl FlagSet - ldr r0, _080C9BCC @ =gUnknown_81BFB5F + ldr r0, _080C9BCC @ =EventScript_81BFB5F bl ScriptContext1_SetupScript pop {r0} bx r0 .align 2, 0 _080C9BC8: .4byte 0x00000806 -_080C9BCC: .4byte gUnknown_81BFB5F +_080C9BCC: .4byte EventScript_81BFB5F thumb_func_end sub_80C9BB0 thumb_func_start sub_80C9BD0 diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index f077a8f5a..8ad5a313e 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -110,6 +110,8 @@ create_movement step_65 create_movement step_66 create_movement step_67 + create_movement step_68 + create_movement step_69 enum_start 0x91 create_movement step_91 diff --git a/asm/overworld.s b/asm/overworld.s index 9bcd95eab..bd5ab7500 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214 thumb_func_start sub_8058230 sub_8058230: @ 8058230 push {lr} - ldr r0, _08058240 @ =gUnknown_81BB9F0 + ldr r0, _08058240 @ =EventScript_1BB9F0 bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_08058240: .4byte gUnknown_81BB9F0 +_08058240: .4byte EventScript_1BB9F0 thumb_func_end sub_8058230 thumb_func_start sub_8058244 diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index c43ebf0a9..b7ac02d0a 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -1302,14 +1302,14 @@ sub_80830B8: @ 80830B8 bl VarSet cmp r4, 0 bne _08083104 - ldr r0, _08083100 @ =gUnknown_81BFB65 + ldr r0, _08083100 @ =EventScript_1BFB65 bl ScriptContext1_SetupScript movs r0, 0x1 b _08083106 .align 2, 0 _080830F8: .4byte gUnknown_203ADFA _080830FC: .4byte 0x00004020 -_08083100: .4byte gUnknown_81BFB65 +_08083100: .4byte EventScript_1BFB65 _08083104: movs r0, 0 _08083106: |