diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-02-01 22:15:38 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-02-01 22:15:38 -0600 |
| commit | bcff8d1b45d6cfdc0c2e5e94137aa0e578009f7c (patch) | |
| tree | 9ee1265e986292feca8d01345888134e9fd76ea3 /asm/calculate_base_damage.s | |
| parent | 8a36c77ac8fd10350eed197f28e519c9a7a3b8a6 (diff) | |
start decompiling battle_ai
Diffstat (limited to 'asm/calculate_base_damage.s')
| -rw-r--r-- | asm/calculate_base_damage.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index f6c2497a7..47813bbd0 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -261,7 +261,7 @@ _08069790: mov r0, r9 cmp r0, 0x22 bne _080697C6 - ldr r0, =gUnknown_02022FEC + ldr r0, =gBattleTypeFlags ldr r0, [r0] ldr r1, =0x003f0100 ands r0, r1 @@ -288,7 +288,7 @@ _080697C6: ldr r0, [sp, 0x20] cmp r0, 0x22 bne _080697FC - ldr r0, =gUnknown_02022FEC + ldr r0, =gBattleTypeFlags ldr r0, [r0] ldr r1, =0x003f0100 ands r0, r1 @@ -728,7 +728,7 @@ _08069B48: ldrb r1, [r4] cmp r1, 0x1 bne _08069B8A - ldr r0, =gUnknown_02022FEC + ldr r0, =gBattleTypeFlags ldr r0, [r0] ands r0, r1 cmp r0, 0 @@ -750,7 +750,7 @@ _08069B84: adds r0, r5, r0 asrs r5, r0, 1 _08069B8A: - ldr r0, =gUnknown_02022FEC + ldr r0, =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -880,7 +880,7 @@ _08069C76: ldrb r1, [r4] cmp r1, 0x1 bne _08069CCA - ldr r0, =gUnknown_02022FEC + ldr r0, =gBattleTypeFlags ldr r0, [r0] ands r0, r1 cmp r0, 0 @@ -902,7 +902,7 @@ _08069CC4: adds r0, r5, r0 asrs r5, r0, 1 _08069CCA: - ldr r0, =gUnknown_02022FEC + ldr r0, =gBattleTypeFlags ldr r0, [r0] movs r1, 0x1 ands r0, r1 |