diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:41 -0400 |
| commit | 9cfdc8b7e8cba38bc530b16993f628c92f69c025 (patch) | |
| tree | d37bef6a048f87491011addb679cb75ef0d8c74a /asm/battle_transition.s | |
| parent | 1b499670bd8a428f9b0d5506c334aa88bf4272a3 (diff) | |
| parent | 63210c07897e86953bf093397eee5a33e95b8c91 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'asm/battle_transition.s')
| -rw-r--r-- | asm/battle_transition.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 2f9637594..6ffa17320 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -4348,7 +4348,7 @@ sub_8148218: @ 8148218 ldr r0, =gSaveBlock2Ptr ldr r0, [r0] ldrb r0, [r0, 0x8] - bl sub_806F000 + bl PlayerGenderToFrontTrainerPicId lsls r0, 24 lsrs r0, 24 movs r1, 0x88 |