diff options
Diffstat (limited to 'asm/recorded_battle.s')
| -rw-r--r-- | asm/recorded_battle.s | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/asm/recorded_battle.s b/asm/recorded_battle.s index f22214f93..9f76ff3df 100644 --- a/asm/recorded_battle.s +++ b/asm/recorded_battle.s @@ -873,12 +873,12 @@ _081854DC: adds r0, r7, r3 str r2, [r0] _081854E2: - ldr r4, =gUnknown_02038BCA + ldr r4, =gTrainerBattleOpponent_A ldrh r1, [r4] ldr r5, =0x000004f4 adds r0, r7, r5 strh r1, [r0] - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B ldrh r1, [r0] ldr r2, =0x000004f6 adds r0, r7, r2 @@ -944,7 +944,7 @@ _081854E2: str r0, [r1] ldr r4, =0xfffffed4 adds r1, r4, 0 - ldr r5, =gUnknown_02038BCA + ldr r5, =gTrainerBattleOpponent_A ldrh r5, [r5] adds r0, r1, r5 lsls r0, 16 @@ -957,7 +957,7 @@ _08185580: ldr r0, =0x00000504 adds r3, r7, r0 mov r10, r9 - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A mov r12, r1 adds r2, r4, 0 mov r8, r2 @@ -981,7 +981,7 @@ _08185592: ble _08185592 mov r0, r9 ldr r2, [r0] - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A ldrh r0, [r1] ldr r3, =0xfffffed4 adds r0, r3 @@ -1002,7 +1002,7 @@ _08185592: ldr r2, =0x0000050e adds r4, r7, r2 mov r10, r9 - ldr r5, =gUnknown_02038BCA + ldr r5, =gTrainerBattleOpponent_A mov r8, r5 adds r5, r3, 0 _081855E6: @@ -1032,7 +1032,7 @@ _08185664: ldr r1, =0x0000050e adds r4, r7, r1 mov r10, r9 - ldr r2, =gUnknown_02038BCA + ldr r2, =gTrainerBattleOpponent_A mov r8, r2 adds r5, r3, 0 _08185672: @@ -1057,7 +1057,7 @@ _08185672: _08185696: mov r1, r9 ldr r2, [r1] - ldr r3, =gUnknown_02038BCA + ldr r3, =gTrainerBattleOpponent_A ldrh r0, [r3] ldr r4, =0xfffffed4 adds r0, r4 @@ -1070,7 +1070,7 @@ _08185696: b _08185856 .pool _081856C4: - ldr r3, =gUnknown_02038BCC + ldr r3, =gTrainerBattleOpponent_B ldrh r3, [r3] adds r0, r1, r3 lsls r0, 16 @@ -1083,7 +1083,7 @@ _081856D4: ldr r4, =0x00000504 adds r3, r7, r4 mov r10, r9 - ldr r5, =gUnknown_02038BCC + ldr r5, =gTrainerBattleOpponent_B mov r12, r5 ldr r0, =0xfffffed4 mov r8, r0 @@ -1107,7 +1107,7 @@ _081856E6: ble _081856E6 mov r0, r9 ldr r2, [r0] - ldr r1, =gUnknown_02038BCC + ldr r1, =gTrainerBattleOpponent_B ldrh r0, [r1] ldr r3, =0xfffffed4 adds r0, r3 @@ -1128,7 +1128,7 @@ _081856E6: ldr r2, =0x0000050e adds r4, r7, r2 mov r10, r9 - ldr r5, =gUnknown_02038BCC + ldr r5, =gTrainerBattleOpponent_B mov r8, r5 adds r5, r3, 0 _0818573A: @@ -1158,7 +1158,7 @@ _08185784: ldr r1, =0x0000050e adds r4, r7, r1 mov r10, r9 - ldr r2, =gUnknown_02038BCC + ldr r2, =gTrainerBattleOpponent_B mov r8, r2 adds r5, r3, 0 _08185792: @@ -1183,7 +1183,7 @@ _08185792: _081857B6: mov r1, r9 ldr r2, [r1] - ldr r3, =gUnknown_02038BCC + ldr r3, =gTrainerBattleOpponent_B ldrh r0, [r3] ldr r4, =0xfffffed4 adds r0, r4 @@ -1259,7 +1259,7 @@ _08185856: adds r0, r7, r2 strb r1, [r0] _0818585C: - ldr r3, =gUnknown_02038BCA + ldr r3, =gTrainerBattleOpponent_A ldrh r0, [r3] ldr r1, =0x0000018f cmp r0, r1 @@ -1284,7 +1284,7 @@ _0818585C: ldr r0, =0x0000050e adds r4, r7, r0 mov r10, r9 - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A mov r8, r1 adds r5, r3, 0 _08185894: @@ -1310,14 +1310,14 @@ _08185894: ble _08185894 mov r3, r9 ldr r2, [r3] - ldr r4, =gUnknown_02038BCA + ldr r4, =gTrainerBattleOpponent_A ldrh r1, [r4] ldr r5, =0xfffffe70 adds r1, r5 b _081859AC .pool _08185900: - ldr r3, =gUnknown_02038BCC + ldr r3, =gTrainerBattleOpponent_B ldrh r0, [r3] cmp r0, r1 bls _0818597C @@ -1341,7 +1341,7 @@ _08185900: ldr r0, =0x0000050e adds r4, r7, r0 mov r10, r9 - ldr r1, =gUnknown_02038BCC + ldr r1, =gTrainerBattleOpponent_B mov r8, r1 adds r5, r3, 0 _08185936: @@ -1367,7 +1367,7 @@ _08185936: ble _08185936 mov r3, r9 ldr r2, [r3] - ldr r4, =gUnknown_02038BCC + ldr r4, =gTrainerBattleOpponent_B ldrh r1, [r4] ldr r5, =0xfffffe70 adds r1, r5 @@ -1542,9 +1542,9 @@ sub_8185AB0: @ 8185AB0 ldr r0, =gBattleTypeFlags movs r1, 0 str r1, [r0] - ldr r0, =gUnknown_02038BCA + ldr r0, =gTrainerBattleOpponent_A strh r1, [r0] - ldr r0, =gUnknown_02038BCC + ldr r0, =gTrainerBattleOpponent_B strh r1, [r0] ldr r0, =gUnknown_02038BCE strh r1, [r0] @@ -1715,12 +1715,12 @@ _08185C2A: lsls r1, 17 orrs r0, r1 str r0, [r2] - ldr r1, =gUnknown_02038BCA + ldr r1, =gTrainerBattleOpponent_A ldr r2, =0x000004f4 adds r0, r7, r2 ldrh r0, [r0] strh r0, [r1] - ldr r1, =gUnknown_02038BCC + ldr r1, =gTrainerBattleOpponent_B adds r3, 0xE adds r0, r7, r3 ldrh r0, [r0] @@ -2638,13 +2638,13 @@ _081863FC: .pool thumb_func_end sub_818603C - thumb_func_start sub_8186438 -sub_8186438: @ 8186438 + thumb_func_start GetAiScriptsInRecordedBattle +GetAiScriptsInRecordedBattle: @ 8186438 ldr r0, =gUnknown_0203C7BC ldr r0, [r0] bx lr .pool - thumb_func_end sub_8186438 + thumb_func_end GetAiScriptsInRecordedBattle thumb_func_start sub_8186444 sub_8186444: @ 8186444 |