diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-07 18:03:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-07 18:03:13 -0500 |
| commit | 9b920bfec363bbcda40354079500062bc992dfed (patch) | |
| tree | bdbc9f8feda728f2d13a2db95350b2d3e662a73a /asm | |
| parent | b2d8ce10ceb9063ae44daf4b6f8cb8a956cbde26 (diff) | |
More renaming
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_specials.s | 2 | ||||
| -rw-r--r-- | asm/pokenav.s | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index 6200123ac..d7bb80f30 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -6817,7 +6817,7 @@ sub_813B4E0: @ 813B4E0 push {lr} ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] - bl sub_81D15CC + bl GetRematchIdxByTrainerIdx cmp r0, 0 blt _0813B50C movs r1, 0xAE diff --git a/asm/pokenav.s b/asm/pokenav.s index 1708642b3..fe96d51e7 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -7870,7 +7870,7 @@ sub_81CAF04: @ 81CAF04 cmp r0, 0 bne _081CAF34 ldrh r0, [r1, 0x1E] - bl sub_81D15BC + bl GetTrainerIdxByRematchIdx adds r4, r0, 0 ldr r1, =gTrainers lsls r0, r4, 2 @@ -7897,7 +7897,7 @@ _081CAF34: .pool _081CAF58: adds r0, r4, 0 - bl sub_81D15BC + bl GetTrainerIdxByRematchIdx adds r4, r0, 0 ldr r0, =gTrainers lsls r1, r4, 2 @@ -7938,7 +7938,7 @@ _081CAFA4: cmp r0, 0 bne _081CAFC4 ldrh r0, [r1, 0x1E] - bl sub_81D15BC + bl GetTrainerIdxByRematchIdx ldr r1, =gStringVar4 bl sub_81967AC strb r0, [r6] @@ -8036,7 +8036,7 @@ sub_81CB050: @ 81CB050 cmp r0, 0 bne _081CB088 ldrh r0, [r2, 0x2] - bl sub_81D15BC + bl GetTrainerIdxByRematchIdx lsls r1, r0, 2 adds r1, r0 lsls r1, 3 |