diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 22:31:37 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-02 22:31:37 +0200 |
commit | b5fea95a460d97a2b3660fcc013bf88f99b3269c (patch) | |
tree | 6f9480bc40b582776a716ca150cf4c67247eadd3 /asm/cable_club.s | |
parent | a4cc67008e29b9a54c67c89f12b0cdd014cf31a7 (diff) |
finish event data
Diffstat (limited to 'asm/cable_club.s')
-rw-r--r-- | asm/cable_club.s | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/asm/cable_club.s b/asm/cable_club.s index df254cfe0..73288455f 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -663,7 +663,7 @@ sub_80B28A8: @ 80B28A8 b _080B2908 .pool _080B28F4: - ldr r4, =gUnknown_020375F0 + ldr r4, =gScriptResult adds r0, r7, 0 adds r1, r6, 0 bl sub_80B2478 @@ -703,7 +703,7 @@ sub_80B2918: @ 80B2918 bl sub_80B24F8 cmp r0, 0x1 beq _080B29E6 - ldr r4, =gUnknown_020375F0 + ldr r4, =gScriptResult adds r0, r6, 0 adds r1, r5, 0 bl sub_80B2478 @@ -791,7 +791,7 @@ sub_80B2A08: @ 80B2A08 bl sub_80B24F8 cmp r0, 0x1 beq _080B2ACE - ldr r0, =gUnknown_020375F0 + ldr r0, =gScriptResult ldrh r0, [r0] cmp r0, 0x4 bne _080B2A38 @@ -941,7 +941,7 @@ _080B2B5E: mov r1, r8 cmp r1, 0x1 ble _080B2B20 - ldr r0, =gUnknown_020375E2 + ldr r0, =gSpecialVar_0x8005 strh r7, [r0] adds r0, r2, 0 add sp, 0x8 @@ -1067,7 +1067,7 @@ _080B2C7E: movs r0, 0 bl sub_800B330 bl sub_800A5B4 - ldr r0, =gUnknown_020375F0 + ldr r0, =gScriptResult adds r1, r5, 0 bl task_map_chg_seq_0807EC34 _080B2C9C: @@ -1111,7 +1111,7 @@ sub_80B2CEC: @ 80B2CEC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, =gUnknown_020375F0 + ldr r1, =gScriptResult movs r0, 0x5 strh r0, [r1] ldr r0, =gTasks @@ -1139,7 +1139,7 @@ sub_80B2D2C: @ 80B2D2C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, =gUnknown_020375F0 + ldr r1, =gScriptResult movs r0, 0x6 strh r0, [r1] ldr r0, =gTasks @@ -1197,7 +1197,7 @@ sub_80B2DA4: @ 80B2DA4 push {r4,lr} movs r3, 0x2 movs r2, 0x2 - ldr r0, =gUnknown_020375E0 + ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] cmp r0, 0x2 beq _080B2DDC @@ -1284,7 +1284,7 @@ sub_80B2E4C: @ 80B2E4C thumb_func_start sub_80B2E74 sub_80B2E74: @ 80B2E74 push {lr} - ldr r1, =gUnknown_020375F0 + ldr r1, =gScriptResult movs r0, 0 strh r0, [r1] ldr r1, =gUnknown_020229C6 @@ -1353,7 +1353,7 @@ sub_80B2EE4: @ 80B2EE4 b _080B2FC6 .pool _080B2F0C: - ldr r0, =gUnknown_020375F0 + ldr r0, =gScriptResult ldrh r0, [r0] cmp r0, 0x1 bne _080B2FA8 @@ -1415,7 +1415,7 @@ _080B2F74: _080B2F82: cmp r7, 0 beq _080B2FA8 - ldr r1, =gUnknown_020375F0 + ldr r1, =gScriptResult movs r0, 0xC strh r0, [r1] bl sub_800AD10 @@ -1517,7 +1517,7 @@ sub_80B3050: @ 80B3050 b _080B3134 .pool _080B3068: - ldr r0, =gUnknown_020375E0 + ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x8 @@ -1863,7 +1863,7 @@ _080B3370: lsls r0, 1 bl PlayNewMapMusic__default_for_battle _080B3378: - ldr r0, =gUnknown_020375E0 + ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] bl sub_80B3260 bl overworld_free_bg_tilemaps @@ -2036,7 +2036,7 @@ _080B3504: ldr r1, =gUnknown_020229E8 ldr r0, =0x00002211 str r0, [r1, 0x14] - ldr r0, =gUnknown_020375E0 + ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] bl sub_80B3260 bl overworld_free_bg_tilemaps @@ -2160,7 +2160,7 @@ sub_80B360C: @ 80B360C bl copy_player_party_from_sav1 bl copy_bags_and_unk_data_to_save_blocks bl sub_813BF10 - ldr r0, =gUnknown_020375E0 + ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] subs r0, 0x1 lsls r0, 16 @@ -2238,7 +2238,7 @@ _080B36D0: thumb_func_start sub_80B36EC sub_80B36EC: @ 80B36EC push {lr} - ldr r0, =gUnknown_020375E0 + ldr r0, =gSpecialVar_0x8004 ldrh r1, [r0] subs r0, r1, 0x1 lsls r0, 16 @@ -2308,7 +2308,7 @@ _080B376C: cmp r0, 0 beq _080B37CC bl sub_8087288 - ldr r0, =gUnknown_020375E2 + ldr r0, =gSpecialVar_0x8005 ldrb r0, [r0] bl sub_8009628 movs r0, 0x2 @@ -2584,7 +2584,7 @@ sub_80B39A4: @ 80B39A4 thumb_func_start sp02A_crash_sound sp02A_crash_sound: @ 80B39BC push {lr} - ldr r0, =gUnknown_020375E4 + ldr r0, =gSpecialVar_0x8006 ldrb r0, [r0] ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music bl sub_80C4E74 @@ -2599,7 +2599,7 @@ sub_80B39D4: @ 80B39D4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_020375E4 + ldr r0, =gSpecialVar_0x8006 strh r4, [r0] ldr r0, =gStringVar1 lsls r1, r4, 3 |