diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
| commit | ed7ded0748b38b5266cdc6092446c7b184f75778 (patch) | |
| tree | 0779eacd2dc6107e2dc47370abf82a1793cde6ed /asm/battle_transition.s | |
| parent | 975e28c01e70c63587c8633ffc3c50b7d1759dec (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge branch 'master' into easy_chat
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 |