diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-02-03 21:34:56 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-02-03 18:34:56 -0800 |
| commit | 689df5cff8386d85f1f1da1fc332db18d282f928 (patch) | |
| tree | 0c8b3264268315422064aa8960c0007f5f5d9341 /asm/calculate_base_damage.s | |
| parent | e2b834d21d96332c5bcf788b390a09e285c7a5cb (diff) | |
finish decompiling battle_ai.c (#16)
* partially decompile battle_ai.c up to tai60_unk
* nonmatching tai60_unk
* decompile more of battle_ai.c
* formatting
* finish porting battle_ai.c
* formatting
Diffstat (limited to 'asm/calculate_base_damage.s')
| -rw-r--r-- | asm/calculate_base_damage.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s index 47813bbd0..379a8c46a 100644 --- a/asm/calculate_base_damage.s +++ b/asm/calculate_base_damage.s @@ -621,7 +621,7 @@ _08069A58: bls _08069A60 b _08069BC2 _08069A60: - ldr r0, =gUnknown_02024211 + ldr r0, =gCritMultiplier ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -789,7 +789,7 @@ _08069BCA: bhi _08069BD2 b _08069DD4 _08069BD2: - ldr r0, =gUnknown_02024211 + ldr r0, =gCritMultiplier ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -947,7 +947,7 @@ _08069CFC: lsls r0, 24 cmp r0, 0 bne _08069DAC - ldr r2, =gUnknown_020243CC + ldr r2, =gBattleWeather ldrh r1, [r2] movs r0, 0x1 ands r0, r1 |